From 434cb7e5b5a969575583e45c3fd85fd04fdf2f0c Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 14:22:54 +0100 Subject: [PATCH 001/962] Create suggestion list --- bookwyrm/forms/lists.py | 6 +++++ bookwyrm/migrations/0173_suggestionlist.py | 26 ++++++++++++++++++++++ bookwyrm/models/__init__.py | 2 +- bookwyrm/models/fields.py | 2 +- bookwyrm/models/list.py | 8 +++++++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 bookwyrm/migrations/0173_suggestionlist.py diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py index 647db3bfe9..945c2889df 100644 --- a/bookwyrm/forms/lists.py +++ b/bookwyrm/forms/lists.py @@ -14,6 +14,12 @@ class Meta: fields = ["user", "name", "description", "curation", "privacy", "group"] +class SuggestionListForm(CustomForm): + class Meta: + model = models.SuggestionList + fields = ["user", "book"] + + class ListItemForm(CustomForm): class Meta: model = models.ListItem diff --git a/bookwyrm/migrations/0173_suggestionlist.py b/bookwyrm/migrations/0173_suggestionlist.py new file mode 100644 index 0000000000..b056b3cb03 --- /dev/null +++ b/bookwyrm/migrations/0173_suggestionlist.py @@ -0,0 +1,26 @@ +# Generated by Django 3.2.16 on 2023-01-01 12:26 + +import bookwyrm.models.fields +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0172_alter_user_preferred_language'), + ] + + operations = [ + migrations.CreateModel( + name='SuggestionList', + fields=[ + ('list_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.list')), + ('book', bookwyrm.models.fields.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.edition')), + ], + options={ + 'abstract': False, + }, + bases=('bookwyrm.list',), + ), + ] diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py index ae70001623..ae2be0aff0 100644 --- a/bookwyrm/models/__init__.py +++ b/bookwyrm/models/__init__.py @@ -8,7 +8,7 @@ from .connector import Connector from .shelf import Shelf, ShelfBook -from .list import List, ListItem +from .list import List, SuggestionList, ListItem from .status import Status, GeneratedNote, Comment, Quotation from .status import Review, ReviewRating diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index d11f5fb1d1..dbced6d984 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -280,7 +280,7 @@ def field_to_activity(self, value): class OneToOneField(ActivitypubRelatedFieldMixin, models.OneToOneField): - """activitypub-aware foreign key field""" + """activitypub-aware one to one field""" def field_to_activity(self, value): if not value: diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 63dd5b23f6..080bfd49c8 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -131,6 +131,14 @@ def save(self, *args, **kwargs): super().save(*args, **kwargs) +class SuggestionList(List): + """List related to a specific book""" + + book = fields.OneToOneField( + "Edition", on_delete=models.PROTECT, activitypub_field="book" + ) + + class ListItem(CollectionItemMixin, BookWyrmModel): """ok""" From acd379944d4ab3a842b57c2dade0bf49720b763c Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 14:23:37 +0100 Subject: [PATCH 002/962] Add list creation button --- bookwyrm/templates/book/book.html | 4 ++++ .../templates/book/suggestion_list/list.html | 11 ++++++++++ bookwyrm/urls.py | 5 +++++ bookwyrm/views/__init__.py | 1 + bookwyrm/views/books/books.py | 20 +++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 bookwyrm/templates/book/suggestion_list/list.html diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 6a8d4d794c..2a69829e56 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -344,6 +344,10 @@

{% trans "Your reading activity" %}

+
+ {% include "book/suggestion_list/list.html" %} +
+ {% if book.subjects %}

{% trans "Subjects" %}

diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html new file mode 100644 index 0000000000..8f9ad179ac --- /dev/null +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -0,0 +1,11 @@ +{% load i18n %} +{% if book.suggestionlist %} +

{% trans "Suggestions" %}

+{% else %} +
+ {% csrf_token %} + + + +
+{% endif %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index ac3a805803..7ee4bca8e0 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -664,6 +664,11 @@ views.update_book_from_remote, name="book-update-remote", ), + re_path( + rf"{BOOK_PATH}/create-suggestion-list/?$", + views.create_suggestion_list, + name="book-create-suggestion-list", + ), re_path( r"^author/(?P\d+)/update/(?P[\w\.]+)/?$", views.update_author_from_remote, diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index db88f1ae28..0e815853ec 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -49,6 +49,7 @@ upload_cover, add_description, resolve_book, + create_suggestion_list, ) from .books.books import update_book_from_remote from .books.edit_book import ( diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 565220b6ea..9339840694 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -208,3 +208,23 @@ def update_book_from_remote(request, book_id, connector_identifier): return Book().get(request, book_id, update_error=True) return redirect("book", book.id) + + +@login_required +@require_POST +def create_suggestion_list(request, book_id): + """create a suggestion_list""" + form = forms.SuggestionListForm(request.POST) + book = get_object_or_404(models.Edition, id=book_id) + + if not form.is_valid(): + return redirect("book", book.id) + suggestion_list = form.save(request, commit=False) + + # default values for the suggestion list + suggestion_list.privacy = "public" + suggestion_list.curation = "open" + suggestion_list.save() + + return redirect("book", book.id) + From fe05e319037b68eb433855c8514e69fa2714cbb6 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 14:27:54 +0100 Subject: [PATCH 003/962] Fix field doc --- bookwyrm/models/fields.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index dbced6d984..572e4a3395 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -528,11 +528,11 @@ class BooleanField(ActivitypubFieldMixin, models.BooleanField): class IntegerField(ActivitypubFieldMixin, models.IntegerField): - """activitypub-aware boolean field""" + """activitypub-aware integer field""" class DecimalField(ActivitypubFieldMixin, models.DecimalField): - """activitypub-aware boolean field""" + """activitypub-aware decimal field""" def field_to_activity(self, value): if not value: From 25af64f03d88a0bf9880ea05f384d1717908b586 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 15:32:25 +0100 Subject: [PATCH 004/962] Display books in list --- bookwyrm/templates/book/book.html | 9 ++- .../templates/book/suggestion_list/list.html | 72 +++++++++++++++++-- 2 files changed, 69 insertions(+), 12 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 2a69829e56..e920a496ca 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -344,10 +344,6 @@

{% trans "Your reading activity" %}

-
- {% include "book/suggestion_list/list.html" %} -
- {% if book.subjects %}

{% trans "Subjects" %}

@@ -408,8 +404,11 @@

{% trans "Lists" %}

- + +
+ {% include "book/suggestion_list/list.html" %} +
{% endwith %} {% endblock %} diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 8f9ad179ac..d75e7c27a8 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -1,11 +1,69 @@ {% load i18n %} + +

+ {% trans "Suggestions" %} +

+ {% if book.suggestionlist %} -

{% trans "Suggestions" %}

+{% with book.suggestionlist.listitem_set.all as items %} + + {% if items.count == 0 %} +
+

+ {% trans "There are currently no suggestions." %} +
+

+

+ +

+
+ {% else %} +
    + {% for item in items %} +
  1. +
    +
    + {% with book=item.book %} +
    + +
    + +

    + {% include 'snippets/book_titleby.html' %} +

    + {% endwith %} +
    +
    +
    +

    + {% blocktrans trimmed with username=item.user.display_name user_path=item.user.local_path %} + Added by {{ username }} + {% endblocktrans %} +

    +
    +
    +

    + TODO :: endorsements +

    +
    +
    +
    +
    2. + {% endfor %} +
+ {% endif %} +{% endwith %} {% else %} -
- {% csrf_token %} - - - -
+
+
+ {% csrf_token %} + + + +
+
{% endif %} From 4712673f945533e98708aba9cf8b414ff8cdccc6 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 16:48:19 +0100 Subject: [PATCH 005/962] Add book suggestion --- .../templates/book/suggestion_list/list.html | 25 ++++----- .../book/suggestion_list/search.html | 54 +++++++++++++++++++ bookwyrm/templates/lists/add_item_modal.html | 6 ++- bookwyrm/urls.py | 5 ++ bookwyrm/views/__init__.py | 1 + bookwyrm/views/books/books.py | 36 ++++++++++++- bookwyrm/views/list/list.py | 10 ++-- 7 files changed, 118 insertions(+), 19 deletions(-) create mode 100644 bookwyrm/templates/book/suggestion_list/search.html diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index d75e7c27a8..cf97b53cde 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -1,23 +1,17 @@ {% load i18n %} -

+

{% trans "Suggestions" %}

{% if book.suggestionlist %} {% with book.suggestionlist.listitem_set.all as items %} - {% if items.count == 0 %} -
-

- {% trans "There are currently no suggestions." %} -
-

-

- -

+ {% if items|length == 0 %} +
+
+ {% include "book/suggestion_list/search.html" %} +
{% else %}
    @@ -28,7 +22,7 @@

    {% with book=item.book %}
    @@ -54,12 +48,15 @@

    {% endfor %} +
  1. + {% include "book/suggestion_list/search.html" %} +

{% endif %} {% endwith %} {% else %}
-
+ {% csrf_token %} diff --git a/bookwyrm/templates/book/suggestion_list/search.html b/bookwyrm/templates/book/suggestion_list/search.html new file mode 100644 index 0000000000..989583a0c6 --- /dev/null +++ b/bookwyrm/templates/book/suggestion_list/search.html @@ -0,0 +1,54 @@ +{% load i18n %} +{% load utilities %} + +{% if request.user.is_authenticated %} +{% with book.suggestionlist as list %} +

+ {% trans "Add suggestions" %} +

+ +
+
+ +
+
+ +
+
+ {% if query %} +

{% trans "Clear search" %}

+ {% endif %} +
+ {% if not suggested_books %} + {% if query %} +

{% blocktrans %}No books found matching the query "{{ query }}"{% endblocktrans %}

{% else %} +

{% trans "No books found" %}

+ {% endif %} + {% endif %} + + {% if suggested_books|length > 0 %} + {% for book in suggested_books %} +
+
+

{% include 'snippets/book_titleby.html' with book=book %}

+ + {% join "add_item" list.id book.id as modal_id %} + + {% include "lists/add_item_modal.html" with id=modal_id is_suggestion=True %} +
+
+ {% endfor %} + {% endif %} +{% endwith %} +{% endif %} + diff --git a/bookwyrm/templates/lists/add_item_modal.html b/bookwyrm/templates/lists/add_item_modal.html index 2c586b308c..184911cfca 100644 --- a/bookwyrm/templates/lists/add_item_modal.html +++ b/bookwyrm/templates/lists/add_item_modal.html @@ -19,7 +19,11 @@
{% endblock %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 7ee4bca8e0..6c5d4f993c 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -669,6 +669,11 @@ views.create_suggestion_list, name="book-create-suggestion-list", ), + re_path( + rf"{BOOK_PATH}/book-add-suggestion/?$", + views.book_add_suggestion, + name="book-add-suggestion", + ), re_path( r"^author/(?P\d+)/update/(?P[\w\.]+)/?$", views.update_author_from_remote, diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 0e815853ec..b35e833247 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -50,6 +50,7 @@ add_description, resolve_book, create_suggestion_list, + book_add_suggestion, ) from .books.books import update_book_from_remote from .books.edit_book import ( diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 9339840694..4d7ffecf92 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -3,7 +3,8 @@ from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator -from django.db.models import Avg, Q +from django.db import transaction +from django.db.models import Avg, Q, Max from django.http import Http404 from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse @@ -16,6 +17,7 @@ from bookwyrm.connectors.abstract_connector import get_image from bookwyrm.settings import PAGE_LENGTH from bookwyrm.views.helpers import is_api_request, maybe_redirect_local_path +from bookwyrm.views.list.list import get_list_suggestions, increment_order_in_reverse # pylint: disable=no-self-use @@ -74,6 +76,8 @@ def get(self, request, book_id, **kwargs): queryset = queryset.select_related("user").order_by("-published_date") paginated = Paginator(queryset, PAGE_LENGTH) + query = request.GET.get("suggestion_query", "") + lists = models.List.privacy_filter(request.user,).filter( listitem__approved=True, listitem__book__in=book.parent_work.editions.all(), @@ -90,6 +94,7 @@ def get(self, request, book_id, **kwargs): "rating": reviews.aggregate(Avg("rating"))["rating__avg"], "lists": lists, "update_error": kwargs.get("update_error", False), + "query": query, } if request.user.is_authenticated: @@ -122,6 +127,10 @@ def get(self, request, book_id, **kwargs): "comment_count": book.comment_set.filter(**filters).count(), "quotation_count": book.quotation_set.filter(**filters).count(), } + if hasattr(book, "suggestionlist"): + data["suggested_books"] = get_list_suggestions( + book.suggestionlist, request.user, query=query, ignore_id=book.id, + ) return TemplateResponse(request, "book/book.html", data) @@ -228,3 +237,28 @@ def create_suggestion_list(request, book_id): return redirect("book", book.id) + +@login_required +@require_POST +@transaction.atomic +def book_add_suggestion(request, book_id): + """put a book on the suggestion list""" + book_list = get_object_or_404(models.List, id=request.POST.get("book_list")) + + form = forms.ListItemForm(request.POST) + if not form.is_valid(): + return Book().get(request, book_id, add_failed=True) + + item = form.save(request, commit=False) + + # add the book at the latest order of approved books, before pending books + order_max = ( + book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[ + "order__max" + ] + ) or 0 + increment_order_in_reverse(book_list.id, order_max + 1) + item.order = order_max + 1 + item.save() + + return Book().get(request, book_id, add_succeeded=True) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 1adf7a6797..a8f31b5c05 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -94,22 +94,26 @@ def post(self, request, list_id): return redirect(book_list.local_path) -def get_list_suggestions(book_list, user, query=None): +def get_list_suggestions(book_list, user, query=None, ignore_id=None): """What books might a user want to add to a list""" if query: # search for books return book_search.search( query, - filters=[~Q(parent_work__editions__in=book_list.books.all())], + filters=[ + ~Q(parent_work__editions__in=book_list.books.all()), + ~Q(parent_work__editions__in=[ignore_id]), + ], ) # just suggest whatever books are nearby - suggestions = user.shelfbook_set.filter(~Q(book__in=book_list.books.all())) + suggestions = user.shelfbook_set.filter(~Q(book__in=book_list.books.all())).exclude(book__id=ignore_id) suggestions = [s.book for s in suggestions[:5]] if len(suggestions) < 5: suggestions += [ s.default_edition for s in models.Work.objects.filter( ~Q(editions__in=book_list.books.all()), + ~Q(editions__in=[ignore_id]), ).order_by("-updated_date")[: 5 - len(suggestions)] ] return suggestions From aee1af52fb4e5499a686d2ba076bf7bac23b0076 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 16:53:19 +0100 Subject: [PATCH 006/962] =?UTF-8?q?black=20=E2=9C=A8=20=F0=9F=8D=B0=20?= =?UTF-8?q?=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookwyrm/migrations/0173_suggestionlist.py | 28 +++++++++++++++++----- bookwyrm/views/books/books.py | 7 ++++-- bookwyrm/views/list/list.py | 4 +++- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/bookwyrm/migrations/0173_suggestionlist.py b/bookwyrm/migrations/0173_suggestionlist.py index b056b3cb03..96e9341e27 100644 --- a/bookwyrm/migrations/0173_suggestionlist.py +++ b/bookwyrm/migrations/0173_suggestionlist.py @@ -8,19 +8,35 @@ class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0172_alter_user_preferred_language'), + ("bookwyrm", "0172_alter_user_preferred_language"), ] operations = [ migrations.CreateModel( - name='SuggestionList', + name="SuggestionList", fields=[ - ('list_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='bookwyrm.list')), - ('book', bookwyrm.models.fields.OneToOneField(on_delete=django.db.models.deletion.PROTECT, to='bookwyrm.edition')), + ( + "list_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="bookwyrm.list", + ), + ), + ( + "book", + bookwyrm.models.fields.OneToOneField( + on_delete=django.db.models.deletion.PROTECT, + to="bookwyrm.edition", + ), + ), ], options={ - 'abstract': False, + "abstract": False, }, - bases=('bookwyrm.list',), + bases=("bookwyrm.list",), ), ] diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 4d7ffecf92..b577beeef1 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -129,7 +129,10 @@ def get(self, request, book_id, **kwargs): } if hasattr(book, "suggestionlist"): data["suggested_books"] = get_list_suggestions( - book.suggestionlist, request.user, query=query, ignore_id=book.id, + book.suggestionlist, + request.user, + query=query, + ignore_id=book.id, ) return TemplateResponse(request, "book/book.html", data) @@ -225,7 +228,7 @@ def create_suggestion_list(request, book_id): """create a suggestion_list""" form = forms.SuggestionListForm(request.POST) book = get_object_or_404(models.Edition, id=book_id) - + if not form.is_valid(): return redirect("book", book.id) suggestion_list = form.save(request, commit=False) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index a8f31b5c05..61f870928b 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -106,7 +106,9 @@ def get_list_suggestions(book_list, user, query=None, ignore_id=None): ], ) # just suggest whatever books are nearby - suggestions = user.shelfbook_set.filter(~Q(book__in=book_list.books.all())).exclude(book__id=ignore_id) + suggestions = user.shelfbook_set.filter(~Q(book__in=book_list.books.all())).exclude( + book__id=ignore_id + ) suggestions = [s.book for s in suggestions[:5]] if len(suggestions) < 5: suggestions += [ From 3cb548f059878c8ae2a9ebbf491bc738b5956270 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 17:52:43 +0100 Subject: [PATCH 007/962] Switch from subclass to new column --- bookwyrm/forms/lists.py | 4 +- bookwyrm/migrations/0173_list_suggests_for.py | 26 ++++++++++++ bookwyrm/migrations/0173_suggestionlist.py | 42 ------------------- bookwyrm/models/__init__.py | 2 +- bookwyrm/models/list.py | 16 +++---- bookwyrm/views/books/books.py | 4 +- bookwyrm/views/list/lists.py | 11 ++++- 7 files changed, 48 insertions(+), 57 deletions(-) create mode 100644 bookwyrm/migrations/0173_list_suggests_for.py delete mode 100644 bookwyrm/migrations/0173_suggestionlist.py diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py index 945c2889df..29c17bc0e5 100644 --- a/bookwyrm/forms/lists.py +++ b/bookwyrm/forms/lists.py @@ -16,8 +16,8 @@ class Meta: class SuggestionListForm(CustomForm): class Meta: - model = models.SuggestionList - fields = ["user", "book"] + model = models.List + fields = ["user", "suggests_for"] class ListItemForm(CustomForm): diff --git a/bookwyrm/migrations/0173_list_suggests_for.py b/bookwyrm/migrations/0173_list_suggests_for.py new file mode 100644 index 0000000000..48c9456967 --- /dev/null +++ b/bookwyrm/migrations/0173_list_suggests_for.py @@ -0,0 +1,26 @@ +# Generated by Django 3.2.16 on 2023-01-01 16:19 + +import bookwyrm.models.fields +from django.db import migrations +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0172_alter_user_preferred_language"), + ] + + operations = [ + migrations.AddField( + model_name="list", + name="suggests_for", + field=bookwyrm.models.fields.OneToOneField( + default=None, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name="suggestion_list", + to="bookwyrm.edition", + ), + ), + ] diff --git a/bookwyrm/migrations/0173_suggestionlist.py b/bookwyrm/migrations/0173_suggestionlist.py deleted file mode 100644 index 96e9341e27..0000000000 --- a/bookwyrm/migrations/0173_suggestionlist.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 3.2.16 on 2023-01-01 12:26 - -import bookwyrm.models.fields -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0172_alter_user_preferred_language"), - ] - - operations = [ - migrations.CreateModel( - name="SuggestionList", - fields=[ - ( - "list_ptr", - models.OneToOneField( - auto_created=True, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="bookwyrm.list", - ), - ), - ( - "book", - bookwyrm.models.fields.OneToOneField( - on_delete=django.db.models.deletion.PROTECT, - to="bookwyrm.edition", - ), - ), - ], - options={ - "abstract": False, - }, - bases=("bookwyrm.list",), - ), - ] diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py index ae2be0aff0..ae70001623 100644 --- a/bookwyrm/models/__init__.py +++ b/bookwyrm/models/__init__.py @@ -8,7 +8,7 @@ from .connector import Connector from .shelf import Shelf, ShelfBook -from .list import List, SuggestionList, ListItem +from .list import List, ListItem from .status import Status, GeneratedNote, Comment, Quotation from .status import Review, ReviewRating diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 080bfd49c8..2c5e1e9779 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -47,6 +47,14 @@ class List(OrderedCollectionMixin, BookWyrmModel): ) embed_key = models.UUIDField(unique=True, null=True, editable=False) activity_serializer = activitypub.BookList + suggests_for = fields.OneToOneField( + "Edition", + on_delete=models.PROTECT, + activitypub_field="book", + related_name="suggestion_list", + default=None, + null=True, + ) def get_remote_id(self): """don't want the user to be in there in this case""" @@ -131,14 +139,6 @@ def save(self, *args, **kwargs): super().save(*args, **kwargs) -class SuggestionList(List): - """List related to a specific book""" - - book = fields.OneToOneField( - "Edition", on_delete=models.PROTECT, activitypub_field="book" - ) - - class ListItem(CollectionItemMixin, BookWyrmModel): """ok""" diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index b577beeef1..b55af8ea6b 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -127,9 +127,9 @@ def get(self, request, book_id, **kwargs): "comment_count": book.comment_set.filter(**filters).count(), "quotation_count": book.quotation_set.filter(**filters).count(), } - if hasattr(book, "suggestionlist"): + if hasattr(book, "suggestion_list"): data["suggested_books"] = get_list_suggestions( - book.suggestionlist, + book.suggestion_list, request.user, query=query, ignore_id=book.id, diff --git a/bookwyrm/views/list/lists.py b/bookwyrm/views/list/lists.py index 2514fad58b..90cca49737 100644 --- a/bookwyrm/views/list/lists.py +++ b/bookwyrm/views/list/lists.py @@ -21,6 +21,7 @@ def get(self, request): lists = ListsStream().get_list_stream(request.user) else: lists = models.List.objects.filter(privacy="public") + lists = lists.filter(suggests_for__isnull=True) paginated = Paginator(lists, 12) data = { "lists": paginated.get_page(request.GET.get("page")), @@ -53,7 +54,9 @@ class SavedLists(View): def get(self, request): """display book lists""" # hide lists with no approved books - lists = request.user.saved_lists.order_by("-updated_date") + lists = request.user.saved_lists.order_by("-updated_date").filter( + suggests_for__isnull=True + ) paginated = Paginator(lists, 12) data = { @@ -71,7 +74,11 @@ class UserLists(View): def get(self, request, username): """display a book list""" user = get_user_from_username(request.user, username) - lists = models.List.privacy_filter(request.user).filter(user=user) + lists = ( + models.List.privacy_filter(request.user) + .filter(user=user) + .filter(suggests_for__isnull=True) + ) paginated = Paginator(lists, 12) data = { From 630bbc1075a4740c5a7a7b5eab459ea1db3f1265 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 17:53:08 +0100 Subject: [PATCH 008/962] Update template with new column names --- bookwyrm/templates/book/suggestion_list/list.html | 6 +++--- bookwyrm/templates/book/suggestion_list/search.html | 2 +- bookwyrm/templates/lists/add_item_modal.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index cf97b53cde..a5249b3f89 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -4,8 +4,8 @@

{% trans "Suggestions" %}

-{% if book.suggestionlist %} -{% with book.suggestionlist.listitem_set.all as items %} +{% if book.suggestion_list %} +{% with book.suggestion_list.listitem_set.all as items %} {% if items|length == 0 %}
@@ -59,7 +59,7 @@

{% csrf_token %} - +

diff --git a/bookwyrm/templates/book/suggestion_list/search.html b/bookwyrm/templates/book/suggestion_list/search.html index 989583a0c6..8edd5fd7db 100644 --- a/bookwyrm/templates/book/suggestion_list/search.html +++ b/bookwyrm/templates/book/suggestion_list/search.html @@ -2,7 +2,7 @@ {% load utilities %} {% if request.user.is_authenticated %} -{% with book.suggestionlist as list %} +{% with book.suggestion_list as list %}

{% trans "Add suggestions" %}

diff --git a/bookwyrm/templates/lists/add_item_modal.html b/bookwyrm/templates/lists/add_item_modal.html index 184911cfca..254d17b99d 100644 --- a/bookwyrm/templates/lists/add_item_modal.html +++ b/bookwyrm/templates/lists/add_item_modal.html @@ -20,7 +20,7 @@ name="add-book-{{ book.id }}" method="POST" {% if is_suggestion %} - action="{% url 'book-add-suggestion' book_id=list.book.id %}{% if query %}?suggestion_query={{ query }}#suggestions-section{% endif %}" + action="{% url 'book-add-suggestion' book_id=list.suggests_for.id %}{% if query %}?suggestion_query={{ query }}#suggestions-section{% endif %}" {% else %} action="{% url 'list-add-book' %}{% if query %}?q={{ query }}{% endif %}" {% endif %} From 6de97aebde6e64afb70979ba51d391b10fbff43b Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 18:01:15 +0100 Subject: [PATCH 009/962] Add get_name for dynamically generated name and description --- bookwyrm/models/list.py | 18 ++++++++++++++++++ bookwyrm/templates/lists/embed-list.html | 2 +- bookwyrm/templates/lists/layout.html | 6 +++--- bookwyrm/templates/lists/list.html | 4 ++-- bookwyrm/templates/lists/list_items.html | 8 ++++---- 5 files changed, 28 insertions(+), 10 deletions(-) diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 2c5e1e9779..2b18b733c9 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -5,6 +5,7 @@ from django.db import models from django.db.models import Q from django.utils import timezone +from django.utils.translation import gettext_lazy as _ from bookwyrm import activitypub from bookwyrm.settings import DOMAIN @@ -65,6 +66,23 @@ def collection_queryset(self): """list of books for this shelf, overrides OrderedCollectionMixin""" return self.books.filter(listitem__approved=True).order_by("listitem") + @property + def get_name(self): + if self.suggests_for: + return _("Suggestions for %(title)s") % {"title": self.suggests_for.title} + + return self.name + + @property + def get_description(self): + if self.suggests_for: + return _("This is the list of suggestions for %(title)s") % { + "title": self.suggests_for.title, + "url": self.suggests_for.local_path, + } + + return self.description + class Meta: """default sorting""" diff --git a/bookwyrm/templates/lists/embed-list.html b/bookwyrm/templates/lists/embed-list.html index d9a50a4646..411763eab2 100644 --- a/bookwyrm/templates/lists/embed-list.html +++ b/bookwyrm/templates/lists/embed-list.html @@ -21,7 +21,7 @@

- {% include 'snippets/trimmed_text.html' with full=list.description %} + {% include 'snippets/trimmed_text.html' with full=list.get_description %}
diff --git a/bookwyrm/templates/lists/layout.html b/bookwyrm/templates/lists/layout.html index e61d72b562..f1f52c7cab 100644 --- a/bookwyrm/templates/lists/layout.html +++ b/bookwyrm/templates/lists/layout.html @@ -1,12 +1,12 @@ {% extends 'layout.html' %} {% load i18n %} -{% block title %}{{ list.name }}{% endblock %} +{% block title %}{{ list.get_name }}{% endblock %} {% block content %}
-

{{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %}

+

{{ list.get_name }} {% include 'snippets/privacy-icons.html' with item=list %}

{% include 'lists/created_text.html' with list=list %}

@@ -28,7 +28,7 @@

{{ list.name }} {% include 'snippets/pr {% block breadcrumbs %}{% endblock %}
- {% include 'snippets/trimmed_text.html' with full=list.description %} + {% include 'snippets/trimmed_text.html' with full=list.get_description %}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 6824f50076..04fcd253c8 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -12,7 +12,7 @@
  • {% trans "Lists" %}
  • - {{ list.name|truncatechars:30 }} + {{ list.get_name|truncatechars:30 }}
    • @@ -275,7 +275,7 @@

    data-copytext data-copytext-label="{% trans 'Copy embed code' %}" data-copytext-success="{% trans 'Copied!' %}" - ><iframe style="border-width:0;" id="bookwyrm_list_embed" width="400" height="600" title="{% blocktrans trimmed with list_name=list.name site_name=site.name owner=list.user.display_name %} + ><iframe style="border-width:0;" id="bookwyrm_list_embed" width="400" height="600" title="{% blocktrans trimmed with list_name=list.get_name site_name=site.name owner=list.user.display_name %} {{ list_name }}, a list by {{owner}} on {{ site_name }} {% endblocktrans %}" src="{{ embed_url }}"></iframe>

    diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html index 1191a62647..1e73847a38 100644 --- a/bookwyrm/templates/lists/list_items.html +++ b/bookwyrm/templates/lists/list_items.html @@ -8,7 +8,7 @@

    - {{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %} + {{ list.get_name }} {% include 'snippets/privacy-icons.html' with item=list %}

    {% if request.user.is_authenticated and request.user|saved:list %}
    @@ -33,9 +33,9 @@

    {% endwith %}
    -
    - {% if list.description %} - {{ list.description|to_markdown|safe|truncatechars_html:30 }} +
    + {% if list.get_description %} + {{ list.get_description|to_markdown|safe|truncatechars_html:30 }} {% else %}   {% endif %} From f81c1611fed4a60277741f99f5fb2df4475f9645 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 18:09:48 +0100 Subject: [PATCH 010/962] Limit what's displayed on list page --- bookwyrm/templates/lists/layout.html | 4 +++- bookwyrm/templates/lists/list.html | 2 ++ bookwyrm/views/list/list.py | 2 +- bookwyrm/views/list/lists.py | 4 +--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/lists/layout.html b/bookwyrm/templates/lists/layout.html index f1f52c7cab..fb4dacacb4 100644 --- a/bookwyrm/templates/lists/layout.html +++ b/bookwyrm/templates/lists/layout.html @@ -7,13 +7,15 @@

    {{ list.get_name }} {% include 'snippets/privacy-icons.html' with item=list %}

    + {% if list.suggests_for == None %}

    {% include 'lists/created_text.html' with list=list %}

    + {% endif %}
    - {% if request.user == list.user %} + {% if request.user == list.user and list.suggests_for == None %}
    {% trans "Edit List" as button_text %} {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_list" focus="edit_list_header" %} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 04fcd253c8..6a5208a555 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -177,6 +177,7 @@

    + {% if list.suggests_for == None %}

    {% trans "Sort List" %}

    @@ -199,6 +200,7 @@

    + {% endif %} {% if request.user.is_authenticated and not list.curation == 'closed' or request.user == list.user %}

    {% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %} diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 61f870928b..079d7a035e 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -73,7 +73,7 @@ def get(self, request, list_id, **kwargs): if request.user.is_authenticated: data["suggested_books"] = get_list_suggestions( - book_list, request.user, query=query + book_list, request.user, query=query, ignore_id=book_list.suggests_for.id ) return TemplateResponse(request, "lists/list.html", data) diff --git a/bookwyrm/views/list/lists.py b/bookwyrm/views/list/lists.py index 90cca49737..ff4c931779 100644 --- a/bookwyrm/views/list/lists.py +++ b/bookwyrm/views/list/lists.py @@ -54,9 +54,7 @@ class SavedLists(View): def get(self, request): """display book lists""" # hide lists with no approved books - lists = request.user.saved_lists.order_by("-updated_date").filter( - suggests_for__isnull=True - ) + lists = request.user.saved_lists.order_by("-updated_date") paginated = Paginator(lists, 12) data = { From 067ce297bc9c9ad11a4dce556263fd1c12c24002 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 18:14:04 +0100 Subject: [PATCH 011/962] black --- bookwyrm/models/list.py | 4 +++- bookwyrm/views/list/list.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 2b18b733c9..2862a0695c 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -76,7 +76,9 @@ def get_name(self): @property def get_description(self): if self.suggests_for: - return _("This is the list of suggestions for %(title)s") % { + return _( + "This is the list of suggestions for %(title)s" + ) % { "title": self.suggests_for.title, "url": self.suggests_for.local_path, } diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 079d7a035e..ef9c7a53d3 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -73,7 +73,10 @@ def get(self, request, list_id, **kwargs): if request.user.is_authenticated: data["suggested_books"] = get_list_suggestions( - book_list, request.user, query=query, ignore_id=book_list.suggests_for.id + book_list, + request.user, + query=query, + ignore_id=book_list.suggests_for.id, ) return TemplateResponse(request, "lists/list.html", data) From 2faaea6ef76e19968a0ddf611f2b2cb472ac6027 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 18:14:26 +0100 Subject: [PATCH 012/962] docstrings --- bookwyrm/models/list.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 2862a0695c..68ce6e8621 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -68,6 +68,7 @@ def collection_queryset(self): @property def get_name(self): + """The name comes from the book title if it's a suggestion list""" if self.suggests_for: return _("Suggestions for %(title)s") % {"title": self.suggests_for.title} @@ -75,6 +76,7 @@ def get_name(self): @property def get_description(self): + """The description comes from the book title if it's a suggestion list""" if self.suggests_for: return _( "This is the list of suggestions for %(title)s" From 62c9c71343f187112d18188e7f82058d49576458 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 18:31:24 +0100 Subject: [PATCH 013/962] Replace ignore_id with ignore_book --- bookwyrm/views/books/books.py | 2 +- bookwyrm/views/list/list.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index b55af8ea6b..ff2d2ce551 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -132,7 +132,7 @@ def get(self, request, book_id, **kwargs): book.suggestion_list, request.user, query=query, - ignore_id=book.id, + ignore_book=book, ) return TemplateResponse(request, "book/book.html", data) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index ef9c7a53d3..11b4cd77f7 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -76,7 +76,7 @@ def get(self, request, list_id, **kwargs): book_list, request.user, query=query, - ignore_id=book_list.suggests_for.id, + ignore_book=book_list.suggests_for, ) return TemplateResponse(request, "lists/list.html", data) @@ -97,7 +97,7 @@ def post(self, request, list_id): return redirect(book_list.local_path) -def get_list_suggestions(book_list, user, query=None, ignore_id=None): +def get_list_suggestions(book_list, user, query=None, ignore_book=None): """What books might a user want to add to a list""" if query: # search for books @@ -105,12 +105,12 @@ def get_list_suggestions(book_list, user, query=None, ignore_id=None): query, filters=[ ~Q(parent_work__editions__in=book_list.books.all()), - ~Q(parent_work__editions__in=[ignore_id]), + ~Q(parent_work__editions__in=[ignore_book]), ], ) # just suggest whatever books are nearby suggestions = user.shelfbook_set.filter(~Q(book__in=book_list.books.all())).exclude( - book__id=ignore_id + book=ignore_book ) suggestions = [s.book for s in suggestions[:5]] if len(suggestions) < 5: @@ -118,7 +118,7 @@ def get_list_suggestions(book_list, user, query=None, ignore_id=None): s.default_edition for s in models.Work.objects.filter( ~Q(editions__in=book_list.books.all()), - ~Q(editions__in=[ignore_id]), + ~Q(editions__in=[ignore_book]), ).order_by("-updated_date")[: 5 - len(suggestions)] ] return suggestions From 80ce4eca459d5bdb57e6767b9f7ec9b5e0973f71 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 18:46:34 +0100 Subject: [PATCH 014/962] Display the right lists in the Book sidebar --- bookwyrm/templates/book/book.html | 2 +- bookwyrm/views/books/books.py | 22 ++++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index e920a496ca..62df9b2ea6 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -367,7 +367,7 @@

    {% trans "Places" %}

    {% endif %} - {% if lists.exists or request.user.list_set.exists %} + {% if lists.exists or list_options.exists %}

    {% trans "Lists" %}

      diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index ff2d2ce551..8c4ee0e1c0 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -76,11 +76,15 @@ def get(self, request, book_id, **kwargs): queryset = queryset.select_related("user").order_by("-published_date") paginated = Paginator(queryset, PAGE_LENGTH) - query = request.GET.get("suggestion_query", "") - - lists = models.List.privacy_filter(request.user,).filter( - listitem__approved=True, - listitem__book__in=book.parent_work.editions.all(), + lists = ( + models.List.privacy_filter( + request.user, + ) + .filter( + listitem__approved=True, + listitem__book__in=book.parent_work.editions.all(), + ) + .filter(suggests_for__isnull=True) ) data = { "book": book, @@ -94,11 +98,13 @@ def get(self, request, book_id, **kwargs): "rating": reviews.aggregate(Avg("rating"))["rating__avg"], "lists": lists, "update_error": kwargs.get("update_error", False), - "query": query, + "query": request.GET.get("suggestion_query", ""), } if request.user.is_authenticated: - data["list_options"] = request.user.list_set.exclude(id__in=data["lists"]) + data["list_options"] = request.user.list_set.filter( + suggests_for__isnull=True + ).exclude(id__in=data["lists"]) data["file_link_form"] = forms.FileLinkForm() readthroughs = models.ReadThrough.objects.filter( user=request.user, @@ -131,7 +137,7 @@ def get(self, request, book_id, **kwargs): data["suggested_books"] = get_list_suggestions( book.suggestion_list, request.user, - query=query, + query=request.GET.get("suggestion_query", ""), ignore_book=book, ) From 88da8257d56ccf776d26de30a4cc5c642040f7c6 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 19:44:02 +0100 Subject: [PATCH 015/962] Update ordered_collection.py --- bookwyrm/activitypub/ordered_collection.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py index 32e37c9966..7d8437d09b 100644 --- a/bookwyrm/activitypub/ordered_collection.py +++ b/bookwyrm/activitypub/ordered_collection.py @@ -40,6 +40,7 @@ class BookList(OrderedCollectionPrivate): summary: str = None curation: str = "closed" + book: str type: str = "BookList" From bee38cdf1f2594d46c763d42a66fab2463ea378c Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 1 Jan 2023 19:44:33 +0100 Subject: [PATCH 016/962] Add defauult --- bookwyrm/activitypub/ordered_collection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py index 7d8437d09b..a3da6d24cb 100644 --- a/bookwyrm/activitypub/ordered_collection.py +++ b/bookwyrm/activitypub/ordered_collection.py @@ -40,7 +40,7 @@ class BookList(OrderedCollectionPrivate): summary: str = None curation: str = "closed" - book: str + book: str = None type: str = "BookList" From 486278bbf44aaf4c63ffbd37852290ca9e71f0c9 Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 1 Aug 2023 15:12:50 +0200 Subject: [PATCH 017/962] =?UTF-8?q?Black=20=F0=9F=95=B4=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookwyrm/views/list/list.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index ceb5fc2185..227725b2eb 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -102,8 +102,8 @@ def post(self, request, list_id): def get_list_suggestions( - book_list, user, query=None, num_suggestions=5, ignore_book=None - ): + book_list, user, query=None, num_suggestions=5, ignore_book=None +): """What books might a user want to add to a list""" if query: # search for books @@ -115,9 +115,11 @@ def get_list_suggestions( ], ) # just suggest whatever books are nearby - suggestions = user.shelfbook_set.filter( - ~Q(book__in=book_list.books.all()) - ).exclude(book=ignore_book).distinct()[:num_suggestions] + suggestions = ( + user.shelfbook_set.filter(~Q(book__in=book_list.books.all())) + .exclude(book=ignore_book) + .distinct()[:num_suggestions] + ) suggestions = [s.book for s in suggestions[:num_suggestions]] if len(suggestions) < num_suggestions: others = [ From 0f93833b4fcb91d8b094591ae7ea7eeff654fa82 Mon Sep 17 00:00:00 2001 From: Joachim Date: Tue, 1 Aug 2023 15:12:57 +0200 Subject: [PATCH 018/962] Update migration --- .../{0173_list_suggests_for.py => 0180_list_suggests_for.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename bookwyrm/migrations/{0173_list_suggests_for.py => 0180_list_suggests_for.py} (83%) diff --git a/bookwyrm/migrations/0173_list_suggests_for.py b/bookwyrm/migrations/0180_list_suggests_for.py similarity index 83% rename from bookwyrm/migrations/0173_list_suggests_for.py rename to bookwyrm/migrations/0180_list_suggests_for.py index 48c9456967..dcd2e09858 100644 --- a/bookwyrm/migrations/0173_list_suggests_for.py +++ b/bookwyrm/migrations/0180_list_suggests_for.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.16 on 2023-01-01 16:19 +# Generated by Django 3.2.20 on 2023-08-01 13:12 import bookwyrm.models.fields from django.db import migrations @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ - ("bookwyrm", "0172_alter_user_preferred_language"), + ("bookwyrm", "0179_populate_sort_title"), ] operations = [ From 5b229fa362dae4cd22495765b7e7c7e21f44fde8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 13:57:19 -0800 Subject: [PATCH 019/962] Makes reports an activitypub model --- bookwyrm/activitypub/__init__.py | 1 + bookwyrm/activitypub/verbs.py | 10 ++++ .../migrations/0192_auto_20240102_2156.py | 57 +++++++++++++++++++ bookwyrm/models/report.py | 25 +++++--- 4 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 bookwyrm/migrations/0192_auto_20240102_2156.py diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py index 41decd68af..5789986378 100644 --- a/bookwyrm/activitypub/__init__.py +++ b/bookwyrm/activitypub/__init__.py @@ -24,6 +24,7 @@ from .verbs import Add, Remove from .verbs import Announce, Like from .verbs import Move +from .verbs import Flag # this creates a list of all the Activity types that we can serialize, # so when an Activity comes in from outside, we can check if it's known diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py index a365f4cc07..13a303af71 100644 --- a/bookwyrm/activitypub/verbs.py +++ b/bookwyrm/activitypub/verbs.py @@ -268,3 +268,13 @@ def action(self, allow_external_connections=True): else: # we might do something with this to move other objects at some point pass + + +@dataclass(init=False) +class Flag(Verb): + """Report a user to their home server""" + + to: str + object: List[str] = None + links: List[str] = None + type: str = "Flag" diff --git a/bookwyrm/migrations/0192_auto_20240102_2156.py b/bookwyrm/migrations/0192_auto_20240102_2156.py new file mode 100644 index 0000000000..7537bbbaae --- /dev/null +++ b/bookwyrm/migrations/0192_auto_20240102_2156.py @@ -0,0 +1,57 @@ +# Generated by Django 3.2.23 on 2024-01-02 21:56 + +import bookwyrm.models.fields +from django.conf import settings +from django.db import migrations +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0191_merge_20240102_0326"), + ] + + operations = [ + migrations.AlterField( + model_name="report", + name="links", + field=bookwyrm.models.fields.ManyToManyField( + blank=True, to="bookwyrm.Link" + ), + ), + migrations.AlterField( + model_name="report", + name="note", + field=bookwyrm.models.fields.TextField(blank=True, null=True), + ), + migrations.AlterField( + model_name="report", + name="reporter", + field=bookwyrm.models.fields.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="reporter", + to=settings.AUTH_USER_MODEL, + ), + ), + migrations.AlterField( + model_name="report", + name="status", + field=bookwyrm.models.fields.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="bookwyrm.status", + ), + ), + migrations.AlterField( + model_name="report", + name="user", + field=bookwyrm.models.fields.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + to=settings.AUTH_USER_MODEL, + ), + ), + ] diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py index 74a9bbe411..153ba6dc29 100644 --- a/bookwyrm/models/report.py +++ b/bookwyrm/models/report.py @@ -3,8 +3,11 @@ from django.db import models from django.utils.translation import gettext_lazy as _ +from bookwyrm import activitypub from bookwyrm.settings import DOMAIN +from .activitypub_mixin import ActivityMixin from .base_model import BookWyrmModel +from . import fields # Report action enums @@ -22,21 +25,29 @@ DELETE_ITEM = "delete_item" -class Report(BookWyrmModel): +class Report(ActivityMixin, BookWyrmModel): """reported status or user""" - reporter = models.ForeignKey( - "User", related_name="reporter", on_delete=models.PROTECT + activity_serializer = activitypub.Flag + + reporter = fields.ForeignKey( + "User", + related_name="reporter", + on_delete=models.PROTECT, + activitypub_field="actor", + ) + note = fields.TextField(null=True, blank=True, activitypub_field="content") + user = fields.ForeignKey( + "User", on_delete=models.PROTECT, null=True, blank=True, activitypub_field="to" ) - note = models.TextField(null=True, blank=True) - user = models.ForeignKey("User", on_delete=models.PROTECT, null=True, blank=True) - status = models.ForeignKey( + status = fields.ForeignKey( "Status", null=True, blank=True, on_delete=models.PROTECT, + activitypub_field="object", ) - links = models.ManyToManyField("Link", blank=True) + links = fields.ManyToManyField("Link", blank=True) resolved = models.BooleanField(default=False) def raise_not_editable(self, viewer): From 5c0ade5346726e39453c202b1c6cf7ea78969252 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 14:38:35 -0800 Subject: [PATCH 020/962] Changes field names in report model so the reporter is "user" This is such an annoying change but it is objectively better. Just gotta be real sure they didn't get mixed up anywhere along the way. --- bookwyrm/emailing.py | 8 ++-- bookwyrm/forms/forms.py | 2 +- .../0193_rename_user_report_reported_user.py | 18 ++++++++ .../0194_rename_reporter_report_user.py | 18 ++++++++ bookwyrm/models/antispam.py | 8 ++-- bookwyrm/models/report.py | 23 ++++++---- bookwyrm/templates/report.html | 2 +- .../templates/settings/reports/report.html | 20 ++++---- .../settings/reports/report_header.html | 8 ++-- .../settings/reports/report_preview.html | 2 +- bookwyrm/templates/snippets/report_modal.html | 8 ++-- bookwyrm/tests/models/test_report_model.py | 46 +++++++++++++++++++ bookwyrm/tests/views/admin/test_reports.py | 18 +++++--- bookwyrm/tests/views/admin/test_user_admin.py | 2 +- bookwyrm/tests/views/test_notifications.py | 4 +- bookwyrm/tests/views/test_report.py | 10 ++-- 16 files changed, 145 insertions(+), 52 deletions(-) create mode 100644 bookwyrm/migrations/0193_rename_user_report_reported_user.py create mode 100644 bookwyrm/migrations/0194_rename_reporter_report_user.py create mode 100644 bookwyrm/tests/models/test_report_model.py diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py index 5e08ebba13..758da962c0 100644 --- a/bookwyrm/emailing.py +++ b/bookwyrm/emailing.py @@ -50,9 +50,11 @@ def password_reset_email(reset_code): def moderation_report_email(report): """a report was created""" data = email_data() - data["reporter"] = report.reporter.localname or report.reporter.username - if report.user: - data["reportee"] = report.user.localname or report.user.username + data["reporter"] = report.user.localname or report.user.username + if report.reported_user: + data["reportee"] = ( + report.reported_user.localname or report.reported_user.username + ) data["report_link"] = report.remote_id data["link_domain"] = report.links.exists() diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py index 3d555f308d..4764b871a7 100644 --- a/bookwyrm/forms/forms.py +++ b/bookwyrm/forms/forms.py @@ -44,7 +44,7 @@ class Meta: class ReportForm(CustomForm): class Meta: model = models.Report - fields = ["user", "reporter", "status", "links", "note"] + fields = ["reported_user", "user", "status", "links", "note"] class ReadThroughForm(CustomForm): diff --git a/bookwyrm/migrations/0193_rename_user_report_reported_user.py b/bookwyrm/migrations/0193_rename_user_report_reported_user.py new file mode 100644 index 0000000000..0633e69fa1 --- /dev/null +++ b/bookwyrm/migrations/0193_rename_user_report_reported_user.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.23 on 2024-01-02 22:16 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0192_auto_20240102_2156"), + ] + + operations = [ + migrations.RenameField( + model_name="report", + old_name="user", + new_name="reported_user", + ), + ] diff --git a/bookwyrm/migrations/0194_rename_reporter_report_user.py b/bookwyrm/migrations/0194_rename_reporter_report_user.py new file mode 100644 index 0000000000..3c2c0f1802 --- /dev/null +++ b/bookwyrm/migrations/0194_rename_reporter_report_user.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.23 on 2024-01-02 22:17 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0193_rename_user_report_reported_user"), + ] + + operations = [ + migrations.RenameField( + model_name="report", + old_name="reporter", + new_name="user", + ), + ] diff --git a/bookwyrm/models/antispam.py b/bookwyrm/models/antispam.py index 1067cbf1d7..da58e8aa68 100644 --- a/bookwyrm/models/antispam.py +++ b/bookwyrm/models/antispam.py @@ -109,9 +109,9 @@ def automod_users(reporter): return report_model.objects.bulk_create( [ report_model( - reporter=reporter, + user=reporter, note=_("Automatically generated report"), - user=u, + reported_user=u, ) for u in users ] @@ -143,9 +143,9 @@ def automod_statuses(reporter): return report_model.objects.bulk_create( [ report_model( - reporter=reporter, + user=reporter, note=_("Automatically generated report"), - user=s.user, + reported_user=s.user, status=s, ) for s in statuses diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py index 153ba6dc29..9a9b0393c5 100644 --- a/bookwyrm/models/report.py +++ b/bookwyrm/models/report.py @@ -1,5 +1,4 @@ """ flagged for moderation """ -from django.core.exceptions import PermissionDenied from django.db import models from django.utils.translation import gettext_lazy as _ @@ -30,15 +29,19 @@ class Report(ActivityMixin, BookWyrmModel): activity_serializer = activitypub.Flag - reporter = fields.ForeignKey( + user = fields.ForeignKey( "User", - related_name="reporter", on_delete=models.PROTECT, activitypub_field="actor", ) note = fields.TextField(null=True, blank=True, activitypub_field="content") - user = fields.ForeignKey( - "User", on_delete=models.PROTECT, null=True, blank=True, activitypub_field="to" + reported_user = fields.ForeignKey( + "User", + related_name="reported_user", + on_delete=models.PROTECT, + null=True, + blank=True, + activitypub_field="to", ) status = fields.ForeignKey( "Status", @@ -50,11 +53,11 @@ class Report(ActivityMixin, BookWyrmModel): links = fields.ManyToManyField("Link", blank=True) resolved = models.BooleanField(default=False) - def raise_not_editable(self, viewer): - """instead of user being the owner field, it's reporter""" - if self.reporter == viewer or viewer.has_perm("bookwyrm.moderate_user"): - return - raise PermissionDenied() + def get_recipients(self, software=None): + """Send this to the public inbox of the offending instance""" + if self.user.local: + return None + return [self.user.shared_inbox or self.user.inbox] def get_remote_id(self): return f"https://{DOMAIN}/settings/reports/{self.id}" diff --git a/bookwyrm/templates/report.html b/bookwyrm/templates/report.html index be7ed68f7a..b1ea826925 100644 --- a/bookwyrm/templates/report.html +++ b/bookwyrm/templates/report.html @@ -6,5 +6,5 @@ {% endblock %} {% block content %} -{% include "snippets/report_modal.html" with user=user active=True static=True id="report-modal" %} +{% include "snippets/report_modal.html" with reported_user=reported_user active=True static=True id="report-modal" %} {% endblock %} diff --git a/bookwyrm/templates/settings/reports/report.html b/bookwyrm/templates/settings/reports/report.html index df45341c6d..f26892af51 100644 --- a/bookwyrm/templates/settings/reports/report.html +++ b/bookwyrm/templates/settings/reports/report.html @@ -27,7 +27,7 @@
      {% trans "Update on your report:" as dm_template %} - {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=report.reporter prepared_content=dm_template no_script=True %} + {% include 'snippets/create_status/status.html' with type="direct" uuid=1 mention=report.user prepared_content=dm_template no_script=True %}
      @@ -56,10 +56,10 @@

      {% trans "Reported links" %}

      {% endif %} -{% if report.user %} -{% include 'settings/users/user_info.html' with user=report.user %} +{% if report.reported_user %} +{% include 'settings/users/user_info.html' with reported_user=report.reported_user %} -{% include 'settings/users/user_moderation_actions.html' with user=report.user %} +{% include 'settings/users/user_moderation_actions.html' with reported_user=report.reported_user %} {% endif %}
      @@ -70,8 +70,8 @@

      {% trans "Moderation Activity" %}

    • - {% blocktrans trimmed with user=report.reporter|username user_link=report.reporter.local_path %} - {{ user}} opened this report + {% blocktrans trimmed with reported_user=report.user|username user_link=report.user.local_path %} + {{ reported_user}} opened this report {% endblocktrans %}

      {{ report.created_date }} @@ -83,12 +83,12 @@

      {% trans "Moderation Activity" %}

      {% if comment.action_type == "comment" %} - {% blocktrans trimmed with user=comment.user|username user_link=comment.user.local_path %} - {{ user}} commented on this report: + {% blocktrans trimmed with reported_user=comment.reported_user|username user_link=comment.reported_user.local_path %} + {{ reported_user}} commented on this report: {% endblocktrans %} {% else %} - {% blocktrans trimmed with user=comment.user|username user_link=comment.user.local_path %} - {{ user}} took an action on this report: + {% blocktrans trimmed with reported_user=comment.reported_user|username user_link=comment.reported_user.local_path %} + {{ reported_user}} took an action on this report: {% endblocktrans %} {{ comment.get_action_type_display }} diff --git a/bookwyrm/templates/settings/reports/report_header.html b/bookwyrm/templates/settings/reports/report_header.html index b77c6c6ae6..1c9b01c9b2 100644 --- a/bookwyrm/templates/settings/reports/report_header.html +++ b/bookwyrm/templates/settings/reports/report_header.html @@ -3,14 +3,14 @@ {% if report.status %} -{% blocktrans trimmed with report_id=report.id username=report.user|username %} +{% blocktrans trimmed with report_id=report.id username=report.reported_user|username %} Report #{{ report_id }}: Status posted by @{{ username }} {% endblocktrans %} {% elif report.links.exists %} - {% if report.user %} - {% blocktrans trimmed with report_id=report.id username=report.user|username %} + {% if report.reported_user %} + {% blocktrans trimmed with report_id=report.id username=report.reported_user|username %} Report #{{ report_id }}: Link added by @{{ username }} {% endblocktrans %} {% else %} @@ -21,7 +21,7 @@ {% else %} -{% blocktrans trimmed with report_id=report.id username=report.user|username %} +{% blocktrans trimmed with report_id=report.id username=report.reported_user|username %} Report #{{ report_id }}: User @{{ username }} {% endblocktrans %} diff --git a/bookwyrm/templates/settings/reports/report_preview.html b/bookwyrm/templates/settings/reports/report_preview.html index bd0009c519..26afd273cf 100644 --- a/bookwyrm/templates/settings/reports/report_preview.html +++ b/bookwyrm/templates/settings/reports/report_preview.html @@ -21,7 +21,7 @@

      {% block card-footer %}
      -

      {% blocktrans with username=report.reporter|username path=report.reporter.local_path %}Reported by @{{ username }}{% endblocktrans %}

      +

      {% blocktrans with username=report.user|username path=report.user.local_path %}Reported by @{{ username }}{% endblocktrans %}

      {{ report.created_date | naturaltime }} diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html index e80dd1f5ea..8e4315c538 100644 --- a/bookwyrm/templates/snippets/report_modal.html +++ b/bookwyrm/templates/snippets/report_modal.html @@ -5,11 +5,11 @@ {% block modal-title %} {% if status %} -{% blocktrans with username=user|username %}Report @{{ username }}'s status{% endblocktrans %} +{% blocktrans with username=reported_user|username %}Report @{{ username }}'s status{% endblocktrans %} {% elif link %} {% blocktrans with domain=link.domain.domain %}Report {{ domain }} link{% endblocktrans %} {% else %} -{% blocktrans with username=user|username %}Report @{{ username }}{% endblocktrans %} +{% blocktrans with username=reported_user|username %}Report @{{ username }}{% endblocktrans %} {% endif %} {% endblock %} @@ -20,8 +20,8 @@ {% block modal-body %} {% csrf_token %} - - + + {% if status_id %} {% endif %} diff --git a/bookwyrm/tests/models/test_report_model.py b/bookwyrm/tests/models/test_report_model.py new file mode 100644 index 0000000000..2a77a7c639 --- /dev/null +++ b/bookwyrm/tests/models/test_report_model.py @@ -0,0 +1,46 @@ +""" testing models """ +from unittest.mock import patch +from django.test import TestCase + +from bookwyrm import models + + +class Relationship(TestCase): + """following, blocking, stuff like that""" + + @classmethod + def setUpTestData(self): # pylint: disable=bad-classmethod-argument, invalid-name + """we need some users for this""" + with patch("bookwyrm.models.user.set_remote_server.delay"): + self.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) + with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( + "bookwyrm.activitystreams.populate_stream_task.delay" + ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): + self.local_user = models.User.objects.create_user( + "mouse", "mouse@mouse.com", "mouseword", local=True, localname="mouse" + ) + self.another_local_user = models.User.objects.create_user( + "bird", "bird@bird.com", "birdword", local=True, localname="bird" + ) + self.local_user.remote_id = "http://local.com/user/mouse" + self.local_user.save(broadcast=False, update_fields=["remote_id"]) + + def test_report_local_user(self): + """a report/flag within an instance""" + report = models.Report.objects.create( + user=self.local_user, + note="oh no bad", + reported_user=self.another_local_user, + ) + activity = report.to_activity() + self.assertEqual(activity.type, "Flag") + self.assertEqual(activity.actor, self.local_user) + self.assertEqual(activity.to, self.another_local_user.remote_id) diff --git a/bookwyrm/tests/views/admin/test_reports.py b/bookwyrm/tests/views/admin/test_reports.py index 4334eeed96..3b72a64d6c 100644 --- a/bookwyrm/tests/views/admin/test_reports.py +++ b/bookwyrm/tests/views/admin/test_reports.py @@ -61,7 +61,7 @@ def test_reports_page_with_data(self): view = views.ReportsAdmin.as_view() request = self.factory.get("") request.user = self.local_user - models.Report.objects.create(reporter=self.local_user, user=self.rat) + models.Report.objects.create(user=self.local_user, reported_user=self.rat) result = view(request) self.assertIsInstance(result, TemplateResponse) @@ -73,7 +73,9 @@ def test_report_page(self): view = views.ReportAdmin.as_view() request = self.factory.get("") request.user = self.local_user - report = models.Report.objects.create(reporter=self.local_user, user=self.rat) + report = models.Report.objects.create( + user=self.local_user, reported_user=self.rat + ) result = view(request, report.id) @@ -86,7 +88,9 @@ def test_report_action(self): view = views.ReportAdmin.as_view() request = self.factory.post("", {"note": "hi"}) request.user = self.local_user - report = models.Report.objects.create(reporter=self.local_user, user=self.rat) + report = models.Report.objects.create( + user=self.local_user, reported_user=self.rat + ) view(request, report.id) @@ -98,7 +102,9 @@ def test_report_action(self): def test_resolve_report(self): """toggle report resolution status""" - report = models.Report.objects.create(reporter=self.local_user, user=self.rat) + report = models.Report.objects.create( + user=self.local_user, reported_user=self.rat + ) self.assertFalse(report.resolved) self.assertFalse(models.ReportAction.objects.exists()) request = self.factory.post("") @@ -112,7 +118,7 @@ def test_resolve_report(self): # check that the action was noted self.assertTrue( models.ReportAction.objects.filter( - report=report, action_type="resolve", user=self.local_user + report=report, action_type="resolve", reported_user=self.local_user ).exists() ) @@ -124,7 +130,7 @@ def test_resolve_report(self): # check that the action was noted self.assertTrue( models.ReportAction.objects.filter( - report=report, action_type="reopen", user=self.local_user + report=report, action_type="reopen", reported_user=self.local_user ).exists() ) diff --git a/bookwyrm/tests/views/admin/test_user_admin.py b/bookwyrm/tests/views/admin/test_user_admin.py index 99c6305269..379b0bc4a2 100644 --- a/bookwyrm/tests/views/admin/test_user_admin.py +++ b/bookwyrm/tests/views/admin/test_user_admin.py @@ -96,7 +96,7 @@ def test_user_admin_page_post_with_report(self, *_): ) report = models.Report.objects.create( - user=self.local_user, reporter=self.local_user + reported_user=self.local_user, user=self.local_user ) view = views.UserAdmin.as_view() diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index 8d239d77a2..6df7394675 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -115,8 +115,8 @@ def test_notifications_page_follows(self): def test_notifications_page_report(self): """import completed notification""" report = models.Report.objects.create( - user=self.another_user, - reporter=self.local_user, + reported_user=self.another_user, + user=self.local_user, ) notification = models.Notification.objects.create( user=self.local_user, diff --git a/bookwyrm/tests/views/test_report.py b/bookwyrm/tests/views/test_report.py index 3e4c64f684..6d92b11a08 100644 --- a/bookwyrm/tests/views/test_report.py +++ b/bookwyrm/tests/views/test_report.py @@ -77,15 +77,15 @@ def test_report_modal_view_with_link_domain(self): def test_make_report(self): """a user reports another user""" form = forms.ReportForm() - form.data["reporter"] = self.local_user.id - form.data["user"] = self.rat.id + form.data["user"] = self.local_user.id + form.data["reported_user"] = self.rat.id request = self.factory.post("", form.data) request.user = self.local_user views.Report.as_view()(request) report = models.Report.objects.get() - self.assertEqual(report.reporter, self.local_user) + self.assertEqual(report.user, self.local_user) self.assertEqual(report.user, self.rat) def test_report_link(self): @@ -99,8 +99,8 @@ def test_report_link(self): domain.save() form = forms.ReportForm() - form.data["reporter"] = self.local_user.id - form.data["user"] = self.rat.id + form.data["user"] = self.local_user.id + form.data["reported_user"] = self.rat.id form.data["links"] = link.id request = self.factory.post("", form.data) request.user = self.local_user From 052823e0c94f2c1d4ee58f66dacba3b48a1ecf36 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 15:13:56 -0800 Subject: [PATCH 021/962] Allow the user to decide if they want to send along a report --- .../migrations/0195_auto_20240102_2310.py | 39 +++++++++++++++++++ bookwyrm/models/report.py | 9 +++++ .../templates/snippets/report_button.html | 2 +- bookwyrm/templates/snippets/report_modal.html | 2 +- bookwyrm/tests/models/test_report_model.py | 7 ++-- 5 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 bookwyrm/migrations/0195_auto_20240102_2310.py diff --git a/bookwyrm/migrations/0195_auto_20240102_2310.py b/bookwyrm/migrations/0195_auto_20240102_2310.py new file mode 100644 index 0000000000..c6af5ae780 --- /dev/null +++ b/bookwyrm/migrations/0195_auto_20240102_2310.py @@ -0,0 +1,39 @@ +# Generated by Django 3.2.23 on 2024-01-02 23:10 + +import bookwyrm.models.fields +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0194_rename_reporter_report_user"), + ] + + operations = [ + migrations.AddField( + model_name="report", + name="allow_broadcast", + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name="report", + name="reported_user", + field=bookwyrm.models.fields.ForeignKey( + blank=True, + null=True, + on_delete=django.db.models.deletion.PROTECT, + related_name="reported_user", + to=settings.AUTH_USER_MODEL, + ), + ), + migrations.AlterField( + model_name="report", + name="user", + field=bookwyrm.models.fields.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL + ), + ), + ] diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py index 9a9b0393c5..a8a4357814 100644 --- a/bookwyrm/models/report.py +++ b/bookwyrm/models/report.py @@ -52,6 +52,15 @@ class Report(ActivityMixin, BookWyrmModel): ) links = fields.ManyToManyField("Link", blank=True) resolved = models.BooleanField(default=False) + allow_broadcast = models.BooleanField(default=False) + + def broadcast(self, activity, sender, *args, **kwargs): + """only need to send an activity for remote offenders""" + # don't try to broadcast if the reporter doesn't want you to, + # or if the reported user is local + if self.reported_user.local or not self.allow_broadcast: + return + super().broadcast(activity, sender, *args, **kwargs) def get_recipients(self, software=None): """Send this to the public inbox of the offending instance""" diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html index 92d70699ca..ce795f5bec 100644 --- a/bookwyrm/templates/snippets/report_button.html +++ b/bookwyrm/templates/snippets/report_button.html @@ -12,6 +12,6 @@ > {% trans "Report" %} -{% include 'snippets/report_modal.html' with user=user id=modal_id status_id=status.id %} +{% include 'snippets/report_modal.html' with reported_user=user id=modal_id status_id=status.id %} {% endwith %} diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html index 8e4315c538..c5d3987f53 100644 --- a/bookwyrm/templates/snippets/report_modal.html +++ b/bookwyrm/templates/snippets/report_modal.html @@ -20,7 +20,7 @@ {% block modal-body %} {% csrf_token %} - + {% if status_id %} diff --git a/bookwyrm/tests/models/test_report_model.py b/bookwyrm/tests/models/test_report_model.py index 2a77a7c639..cb6942a276 100644 --- a/bookwyrm/tests/models/test_report_model.py +++ b/bookwyrm/tests/models/test_report_model.py @@ -40,7 +40,8 @@ def test_report_local_user(self): note="oh no bad", reported_user=self.another_local_user, ) + activity = report.to_activity() - self.assertEqual(activity.type, "Flag") - self.assertEqual(activity.actor, self.local_user) - self.assertEqual(activity.to, self.another_local_user.remote_id) + self.assertEqual(activity["type"], "Flag") + self.assertEqual(activity["actor"], self.local_user.remote_id) + self.assertEqual(activity["to"], self.another_local_user.remote_id) From d4013b97212b51d6b9a3728d631b6aa84f28fd43 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 18:54:16 -0800 Subject: [PATCH 022/962] Fixes some user/reported_user references --- bookwyrm/templates/settings/reports/report.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bookwyrm/templates/settings/reports/report.html b/bookwyrm/templates/settings/reports/report.html index f26892af51..e0c86af6ca 100644 --- a/bookwyrm/templates/settings/reports/report.html +++ b/bookwyrm/templates/settings/reports/report.html @@ -57,9 +57,9 @@

      {% trans "Reported links" %}

      {% endif %} {% if report.reported_user %} -{% include 'settings/users/user_info.html' with reported_user=report.reported_user %} +{% include 'settings/users/user_info.html' with user=report.reported_user %} -{% include 'settings/users/user_moderation_actions.html' with reported_user=report.reported_user %} +{% include 'settings/users/user_moderation_actions.html' with user=report.reported_user %} {% endif %}
      @@ -70,8 +70,8 @@

      {% trans "Moderation Activity" %}

    • - {% blocktrans trimmed with reported_user=report.user|username user_link=report.user.local_path %} - {{ reported_user}} opened this report + {% blocktrans trimmed with user=report.user|username user_link=report.user.local_path %} + {{ user }} opened this report {% endblocktrans %}

      {{ report.created_date }} @@ -83,12 +83,12 @@

      {% trans "Moderation Activity" %}

      {% if comment.action_type == "comment" %} - {% blocktrans trimmed with reported_user=comment.reported_user|username user_link=comment.reported_user.local_path %} - {{ reported_user}} commented on this report: + {% blocktrans trimmed with user=comment.user|username user_link=comment.user.local_path %} + {{ user}} commented on this report: {% endblocktrans %} {% else %} - {% blocktrans trimmed with reported_user=comment.reported_user|username user_link=comment.reported_user.local_path %} - {{ reported_user}} took an action on this report: + {% blocktrans trimmed with user=comment.user|username user_link=comment.user.local_path %} + {{ user}} took an action on this report: {% endblocktrans %} {{ comment.get_action_type_display }} From 0612930fb95b242183a73f52b667b44673797f81 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Jan 2024 19:14:40 -0800 Subject: [PATCH 023/962] UI for deciding to send reports to remote Shows a checkbox for the user and lets the admin know --- bookwyrm/forms/forms.py | 2 +- bookwyrm/templates/settings/reports/report_preview.html | 9 +++++++++ bookwyrm/templates/snippets/report_modal.html | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py index 4764b871a7..96d8142a58 100644 --- a/bookwyrm/forms/forms.py +++ b/bookwyrm/forms/forms.py @@ -44,7 +44,7 @@ class Meta: class ReportForm(CustomForm): class Meta: model = models.Report - fields = ["reported_user", "user", "status", "links", "note"] + fields = ["reported_user", "user", "status", "links", "note", "allow_broadcast"] class ReadThroughForm(CustomForm): diff --git a/bookwyrm/templates/settings/reports/report_preview.html b/bookwyrm/templates/settings/reports/report_preview.html index 26afd273cf..85eb2a1004 100644 --- a/bookwyrm/templates/settings/reports/report_preview.html +++ b/bookwyrm/templates/settings/reports/report_preview.html @@ -23,6 +23,15 @@

      {% blocktrans with username=report.user|username path=report.user.local_path %}Reported by @{{ username }}{% endblocktrans %}

      +{% if not report.reported_user.local %} +
      + {% if report.allow_broadcast %} +

      {% trans "Sent to remote instance" %}

      + {% else %} +

      {% trans "Not sent to remote instance" %}

      + {% endif %} +
      +{% endif %}
      {{ report.created_date | naturaltime }}
      diff --git a/bookwyrm/templates/snippets/report_modal.html b/bookwyrm/templates/snippets/report_modal.html index c5d3987f53..67a2d8cc6f 100644 --- a/bookwyrm/templates/snippets/report_modal.html +++ b/bookwyrm/templates/snippets/report_modal.html @@ -36,6 +36,15 @@ {% trans "Links from this domain will be removed until your report has been reviewed." %} {% endif %}

      + {% if not reported_user.local %} + + {% else %} + + {% endif %} +

      • +
    • + {% url 'settings-redis' as url %} + {% trans "Redis status" %} +
    • {% url 'settings-schedules' as url %} {% trans "Scheduled tasks" %} diff --git a/bookwyrm/templates/settings/redis.html b/bookwyrm/templates/settings/redis.html new file mode 100644 index 0000000000..8344f59421 --- /dev/null +++ b/bookwyrm/templates/settings/redis.html @@ -0,0 +1,68 @@ +{% extends 'settings/layout.html' %} +{% load humanize %} +{% load i18n %} + +{% block title %}{% trans "Redis Status" %}{% endblock %} + +{% block header %}{% trans "Redis Status" %}{% endblock %} + +{% block panel %} + +{% if info %} +
      +

      {% trans "Info" %}

      +
      +
      +
      +

      {% trans "Used memory" %}

      +

      {{ info.used_memory_human }}

      +
      +
      +
      +
      +

      {% trans "Total system memory" %}

      +

      {{ info.total_system_memory_human }}

      +
      +
      +
      +
      +

      {% trans "Keys" %}

      +

      {{ info.db0.keys | intcomma }}

      +
      +
      +
      +
      + +
      + {{ dead_key_count }} +
      + {% csrf_token %} + +
      +
      + {% csrf_token %} + + +
      +
      +{% else %} +
      + + + {% trans "Could not connect to Redis Activity" %} + +
      + +{% endif %} + +{% if errors %} +
      +

      {% trans "Errors" %}

      + {% for error in errors %} + 
      {{ error }}
      +{% endfor %} + +
      +{% endif %} + +{% endblock %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index bfa1aacce0..5a26efbc83 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -369,6 +369,7 @@ re_path( r"^settings/celery/ping/?$", views.celery_ping, name="settings-celery-ping" ), + re_path(r"^settings/redis/?$", views.RedisStatus.as_view(), name="settings-redis"), re_path( r"^settings/schedules/(?P\d+)?$", views.ScheduledTasks.as_view(), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index ebc851847a..24b00fffff 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -5,6 +5,7 @@ from .admin.automod import AutoMod, automod_delete, run_automod from .admin.automod import schedule_automod_task, unschedule_automod_task from .admin.celery_status import CeleryStatus, celery_ping +from .admin.redis import RedisStatus from .admin.schedule import ScheduledTasks from .admin.dashboard import Dashboard from .admin.federation import Federation, FederatedServer diff --git a/bookwyrm/views/admin/redis.py b/bookwyrm/views/admin/redis.py new file mode 100644 index 0000000000..38d390e0f0 --- /dev/null +++ b/bookwyrm/views/admin/redis.py @@ -0,0 +1,63 @@ +""" redis cache status """ +from django.contrib.auth.decorators import login_required, permission_required +from django.http import HttpResponse +from django.template.response import TemplateResponse +from django.utils.decorators import method_decorator +from django.views import View +import redis + +from bookwyrm import models, settings + +r = redis.from_url(settings.REDIS_ACTIVITY_URL) + +# pylint: disable= no-self-use +@method_decorator(login_required, name="dispatch") +@method_decorator( + permission_required("bookwyrm.edit_instance_settings", raise_exception=True), + name="dispatch", +) +class RedisStatus(View): + """Are your tasks running? Well you'd better go catch them""" + + def get(self, request): + """See workers and active tasks""" + data = {"errors": []} + try: + data["info"] = r.info + # pylint: disable=broad-except + except Exception as err: + data["errors"].append(err) + + return TemplateResponse(request, "settings/redis.html", data) + + # pylint: disable=unused-argument + def post(self, request): + """Erase invalid keys""" + dry_run = request.POST.get("dry_run") + patterns = [":*:*"] # this pattern is a django cache with no prefix + for user_id in models.User.objects.filter( + is_deleted=True, local=True + ).values_list("id", flat=True): + patterns.append(f"{user_id}-*") + + deleted_count = 0 + for pattern in patterns: + deleted_count += erase_keys(pattern, dry_run=dry_run) + + if dry_run: + return HttpResponse(f"{deleted_count} keys identified for deletion") + return HttpResponse(f"{deleted_count} keys deleted") + + +def erase_keys(pattern, count=1000, dry_run=False): + """Delete all redis activity keys according to a provided regex pattern""" + pipeline = r.pipeline() + key_count = 0 + for keys in r.scan_iter(match=pattern, count=count): + key_count += len(keys) + if not dry_run: + for key in keys: + pipeline.delete(key) + if not dry_run: + pipeline.execute() + return key_count From a7669aa51c4ad272360e6e0a9bd1985d9a372a97 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 3 Apr 2024 10:44:26 -0700 Subject: [PATCH 027/962] Adds merge migration --- bookwyrm/migrations/0200_merge_20240403_1728.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0200_merge_20240403_1728.py diff --git a/bookwyrm/migrations/0200_merge_20240403_1728.py b/bookwyrm/migrations/0200_merge_20240403_1728.py new file mode 100644 index 0000000000..e39991ea22 --- /dev/null +++ b/bookwyrm/migrations/0200_merge_20240403_1728.py @@ -0,0 +1,13 @@ +# Generated by Django 3.2.25 on 2024-04-03 17:28 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0195_auto_20240102_2310"), + ("bookwyrm", "0199_status_bookwyrm_st_remote__06aeba_idx"), + ] + + operations = [] From 8fdcd4b6b1aa1d79ff03b6360a48c5458220788d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 3 Apr 2024 10:50:02 -0700 Subject: [PATCH 028/962] Fixes error in report tests --- bookwyrm/tests/views/test_report.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bookwyrm/tests/views/test_report.py b/bookwyrm/tests/views/test_report.py index 9339c37469..8512378a2f 100644 --- a/bookwyrm/tests/views/test_report.py +++ b/bookwyrm/tests/views/test_report.py @@ -8,6 +8,7 @@ from bookwyrm.tests.validate_html import validate_html +# pylint: disable=invalid-name class ReportViews(TestCase): """every response to a get request, html or json""" @@ -51,12 +52,12 @@ def test_report_modal_view(self): """a user reports another user""" request = self.factory.get("") request.user = self.local_user - result = views.Report.as_view()(request, self.local_user.id) + result = views.Report.as_view()(request, user_id=self.local_user.id) validate_html(result.render()) def test_report_modal_view_with_status(self): - """a user reports another user""" + """a user reports another user status""" request = self.factory.get("") request.user = self.local_user result = views.Report.as_view()( @@ -66,7 +67,7 @@ def test_report_modal_view_with_status(self): validate_html(result.render()) def test_report_modal_view_with_link_domain(self): - """a user reports another user""" + """a user reports a link""" link = models.Link.objects.create( url="http://example.com/hi", added_by=self.local_user, @@ -78,7 +79,7 @@ def test_report_modal_view_with_link_domain(self): validate_html(result.render()) def test_make_report(self): - """a user reports another user""" + """a local user reports a remote user""" form = forms.ReportForm() form.data["user"] = self.local_user.id form.data["reported_user"] = self.rat.id @@ -89,7 +90,7 @@ def test_make_report(self): report = models.Report.objects.get() self.assertEqual(report.user, self.local_user) - self.assertEqual(report.user, self.rat) + self.assertEqual(report.reported_user, self.rat) def test_report_link(self): """a user reports a link as spam""" From f5c3b6250e70bf31fa9c1d866f460f0aa3bb2026 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 3 Apr 2024 10:55:02 -0700 Subject: [PATCH 029/962] Makes report button work without javascript --- bookwyrm/templates/snippets/report_button.html | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bookwyrm/templates/snippets/report_button.html b/bookwyrm/templates/snippets/report_button.html index ce795f5bec..f54ddd9660 100644 --- a/bookwyrm/templates/snippets/report_button.html +++ b/bookwyrm/templates/snippets/report_button.html @@ -4,14 +4,16 @@ {% with 0|uuid as report_uuid %} {% join "report" report_uuid as modal_id %} - +
      + +
      {% include 'snippets/report_modal.html' with reported_user=user id=modal_id status_id=status.id %} {% endwith %} From 875c7122f3d6152b05f4eba9938d1a37c0b9b984 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 3 Apr 2024 10:58:26 -0700 Subject: [PATCH 030/962] Fixes static view of report form in no js mode --- bookwyrm/views/report.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/report.py b/bookwyrm/views/report.py index 121b7a232e..de438472bc 100644 --- a/bookwyrm/views/report.py +++ b/bookwyrm/views/report.py @@ -18,7 +18,7 @@ def get(self, request, user_id=None, status_id=None, link_id=None): data = {"user": None} if user_id: # but normally we should have an error if the user is not found - data["user"] = get_object_or_404(models.User, id=user_id) + data["reported_user"] = get_object_or_404(models.User, id=user_id) if status_id: data["status"] = status_id From 2e4e96525b479ac8565e3d8aa001c9870441428a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 3 Apr 2024 11:19:51 -0700 Subject: [PATCH 031/962] Adds first-pass test for incoming reports I'm writing this offline so I can't check what the actual Flag activity spec looks like from Mastodon. --- bookwyrm/activitypub/verbs.py | 5 ++ bookwyrm/tests/views/inbox/test_inbox_flag.py | 64 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 bookwyrm/tests/views/inbox/test_inbox_flag.py diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py index 13a303af71..ca56429918 100644 --- a/bookwyrm/activitypub/verbs.py +++ b/bookwyrm/activitypub/verbs.py @@ -278,3 +278,8 @@ class Flag(Verb): object: List[str] = None links: List[str] = None type: str = "Flag" + content: str = None + + def action(self, allow_external_connections=False): + """usually we just want to update and save""" + self.to_model(allow_external_connections=allow_external_connections) diff --git a/bookwyrm/tests/views/inbox/test_inbox_flag.py b/bookwyrm/tests/views/inbox/test_inbox_flag.py new file mode 100644 index 0000000000..3246c14886 --- /dev/null +++ b/bookwyrm/tests/views/inbox/test_inbox_flag.py @@ -0,0 +1,64 @@ +""" tests incoming activities""" +from unittest.mock import patch + +from django.test import TestCase +import responses + +from bookwyrm import models, views + + +# pylint: disable=too-many-public-methods +class InboxFlag(TestCase): + """inbox tests""" + + @classmethod + def setUpTestData(cls): # pylint: disable=invalid-name + """basic user and book data""" + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): + cls.local_user = models.User.objects.create_user( + "mouse@example.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + ) + cls.local_user.remote_id = "https://example.com/user/mouse" + cls.local_user.save(broadcast=False, update_fields=["remote_id"]) + with patch("bookwyrm.models.user.set_remote_server.delay"): + cls.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) + + models.SiteSettings.objects.create() + + @responses.activate + def test_flag_local_user(self): + """Serialize a report from a remote server""" + # TODO: is this actually what a Flag object from mastodon looks like? + activity = { + "id": "https://example.com/shelfbook/6189#add", + "type": "Flag", + "actor": self.remote_user.remote_id, + "object": {}, + "to": self.local_user.remote_id, + "cc": ["https://example.com/user/mouse/followers"], + "published": "Mon, 25 May 2020 19:31:20 GMT", + "@context": "https://www.w3.org/ns/activitystreams", + } + views.inbox.activity_task(activity) + # a report should now exist + self.assertTrue( + models.Report.objects.filter( + user=self.remote_user, reported_user=self.local_user + ).exists() + ) From e0719b34ab7f44787e276c75e5c29078ef4076d7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 3 Apr 2024 11:20:28 -0700 Subject: [PATCH 032/962] Json view of admin report --- bookwyrm/urls.py | 2 +- bookwyrm/views/admin/reports.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index bfa1aacce0..f2be3b2f33 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -282,7 +282,7 @@ r"^settings/reports/?$", views.ReportsAdmin.as_view(), name="settings-reports" ), re_path( - r"^settings/reports/(?P\d+)/?$", + r"^settings/reports/(?P\d+)(.json)?/?$", views.ReportAdmin.as_view(), name="settings-report", ), diff --git a/bookwyrm/views/admin/reports.py b/bookwyrm/views/admin/reports.py index 1a17f588e4..85ff7b0029 100644 --- a/bookwyrm/views/admin/reports.py +++ b/bookwyrm/views/admin/reports.py @@ -8,8 +8,9 @@ from django.views import View from bookwyrm import forms, models +from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.models.report import USER_SUSPENSION, USER_UNSUSPENSION, USER_DELETION -from bookwyrm.views.helpers import redirect_to_referer +from bookwyrm.views.helpers import redirect_to_referer, is_api_request from bookwyrm.settings import PAGE_LENGTH @@ -73,8 +74,12 @@ class ReportAdmin(View): def get(self, request, report_id): """load a report""" + report = get_object_or_404(models.Report, id=report_id) + if is_api_request(request): + return ActivitypubResponse(report.to_activity(**request.GET)) + data = { - "report": get_object_or_404(models.Report, id=report_id), + "report": report, "group_form": forms.UserGroupForm(), } return TemplateResponse(request, "settings/reports/report.html", data) From 4bab19c126e0ae78bf722538ab83aa8f148f3f3d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 23 Aug 2024 18:47:31 -0700 Subject: [PATCH 033/962] Fixes misunderstanding of how scan_iter yields keys --- bookwyrm/views/admin/redis.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/views/admin/redis.py b/bookwyrm/views/admin/redis.py index 38d390e0f0..c682bfcf19 100644 --- a/bookwyrm/views/admin/redis.py +++ b/bookwyrm/views/admin/redis.py @@ -53,11 +53,11 @@ def erase_keys(pattern, count=1000, dry_run=False): """Delete all redis activity keys according to a provided regex pattern""" pipeline = r.pipeline() key_count = 0 - for keys in r.scan_iter(match=pattern, count=count): - key_count += len(keys) - if not dry_run: - for key in keys: - pipeline.delete(key) + for key in r.scan_iter(match=pattern, count=count): + key_count += 1 + if dry_run: + continue + pipeline.delete(key) if not dry_run: pipeline.execute() return key_count From 6c252c1311d15f4be685cd9c02a73f2abf3ad08a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 23 Aug 2024 19:26:25 -0700 Subject: [PATCH 034/962] Option to clear Django cache --- bookwyrm/templates/settings/redis.html | 70 ++++++++++++++++++++++---- bookwyrm/views/admin/redis.py | 41 ++++++++++----- 2 files changed, 87 insertions(+), 24 deletions(-) diff --git a/bookwyrm/templates/settings/redis.html b/bookwyrm/templates/settings/redis.html index 8344f59421..342f11c6da 100644 --- a/bookwyrm/templates/settings/redis.html +++ b/bookwyrm/templates/settings/redis.html @@ -33,19 +33,67 @@

      {% trans "Info" %}

    -
    - {{ dead_key_count }} -
    - {% csrf_token %} - -
    -
    - {% csrf_token %} - - -
    +
    +

    {% trans "Outdated cache keys" %}

    +
    +

    + {% blocktrans trimmed %} + This will scan for keys in the Django redis cache that use no prefix (the current prefix is {{ prefix }}), and identify Activity Streams for users with deleted accounts. + {% endblocktrans %} +

    + + {% if outdated_identified is not None %} +

    + {% blocktrans trimmed with keys=outdated_identified|intcomma %} + {{ keys }} identified + {% endblocktrans %} +

    + + {% if outdated_identified > 0 %} +
    + {% csrf_token %} + +
    + {% endif %} + {% else %} +
    + {% csrf_token %} + + +
    + {% endif %} +
    + +
    +

    {% trans "Clear Django cache" %}

    +
    +

    + {% blocktrans trimmed %} + This is NOT recommended and should only be used if something has gone very wrong with your cache. All sessions will be cleared and users will be logged out of their accounts. + {% endblocktrans %} +

    + + {% if cache_deleted %} +

    + {% blocktrans trimmed with keys=cache_deleted|intcomma %} + {{ keys }} keys deleted + {% endblocktrans %} +

    + {% else %} +
    + {% csrf_token %} + + +
    + {% endif %} +
    +
    + {% else %} +
    diff --git a/bookwyrm/views/admin/redis.py b/bookwyrm/views/admin/redis.py index c682bfcf19..ff975e550a 100644 --- a/bookwyrm/views/admin/redis.py +++ b/bookwyrm/views/admin/redis.py @@ -21,12 +21,7 @@ class RedisStatus(View): def get(self, request): """See workers and active tasks""" - data = {"errors": []} - try: - data["info"] = r.info - # pylint: disable=broad-except - except Exception as err: - data["errors"].append(err) + data = view_data() return TemplateResponse(request, "settings/redis.html", data) @@ -34,19 +29,39 @@ def get(self, request): def post(self, request): """Erase invalid keys""" dry_run = request.POST.get("dry_run") - patterns = [":*:*"] # this pattern is a django cache with no prefix - for user_id in models.User.objects.filter( - is_deleted=True, local=True - ).values_list("id", flat=True): - patterns.append(f"{user_id}-*") + erase_cache = request.POST.get("erase_cache") + data_key = "cache" if erase_cache else "outdated" + + if erase_cache: + patterns = [f"{settings.CACHE_KEY_PREFIX}:*:*"] + else: + patterns = [":*:*"] # this pattern is a django cache with no prefix + for user_id in models.User.objects.filter( + is_deleted=True, local=True + ).values_list("id", flat=True): + patterns.append(f"{user_id}-*") deleted_count = 0 for pattern in patterns: deleted_count += erase_keys(pattern, dry_run=dry_run) + data = view_data() if dry_run: - return HttpResponse(f"{deleted_count} keys identified for deletion") - return HttpResponse(f"{deleted_count} keys deleted") + data[f"{data_key}_identified"] = deleted_count + else: + data[f"{data_key}_deleted"] = deleted_count + return TemplateResponse(request, "settings/redis.html", data) + + +def view_data(): + """Helper function to load basic info for the view""" + data = {"errors": [], "prefix": settings.CACHE_KEY_PREFIX} + try: + data["info"] = r.info + # pylint: disable=broad-except + except Exception as err: + data["errors"].append(err) + return data def erase_keys(pattern, count=1000, dry_run=False): From ace0bf46d6b41ee76981efb5491a8001f4be09d6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 23 Aug 2024 19:35:12 -0700 Subject: [PATCH 035/962] Hide option to clear redis cache Don't make it tempting to do this --- bookwyrm/templates/settings/redis.html | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/bookwyrm/templates/settings/redis.html b/bookwyrm/templates/settings/redis.html index 342f11c6da..7d740b0253 100644 --- a/bookwyrm/templates/settings/redis.html +++ b/bookwyrm/templates/settings/redis.html @@ -68,8 +68,15 @@

    {% trans "Outdated cache keys" %}

    -

    {% trans "Clear Django cache" %}

    -
    +

    {% trans "Advanced" %}

    +
    + + + {% trans "Clear Django Cache" %} + + + +

    {% blocktrans trimmed %} This is NOT recommended and should only be used if something has gone very wrong with your cache. All sessions will be cleared and users will be logged out of their accounts. @@ -86,10 +93,12 @@

    {% trans "Clear Django cache" %}

    {% csrf_token %} - +
    + +
    {% endif %} -
    +
    {% else %} From 1c9bc936f63f851c0653ee98ebe0abc86a7a0728 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 24 Aug 2024 09:09:09 -0700 Subject: [PATCH 036/962] Adds tests file --- bookwyrm/templates/settings/redis.html | 4 +- bookwyrm/tests/views/admin/test_redis.py | 51 ++++++++++++++++++++++++ bookwyrm/views/admin/redis.py | 2 - 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 bookwyrm/tests/views/admin/test_redis.py diff --git a/bookwyrm/templates/settings/redis.html b/bookwyrm/templates/settings/redis.html index 7d740b0253..3915544987 100644 --- a/bookwyrm/templates/settings/redis.html +++ b/bookwyrm/templates/settings/redis.html @@ -56,7 +56,7 @@

    {% trans "Outdated cache keys" %}

    {% endif %} {% else %} -
    + {% csrf_token %}

    {% else %} -
      +
        {% for item in items %}
      1. From cc70e836877724a17aa71a33726556ead957dee2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 25 Aug 2024 19:16:22 -0700 Subject: [PATCH 046/962] Re-styles suggstions to show the recommender's notes I also just shuffled the card around to fit more text. --- .../templates/book/suggestion_list/list.html | 37 +++++++++----- bookwyrm/templates/lists/list.html | 44 +---------------- bookwyrm/templates/lists/list_item_notes.html | 48 +++++++++++++++++++ 3 files changed, 73 insertions(+), 56 deletions(-) create mode 100644 bookwyrm/templates/lists/list_item_notes.html diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index d2b862d2cb..fd8eeb3682 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load book_display_tags %}

        {% trans "Suggestions" %} @@ -16,19 +17,29 @@

        {% else %}
          {% for item in items %} -
        1. +
        2. -
          - {% with book=item.book %} -
          - +
          + {% with item_book=item.book %} +
          +
          + +
          +
          +
          +

          + {% include 'snippets/book_titleby.html' with book=item_book %} +

          + {% if item_book|book_description %} +
          + {% with full=item_book|book_description trim_length=20 %} + {% include 'snippets/trimmed_text.html' with hide_more=True %} + {% endwith %} + {% endif %} + {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True %}
          - -

          - {% include 'snippets/book_titleby.html' %} -

          {% endwith %}
          @@ -48,7 +59,7 @@

          3. {% endfor %} -
        3. +
        4. {% include "book/suggestion_list/search.html" %}
        @@ -61,6 +72,6 @@

        - +

    {% endif %} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 804e71037f..3836720534 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -80,50 +80,8 @@ {% endwith %} + {% include "lists/list_item_notes.html" with item=item %} - {% if item.notes %} -
    - -
    -
    -
    - {% url 'user-feed' item.user|username as user_path %} - {% blocktrans trimmed with username=item.user.display_name %} - {{ username }} says: - {% endblocktrans %} -
    - {{ item.notes|to_markdown|safe }} -
    - {% if item.user == request.user %} -
    -
    - - - {% trans "Edit notes" %} - - - - {% include "lists/edit_item_form.html" with book=item.book %} -
    -
    - {% endif %} -
    -
    - {% elif item.user == request.user %} -
    -
    - - - {% trans "Add notes" %} - - - - {% include "lists/edit_item_form.html" with book=item.book %} -
    -
    - {% endif %}
    diff --git a/bookwyrm/templates/lists/list_item_notes.html b/bookwyrm/templates/lists/list_item_notes.html new file mode 100644 index 0000000000..812145d169 --- /dev/null +++ b/bookwyrm/templates/lists/list_item_notes.html @@ -0,0 +1,48 @@ +{% load i18n %} +{% load utilities %} +{% load markdown %} + +{% if item.notes %} +
    + +
    +
    +
    + {% url 'user-feed' item.user|username as user_path %} + {% blocktrans trimmed with username=item.user.display_name %} + {{ username }} says: + {% endblocktrans %} +
    + {{ item.notes|to_markdown|safe }} +
    + {% if item.user == request.user and not hide_edit %} +
    +
    + + + {% trans "Edit notes" %} + + + + {% include "lists/edit_item_form.html" with book=item.book %} +
    +
    + {% endif %} +
    +
    +{% elif item.user == request.user and not hide_edit %} +
    +
    + + + {% trans "Add notes" %} + + + + {% include "lists/edit_item_form.html" with book=item.book %} +
    +
    +{% endif %} + From 68fa3def0ca0dc8dc5d7111818cb47f8f341f9ef Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 25 Aug 2024 19:50:18 -0700 Subject: [PATCH 047/962] Makes "add suggestions" section a detail element Also generalizes the markup for searching for list suggestions --- .../book/suggestion_list/search.html | 58 ++++-------------- bookwyrm/templates/lists/list.html | 57 +----------------- .../templates/lists/suggestion_search.html | 60 +++++++++++++++++++ 3 files changed, 74 insertions(+), 101 deletions(-) create mode 100644 bookwyrm/templates/lists/suggestion_search.html diff --git a/bookwyrm/templates/book/suggestion_list/search.html b/bookwyrm/templates/book/suggestion_list/search.html index 8edd5fd7db..4446bbb346 100644 --- a/bookwyrm/templates/book/suggestion_list/search.html +++ b/bookwyrm/templates/book/suggestion_list/search.html @@ -3,52 +3,18 @@ {% if request.user.is_authenticated %} {% with book.suggestion_list as list %} -

    - {% trans "Add suggestions" %} -

    -
    -
    -
    - -
    -
    - -
    -
    - {% if query %} -

    {% trans "Clear search" %}

    - {% endif %} -
    - {% if not suggested_books %} - {% if query %} -

    {% blocktrans %}No books found matching the query "{{ query }}"{% endblocktrans %}

    {% else %} -

    {% trans "No books found" %}

    - {% endif %} - {% endif %} - - {% if suggested_books|length > 0 %} - {% for book in suggested_books %} -
    -
    -

    {% include 'snippets/book_titleby.html' with book=book %}

    - - {% join "add_item" list.id book.id as modal_id %} - - {% include "lists/add_item_modal.html" with id=modal_id is_suggestion=True %} -
    -
    - {% endfor %} - {% endif %} +
    + + + {% trans "Add suggestions" %} + + + + {% url 'book' book_id=book.id as partial_url %} + {% with search_url=partial_url|add:"#add-suggestions" %} + {% include "lists/suggestion_search.html" with is_suggestion=True query_param="suggestion_query" %} + {% endwith %} +
    {% endwith %} {% endif %} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 3836720534..da85623f01 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -167,61 +167,8 @@

    {% trans "Suggest Books" %} {% endif %}

    -
    -
    -
    - -
    -
    - -
    -
    - {% if query %} -

    {% trans "Clear search" %}

    - {% endif %} -
    - {% if not suggested_books %} - {% if query %} -

    {% blocktrans %}No books found matching the query "{{ query }}"{% endblocktrans %}

    {% else %} -

    {% trans "No books found" %}

    - {% endif %} - {% endif %} - - {% if suggested_books|length > 0 %} - {% for book in suggested_books %} -
    - - -
    -

    {% include 'snippets/book_titleby.html' with book=book %}

    - - {% join "add_item" list.id book.id as modal_id %} - - {% include "lists/add_item_modal.html" with id=modal_id %} -
    -
    - {% endfor %} - {% endif %} + {% url 'list' list_id=list.id slug=list.name|slugify as search_url %} + {% include "lists/suggestion_search.html" with query_param="q" %} {% endif %}

    diff --git a/bookwyrm/templates/lists/suggestion_search.html b/bookwyrm/templates/lists/suggestion_search.html new file mode 100644 index 0000000000..b432afa495 --- /dev/null +++ b/bookwyrm/templates/lists/suggestion_search.html @@ -0,0 +1,60 @@ +{% load i18n %} +{% load utilities %} +{% load group_tags %} + +
    +
    +
    + +
    +
    + +
    +
    + {% if query %} +

    {% trans "Clear search" %}

    + {% endif %} +
    +{% if not suggested_books %} +{% if query %} +

    {% blocktrans %}No books found matching the query "{{ query }}"{% endblocktrans %}

    {% else %} +

    {% trans "No books found" %}

    +{% endif %} +{% endif %} + +{% if suggested_books|length > 0 %} + {% for book in suggested_books %} +
    + + +
    +

    {% include 'snippets/book_titleby.html' with book=book %}

    + + {% join "add_item" list.id book.id as modal_id %} + + {% include "lists/add_item_modal.html" with id=modal_id is_suggestion=is_suggestion %} +
    +
    + {% endfor %} +{% endif %} + From e8a95a217bb9d9fd49de3a0ffc14780fcd04ad07 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 25 Aug 2024 20:12:21 -0700 Subject: [PATCH 048/962] Moves book suggestion markup to a snippet --- .../book/suggestion_list/book_card.html | 43 +++++++++++++++++++ .../templates/book/suggestion_list/list.html | 43 +------------------ 2 files changed, 45 insertions(+), 41 deletions(-) create mode 100644 bookwyrm/templates/book/suggestion_list/book_card.html diff --git a/bookwyrm/templates/book/suggestion_list/book_card.html b/bookwyrm/templates/book/suggestion_list/book_card.html new file mode 100644 index 0000000000..694bc54b21 --- /dev/null +++ b/bookwyrm/templates/book/suggestion_list/book_card.html @@ -0,0 +1,43 @@ +{% load i18n %} +{% load book_display_tags %} + +
    +
    + {% with item_book=item.book %} +
    +
    + +
    +
    +
    +

    + {% include 'snippets/book_titleby.html' with book=item_book %} +

    + {% if item_book|book_description %} +
    + {% with full=item_book|book_description trim_length=20 %} + {% include 'snippets/trimmed_text.html' with hide_more=True %} + {% endwith %} + {% endif %} + {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True %} +
    + {% endwith %} +
    +
    +
    +

    + {% blocktrans trimmed with username=item.user.display_name user_path=item.user.local_path %} + Added by {{ username }} + {% endblocktrans %} +

    +
    +
    +

    + TODO :: endorsements +

    +
    +
    +
    + diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index fd8eeb3682..20fcad63f1 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -1,5 +1,4 @@ {% load i18n %} -{% load book_display_tags %}

    {% trans "Suggestions" %} @@ -17,46 +16,8 @@

    {% else %}
      {% for item in items %} -
    1. -
      -
      - {% with item_book=item.book %} -
      -
      - -
      -
      -
      -

      - {% include 'snippets/book_titleby.html' with book=item_book %} -

      - {% if item_book|book_description %} -
      - {% with full=item_book|book_description trim_length=20 %} - {% include 'snippets/trimmed_text.html' with hide_more=True %} - {% endwith %} - {% endif %} - {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True %} -
      - {% endwith %} -
      -
      -
      -

      - {% blocktrans trimmed with username=item.user.display_name user_path=item.user.local_path %} - Added by {{ username }} - {% endblocktrans %} -

      -
      -
      -

      - TODO :: endorsements -

      -
      -
      -
      +
    2. + {% include "book/suggestion_list/book_card.html" %}
      3. {% endfor %}
    3. From 5ea9358856d8846c5319123182d26e36975a7825 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 25 Aug 2024 20:47:26 -0700 Subject: [PATCH 049/962] Only show three suggestions on the book page --- .../book/suggestion_list/book_card.html | 25 ++++++++++++------- .../templates/book/suggestion_list/list.html | 12 +++++++-- bookwyrm/templates/lists/list.html | 2 +- bookwyrm/templates/lists/list_item_notes.html | 3 +-- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/bookwyrm/templates/book/suggestion_list/book_card.html b/bookwyrm/templates/book/suggestion_list/book_card.html index 694bc54b21..afbab74760 100644 --- a/bookwyrm/templates/book/suggestion_list/book_card.html +++ b/bookwyrm/templates/book/suggestion_list/book_card.html @@ -1,8 +1,8 @@ {% load i18n %} {% load book_display_tags %} -
      -
      +
      +
      {% with item_book=item.book %}
      @@ -11,22 +11,29 @@
      -
      -

      +

      +

      {% include 'snippets/book_titleby.html' with book=item_book %}

      {% if item_book|book_description %} -
      - {% with full=item_book|book_description trim_length=20 %} - {% include 'snippets/trimmed_text.html' with hide_more=True %} +
      + {% with full=item_book|book_description %} + {% include 'snippets/trimmed_text.html' with trim_length=15 hide_more=True %} {% endwith %} +
      + {% else %} + {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True %} {% endif %} - {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True %}
      + {% if item_book|book_description %} +
      + {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True no_trim=False trim_length=10 %} +
      + {% endif %} {% endwith %}
      -
      +

      {% blocktrans trimmed with username=item.user.display_name user_path=item.user.local_path %} Added by {{ username }} diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 20fcad63f1..635d5d93bb 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -1,15 +1,23 @@ {% load i18n %} +{% load humanize %}

      {% trans "Suggestions" %} + {% if book.suggestion_list %} + + {% blocktrans trimmed with count=book.suggestion_list.listitem_set.count|intcomma %} + View all {{ count }} suggestions + {% endblocktrans %} + + {% endif %}

      {% if book.suggestion_list %} -{% with book.suggestion_list.listitem_set.all as items %} +{% with book.suggestion_list.listitem_set.all|slice:3 as items %} {% if items|length == 0 %}
      -
      +
      {% include "book/suggestion_list/search.html" %}
      diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index da85623f01..e76c9eec06 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -80,7 +80,7 @@
      {% endwith %} - {% include "lists/list_item_notes.html" with item=item %} + {% include "lists/list_item_notes.html" with item=item no_trim=True %}
      diff --git a/bookwyrm/templates/lists/list_item_notes.html b/bookwyrm/templates/lists/list_item_notes.html index 812145d169..c7fff17c43 100644 --- a/bookwyrm/templates/lists/list_item_notes.html +++ b/bookwyrm/templates/lists/list_item_notes.html @@ -1,6 +1,5 @@ {% load i18n %} {% load utilities %} -{% load markdown %} {% if item.notes %}
      @@ -15,7 +14,7 @@ {{ username }} says: {% endblocktrans %} - {{ item.notes|to_markdown|safe }} + {% include 'snippets/trimmed_text.html' with no_trim=no_trim full=item.notes %}
      {% if item.user == request.user and not hide_edit %}
      From 500bd847197c9aca7707233cee10650f209dc60f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 25 Aug 2024 21:05:05 -0700 Subject: [PATCH 050/962] hide description if note is present for suggestion card --- .../templates/book/suggestion_list/book_card.html | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/bookwyrm/templates/book/suggestion_list/book_card.html b/bookwyrm/templates/book/suggestion_list/book_card.html index afbab74760..192979dd4c 100644 --- a/bookwyrm/templates/book/suggestion_list/book_card.html +++ b/bookwyrm/templates/book/suggestion_list/book_card.html @@ -2,7 +2,7 @@ {% load book_display_tags %}
      -
      +
      {% with item_book=item.book %}
      @@ -15,21 +15,16 @@

      {% include 'snippets/book_titleby.html' with book=item_book %}

      - {% if item_book|book_description %} + {% if item.notes %} + {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True no_trim=False trim_length=15 %} + {% else %}
      {% with full=item_book|book_description %} {% include 'snippets/trimmed_text.html' with trim_length=15 hide_more=True %} {% endwith %}
      - {% else %} - {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True %} {% endif %}
      - {% if item_book|book_description %} -
      - {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True no_trim=False trim_length=10 %} -
      - {% endif %} {% endwith %}
      From 01d7088e28fb5e0319eda37e6e5f10e9c83c2096 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Aug 2024 12:39:18 -0700 Subject: [PATCH 051/962] Show suggestion list suggestions in columns --- .../templates/book/suggestion_list/list.html | 26 +++++++++------- .../book/suggestion_list/search.html | 2 +- bookwyrm/templates/lists/list_item_notes.html | 30 ++++++++++--------- .../templates/lists/suggestion_search.html | 6 +++- 4 files changed, 38 insertions(+), 26 deletions(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 635d5d93bb..805fa43a69 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -3,16 +3,16 @@

      {% trans "Suggestions" %} - {% if book.suggestion_list %} - - {% blocktrans trimmed with count=book.suggestion_list.listitem_set.count|intcomma %} - View all {{ count }} suggestions - {% endblocktrans %} - - {% endif %}

      {% if book.suggestion_list %} + +

      + {% blocktrans trimmed with title=book.title %} + Readers who liked {{ title }} recommend giving these books a try: + {% endblocktrans %} +

      + {% with book.suggestion_list.listitem_set.all|slice:3 as items %} {% if items|length == 0 %} @@ -22,16 +22,22 @@

      {% else %} + + {% blocktrans trimmed with count=book.suggestion_list.listitem_set.count|intcomma %} + View all {{ count }} suggestions + {% endblocktrans %} +
        {% for item in items %}
      1. {% include "book/suggestion_list/book_card.html" %}
        2. {% endfor %} -
      2. - {% include "book/suggestion_list/search.html" %} -
      + +
      + {% include "book/suggestion_list/search.html" %} +
      {% endif %} {% endwith %} {% else %} diff --git a/bookwyrm/templates/book/suggestion_list/search.html b/bookwyrm/templates/book/suggestion_list/search.html index 4446bbb346..583ac8727d 100644 --- a/bookwyrm/templates/book/suggestion_list/search.html +++ b/bookwyrm/templates/book/suggestion_list/search.html @@ -12,7 +12,7 @@ {% url 'book' book_id=book.id as partial_url %} {% with search_url=partial_url|add:"#add-suggestions" %} - {% include "lists/suggestion_search.html" with is_suggestion=True query_param="suggestion_query" %} + {% include "lists/suggestion_search.html" with is_suggestion=True query_param="suggestion_query" columns=True %} {% endwith %} {% endwith %} diff --git a/bookwyrm/templates/lists/list_item_notes.html b/bookwyrm/templates/lists/list_item_notes.html index c7fff17c43..dd03c8cc9a 100644 --- a/bookwyrm/templates/lists/list_item_notes.html +++ b/bookwyrm/templates/lists/list_item_notes.html @@ -2,20 +2,22 @@ {% load utilities %} {% if item.notes %} -
      - -
      -
      -
      - {% url 'user-feed' item.user|username as user_path %} - {% blocktrans trimmed with username=item.user.display_name %} - {{ username }} says: - {% endblocktrans %} -
      - {% include 'snippets/trimmed_text.html' with no_trim=no_trim full=item.notes %} -
      +
      +
      + +
      + {% url 'user-feed' item.user|username as user_path %} + {% blocktrans trimmed with username=item.user.display_name %} + {{ username }} says: + {% endblocktrans %} +
      +
      +
      + + {% include 'snippets/trimmed_text.html' with no_trim=no_trim full=item.notes %} + {% if item.user == request.user and not hide_edit %}
      diff --git a/bookwyrm/templates/lists/suggestion_search.html b/bookwyrm/templates/lists/suggestion_search.html index b432afa495..f8fa10cbd1 100644 --- a/bookwyrm/templates/lists/suggestion_search.html +++ b/bookwyrm/templates/lists/suggestion_search.html @@ -27,7 +27,9 @@ {% endif %} {% if suggested_books|length > 0 %} + {% for book in suggested_books %} +
      -
      +

      {% include 'snippets/book_titleby.html' with book=book %}

      {% join "add_item" list.id book.id as modal_id %} @@ -55,6 +57,8 @@ {% include "lists/add_item_modal.html" with id=modal_id is_suggestion=is_suggestion %}
      +
      {% endfor %} +
      {% endif %} From 6b615d45b3fc237107521f76ecca2aa2cfe07e9b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Aug 2024 13:57:22 -0700 Subject: [PATCH 052/962] Adds a couple suggestions tests --- bookwyrm/models/list.py | 5 +++ bookwyrm/tests/views/books/test_book.py | 50 ++++++++++++++++++++++++- bookwyrm/views/books/books.py | 6 +-- 3 files changed, 56 insertions(+), 5 deletions(-) diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 76fc91c6eb..a79123cc6d 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -162,6 +162,11 @@ def save(self, *args, update_fields: Optional[Iterable[str]] = None, **kwargs): self.embed_key = uuid.uuid4() update_fields = add_update_fields(update_fields, "embed_key") + # ensure that suggestion lists have the right properties + if self.suggests_for: + self.privacy = "public" + self.curation = "open" + super().save(*args, update_fields=update_fields, **kwargs) diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index ee6e7d8b47..d9048d5491 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -51,6 +51,11 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=cls.work, ) + cls.another_book = models.Edition.objects.create( + title="Another Example Edition", + remote_id="https://example.com/book/1", + parent_work=models.Work.objects.create(title="Another Work"), + ) models.SiteSettings.objects.create() @@ -267,7 +272,7 @@ def test_quotation_endposition(self, *_): """make sure the endposition is served as well""" view = views.Book.as_view() - _ = models.Quotation.objects.create( + models.Quotation.objects.create( user=self.local_user, book=self.book, content="hi", @@ -290,6 +295,49 @@ def test_quotation_endposition(self, *_): result.context_data["statuses"].object_list[0].endposition, "13" ) + def test_create_suggestion_list(self, *_): + """start a suggestion list for a book""" + self.assertFalse(hasattr(self.book, "suggestion_list")) + + view = views.create_suggestion_list + form = forms.SuggestionListForm() + form.data["user"] = self.local_user.id + form.data["suggests_for"] = self.book.id + request = self.factory.post("", form.data) + request.user = self.local_user + + view(request, self.book.id) + + self.book.refresh_from_db() + self.assertTrue(hasattr(self.book, "suggestion_list")) + + suggestion_list = self.book.suggestion_list + self.assertEqual(suggestion_list.suggests_for, self.book) + self.assertEqual(suggestion_list.privacy, "public") + self.assertEqual(suggestion_list.curation, "open") + + def test_book_add_suggestion(self, *_): + """Add a book to the recommendation list""" + suggestion_list = models.List.objects.create( + suggests_for=self.book, user=self.local_user + ) + view = views.book_add_suggestion + form = forms.ListItemForm() + form.data["user"] = self.local_user.id + form.data["book"] = self.another_book.id + form.data["book_list"] = suggestion_list.id + form.data["notes"] = "hello" + request = self.factory.post("", form.data) + request.user = self.local_user + + view(request, self.book.id) + + self.assertEqual(suggestion_list.listitem_set.count(), 1) + item = suggestion_list.listitem_set.first() + self.assertEqual(item.book, self.another_book) + self.assertEqual(item.user, self.local_user) + self.assertEqual(item.notes, "hello") + def _setup_cover_url(): """creates cover url mock""" diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 3ecf97f7fc..9c017538b9 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -249,11 +249,9 @@ def create_suggestion_list(request, book_id): if not form.is_valid(): return redirect("book", book.id) + # saving in two steps means django uses the model's custom save functionality, + # which adds an embed key and fixes the privacy and curation settings suggestion_list = form.save(request, commit=False) - - # default values for the suggestion list - suggestion_list.privacy = "public" - suggestion_list.curation = "open" suggestion_list.save() return redirect("book", book.id) From 003465398306a5f4a594c77ddd2034357b998569 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Aug 2024 17:16:07 -0700 Subject: [PATCH 053/962] Uses a separate model for suggestion lists --- bookwyrm/forms/lists.py | 14 +- bookwyrm/models/__init__.py | 1 + bookwyrm/models/list.py | 185 +++++++++++------- .../templates/book/suggestion_list/list.html | 14 +- bookwyrm/templates/lists/embed-list.html | 2 +- bookwyrm/templates/lists/layout.html | 6 +- bookwyrm/templates/lists/list.html | 4 +- bookwyrm/templates/lists/list_items.html | 8 +- bookwyrm/urls.py | 8 +- bookwyrm/views/__init__.py | 13 +- bookwyrm/views/books/books.py | 64 +----- bookwyrm/views/list/list.py | 3 +- bookwyrm/views/list/lists.py | 8 +- 13 files changed, 162 insertions(+), 168 deletions(-) diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py index 03979a45c4..d3bf5961e7 100644 --- a/bookwyrm/forms/lists.py +++ b/bookwyrm/forms/lists.py @@ -14,15 +14,21 @@ class Meta: fields = ["user", "name", "description", "curation", "privacy", "group"] +class ListItemForm(CustomForm): + class Meta: + model = models.ListItem + fields = ["user", "book", "book_list", "notes"] + + class SuggestionListForm(CustomForm): class Meta: - model = models.List - fields = ["user", "suggests_for"] + model = models.SuggestionList + fields = ["suggests_for"] -class ListItemForm(CustomForm): +class SuggestionListItemForm(CustomForm): class Meta: - model = models.ListItem + model = models.SuggestionListItem fields = ["user", "book", "book_list", "notes"] diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py index 6bb99c7f25..e30004cc20 100644 --- a/bookwyrm/models/__init__.py +++ b/bookwyrm/models/__init__.py @@ -9,6 +9,7 @@ from .shelf import Shelf, ShelfBook from .list import List, ListItem +from .list import SuggestionList, SuggestionListItem from .status import Status, GeneratedNote, Comment, Quotation from .status import Review, ReviewRating diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index a79123cc6d..eb44814d95 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -23,76 +23,119 @@ ) -class List(OrderedCollectionMixin, BookWyrmModel): - """a list of books""" +class AbstractList(OrderedCollectionMixin, BookWyrmModel): + """Abstract model for regular lists and suggestion lists""" - name = fields.CharField(max_length=100) + embed_key = models.UUIDField(unique=True, null=True, editable=False) + activity_serializer = activitypub.BookList + privacy = fields.PrivacyField() user = fields.ForeignKey( "User", on_delete=models.PROTECT, activitypub_field="owner" ) - description = fields.TextField(blank=True, null=True, activitypub_field="summary") - privacy = fields.PrivacyField() - curation = fields.CharField( - max_length=255, default="closed", choices=CurationType.choices - ) - group = models.ForeignKey( - "Group", - on_delete=models.SET_NULL, - default=None, - blank=True, - null=True, - ) + + def save(self, *args, update_fields: Optional[Iterable[str]] = None, **kwargs): + """on save, update embed_key and avoid clash with existing code""" + if not self.embed_key: + self.embed_key = uuid.uuid4() + update_fields = add_update_fields(update_fields, "embed_key") + + super().save(*args, update_fields=update_fields, **kwargs) + + @property + def collection_queryset(self): + raise NotImplementedError + + class Meta: + """default sorting""" + + ordering = ("-updated_date",) + abstract = True + + +class SuggestionList(AbstractList): + """a list of user-provided suggested things to read next""" + books = models.ManyToManyField( "Edition", symmetrical=False, - through="ListItem", + through="SuggestionListItem", through_fields=("book_list", "book"), ) - embed_key = models.UUIDField(unique=True, null=True, editable=False) - activity_serializer = activitypub.BookList + suggests_for = fields.OneToOneField( "Edition", on_delete=models.PROTECT, activitypub_field="book", related_name="suggestion_list", - default=None, - null=True, + unique=True, ) - def get_remote_id(self): - """don't want the user to be in there in this case""" - return f"{BASE_URL}/list/{self.id}" - @property def collection_queryset(self): """list of books for this shelf, overrides OrderedCollectionMixin""" - return self.books.filter(listitem__approved=True).order_by("listitem") + return self.books.order_by("suggestionlistitem") + + def save(self, *args, **kwargs): + """on save, update embed_key and avoid clash with existing code""" + self.user = activitypub.get_representative() + self.privacy = "public" + + super().save(*args, **kwargs) + + def raise_not_editable(self, viewer): + """anyone can create a suggestion list, no one can edit""" + return + + def get_remote_id(self): + """don't want the user to be in there in this case""" + return f"{BASE_URL}/book/{self.suggests_for.id}/suggestions" @property - def get_name(self): + def name(self): """The name comes from the book title if it's a suggestion list""" - if self.suggests_for: - return _("Suggestions for %(title)s") % {"title": self.suggests_for.title} - - return self.name + return _("Suggestions for %(title)s") % {"title": self.suggests_for.title} @property - def get_description(self): + def description(self): """The description comes from the book title if it's a suggestion list""" - if self.suggests_for: - return _( - "This is the list of suggestions for %(title)s" - ) % { - "title": self.suggests_for.title, - "url": self.suggests_for.local_path, - } + return _( + "This is the list of suggestions for %(title)s" + ) % { + "title": self.suggests_for.title, + "url": self.suggests_for.local_path, + } - return self.description - class Meta: - """default sorting""" +class List(AbstractList): + """a list of books""" - ordering = ("-updated_date",) + books = models.ManyToManyField( + "Edition", + symmetrical=False, + through="ListItem", + through_fields=("book_list", "book"), + ) + name = fields.CharField(max_length=100) + description = fields.TextField(blank=True, null=True, activitypub_field="summary") + curation = fields.CharField( + max_length=255, default="closed", choices=CurationType.choices + ) + group = models.ForeignKey( + "Group", + on_delete=models.SET_NULL, + default=None, + blank=True, + null=True, + ) + + @property + def collection_queryset(self): + """list of books for this shelf, overrides OrderedCollectionMixin""" + return self.books.filter(listitem__approved=True).order_by("listitem") + + def get_remote_id(self): + """don't want the user to be in there in this case""" + return f"{BASE_URL}/list/{self.id}" def raise_not_editable(self, viewer): """the associated user OR the list owner can edit""" @@ -156,45 +199,22 @@ def remove_from_group(cls, owner, user): group=None, curation="closed" ) - def save(self, *args, update_fields: Optional[Iterable[str]] = None, **kwargs): - """on save, update embed_key and avoid clash with existing code""" - if not self.embed_key: - self.embed_key = uuid.uuid4() - update_fields = add_update_fields(update_fields, "embed_key") - - # ensure that suggestion lists have the right properties - if self.suggests_for: - self.privacy = "public" - self.curation = "open" - - super().save(*args, update_fields=update_fields, **kwargs) - -class ListItem(CollectionItemMixin, BookWyrmModel): - """ok""" +class AbstractListItem(CollectionItemMixin, BookWyrmModel): + """Abstracy class for list items for all types of lists""" book = fields.ForeignKey( "Edition", on_delete=models.PROTECT, activitypub_field="book" ) - book_list = models.ForeignKey("List", on_delete=models.CASCADE) user = fields.ForeignKey( "User", on_delete=models.PROTECT, activitypub_field="actor" ) notes = fields.HtmlField(blank=True, null=True, max_length=300) - approved = models.BooleanField(default=True) - order = fields.IntegerField() endorsement = models.ManyToManyField("User", related_name="endorsers") activity_serializer = activitypub.ListItem collection_field = "book_list" - def save(self, *args, **kwargs): - """Update the list's date""" - super().save(*args, **kwargs) - # tick the updated date on the parent list - self.book_list.updated_date = timezone.now() - self.book_list.save(broadcast=False, update_fields=["updated_date"]) - def raise_not_deletable(self, viewer): """the associated user OR the list owner can delete""" if self.book_list.user == viewer: @@ -211,5 +231,34 @@ class Meta: """A book may only be placed into a list once, and each order in the list may be used only once""" - unique_together = (("book", "book_list"), ("order", "book_list")) + unique_together = ("book", "book_list") ordering = ("-created_date",) + abstract = True + + +class ListItem(AbstractListItem): + """ok""" + + book_list = models.ForeignKey("List", on_delete=models.CASCADE) + approved = models.BooleanField(default=True) + order = fields.IntegerField() + + def save(self, *args, **kwargs): + """Update the list's date""" + super().save(*args, **kwargs) + # tick the updated date on the parent list + self.book_list.updated_date = timezone.now() + self.book_list.save(broadcast=False, update_fields=["updated_date"]) + + class Meta: + """A book may only be placed into a list once, + and each order in the list may be used only once""" + + unique_together = (("book", "book_list"), ("order", "book_list")) + + +class SuggestionListItem(AbstractListItem): + """items on a suggestion list""" + + book_list = models.ForeignKey("SuggestionList", on_delete=models.CASCADE) + endorsement = models.ManyToManyField("User", related_name="suggestion_endorsers") diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 805fa43a69..09925377df 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -3,6 +3,11 @@

      {% trans "Suggestions" %} + + {% blocktrans trimmed with count=book.suggestion_list.suggestionlistitem_set.count|intcomma %} + View all {{ count }} suggestions + {% endblocktrans %} +

      {% if book.suggestion_list %} @@ -13,7 +18,7 @@

      {% endblocktrans %}

      -{% with book.suggestion_list.listitem_set.all|slice:3 as items %} +{% with book.suggestion_list.suggestionlistitem_set.all|slice:3 as items %} {% if items|length == 0 %}
      @@ -22,11 +27,6 @@

      {% else %} - - {% blocktrans trimmed with count=book.suggestion_list.listitem_set.count|intcomma %} - View all {{ count }} suggestions - {% endblocktrans %} -
        {% for item in items %}
      1. @@ -42,7 +42,7 @@

        {% endwith %} {% else %}
        -
        + {% csrf_token %} diff --git a/bookwyrm/templates/lists/embed-list.html b/bookwyrm/templates/lists/embed-list.html index 411763eab2..d9a50a4646 100644 --- a/bookwyrm/templates/lists/embed-list.html +++ b/bookwyrm/templates/lists/embed-list.html @@ -21,7 +21,7 @@

        - {% include 'snippets/trimmed_text.html' with full=list.get_description %} + {% include 'snippets/trimmed_text.html' with full=list.description %}
        diff --git a/bookwyrm/templates/lists/layout.html b/bookwyrm/templates/lists/layout.html index 9dd1c61dbd..c9003b3252 100644 --- a/bookwyrm/templates/lists/layout.html +++ b/bookwyrm/templates/lists/layout.html @@ -2,7 +2,7 @@ {% load i18n %} {% load list_page_tags %} -{% block title %}{{ list.get_name }}{% endblock %} +{% block title %}{{ list.name }}{% endblock %} {% block opengraph %} {% include 'snippets/opengraph.html' with title=list|opengraph_title description=list|opengraph_description %} @@ -11,7 +11,7 @@ {% block content %}
        -

        {{ list.get_name }} {% include 'snippets/privacy-icons.html' with item=list %}

        +

        {{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %}

        {% if list.suggests_for == None %}

        {% include 'lists/created_text.html' with list=list %} @@ -35,7 +35,7 @@

        {{ list.get_name }} {% include 'snippet {% block breadcrumbs %}{% endblock %}
        - {% include 'snippets/trimmed_text.html' with full=list.get_description %} + {% include 'snippets/trimmed_text.html' with full=list.description %}
        diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index e76c9eec06..63f7ffcb28 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -12,7 +12,7 @@
      2. {% trans "Lists" %}
      3. - {{ list.get_name|truncatechars:30 }} + {{ list.name|truncatechars:30 }}
        4. @@ -182,7 +182,7 @@

        data-copytext data-copytext-label="{% trans 'Copy embed code' %}" data-copytext-success="{% trans 'Copied!' %}" - ><iframe style="border-width:0;" id="bookwyrm_list_embed" width="400" height="600" title="{% blocktrans trimmed with list_name=list.get_name site_name=site.name owner=list.user.display_name %} + ><iframe style="border-width:0;" id="bookwyrm_list_embed" width="400" height="600" title="{% blocktrans trimmed with list_name=list.name site_name=site.name owner=list.user.display_name %} {{ list_name }}, a list by {{owner}} on {{ site_name }} {% endblocktrans %}" src="{{ embed_url }}"></iframe>

        diff --git a/bookwyrm/templates/lists/list_items.html b/bookwyrm/templates/lists/list_items.html index 3e91e6f311..cff4c16c1c 100644 --- a/bookwyrm/templates/lists/list_items.html +++ b/bookwyrm/templates/lists/list_items.html @@ -8,7 +8,7 @@

        - {{ list.get_name }} {% include 'snippets/privacy-icons.html' with item=list %} + {{ list.name }} {% include 'snippets/privacy-icons.html' with item=list %}

        {% if request.user.is_authenticated and request.user|saved:list %}
        @@ -33,9 +33,9 @@

        {% endwith %}
        -
        - {% if list.get_description %} - {{ list.get_description|to_markdown|safe|truncatechars_html:30 }} +
        + {% if list.description %} + {{ list.description|to_markdown|safe|truncatechars_html:30 }} {% else %}   {% endif %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index cd071e8711..936327e6fa 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -761,12 +761,12 @@ name="book-update-remote", ), re_path( - rf"{BOOK_PATH}/create-suggestion-list/?$", - views.create_suggestion_list, - name="book-create-suggestion-list", + rf"{BOOK_PATH}/suggestions(.json)?/?$", + views.SuggestionList.as_view(), + name="suggestion-list", ), re_path( - rf"{BOOK_PATH}/book-add-suggestion/?$", + rf"{BOOK_PATH}/suggestions/add/?$", views.book_add_suggestion, name="book-add-suggestion", ), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index ddb07e5de9..7512115080 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -55,14 +55,7 @@ ) # books -from .books.books import ( - Book, - upload_cover, - add_description, - resolve_book, - create_suggestion_list, - book_add_suggestion, -) +from .books.books import Book, upload_cover, add_description, resolve_book from .books.series import BookSeriesBy from .books.books import update_book_from_remote from .books.edit_book import ( @@ -112,6 +105,10 @@ set_book_position, ) +# suggestion lists +from .suggestion_list import SuggestionList +from .suggestion_list import book_add_suggestion + # misc views from .author import Author, EditAuthor, update_author_from_remote from .directory import Directory diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 9c017538b9..5b42fba16d 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -4,8 +4,7 @@ from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator -from django.db import transaction -from django.db.models import Avg, Q, Max +from django.db.models import Avg, Q from django.http import Http404 from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse @@ -22,7 +21,7 @@ maybe_redirect_local_path, get_mergeable_object_or_404, ) -from bookwyrm.views.list.list import get_list_suggestions, increment_order_in_reverse +from bookwyrm.views.list.list import get_list_suggestions # pylint: disable=no-self-use @@ -85,15 +84,9 @@ def get(self, request, book_id, **kwargs): queryset = queryset.select_related("user").order_by("-published_date") paginated = Paginator(queryset, PAGE_LENGTH) - lists = ( - models.List.privacy_filter( - request.user, - ) - .filter( - listitem__approved=True, - listitem__book__in=book.parent_work.editions.all(), - ) - .filter(suggests_for__isnull=True) + lists = models.List.privacy_filter(request.user,).filter( + listitem__approved=True, + listitem__book__in=book.parent_work.editions.all(), ) data = { "book": book, @@ -113,9 +106,7 @@ def get(self, request, book_id, **kwargs): } if request.user.is_authenticated: - data["list_options"] = request.user.list_set.filter( - suggests_for__isnull=True - ).exclude(id__in=data["lists"]) + data["list_options"] = request.user.list_set.exclude(id__in=data["lists"]) data["file_link_form"] = forms.FileLinkForm() readthroughs = models.ReadThrough.objects.filter( user=request.user, @@ -238,46 +229,3 @@ def update_book_from_remote(request, book_id, connector_identifier): return Book().get(request, book_id, update_error=True) return redirect("book", book.id) - - -@login_required -@require_POST -def create_suggestion_list(request, book_id): - """create a suggestion_list""" - form = forms.SuggestionListForm(request.POST) - book = get_object_or_404(models.Edition, id=book_id) - - if not form.is_valid(): - return redirect("book", book.id) - # saving in two steps means django uses the model's custom save functionality, - # which adds an embed key and fixes the privacy and curation settings - suggestion_list = form.save(request, commit=False) - suggestion_list.save() - - return redirect("book", book.id) - - -@login_required -@require_POST -@transaction.atomic -def book_add_suggestion(request, book_id): - """put a book on the suggestion list""" - book_list = get_object_or_404(models.List, id=request.POST.get("book_list")) - - form = forms.ListItemForm(request.POST) - if not form.is_valid(): - return Book().get(request, book_id, add_failed=True) - - item = form.save(request, commit=False) - - # add the book at the latest order of approved books, before pending books - order_max = ( - book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[ - "order__max" - ] - ) or 0 - increment_order_in_reverse(book_list.id, order_max + 1) - item.order = order_max + 1 - item.save() - - return Book().get(request, book_id, add_succeeded=True) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 227725b2eb..ecac9f6b85 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -80,7 +80,6 @@ def get(self, request, list_id, **kwargs): book_list, request.user, query=query, - ignore_book=book_list.suggests_for, ) return TemplateResponse(request, "lists/list.html", data) @@ -92,7 +91,7 @@ def post(self, request, list_id): form = forms.ListForm(request.POST, instance=book_list) if not form.is_valid(): # this shouldn't happen - raise Exception(form.errors) + raise Exception(form.errors) # pylint: disable=broad-exception-raised book_list = form.save(request) if not book_list.curation == "group": book_list.group = None diff --git a/bookwyrm/views/list/lists.py b/bookwyrm/views/list/lists.py index 50f873ad8e..e35cd67df8 100644 --- a/bookwyrm/views/list/lists.py +++ b/bookwyrm/views/list/lists.py @@ -21,7 +21,6 @@ def get(self, request): lists = ListsStream().get_list_stream(request.user) else: lists = models.List.objects.filter(privacy="public") - lists = lists.filter(suggests_for__isnull=True) paginated = Paginator(lists, 12) data = { "lists": paginated.get_page(request.GET.get("page")), @@ -31,7 +30,6 @@ def get(self, request): return TemplateResponse(request, "lists/lists.html", data) @method_decorator(login_required, name="dispatch") - # pylint: disable=unused-argument def post(self, request): """create a book_list""" form = forms.ListForm(request.POST) @@ -72,11 +70,7 @@ class UserLists(View): def get(self, request, username): """display a book list""" user = get_user_from_username(request.user, username) - lists = ( - models.List.privacy_filter(request.user) - .filter(user=user) - .filter(suggests_for__isnull=True) - ) + lists = models.List.privacy_filter(request.user).filter(user=user) paginated = Paginator(lists, 12) data = { From 5879b4be5cb04693368aca8900b01d0bb6029e2b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Aug 2024 17:54:55 -0700 Subject: [PATCH 054/962] Adds missing view file --- bookwyrm/views/suggestion_list.py | 99 +++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 bookwyrm/views/suggestion_list.py diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py new file mode 100644 index 0000000000..3f2cb78f14 --- /dev/null +++ b/bookwyrm/views/suggestion_list.py @@ -0,0 +1,99 @@ +""" the good stuff! the books! """ +from django.contrib.auth.decorators import login_required +from django.core.paginator import Paginator +from django.db import transaction +from django.shortcuts import get_object_or_404, redirect +from django.template.response import TemplateResponse +from django.urls import reverse +from django.utils.decorators import method_decorator +from django.views import View +from django.views.decorators.http import require_POST + +from bookwyrm import forms, models +from bookwyrm.activitypub import ActivitypubResponse +from bookwyrm.settings import PAGE_LENGTH +from bookwyrm.views import Book +from bookwyrm.views.helpers import is_api_request +from bookwyrm.views.list.list import get_list_suggestions + +# pylint: disable=no-self-use +class SuggestionList(View): + """book list page""" + + def get(self, request, book_id, **kwargs): + """display a book list""" + add_failed = kwargs.get("add_failed", False) + add_succeeded = kwargs.get("add_succeeded", False) + + book_list = get_object_or_404(models.SuggestionList, suggests_for=book_id) + + if is_api_request(request): + return ActivitypubResponse(book_list.to_activity(**request.GET)) + + items = book_list.suggestionlistitem_set.prefetch_related( + "user", "book", "book__authors" + ) + + paginated = Paginator(items, PAGE_LENGTH) + + page = paginated.get_page(request.GET.get("page")) + + embed_key = str(book_list.embed_key.hex) + embed_url = reverse("embed-list", args=[book_list.id, embed_key]) + embed_url = request.build_absolute_uri(embed_url) + + if request.GET: + embed_url = f"{embed_url}?{request.GET.urlencode()}" + + query = request.GET.get("q", "") + data = { + "list": book_list, + "items": page, + "page_range": paginated.get_elided_page_range( + page.number, on_each_side=2, on_ends=1 + ), + "query": query, + "embed_url": embed_url, + "add_failed": add_failed, + "add_succeeded": add_succeeded, + } + + if request.user.is_authenticated: + data["suggested_books"] = get_list_suggestions( + book_list, request.user, query=query, ignore_book=book_list.suggests_for + ) + return TemplateResponse(request, "lists/list.html", data) + + @method_decorator(login_required, name="dispatch") + def post(self, request, book_id): + """create a suggestion_list""" + form = forms.SuggestionListForm(request.POST) + book = get_object_or_404(models.Edition, id=book_id) + + if not form.is_valid(): + return redirect("book", book.id) + # saving in two steps means django uses the model's custom save functionality, + # which adds an embed key and fixes the privacy and curation settings + suggestion_list = form.save(request, commit=False) + suggestion_list.save() + + return redirect("book", book.id) + + +@login_required +@require_POST +@transaction.atomic +def book_add_suggestion(request, book_id): + """put a book on the suggestion list""" + _ = get_object_or_404( + models.SuggestionList, suggests_for=book_id, id=request.POST.get("book_list") + ) + + form = forms.SuggestionListItemForm(request.POST) + if not form.is_valid(): + return Book().get(request, book_id, add_failed=True) + + item = form.save(request, commit=False) + item.save() + + return Book().get(request, book_id, add_succeeded=True) From 2e15c227f36da4e75aa5c8e82d18764ad5ce5655 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 26 Aug 2024 17:57:21 -0700 Subject: [PATCH 055/962] Fixes adding books from list page view --- bookwyrm/templates/lists/add_item_modal.html | 6 +++--- bookwyrm/templates/lists/list.html | 5 ++--- bookwyrm/templates/lists/suggestion_search.html | 2 +- bookwyrm/views/list/list.py | 1 + bookwyrm/views/suggestion_list.py | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/lists/add_item_modal.html b/bookwyrm/templates/lists/add_item_modal.html index 254d17b99d..322b69f999 100644 --- a/bookwyrm/templates/lists/add_item_modal.html +++ b/bookwyrm/templates/lists/add_item_modal.html @@ -4,7 +4,7 @@ {% load group_tags %} {% block modal-title %} -{% if list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %} +{% if list.suggests_for or list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %} {% blocktrans trimmed with title=book|book_title %} Add "{{ title }}" to this list {% endblocktrans %} @@ -19,7 +19,7 @@
        diff --git a/bookwyrm/templates/book/suggestion_list/endorsement_button.html b/bookwyrm/templates/book/suggestion_list/endorsement_button.html new file mode 100644 index 0000000000..2ea8b6672f --- /dev/null +++ b/bookwyrm/templates/book/suggestion_list/endorsement_button.html @@ -0,0 +1,10 @@ +{% load i18n %} + + {% csrf_token %} + + diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 09925377df..d7937b7264 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -18,8 +18,6 @@

        {% endblocktrans %}

        -{% with book.suggestion_list.suggestionlistitem_set.all|slice:3 as items %} - {% if items|length == 0 %}
        @@ -39,7 +37,6 @@

        {% include "book/suggestion_list/search.html" %}

        {% endif %} -{% endwith %} {% else %}
        diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index e6fbf12e77..b1f58c50f0 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -91,6 +91,11 @@ {% endblocktrans %}

        + {% if list.suggests_for %} +
        + {% include "book/suggestion_list/endorsement_button.html" with book=list.suggests_for %} +
        + {% endif %} {% if list.user == request.user or list.group|is_member:request.user %} \d+)/?$", + views.endorse_suggestion, + name="suggestion-endorse", + ), re_path( r"^author/(?P\d+)/update/(?P[\w\.]+)/?$", views.update_author_from_remote, diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 7aa86b6b54..2f36063bfb 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -107,7 +107,11 @@ # suggestion lists from .suggestion_list import SuggestionList -from .suggestion_list import book_add_suggestion, book_remove_suggestion +from .suggestion_list import ( + book_add_suggestion, + book_remove_suggestion, + endorse_suggestion, +) # misc views from .author import Author, EditAuthor, update_author_from_remote diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 5b42fba16d..96410a89bd 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -4,7 +4,7 @@ from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator -from django.db.models import Avg, Q +from django.db.models import Avg, Q, Count from django.http import Http404 from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse @@ -136,6 +136,15 @@ def get(self, request, book_id, **kwargs): "quotation_count": book.quotation_set.filter(**filters).count(), } if hasattr(book, "suggestion_list"): + + data["items"] = ( + book.suggestion_list.suggestionlistitem_set.prefetch_related( + "user", "book", "book__authors" + ) + .annotate(endorsement_count=Count("endorsement")) + .order_by("-endorsement_count")[:3] + ) + data["suggested_books"] = get_list_suggestions( book.suggestion_list, request.user, diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py index 15ba5e132a..d0bef36477 100644 --- a/bookwyrm/views/suggestion_list.py +++ b/bookwyrm/views/suggestion_list.py @@ -2,6 +2,7 @@ from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.db import transaction +from django.db.models import Count from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse from django.urls import reverse @@ -30,8 +31,12 @@ def get(self, request, book_id, **kwargs): if is_api_request(request): return ActivitypubResponse(book_list.to_activity(**request.GET)) - items = book_list.suggestionlistitem_set.prefetch_related( - "user", "book", "book__authors" + items = ( + book_list.suggestionlistitem_set.prefetch_related( + "user", "book", "book__authors" + ) + .annotate(endorsement_count=Count("endorsement")) + .order_by("-endorsement_count") ) paginated = Paginator(items, PAGE_LENGTH) @@ -103,12 +108,30 @@ def book_add_suggestion(request, book_id): @require_POST @login_required -def book_remove_suggestion(request, _): +def book_remove_suggestion(request, book_id): """remove a book from a suggestion list""" - item = get_object_or_404(models.SuggestionListItem, id=request.POST.get("item")) + item = get_object_or_404( + models.SuggestionListItem, + id=request.POST.get("item"), + book_list__suggests_for=book_id, + ) item.raise_not_deletable(request.user) with transaction.atomic(): item.delete() return redirect_to_referer(request) + + +@require_POST +@login_required +def endorse_suggestion(request, book_id, item_id): + """endorse a suggestion""" + item = get_object_or_404( + models.SuggestionListItem, id=item_id, book_list__suggests_for=book_id + ) + if request.user not in item.endorsement.all(): + item.endorse(request.user) + else: + item.unendorse(request.user) + return redirect_to_referer(request) From 782ca090c7577e8efb08bf7ad6d47fadc25831fe Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 27 Aug 2024 07:50:09 -0700 Subject: [PATCH 059/962] Updates tests --- bookwyrm/tests/views/books/test_book.py | 48 -------- bookwyrm/tests/views/test_suggestion_list.py | 109 +++++++++++++++++++ 2 files changed, 109 insertions(+), 48 deletions(-) create mode 100644 bookwyrm/tests/views/test_suggestion_list.py diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index d9048d5491..afd0fa47e0 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -51,11 +51,6 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=cls.work, ) - cls.another_book = models.Edition.objects.create( - title="Another Example Edition", - remote_id="https://example.com/book/1", - parent_work=models.Work.objects.create(title="Another Work"), - ) models.SiteSettings.objects.create() @@ -295,49 +290,6 @@ def test_quotation_endposition(self, *_): result.context_data["statuses"].object_list[0].endposition, "13" ) - def test_create_suggestion_list(self, *_): - """start a suggestion list for a book""" - self.assertFalse(hasattr(self.book, "suggestion_list")) - - view = views.create_suggestion_list - form = forms.SuggestionListForm() - form.data["user"] = self.local_user.id - form.data["suggests_for"] = self.book.id - request = self.factory.post("", form.data) - request.user = self.local_user - - view(request, self.book.id) - - self.book.refresh_from_db() - self.assertTrue(hasattr(self.book, "suggestion_list")) - - suggestion_list = self.book.suggestion_list - self.assertEqual(suggestion_list.suggests_for, self.book) - self.assertEqual(suggestion_list.privacy, "public") - self.assertEqual(suggestion_list.curation, "open") - - def test_book_add_suggestion(self, *_): - """Add a book to the recommendation list""" - suggestion_list = models.List.objects.create( - suggests_for=self.book, user=self.local_user - ) - view = views.book_add_suggestion - form = forms.ListItemForm() - form.data["user"] = self.local_user.id - form.data["book"] = self.another_book.id - form.data["book_list"] = suggestion_list.id - form.data["notes"] = "hello" - request = self.factory.post("", form.data) - request.user = self.local_user - - view(request, self.book.id) - - self.assertEqual(suggestion_list.listitem_set.count(), 1) - item = suggestion_list.listitem_set.first() - self.assertEqual(item.book, self.another_book) - self.assertEqual(item.user, self.local_user) - self.assertEqual(item.notes, "hello") - def _setup_cover_url(): """creates cover url mock""" diff --git a/bookwyrm/tests/views/test_suggestion_list.py b/bookwyrm/tests/views/test_suggestion_list.py new file mode 100644 index 0000000000..3eedfcc3a6 --- /dev/null +++ b/bookwyrm/tests/views/test_suggestion_list.py @@ -0,0 +1,109 @@ +""" test for app action functionality """ +from unittest.mock import patch + +from django.test import TestCase +from django.test.client import RequestFactory + +from bookwyrm import forms, models, views +from bookwyrm.activitypub import ActivitypubResponse, get_representative +from bookwyrm.tests.validate_html import validate_html + + +class BookViews(TestCase): + """books books books""" + + @classmethod + def setUpTestData(cls): + """we need basic test data and mocks""" + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): + cls.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword", + local=True, + localname="mouse", + remote_id="https://example.com/users/mouse", + ) + cls.work = models.Work.objects.create(title="Test Work") + cls.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=cls.work, + ) + cls.another_book = models.Edition.objects.create( + title="Another Example Edition", + remote_id="https://example.com/book/1", + parent_work=models.Work.objects.create(title="Another Work"), + ) + + models.SiteSettings.objects.create() + + def setUp(self): + """individual test setup""" + self.factory = RequestFactory() + + def test_suggestion_list_get(self, *_): + """start a suggestion list for a book""" + models.SuggestionList.objects.create(suggests_for=self.book) + view = views.SuggestionList.as_view() + request = self.factory.get("") + request.user = self.local_user + + result = view(request, self.book.id) + validate_html(result.render()) + + def test_suggestion_list_get_json(self, *_): + """start a suggestion list for a book""" + models.SuggestionList.objects.create(suggests_for=self.book) + view = views.SuggestionList.as_view() + request = self.factory.get("") + request.user = self.local_user + + with patch("bookwyrm.views.suggestion_list.is_api_request") as is_api: + is_api.return_value = True + result = view(request, self.book.id) + self.assertIsInstance(result, ActivitypubResponse) + + def test_suggestion_create(self, *_): + """start a suggestion list for a book""" + self.assertFalse(hasattr(self.book, "suggestion_list")) + + view = views.SuggestionList.as_view() + form = forms.SuggestionListForm() + form.data["suggests_for"] = self.book.id + request = self.factory.post("", form.data) + request.user = self.local_user + + view(request, self.book.id) + + self.book.refresh_from_db() + self.assertTrue(hasattr(self.book, "suggestion_list")) + + suggestion_list = self.book.suggestion_list + self.assertEqual(suggestion_list.suggests_for, self.book) + self.assertEqual(suggestion_list.privacy, "public") + self.assertEqual(suggestion_list.user, get_representative()) + + def test_book_add_suggestion(self, *_): + """Add a book to the recommendation list""" + suggestion_list = models.SuggestionList.objects.create(suggests_for=self.book) + view = views.book_add_suggestion + form = forms.SuggestionListItemForm() + form.data["user"] = self.local_user.id + form.data["book"] = self.another_book.id + form.data["book_list"] = suggestion_list.id + form.data["notes"] = "hello" + request = self.factory.post("", form.data) + request.user = self.local_user + + view(request, self.book.id) + + self.assertEqual(suggestion_list.suggestionlistitem_set.count(), 1) + item = suggestion_list.suggestionlistitem_set.first() + self.assertEqual(item.book, self.another_book) + self.assertEqual(item.user, self.local_user) + self.assertEqual(item.notes, "hello") From 299ac0631da705c63130840ccf1be38ec0f3205e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 27 Aug 2024 07:58:29 -0700 Subject: [PATCH 060/962] adds merge migration --- bookwyrm/migrations/0210_merge_20240827_1453.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0210_merge_20240827_1453.py diff --git a/bookwyrm/migrations/0210_merge_20240827_1453.py b/bookwyrm/migrations/0210_merge_20240827_1453.py new file mode 100644 index 0000000000..a54313a2be --- /dev/null +++ b/bookwyrm/migrations/0210_merge_20240827_1453.py @@ -0,0 +1,13 @@ +# Generated by Django 4.2.15 on 2024-08-27 14:53 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0209_suggestionlist_alter_listitem_options_and_more"), + ("bookwyrm", "0209_user_show_ratings"), + ] + + operations = [] From 5deb779efd8e3ade3cdec2b6d106690ecb9d8247 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 27 Aug 2024 11:31:05 -0700 Subject: [PATCH 061/962] Associate suggestions with works instead of editions --- .../migrations/0210_merge_20240827_1453.py | 13 ------------ ...onlist_alter_listitem_options_and_more.py} | 6 +++--- bookwyrm/models/list.py | 2 +- bookwyrm/templates/book/book.html | 2 +- .../suggestion_list/endorsement_button.html | 2 +- .../templates/book/suggestion_list/list.html | 17 +++++++--------- .../book/suggestion_list/search.html | 5 +---- bookwyrm/templates/lists/add_item_modal.html | 10 +++++----- bookwyrm/templates/lists/list.html | 4 ++-- .../templates/lists/suggestion_search.html | 4 ++-- bookwyrm/views/books/books.py | 14 +++++++------ bookwyrm/views/list/list.py | 6 +++--- bookwyrm/views/suggestion_list.py | 20 ++++++++++++------- 13 files changed, 47 insertions(+), 58 deletions(-) delete mode 100644 bookwyrm/migrations/0210_merge_20240827_1453.py rename bookwyrm/migrations/{0209_suggestionlist_alter_listitem_options_and_more.py => 0210_suggestionlist_alter_listitem_options_and_more.py} (96%) diff --git a/bookwyrm/migrations/0210_merge_20240827_1453.py b/bookwyrm/migrations/0210_merge_20240827_1453.py deleted file mode 100644 index a54313a2be..0000000000 --- a/bookwyrm/migrations/0210_merge_20240827_1453.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 4.2.15 on 2024-08-27 14:53 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0209_suggestionlist_alter_listitem_options_and_more"), - ("bookwyrm", "0209_user_show_ratings"), - ] - - operations = [] diff --git a/bookwyrm/migrations/0209_suggestionlist_alter_listitem_options_and_more.py b/bookwyrm/migrations/0210_suggestionlist_alter_listitem_options_and_more.py similarity index 96% rename from bookwyrm/migrations/0209_suggestionlist_alter_listitem_options_and_more.py rename to bookwyrm/migrations/0210_suggestionlist_alter_listitem_options_and_more.py index 85eb8d2fb9..1864701dec 100644 --- a/bookwyrm/migrations/0209_suggestionlist_alter_listitem_options_and_more.py +++ b/bookwyrm/migrations/0210_suggestionlist_alter_listitem_options_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.15 on 2024-08-27 01:20 +# Generated by Django 4.2.15 on 2024-08-27 17:27 import bookwyrm.models.activitypub_mixin import bookwyrm.models.fields @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ - ("bookwyrm", "0208_merge_0207_merge_20240629_0626_0207_sqlparse_update"), + ("bookwyrm", "0209_user_show_ratings"), ] operations = [ @@ -140,7 +140,7 @@ class Migration(migrations.Migration): field=bookwyrm.models.fields.OneToOneField( on_delete=django.db.models.deletion.PROTECT, related_name="suggestion_list", - to="bookwyrm.edition", + to="bookwyrm.work", ), ), migrations.AddField( diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 23e044f58f..3301983cb3 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -63,7 +63,7 @@ class SuggestionList(AbstractList): ) suggests_for = fields.OneToOneField( - "Edition", + "Work", on_delete=models.PROTECT, activitypub_field="book", related_name="suggestion_list", diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 49474147fe..0fe8e13fdc 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -423,7 +423,7 @@

        {% trans "Lists" %}

        - {% include "book/suggestion_list/list.html" %} + {% include "book/suggestion_list/list.html" with list=suggstion_list %}
        {% endwith %} {% endblock %} diff --git a/bookwyrm/templates/book/suggestion_list/endorsement_button.html b/bookwyrm/templates/book/suggestion_list/endorsement_button.html index 2ea8b6672f..9ddad536cd 100644 --- a/bookwyrm/templates/book/suggestion_list/endorsement_button.html +++ b/bookwyrm/templates/book/suggestion_list/endorsement_button.html @@ -1,5 +1,5 @@ {% load i18n %} - + {% csrf_token %}

        diff --git a/bookwyrm/templates/book/suggestion_list/search.html b/bookwyrm/templates/book/suggestion_list/search.html index 583ac8727d..9a5b9cb2ab 100644 --- a/bookwyrm/templates/book/suggestion_list/search.html +++ b/bookwyrm/templates/book/suggestion_list/search.html @@ -2,7 +2,6 @@ {% load utilities %} {% if request.user.is_authenticated %} -{% with book.suggestion_list as list %}
        @@ -10,11 +9,9 @@ - {% url 'book' book_id=book.id as partial_url %} - {% with search_url=partial_url|add:"#add-suggestions" %} + {% with search_url=request.path|add:"#add-suggestions" %} {% include "lists/suggestion_search.html" with is_suggestion=True query_param="suggestion_query" columns=True %} {% endwith %}
        -{% endwith %} {% endif %} diff --git a/bookwyrm/templates/lists/add_item_modal.html b/bookwyrm/templates/lists/add_item_modal.html index 322b69f999..96336809e0 100644 --- a/bookwyrm/templates/lists/add_item_modal.html +++ b/bookwyrm/templates/lists/add_item_modal.html @@ -4,7 +4,7 @@ {% load group_tags %} {% block modal-title %} -{% if list.suggests_for or list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %} +{% if is_suggestion or list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %} {% blocktrans trimmed with title=book|book_title %} Add "{{ title }}" to this list {% endblocktrans %} @@ -19,10 +19,10 @@
        {% endblock %} @@ -39,7 +39,7 @@
        {% if list.suggests_for %}
        - {% include "book/suggestion_list/endorsement_button.html" with book=list.suggests_for %} + {% include "book/suggestion_list/endorsement_button.html" with work=list.suggests_for %}
        {% endif %} {% if list.user == request.user or list.group|is_member:request.user %} @@ -172,7 +172,7 @@

        {% trans "Suggest Books" %} {% endif %}

        - {% include "lists/suggestion_search.html" with query_param="q" search_url=add_book_url %} + {% include "lists/suggestion_search.html" with query_param="q" search_url=request.path %} {% endif %}

        diff --git a/bookwyrm/templates/lists/suggestion_search.html b/bookwyrm/templates/lists/suggestion_search.html index a522e4e079..b852d8b175 100644 --- a/bookwyrm/templates/lists/suggestion_search.html +++ b/bookwyrm/templates/lists/suggestion_search.html @@ -48,13 +48,13 @@ class="button is-small is-link" data-modal-open="{{ modal_id }}" > - {% if list.suggests_for or list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %} + {% if is_suggestion or list.curation == 'open' or request.user == list.user or list.group|is_member:request.user %} {% trans "Add" %} {% else %} {% trans "Suggest" %} {% endif %} - {% include "lists/add_item_modal.html" with id=modal_id is_suggestion=is_suggestion %} + {% include "lists/add_item_modal.html" with id=modal_id is_suggestion=is_suggestion list=list %}

      diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 96410a89bd..2f4a599429 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -90,6 +90,7 @@ def get(self, request, book_id, **kwargs): ) data = { "book": book, + "work": book.parent_work, "statuses": paginated.get_page(request.GET.get("page")), "review_count": reviews.count(), "ratings": ( @@ -135,21 +136,22 @@ def get(self, request, book_id, **kwargs): "comment_count": book.comment_set.filter(**filters).count(), "quotation_count": book.quotation_set.filter(**filters).count(), } - if hasattr(book, "suggestion_list"): - + if hasattr(book.parent_work, "suggestion_list"): + suggestion_list = book.parent_work.suggestion_list + data["suggestion_list"] = suggestion_list data["items"] = ( - book.suggestion_list.suggestionlistitem_set.prefetch_related( - "user", "book", "book__authors" + suggestion_list.suggestionlistitem_set.prefetch_related( + "user", "book", "book__authors", "endorsement" ) .annotate(endorsement_count=Count("endorsement")) .order_by("-endorsement_count")[:3] ) data["suggested_books"] = get_list_suggestions( - book.suggestion_list, + suggestion_list, request.user, query=request.GET.get("suggestion_query", ""), - ignore_book=book, + ignore_book=book.parent_work, ) return TemplateResponse(request, "book/book.html", data) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 2ad9703902..87acb43258 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -112,13 +112,13 @@ def get_list_suggestions( query, filters=[ ~Q(parent_work__editions__in=book_list.books.all()), - ~Q(parent_work__editions__in=[ignore_book]), + ~Q(parent_work=ignore_book), ], ) # just suggest whatever books are nearby suggestions = ( user.shelfbook_set.filter(~Q(book__in=book_list.books.all())) - .exclude(book=ignore_book) + .exclude(book__parent_work=ignore_book) .distinct()[:num_suggestions] ) suggestions = [s.book for s in suggestions[:num_suggestions]] @@ -127,7 +127,7 @@ def get_list_suggestions( s.default_edition for s in models.Work.objects.filter( ~Q(editions__in=book_list.books.all()), - ~Q(editions__in=[ignore_book]), + ~Q(id=ignore_book.id), ) .distinct() .order_by("-updated_date")[:num_suggestions] diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py index d0bef36477..e6187ac6fe 100644 --- a/bookwyrm/views/suggestion_list.py +++ b/bookwyrm/views/suggestion_list.py @@ -2,8 +2,8 @@ from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.db import transaction -from django.db.models import Count -from django.shortcuts import get_object_or_404, redirect +from django.db.models import Count, Q +from django.shortcuts import get_object_or_404 from django.template.response import TemplateResponse from django.urls import reverse from django.utils.decorators import method_decorator @@ -26,7 +26,13 @@ def get(self, request, book_id, **kwargs): add_failed = kwargs.get("add_failed", False) add_succeeded = kwargs.get("add_succeeded", False) - book_list = get_object_or_404(models.SuggestionList, suggests_for=book_id) + work = models.Work.objects.filter( + Q(id=book_id) | Q(editions=book_id) + ).distinct() + print(work.count()) + work = work.first() + + book_list = get_object_or_404(models.SuggestionList, suggests_for=work) if is_api_request(request): return ActivitypubResponse(book_list.to_activity(**request.GET)) @@ -53,6 +59,7 @@ def get(self, request, book_id, **kwargs): query = request.GET.get("q", "") data = { "list": book_list, + "work": book_list.suggests_for, "items": page, "page_range": paginated.get_elided_page_range( page.number, on_each_side=2, on_ends=1 @@ -72,19 +79,18 @@ def get(self, request, book_id, **kwargs): return TemplateResponse(request, "lists/list.html", data) @method_decorator(login_required, name="dispatch") - def post(self, request, book_id): + def post(self, request, book_id): # pylint: disable=unused-argument """create a suggestion_list""" form = forms.SuggestionListForm(request.POST) - book = get_object_or_404(models.Edition, id=book_id) if not form.is_valid(): - return redirect("book", book.id) + return redirect_to_referer(request) # saving in two steps means django uses the model's custom save functionality, # which adds an embed key and fixes the privacy and curation settings suggestion_list = form.save(request, commit=False) suggestion_list.save() - return redirect("book", book.id) + return redirect_to_referer(request) @login_required From 1bccffaa9bda7b70de75394ba5281a5033c24ac9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 27 Aug 2024 11:34:35 -0700 Subject: [PATCH 062/962] Uses separate activitypub type of suggestion lists --- bookwyrm/activitypub/__init__.py | 2 +- bookwyrm/activitypub/ordered_collection.py | 10 +++++++++- bookwyrm/models/list.py | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py index 41decd68af..0705dc2410 100644 --- a/bookwyrm/activitypub/__init__.py +++ b/bookwyrm/activitypub/__init__.py @@ -15,7 +15,7 @@ from .note import Tombstone from .ordered_collection import OrderedCollection, OrderedCollectionPage from .ordered_collection import CollectionItem, ListItem, ShelfItem -from .ordered_collection import BookList, Shelf +from .ordered_collection import BookList, SuggestionList, Shelf from .person import Person, PublicKey from .response import ActivitypubResponse from .book import Edition, Work, Author diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py index 7d811331cc..a88d373287 100644 --- a/bookwyrm/activitypub/ordered_collection.py +++ b/bookwyrm/activitypub/ordered_collection.py @@ -39,10 +39,18 @@ class BookList(OrderedCollectionPrivate): summary: str = None curation: str = "closed" - book: str = None type: str = "BookList" +@dataclass(init=False) +class SuggestionList(OrderedCollectionPrivate): + """structure of an ordered collection activity""" + + summary: str = None + book: str = None + type: str = "SuggestionList" + + # pylint: disable=invalid-name @dataclass(init=False) class OrderedCollectionPage(ActivityObject): diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 3301983cb3..1becf8f080 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -69,6 +69,7 @@ class SuggestionList(AbstractList): related_name="suggestion_list", unique=True, ) + activity_serializer = activitypub.SuggestionList @property def collection_queryset(self): From aee089fcca20529ae3c7e4fd5c74a3acb50142ab Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 27 Aug 2024 11:43:27 -0700 Subject: [PATCH 063/962] Support suggestion filtering when ignore book isn't present --- bookwyrm/views/list/list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 87acb43258..9f333ceaa4 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -127,7 +127,7 @@ def get_list_suggestions( s.default_edition for s in models.Work.objects.filter( ~Q(editions__in=book_list.books.all()), - ~Q(id=ignore_book.id), + ~Q(id=ignore_book.id if ignore_book else None), ) .distinct() .order_by("-updated_date")[:num_suggestions] From 6b622bac3ee1761cb3488aa163879181bbb757c3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 27 Aug 2024 13:49:15 -0700 Subject: [PATCH 064/962] Adds more tests --- bookwyrm/tests/views/books/test_book.py | 42 +++++++++ bookwyrm/tests/views/test_suggestion_list.py | 95 +++++++++++++++++--- bookwyrm/views/books/books.py | 8 +- bookwyrm/views/suggestion_list.py | 4 +- 4 files changed, 132 insertions(+), 17 deletions(-) diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index afd0fa47e0..49f2815dd1 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -51,6 +51,11 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=cls.work, ) + cls.another_book = models.Edition.objects.create( + title="Another Example Edition", + remote_id="https://example.com/book/1", + parent_work=models.Work.objects.create(title="Another Work"), + ) models.SiteSettings.objects.create() @@ -134,6 +139,43 @@ def test_book_page_statuses(self, *_): self.assertEqual(result.status_code, 200) self.assertEqual(result.context_data["statuses"].object_list[0], quote) + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") + def test_book_page_suggestions(self, *_): + """there are so many views, this just makes sure it LOADS""" + view = views.Book.as_view() + suggestion_list = models.SuggestionList.objects.create(suggests_for=self.work) + + request = self.factory.get("") + request.user = self.local_user + with patch("bookwyrm.views.books.books.is_api_request") as is_api: + is_api.return_value = False + result = view(request, self.book.id, user_statuses="review") + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + + self.assertEqual(result.status_code, 200) + self.assertEqual(result.context_data["suggestion_list"], suggestion_list) + + @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") + def test_book_page_suggestions_with_items(self, *_): + """there are so many views, this just makes sure it LOADS""" + view = views.Book.as_view() + suggestion_list = models.SuggestionList.objects.create(suggests_for=self.work) + models.SuggestionListItem.objects.create( + book_list=suggestion_list, user=self.local_user, book=self.another_book + ) + + request = self.factory.get("") + request.user = self.local_user + with patch("bookwyrm.views.books.books.is_api_request") as is_api: + is_api.return_value = False + result = view(request, self.book.id, user_statuses="review") + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + + self.assertEqual(result.status_code, 200) + self.assertEqual(result.context_data["suggestion_list"], suggestion_list) + def test_book_page_invalid_id(self): """there are so many views, this just makes sure it LOADS""" view = views.Book.as_view() diff --git a/bookwyrm/tests/views/test_suggestion_list.py b/bookwyrm/tests/views/test_suggestion_list.py index 3eedfcc3a6..5cdb9fad8a 100644 --- a/bookwyrm/tests/views/test_suggestion_list.py +++ b/bookwyrm/tests/views/test_suggestion_list.py @@ -1,6 +1,7 @@ """ test for app action functionality """ from unittest.mock import patch +from django.core.exceptions import PermissionDenied from django.test import TestCase from django.test.client import RequestFactory @@ -28,6 +29,14 @@ def setUpTestData(cls): localname="mouse", remote_id="https://example.com/users/mouse", ) + cls.another_user = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) cls.work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", @@ -48,7 +57,7 @@ def setUp(self): def test_suggestion_list_get(self, *_): """start a suggestion list for a book""" - models.SuggestionList.objects.create(suggests_for=self.book) + models.SuggestionList.objects.create(suggests_for=self.work) view = views.SuggestionList.as_view() request = self.factory.get("") request.user = self.local_user @@ -58,7 +67,7 @@ def test_suggestion_list_get(self, *_): def test_suggestion_list_get_json(self, *_): """start a suggestion list for a book""" - models.SuggestionList.objects.create(suggests_for=self.book) + models.SuggestionList.objects.create(suggests_for=self.work) view = views.SuggestionList.as_view() request = self.factory.get("") request.user = self.local_user @@ -70,40 +79,106 @@ def test_suggestion_list_get_json(self, *_): def test_suggestion_create(self, *_): """start a suggestion list for a book""" - self.assertFalse(hasattr(self.book, "suggestion_list")) + self.assertFalse(hasattr(self.work, "suggestion_list")) view = views.SuggestionList.as_view() form = forms.SuggestionListForm() - form.data["suggests_for"] = self.book.id + form.data["suggests_for"] = self.work.id request = self.factory.post("", form.data) request.user = self.local_user view(request, self.book.id) - self.book.refresh_from_db() - self.assertTrue(hasattr(self.book, "suggestion_list")) + self.work.refresh_from_db() + self.assertTrue(hasattr(self.work, "suggestion_list")) - suggestion_list = self.book.suggestion_list - self.assertEqual(suggestion_list.suggests_for, self.book) + suggestion_list = self.work.suggestion_list + self.assertEqual(suggestion_list.suggests_for, self.work) self.assertEqual(suggestion_list.privacy, "public") self.assertEqual(suggestion_list.user, get_representative()) def test_book_add_suggestion(self, *_): """Add a book to the recommendation list""" - suggestion_list = models.SuggestionList.objects.create(suggests_for=self.book) + suggestion_list = models.SuggestionList.objects.create(suggests_for=self.work) view = views.book_add_suggestion + form = forms.SuggestionListItemForm() form.data["user"] = self.local_user.id form.data["book"] = self.another_book.id form.data["book_list"] = suggestion_list.id form.data["notes"] = "hello" + request = self.factory.post("", form.data) request.user = self.local_user - view(request, self.book.id) + view(request, self.work.id) self.assertEqual(suggestion_list.suggestionlistitem_set.count(), 1) item = suggestion_list.suggestionlistitem_set.first() self.assertEqual(item.book, self.another_book) self.assertEqual(item.user, self.local_user) self.assertEqual(item.notes, "hello") + + def test_book_remove_suggestion(self, *_): + """Remove a book from the recommendation list""" + suggestion_list = models.SuggestionList.objects.create(suggests_for=self.work) + item = models.SuggestionListItem.objects.create( + book_list=suggestion_list, user=self.local_user, book=self.another_book + ) + self.assertEqual(suggestion_list.suggestionlistitem_set.count(), 1) + + view = views.book_remove_suggestion + request = self.factory.post("", {"item": item.id}) + request.user = self.local_user + + view(request, self.work.id) + + self.assertEqual(suggestion_list.suggestionlistitem_set.count(), 0) + + def test_book_remove_suggestion_without_permission(self, *_): + """Remove a book from the recommendation list""" + suggestion_list = models.SuggestionList.objects.create(suggests_for=self.work) + item = models.SuggestionListItem.objects.create( + book_list=suggestion_list, user=self.local_user, book=self.another_book + ) + self.assertEqual(suggestion_list.suggestionlistitem_set.count(), 1) + + view = views.book_remove_suggestion + request = self.factory.post("", {"item": item.id}) + request.user = self.another_user + + with self.assertRaises(PermissionDenied): + view(request, self.work.id) + + self.assertEqual(suggestion_list.suggestionlistitem_set.count(), 1) + + def test_endorse_suggestion(self, *_): + """Endorse a suggestion""" + suggestion_list = models.SuggestionList.objects.create(suggests_for=self.work) + item = models.SuggestionListItem.objects.create( + book_list=suggestion_list, user=self.local_user, book=self.another_book + ) + self.assertEqual(item.endorsement.count(), 0) + view = views.endorse_suggestion + request = self.factory.post("") + request.user = self.another_user + + view(request, self.work.id, item.id) + + self.assertEqual(item.endorsement.count(), 1) + + def test_endorse_suggestion_by_self(self, *_): + """Endorse a suggestion error handling""" + suggestion_list = models.SuggestionList.objects.create(suggests_for=self.work) + item = models.SuggestionListItem.objects.create( + book_list=suggestion_list, user=self.local_user, book=self.another_book + ) + self.assertEqual(item.endorsement.count(), 0) + view = views.endorse_suggestion + request = self.factory.post("") + request.user = self.local_user + + view(request, self.work.id, item.id) + + # no impact + self.assertEqual(item.endorsement.count(), 0) diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 2f4a599429..ad7f62e88d 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -137,10 +137,10 @@ def get(self, request, book_id, **kwargs): "quotation_count": book.quotation_set.filter(**filters).count(), } if hasattr(book.parent_work, "suggestion_list"): - suggestion_list = book.parent_work.suggestion_list - data["suggestion_list"] = suggestion_list + data["suggestion_list"] = book.parent_work.suggestion_list data["items"] = ( - suggestion_list.suggestionlistitem_set.prefetch_related( + data["suggestion_list"] + .suggestionlistitem_set.prefetch_related( "user", "book", "book__authors", "endorsement" ) .annotate(endorsement_count=Count("endorsement")) @@ -148,7 +148,7 @@ def get(self, request, book_id, **kwargs): ) data["suggested_books"] = get_list_suggestions( - suggestion_list, + data["suggestion_list"], request.user, query=request.GET.get("suggestion_query", ""), ignore_book=book.parent_work, diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py index e6187ac6fe..a2cc9403ec 100644 --- a/bookwyrm/views/suggestion_list.py +++ b/bookwyrm/views/suggestion_list.py @@ -95,7 +95,6 @@ def post(self, request, book_id): # pylint: disable=unused-argument @login_required @require_POST -@transaction.atomic def book_add_suggestion(request, book_id): """put a book on the suggestion list""" _ = get_object_or_404( @@ -106,8 +105,7 @@ def book_add_suggestion(request, book_id): if not form.is_valid(): return Book().get(request, book_id, add_failed=True) - item = form.save(request, commit=False) - item.save() + form.save(request) return redirect_to_referer(request) From 0b171b0ba9f94dddab11d491abd2800bbf122ea5 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 27 Aug 2024 18:22:50 -0700 Subject: [PATCH 065/962] Adds type annotation to suggestion list view file --- bookwyrm/views/suggestion_list.py | 20 +++++++++++++------- mypy.ini | 6 ++++++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py index a2cc9403ec..f8b6cb7558 100644 --- a/bookwyrm/views/suggestion_list.py +++ b/bookwyrm/views/suggestion_list.py @@ -1,8 +1,11 @@ """ the good stuff! the books! """ +from typing import Any + from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.db import transaction from django.db.models import Count, Q +from django.http import HttpRequest, HttpResponse from django.shortcuts import get_object_or_404 from django.template.response import TemplateResponse from django.urls import reverse @@ -21,7 +24,9 @@ class SuggestionList(View): """book list page""" - def get(self, request, book_id, **kwargs): + def get( + self, request: HttpRequest, book_id: int, **kwargs: Any + ) -> ActivitypubResponse | TemplateResponse: """display a book list""" add_failed = kwargs.get("add_failed", False) add_succeeded = kwargs.get("add_succeeded", False) @@ -29,7 +34,6 @@ def get(self, request, book_id, **kwargs): work = models.Work.objects.filter( Q(id=book_id) | Q(editions=book_id) ).distinct() - print(work.count()) work = work.first() book_list = get_object_or_404(models.SuggestionList, suggests_for=work) @@ -49,7 +53,7 @@ def get(self, request, book_id, **kwargs): page = paginated.get_page(request.GET.get("page")) - embed_key = str(book_list.embed_key.hex) + embed_key = str(book_list.embed_key.hex) # type: ignore embed_url = reverse("embed-list", args=[book_list.id, embed_key]) embed_url = request.build_absolute_uri(embed_url) @@ -79,7 +83,9 @@ def get(self, request, book_id, **kwargs): return TemplateResponse(request, "lists/list.html", data) @method_decorator(login_required, name="dispatch") - def post(self, request, book_id): # pylint: disable=unused-argument + def post( + self, request: HttpRequest, book_id: int + ) -> Any: # pylint: disable=unused-argument """create a suggestion_list""" form = forms.SuggestionListForm(request.POST) @@ -95,7 +101,7 @@ def post(self, request, book_id): # pylint: disable=unused-argument @login_required @require_POST -def book_add_suggestion(request, book_id): +def book_add_suggestion(request: HttpRequest, book_id: int) -> Any: """put a book on the suggestion list""" _ = get_object_or_404( models.SuggestionList, suggests_for=book_id, id=request.POST.get("book_list") @@ -112,7 +118,7 @@ def book_add_suggestion(request, book_id): @require_POST @login_required -def book_remove_suggestion(request, book_id): +def book_remove_suggestion(request: HttpRequest, book_id: int) -> Any: """remove a book from a suggestion list""" item = get_object_or_404( models.SuggestionListItem, @@ -129,7 +135,7 @@ def book_remove_suggestion(request, book_id): @require_POST @login_required -def endorse_suggestion(request, book_id, item_id): +def endorse_suggestion(request: HttpRequest, book_id: int, item_id: int) -> Any: """endorse a suggestion""" item = get_object_or_404( models.SuggestionListItem, id=item_id, book_list__suggests_for=book_id diff --git a/mypy.ini b/mypy.ini index 600c370e4a..181a1588aa 100644 --- a/mypy.ini +++ b/mypy.ini @@ -22,6 +22,12 @@ ignore_errors = False [mypy-bookwyrm.isbn.*] ignore_errors = False +[mypy-bookwyrm.views.suggestion_list] +ignore_errors = False +allow_untyped_calls = True +disable_error_code = assignment + + [mypy-celerywyrm.*] ignore_errors = False From b5b9a4fb6433ad4b90a99a5aa43511b9bb63095d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 27 Aug 2024 19:21:55 -0700 Subject: [PATCH 066/962] Fixes placement of ignores that black muddled (rude) --- bookwyrm/views/suggestion_list.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py index f8b6cb7558..85c3bd9606 100644 --- a/bookwyrm/views/suggestion_list.py +++ b/bookwyrm/views/suggestion_list.py @@ -5,7 +5,7 @@ from django.core.paginator import Paginator from django.db import transaction from django.db.models import Count, Q -from django.http import HttpRequest, HttpResponse +from django.http import HttpRequest from django.shortcuts import get_object_or_404 from django.template.response import TemplateResponse from django.urls import reverse @@ -84,8 +84,8 @@ def get( @method_decorator(login_required, name="dispatch") def post( - self, request: HttpRequest, book_id: int - ) -> Any: # pylint: disable=unused-argument + self, request: HttpRequest, book_id: int # pylint: disable=unused-argument + ) -> Any: """create a suggestion_list""" form = forms.SuggestionListForm(request.POST) From daeb80021237552022482b566e3ba115b4c069ea Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 16 Aug 2025 09:40:29 +1000 Subject: [PATCH 067/962] Add background jobs to find and add missing covers Builds on previous work in `scheduled-delete-exports`. Adds new background jobs: * schedulable job to scan connectors for book covers for editions without them * non-schedulable job to scan connectors for book covers for editions where they have a cover filepath but it does not resolve to an actual file I also had to move `set_cover_from_url()` to utils.images because trying to use it from a model was causing circular import problems. --- bookwyrm/models/housekeeping.py | 150 ++++++++++++++- bookwyrm/templates/settings/files.html | 163 +++++++++++++++- bookwyrm/tests/models/test_housekeeping.py | 174 ++++++++++++++++-- .../views/admin/test_files_maintenance.py | 28 ++- bookwyrm/urls.py | 26 ++- bookwyrm/utils/images.py | 17 ++ bookwyrm/views/__init__.py | 6 +- bookwyrm/views/admin/files_maintenance.py | 63 ++++++- bookwyrm/views/books/books.py | 17 +- bookwyrm/views/books/edit_book.py | 3 +- 10 files changed, 604 insertions(+), 43 deletions(-) diff --git a/bookwyrm/models/housekeeping.py b/bookwyrm/models/housekeeping.py index 3696bf90a4..8151238598 100644 --- a/bookwyrm/models/housekeeping.py +++ b/bookwyrm/models/housekeeping.py @@ -1,11 +1,21 @@ """ cleanup tasks """ - from datetime import datetime, timedelta, timezone -from django.db.models import DateTimeField, IntegerField -from bookwyrm.tasks import app, MISC +from django.db.models import ( + CharField, + DateTimeField, + IntegerField, + ManyToManyField, + TextChoices, +) +from django.utils.translation import gettext_lazy as _ + from bookwyrm import models from bookwyrm.models.job import ParentJob, ParentTask +from bookwyrm.connectors.abstract_connector import get_data +from bookwyrm.connectors.connector_manager import search +from bookwyrm.tasks import app, MISC +from bookwyrm.utils.images import set_cover_from_url class CleanUpUserExportFilesJob(ParentJob): @@ -74,3 +84,137 @@ def start_export_deletions(**kwargs): job = CleanUpUserExportFilesJob.objects.create(user=user, expiry_date=expiry_date) job.start_job() + + +class FindMissingCoversJob(ParentJob): + """Job to search the fedi for covers we don't have""" + + class JobType(TextChoices): + """Possible status types.""" + + MISSING = "missing", _("Missing") + WRONG_PATH = "wrong_path", _("Wrong Path") + + job_type = CharField( + max_length=10, choices=JobType.choices, default=JobType.MISSING, null=True + ) + editions = ManyToManyField( + models.Edition, + related_name="missing_covers_job", + ) + found_covers = ManyToManyField( + models.Edition, + related_name="+", + ) + + completed_tasks = IntegerField(default=0) + + def start_job(self): + """Report that the job has started and trigger subtasks""" + + self.set_status("active") + + for edition in self.editions.all(): + get_missing_cover_task.delay(job_id=self.id, edition_id=edition.id) + + +class MissingCoverTask(ParentTask): + """Task to find a cover for an individual edition""" + + def on_success(self, retval, task_id, args, kwargs): + """Override from ParentTask. Save edition to found_covers if we found one""" + + if retval: + job = FindMissingCoversJob.objects.get(id=kwargs["job_id"]) + edition = models.Edition.objects.get(id=kwargs["edition_id"]) + + job.found_covers.add(edition) + + # pylint: disable=too-many-arguments, unused-argument, no-self-use + def after_return(self, status, retval, task_id, args, kwargs, einfo): + """Handler called after the task returns""" + + job = FindMissingCoversJob.objects.get(id=kwargs["job_id"]) + job.completed_tasks += 1 + job.save(update_fields=["completed_tasks"]) + + if job.completed_tasks == job.editions.count(): + job.complete_job() + + +@app.task(queue=MISC, base=MissingCoverTask) +def get_missing_cover_task(**kwargs): + """trigger the child tasks for each edition""" + + job = FindMissingCoversJob.objects.get(id=kwargs["job_id"]) + edition = models.Edition.objects.get(id=kwargs["edition_id"]) + + if job.status == "stopped": + return None + + return get_cover_from_identifiers(edition=edition) + + +def get_cover_from_identifiers(edition): + """for a given edition, can we find a book cover from the fedi?""" + + # idk there is probably a more pythonic way of doing this + # pylint: disable=protected-access + fields = [ + f.name + for f in models.Edition._meta.get_fields() + if hasattr(f, "deduplication_field") and f.deduplication_field + ] + + for field in fields: + query_result = ( + search(query=getattr(edition, field), min_confidence=0.999) or None + ) + if not query_result: + continue + + for search_result in query_result: + for result in search_result["results"]: + data = get_data(getattr(result, "key")) + + if data and data.get("cover"): + if data.get("cover").get("url") in ["", None]: + continue + + url = data["cover"]["url"] + image = set_cover_from_url(url) + if image: + edition.cover.save(*image) + return edition.id + + return None + + +def get_covers_with_incorrect_filepaths(): + """return a queryset of all books where the name path doesn't resolve""" + + has_cover = models.Edition.objects.exclude(cover="") + wrong_path_ids = [ + x.id for x in has_cover if not x.cover.storage.exists(x.cover.name) + ] + + return models.Edition.objects.filter(id__in=wrong_path_ids) + + +@app.task(queue=MISC) +def run_missing_covers_job(**kwargs): + """create and start a FindMissingCoversJob""" + + job_type = kwargs.get("type", "missing") + + if job_type == "wrong_path": + editions = get_covers_with_incorrect_filepaths() + else: + editions = models.Edition.objects.filter(cover="") + + job = FindMissingCoversJob.objects.create( + user_id=kwargs["user_id"], job_type=job_type + ) + job.editions.set(editions) + + job.start_job() diff --git a/bookwyrm/templates/settings/files.html b/bookwyrm/templates/settings/files.html index f7266cbd71..9652b9199d 100644 --- a/bookwyrm/templates/settings/files.html +++ b/bookwyrm/templates/settings/files.html @@ -54,7 +54,7 @@

      {% trans "Schedule file deletion" %}

      - + {% csrf_token %} @@ -124,6 +124,167 @@

      {% trans "Schedule file deletion" %}

      +

      {% trans "Find book covers from connectors" %}

      +
      +

      + {% trans "These jobs find cover images where they are missing or have incorrect filepaths." %} +

      +
      +
      +

      {% trans "Find missing covers" %}

      +
      +

      + {% trans "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no more often than once per week." %} +

      +
      + {% if find_covers_task %} +
      +
      + {% trans "Schedule:" %} +
      +
      + {{ find_covers_task.schedule }} +
      + +
      + {% trans "Last run:" %} +
      +
      + {{ find_covers_task.last_run_at|naturaltime }} +
      + +
      + {% trans "Total run count:" %} +
      +
      + {{ find_covers_task.total_run_count }} +
      + +
      + {% trans "Enabled:" %} +
      +
      + + {{ find_covers_task.enabled|yesno }} + +
      +
      + +
      +
      + {% csrf_token %} + +
      +
      + {% csrf_token %} + +

      {% trans "Last run date will not be updated" %}

      +
      +
      + {% else %} +
      +
      + {% csrf_token %} +
      + +
      +
      + {{ covers_form.every }} +
      +
      +

      + {{ covers_form.every.help_text }} +

      +
      +
      + +
      + {{ covers_form.period }} +
      +

      + {{ covers_form.period.help_text }} +

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

      {% trans "Fix broken book cover filepaths" %}

      +
      +

      + {% trans "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." %} +

      +
      +
      +
      + {% csrf_token %} + +

      {% trans "This job cannot be scheduled to run regularly" %}

      +
      +
      +
      + + + {% if covers_jobs %} +
      +

      Recent jobs

      +
      + + + + + + + + + {% for job in covers_jobs %} + + + + + + + + {% endfor %} +
      {% trans "Date" %}{% trans "Status" %}{% trans "Editions checked" %}{% trans "Covers fixed" %}
      {{ job.updated_date }} + + {% if job.status %} + {{ job.get_status_display }} + {% elif job.complete %} + {% trans "Complete" %} + {% else %} + {% trans "Active" %} + {% endif %} + + {{ job.editions.count }}{{ job.found_covers.count }} + {% if not job.complete %} +
      + {% csrf_token %} + +
      + {% endif %} +
      +
      +
      + {% endif %} + +
      {% if success %}
      diff --git a/bookwyrm/tests/models/test_housekeeping.py b/bookwyrm/tests/models/test_housekeeping.py index 261e243a23..369cf909b0 100644 --- a/bookwyrm/tests/models/test_housekeeping.py +++ b/bookwyrm/tests/models/test_housekeeping.py @@ -2,18 +2,35 @@ from datetime import datetime, timedelta, timezone from os import listdir import pathlib +import tempfile from unittest.mock import patch +import responses + from django.core.files.base import ContentFile from django.test import TestCase -from bookwyrm import models -from bookwyrm.settings import DOMAIN -from bookwyrm.models.housekeeping import ( +from bookwyrm.book_search import SearchResult +from bookwyrm.models import ( + Author, + BookwyrmExportJob, + BookwyrmImportJob, CleanUpUserExportFilesJob, - delete_user_export_file_task, + Connector, + Edition, + SiteSettings, start_export_deletions, + User, + Work, ) +from bookwyrm.models.housekeeping import ( + FindMissingCoversJob, + get_cover_from_identifiers, + get_covers_with_incorrect_filepaths, + run_missing_covers_job, +) +from bookwyrm.settings import DOMAIN +from bookwyrm.models.housekeeping import delete_user_export_file_task class TestCleanUpExportFiles(TestCase): @@ -25,7 +42,7 @@ def setUp(self): patch("bookwyrm.activitystreams.populate_stream_task.delay"), patch("bookwyrm.lists_stream.populate_lists_task.delay"), ): - self.user = models.User.objects.create_user( + self.user = User.objects.create_user( f"mouse@{DOMAIN}", "mouse@mouse.mouse", "mouseword", @@ -41,13 +58,13 @@ def setUp(self): user=self.user, expiry_date=expiry_date ) - models.SiteSettings.objects.create() + SiteSettings.objects.create() def test_export_file_deleted(self, *_): """did the file actually get deleted?""" export_updated_date = datetime.now(timezone.utc) - timedelta(hours=3) - export = models.BookwyrmExportJob.objects.create( + export = BookwyrmExportJob.objects.create( user=self.user, export_data=ContentFile(b"..", name="zzz_testfile.tar.gz"), updated_date=export_updated_date, @@ -63,7 +80,7 @@ def test_import_file_deleted(self, *_): """did the file actually get deleted?""" updated_date = datetime.now(timezone.utc) - timedelta(hours=3) - import_job = models.BookwyrmImportJob.objects.create( + import_job = BookwyrmImportJob.objects.create( user=self.user, archive_file=ContentFile(b"xx", name="zzz_testfile.tar.gz"), updated_date=updated_date, @@ -80,7 +97,7 @@ def test_renamed_file_deleted(self, *_): """files with duplicate names get renamed like filename.tar7x9e.gz""" export_updated_date = datetime.now(timezone.utc) - timedelta(hours=3) - export = models.BookwyrmExportJob.objects.create( + export = BookwyrmExportJob.objects.create( user=self.user, export_data=ContentFile(b"...", name="zzz_testfile.tar.gz"), updated_date=export_updated_date, @@ -96,14 +113,12 @@ def test_renamed_file_deleted(self, *_): def test_start_export_deletions(self, *_): """does start_export_deletions actually start a job?""" - self.assertEqual(models.CleanUpUserExportFilesJob.objects.count(), 1) + self.assertEqual(CleanUpUserExportFilesJob.objects.count(), 1) start_export_deletions(user=self.user.id) - self.assertEqual(models.CleanUpUserExportFilesJob.objects.count(), 2) - self.assertNotEqual( - models.CleanUpUserExportFilesJob.objects.last().status, "pending" - ) + self.assertEqual(CleanUpUserExportFilesJob.objects.count(), 2) + self.assertNotEqual(CleanUpUserExportFilesJob.objects.last().status, "pending") def tearDown(self): """clean up any files""" @@ -112,3 +127,134 @@ def tearDown(self): if "zzz_testfile.tar" in filename: pathlib.Path.unlink(f"exports/{filename}") + + +class Covers(TestCase): + """check our covers utils""" + + @classmethod + def setUpTestData(cls): + """set up the data we need""" + + cls.user = User.objects.create_user( + f"mouse@{DOMAIN}", + "mouse@mouse.mouse", + local=True, + localname="mouse", + ) + + Connector.objects.create( + identifier="example.com", + connector_file="bookwyrm_connector", + base_url="https://example.com", + books_url="https://example.com", + covers_url="https://example.com/images/covers", + search_url="https://example.com/search?q=", + active=True, + ) + + cls.connector = Connector("example.com") + + cls.work = Work.objects.create( + title="Entangled Life", remote_id="https://example.com/book/1" + ) + + cls.first_edition = Edition.objects.create( + title="Entangled Life", parent_work=cls.work, isbn_13="9780525510321" + ) + + cls.second_edition = Edition.objects.create( + title="Entangled Life", parent_work=cls.work, isbn_13="9781784708276" + ) + + cls.author = Author.objects.create(name="Merlin Sheldrake") + cls.first_edition.authors.add(cls.author) + cls.second_edition.authors.add(cls.author) + + cls.result = SearchResult( + key=cls.first_edition.remote_id, + title=cls.first_edition.title, + author=cls.author, + confidence=1, + connector=cls.connector, + ) + + cls.query_response = [{"connector": cls.connector, "results": [cls.result]}] + + cls.book_json = { + "title": "Entangled Life", + "isbn_13": "9780525510321", + "cover": {"url": "https://example.com/images/covers/test.jpeg"}, + } + + def test_get_cover_from_identifer(self): + """Get missing cover from remote source""" + + with tempfile.NamedTemporaryFile() as image: + image.write(b"..") + + responses.add( + responses.GET, "https://example.com/images/covers/test.jpeg", image + ) + + self.assertEqual(self.first_edition.cover, None) + + with patch( + "bookwyrm.models.housekeeping.search", return_value=self.query_response + ), patch( + "bookwyrm.models.housekeeping.get_data", return_value=self.book_json + ), patch( + "bookwyrm.models.housekeeping.set_cover_from_url", + return_value=["test_image", image], + ): + get_cover_from_identifiers(self.first_edition) + + self.assertNotEqual(self.first_edition.cover, None) + + def test_get_covers_with_incorrect_filepaths(self): + """does get_coverless_books return books with wrong cover filepaths?""" + + with tempfile.NamedTemporaryFile() as image: + image.write(b"..") + + self.second_edition.cover.save("test.jpg", image) + + self.assertNotEqual(self.second_edition.cover, None) + + self.second_edition.cover.name = "wrong/name.png" + self.second_edition.save(update_fields=["cover"]) + + cl = get_covers_with_incorrect_filepaths() + + self.assertTrue(self.second_edition in cl) + + def test_trigger_job_for_missing_covers(self): + """create a job and add coverless editions to it""" + + self.assertEqual(FindMissingCoversJob.objects.count(), 0) + + with patch("bookwyrm.models.housekeeping.get_missing_cover_task.delay"): + run_missing_covers_job(user_id=self.user.id) + + self.assertEqual(FindMissingCoversJob.objects.count(), 1) + job = FindMissingCoversJob.objects.first() + self.assertEqual(job.editions.count(), 2) + + def test_trigger_job_for_wrong_filepath(self): + """create a job and add editions with incorrect cover paths to it""" + + with tempfile.NamedTemporaryFile() as image: + image.write(b"..") + self.second_edition.cover.save("test.jpg", image) + + self.second_edition.cover.name = "wrong/name.png" + self.second_edition.save(update_fields=["cover"]) + + self.assertEqual(FindMissingCoversJob.objects.count(), 0) + + with patch("bookwyrm.models.housekeeping.get_missing_cover_task.delay"): + run_missing_covers_job(user_id=self.user.id, type="wrong_path") + + self.assertEqual(FindMissingCoversJob.objects.count(), 1) + edition = FindMissingCoversJob.objects.first().editions.first() + self.assertEqual(edition.isbn_13, "9781784708276") diff --git a/bookwyrm/tests/views/admin/test_files_maintenance.py b/bookwyrm/tests/views/admin/test_files_maintenance.py index c69ed045ec..b23f332d7d 100644 --- a/bookwyrm/tests/views/admin/test_files_maintenance.py +++ b/bookwyrm/tests/views/admin/test_files_maintenance.py @@ -72,7 +72,7 @@ def test_files_maintenance_get_with_schedule(self): self.assertEqual(result.status_code, 200) def test_schedule_delete_export_file(self): - """Schedule the task""" + """Schedule the delete export task""" self.assertFalse(IntervalSchedule.objects.exists()) form = forms.IntervalScheduleForm() @@ -85,6 +85,11 @@ def test_schedule_delete_export_file(self): self.assertEqual(response.status_code, 302) self.assertTrue(IntervalSchedule.objects.exists()) + self.assertTrue(PeriodicTask.objects.exists()) + self.assertEqual( + PeriodicTask.objects.first().task, + "bookwyrm.models.housekeeping.start_export_deletions", + ) def test_export_files_set_expiry(self): """does setting the expiry time change the setting?""" @@ -107,3 +112,24 @@ def test_export_files_set_expiry(self): site.refresh_from_db() self.assertEqual(site.export_files_lifetime_hours, 48) + + def test_schedule_missing_covers_job(self): + """Schedule the missing covers job""" + + self.assertFalse(IntervalSchedule.objects.exists()) + + form = forms.IntervalScheduleForm() + form.data["every"] = 1 + form.data["period"] = "days" + request = self.factory.post("", form.data) + request.user = self.local_user + + response = views.schedule_run_missing_covers_job(request) + self.assertEqual(response.status_code, 302) + + self.assertTrue(IntervalSchedule.objects.exists()) + self.assertTrue(PeriodicTask.objects.exists()) + self.assertEqual( + PeriodicTask.objects.first().task, + "bookwyrm.models.housekeeping.run_missing_covers_job", + ) diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 7b9039bf34..fcc0f8405e 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -183,15 +183,35 @@ name="settings-delete-exports-schedule", ), re_path( - r"^settings/delete-exports/unschedule/(?P\d+)/?$", - views.unschedule_export_delete_task, - name="settings-delete-exports-unschedule", + r"^settings/file-maintenance/unschedule/(?P\d+)/?$", + views.unschedule_file_maintenance_task, + name="settings-file-maintenance-unschedule", ), re_path( r"^settings/delete-exports/run/?$", views.run_export_deletions, name="settings-delete-exports-run", ), + re_path( + r"^settings/missing-covers/schedule/?$", + views.schedule_run_missing_covers_job, + name="find-covers-task-schedule", + ), + re_path( + r"^settings/missing-covers/run/?$", + views.run_missing_covers, + name="find-covers-task-run", + ), + re_path( + r"^settings/wrong-cover-paths/run/?$", + views.run_wrong_cover_paths, + name="wrong-cover-paths-run", + ), + re_path( + r"^settings/file-maintenance/cancel-covers/(?P\d+)/?$", + views.cancel_covers_job, + name="cancel-covers-job", + ), re_path( r"^settings/email-preview/?$", views.admin.email_config.email_preview, diff --git a/bookwyrm/utils/images.py b/bookwyrm/utils/images.py index 4d367a669c..acc00b04be 100644 --- a/bookwyrm/utils/images.py +++ b/bookwyrm/utils/images.py @@ -2,13 +2,18 @@ import logging from io import BytesIO +from uuid import uuid4 + from PIL import Image, UnidentifiedImageError + from django.core.files.uploadedfile import ( UploadedFile, InMemoryUploadedFile, TemporaryUploadedFile, ) +from bookwyrm.connectors import get_image + logger = logging.getLogger(__name__) @@ -41,3 +46,15 @@ def remove_uploaded_image_exif(source: UploadedFile) -> UploadedFile: "Could not open image file for EXIF removal, saving unmodified image" ) return source + + +def set_cover_from_url(url): + """load cover image from a url""" + try: + image_content, extension = get_image(url) + except: # pylint: disable=bare-except + return None + if not image_content: + return None + image_name = str(uuid4()) + "." + extension + return [image_name, image_content] diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 8ffa2877fe..a2a1f3ae99 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -21,8 +21,12 @@ from .admin.files_maintenance import ( FilesMaintenance, run_export_deletions, + run_missing_covers, + run_wrong_cover_paths, schedule_export_delete_task, - unschedule_export_delete_task, + schedule_run_missing_covers_job, + unschedule_file_maintenance_task, + cancel_covers_job, set_export_expiry_age, ) from .admin.email_blocklist import EmailBlocklist diff --git a/bookwyrm/views/admin/files_maintenance.py b/bookwyrm/views/admin/files_maintenance.py index 5dae3cb69c..14bb1a9120 100644 --- a/bookwyrm/views/admin/files_maintenance.py +++ b/bookwyrm/views/admin/files_maintenance.py @@ -52,13 +52,12 @@ def schedule_export_delete_task(request): # pylint: disable=unused-argument @require_POST @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) -def unschedule_export_delete_task(request, task_id): +def unschedule_file_maintenance_task(request, task_id): """unscheduler""" get_object_or_404(PeriodicTask, id=task_id).delete() return redirect("settings-files") -# pylint: disable=unused-argument @require_POST @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) def run_export_deletions(request): @@ -86,6 +85,54 @@ def set_export_expiry_age(request): return TemplateResponse(request, "settings/files.html", data) +@require_POST +@permission_required("bookwyrm.edit_instance_settings", raise_exception=True) +def run_missing_covers(request): + """run job to find missing covers""" + models.housekeeping.run_missing_covers_job.delay(user_id=request.user.id) + return redirect("settings-files") + + +@require_POST +@permission_required("bookwyrm.edit_instance_settings", raise_exception=True) +def run_wrong_cover_paths(request): + """run job to find and replace covers with incorrect filepaths""" + models.housekeeping.run_missing_covers_job.delay( + user_id=request.user.id, type="wrong_path" + ) + return redirect("settings-files") + + +@require_POST +@permission_required("bookwyrm.edit_instance_settings", raise_exception=True) +def cancel_covers_job(request, job_id): + """cancel missing covers job""" + get_object_or_404(models.housekeeping.FindMissingCoversJob, id=job_id).stop_job() + return redirect("settings-files") + + +@require_POST +@permission_required("bookwyrm.edit_instance_settings", raise_exception=True) +def schedule_run_missing_covers_job(request): + """scheduler""" + form = forms.IntervalScheduleForm(request.POST) + if not form.is_valid(): + print("not valid") + data = files_maintenance_data() + data["covers_form"] = form + return TemplateResponse(request, "settings/files.html", data) + + with transaction.atomic(): + schedule, _ = IntervalSchedule.objects.get_or_create(**form.cleaned_data) + PeriodicTask.objects.get_or_create( + interval=schedule, + name="find-missing-covers-task", + task="bookwyrm.models.housekeeping.run_missing_covers_job", + kwargs=json.dumps({"user": request.user.id}), + ) + return redirect("settings-files") + + def files_maintenance_data(): """helper to get data used in the template""" try: @@ -93,11 +140,23 @@ def files_maintenance_data(): except PeriodicTask.DoesNotExist: delete_task = None + try: + find_covers_task = PeriodicTask.objects.get(name="find-missing-covers-task") + except PeriodicTask.DoesNotExist: + find_covers_task = None + site = models.SiteSettings.objects.get() + covers_jobs = models.housekeeping.FindMissingCoversJob.objects.all().order_by( + "-created_date" + )[:5] + return { "delete_task": delete_task, + "find_covers_task": find_covers_task, + "covers_jobs": covers_jobs, "task_form": forms.IntervalScheduleForm(), "expiry_form": forms.ExportFileExpiryForm(), + "covers_form": forms.IntervalScheduleForm(auto_id="covers_%s"), "max_hours": site.export_files_lifetime_hours, } diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 6fc5375645..4acebb2ac5 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -1,7 +1,5 @@ """ the good stuff! the books! """ -from uuid import uuid4 - from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator from django.db.models import Avg, Q @@ -15,9 +13,8 @@ from bookwyrm import forms, models from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.connectors import connector_manager, ConnectorException -from bookwyrm.connectors.abstract_connector import get_image from bookwyrm.settings import PAGE_LENGTH -from bookwyrm.utils.images import remove_uploaded_image_exif +from bookwyrm.utils.images import remove_uploaded_image_exif, set_cover_from_url from bookwyrm.views.helpers import ( is_api_request, maybe_redirect_local_path, @@ -165,18 +162,6 @@ def upload_cover(request, book_id): return redirect(book.local_path) -def set_cover_from_url(url): - """load it from a url""" - try: - image_content, extension = get_image(url) - except: # pylint: disable=bare-except - return None - if not image_content: - return None - image_name = str(uuid4()) + "." + extension - return [image_name, image_content] - - @login_required @require_POST @permission_required("bookwyrm.edit_book", raise_exception=True) diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index 4fa74a0bda..6a118fa466 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -13,7 +13,7 @@ from django.views import View from bookwyrm import book_search, forms, models -from bookwyrm.utils.images import remove_uploaded_image_exif +from bookwyrm.utils.images import remove_uploaded_image_exif, set_cover_from_url # from bookwyrm.activitypub.base_activity import ActivityObject from bookwyrm.utils.isni import ( @@ -22,7 +22,6 @@ augment_author_metadata, ) from bookwyrm.views.helpers import get_edition, get_mergeable_object_or_404 -from .books import set_cover_from_url # pylint: disable=no-self-use From 5c2b92619acbd7b6348cfd991d6c26e5faafa8f2 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 16 Aug 2025 20:21:39 +1000 Subject: [PATCH 068/962] fix up merge --- .../migrations/0218_findmissingcoversjob.py | 54 +++++++++++++++++ bookwyrm/models/housekeeping.py | 6 +- bookwyrm/templates/settings/files.html | 59 +++---------------- bookwyrm/urls.py | 2 + 4 files changed, 68 insertions(+), 53 deletions(-) create mode 100644 bookwyrm/migrations/0218_findmissingcoversjob.py diff --git a/bookwyrm/migrations/0218_findmissingcoversjob.py b/bookwyrm/migrations/0218_findmissingcoversjob.py new file mode 100644 index 0000000000..82bd26698c --- /dev/null +++ b/bookwyrm/migrations/0218_findmissingcoversjob.py @@ -0,0 +1,54 @@ +# Generated by Django 5.2.3 on 2025-08-16 09:31 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0217_merge_20250816_0749"), + ] + + operations = [ + migrations.CreateModel( + name="FindMissingCoversJob", + fields=[ + ( + "parentjob_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="bookwyrm.parentjob", + ), + ), + ( + "job_type", + models.CharField( + choices=[("missing", "Missing"), ("wrong_path", "Wrong Path")], + default="missing", + max_length=10, + null=True, + ), + ), + ("completed_tasks", models.IntegerField(default=0)), + ( + "editions", + models.ManyToManyField( + related_name="missing_covers_job", to="bookwyrm.edition" + ), + ), + ( + "found_covers", + models.ManyToManyField(related_name="+", to="bookwyrm.edition"), + ), + ], + options={ + "abstract": False, + }, + bases=("bookwyrm.parentjob",), + ), + ] diff --git a/bookwyrm/models/housekeeping.py b/bookwyrm/models/housekeeping.py index c974a1ffb2..e8f8ae45dd 100644 --- a/bookwyrm/models/housekeeping.py +++ b/bookwyrm/models/housekeeping.py @@ -2,8 +2,6 @@ import math from datetime import datetime, timedelta, timezone -from django.db.models import DateTimeField, IntegerField - from django.db.models import ( CharField, DateTimeField, @@ -140,6 +138,10 @@ def start_job(self): for edition in self.editions.all(): get_missing_cover_task.delay(job_id=self.id, edition_id=edition.id) + if self.editions.count() == 0: + + self.complete_job() + class MissingCoverTask(ParentTask): """Task to find a cover for an individual edition""" diff --git a/bookwyrm/templates/settings/files.html b/bookwyrm/templates/settings/files.html index dd9c6601e0..678154d4c6 100644 --- a/bookwyrm/templates/settings/files.html +++ b/bookwyrm/templates/settings/files.html @@ -14,49 +14,6 @@ {% block panel %}
      - {% if delete_task %} -
      -
      - {% trans "Schedule:" %} -
      -
      - {{ delete_task.schedule }} -
      - -
      - {% trans "Last run:" %} -
      -
      - {{ delete_task.last_run_at|naturaltime }} -
      - -
      - {% trans "Total run count:" %} -
      -
      - {{ delete_task.total_run_count }} -
      - -
      - {% trans "Enabled:" %} -
      -
      - - {{ delete_task.enabled|yesno }} - -
      -
      - -
      -
      - {% csrf_token %} - -
      -
      - {% csrf_token %} - -

      {% trans "Last run date will not be updated" %}

      -

      {% trans "Schedule file deletion" %}

      @@ -98,7 +55,7 @@

      {% trans "Schedule file deletion" %}

      -
      + {% csrf_token %}
      @@ -242,17 +199,17 @@

      Recent jobs

      {% endif %}
      -

      {% trans "Find book covers from connectors" %}

      -
      -

      - {% trans "These jobs find cover images where they are missing or have incorrect filepaths." %} -

      -
      +

      {% trans "Find book covers from connectors" %}

      +
      +

      + {% trans "These jobs find cover images where they are missing or have incorrect filepaths." %} +

      +

      {% trans "Find missing covers" %}

      - {% trans "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no more often than once per week." %} + {% trans "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." %}

      {% if find_covers_task %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 37018b1b6f..5159eddfde 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -211,6 +211,8 @@ r"^settings/file-maintenance/cancel-covers/(?P\d+)/?$", views.cancel_covers_job, name="cancel-covers-job", + ), + re_path( r"^settings/delete-exports/cancel/(?P\d+)/?$", views.cancel_export_delete_job, name="settings-delete-exports-cancel", From 1fa21cec98102f0fe9b88ce5b4f02b41e83c4b5d Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 17 Aug 2025 07:28:04 +1000 Subject: [PATCH 069/962] fix tests to resolve PIL error maybe --- bookwyrm/tests/models/test_housekeeping.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bookwyrm/tests/models/test_housekeeping.py b/bookwyrm/tests/models/test_housekeeping.py index 369cf909b0..6b5c8fd4e9 100644 --- a/bookwyrm/tests/models/test_housekeeping.py +++ b/bookwyrm/tests/models/test_housekeeping.py @@ -184,17 +184,19 @@ def setUpTestData(cls): cls.book_json = { "title": "Entangled Life", "isbn_13": "9780525510321", - "cover": {"url": "https://example.com/images/covers/test.jpeg"}, + "cover": {"url": "https://example.com/images/covers/test_image.jpeg"}, } def test_get_cover_from_identifer(self): """Get missing cover from remote source""" - with tempfile.NamedTemporaryFile() as image: + with tempfile.NamedTemporaryFile(delete_on_close=False) as image: image.write(b"..") responses.add( - responses.GET, "https://example.com/images/covers/test.jpeg", image + responses.GET, + "https://example.com/images/covers/test_image.jpeg", + image, ) self.assertEqual(self.first_edition.cover, None) @@ -205,7 +207,7 @@ def test_get_cover_from_identifer(self): "bookwyrm.models.housekeeping.get_data", return_value=self.book_json ), patch( "bookwyrm.models.housekeeping.set_cover_from_url", - return_value=["test_image", image], + return_value=["test_image.jpeg", image], ): get_cover_from_identifiers(self.first_edition) @@ -214,10 +216,10 @@ def test_get_cover_from_identifer(self): def test_get_covers_with_incorrect_filepaths(self): """does get_coverless_books return books with wrong cover filepaths?""" - with tempfile.NamedTemporaryFile() as image: + with tempfile.NamedTemporaryFile(delete_on_close=False) as image: image.write(b"..") - self.second_edition.cover.save("test.jpg", image) + self.second_edition.cover.save("test_image2.jpeg", image) self.assertNotEqual(self.second_edition.cover, None) @@ -243,9 +245,9 @@ def test_trigger_job_for_missing_covers(self): def test_trigger_job_for_wrong_filepath(self): """create a job and add editions with incorrect cover paths to it""" - with tempfile.NamedTemporaryFile() as image: + with tempfile.NamedTemporaryFile(delete_on_close=False) as image: image.write(b"..") - self.second_edition.cover.save("test.jpg", image) + self.second_edition.cover.save("test_image3.jpeg", image) self.second_edition.cover.name = "wrong/name.png" self.second_edition.save(update_fields=["cover"]) From 63da270a202042c87ac9a0cb3d4c31a1c51eb75f Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 17 Aug 2025 07:47:13 +1000 Subject: [PATCH 070/962] fix tests not passing this time maybe? --- bookwyrm/tests/models/test_housekeeping.py | 58 +++++++++++----------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/bookwyrm/tests/models/test_housekeeping.py b/bookwyrm/tests/models/test_housekeeping.py index 6b5c8fd4e9..fb6ccfd6a3 100644 --- a/bookwyrm/tests/models/test_housekeeping.py +++ b/bookwyrm/tests/models/test_housekeeping.py @@ -126,7 +126,7 @@ def tearDown(self): for filename in listdir("exports"): if "zzz_testfile.tar" in filename: - pathlib.Path.unlink(f"exports/{filename}") + pathlib.Path(f"exports/{filename}").unlink(missing_ok=True) class Covers(TestCase): @@ -187,39 +187,37 @@ def setUpTestData(cls): "cover": {"url": "https://example.com/images/covers/test_image.jpeg"}, } + cls.image_one = ContentFile(b"..", name="test_image.jpeg") + cls.image_two = ContentFile(b"..", name="test_image2.jpeg") + cls.image_three = ContentFile(b"..", name="test_image3.jpeg") + def test_get_cover_from_identifer(self): """Get missing cover from remote source""" - with tempfile.NamedTemporaryFile(delete_on_close=False) as image: - image.write(b"..") - - responses.add( - responses.GET, - "https://example.com/images/covers/test_image.jpeg", - image, - ) + responses.add( + responses.GET, + "https://example.com/images/covers/test_image.jpeg", + self.image_one, + ) - self.assertEqual(self.first_edition.cover, None) + self.assertEqual(self.first_edition.cover, None) - with patch( - "bookwyrm.models.housekeeping.search", return_value=self.query_response - ), patch( - "bookwyrm.models.housekeeping.get_data", return_value=self.book_json - ), patch( - "bookwyrm.models.housekeeping.set_cover_from_url", - return_value=["test_image.jpeg", image], - ): - get_cover_from_identifiers(self.first_edition) + with patch( + "bookwyrm.models.housekeeping.search", return_value=self.query_response + ), patch( + "bookwyrm.models.housekeeping.get_data", return_value=self.book_json + ), patch( + "bookwyrm.models.housekeeping.set_cover_from_url", + return_value=["test_image.jpeg", self.image_one], + ): + get_cover_from_identifiers(self.first_edition) - self.assertNotEqual(self.first_edition.cover, None) + self.assertNotEqual(self.first_edition.cover, None) def test_get_covers_with_incorrect_filepaths(self): """does get_coverless_books return books with wrong cover filepaths?""" - with tempfile.NamedTemporaryFile(delete_on_close=False) as image: - image.write(b"..") - - self.second_edition.cover.save("test_image2.jpeg", image) + self.second_edition.cover.save("test_image2.jpeg", self.image_two) self.assertNotEqual(self.second_edition.cover, None) @@ -245,10 +243,7 @@ def test_trigger_job_for_missing_covers(self): def test_trigger_job_for_wrong_filepath(self): """create a job and add editions with incorrect cover paths to it""" - with tempfile.NamedTemporaryFile(delete_on_close=False) as image: - image.write(b"..") - self.second_edition.cover.save("test_image3.jpeg", image) - + self.second_edition.cover.save("test_image3.jpeg", self.image_three) self.second_edition.cover.name = "wrong/name.png" self.second_edition.save(update_fields=["cover"]) @@ -260,3 +255,10 @@ def test_trigger_job_for_wrong_filepath(self): self.assertEqual(FindMissingCoversJob.objects.count(), 1) edition = FindMissingCoversJob.objects.first().editions.first() self.assertEqual(edition.isbn_13, "9781784708276") + + def tearDown(self): + """clean up files""" + + for filename in ["test_image.jpeg", "test_image2.jpeg", "test_image3.jpeg"]: + + pathlib.Path(f"covers/{filename}").unlink(missing_ok=True) From 34ac7768e487fa990002ac5cb3884edca806ef38 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 17 Aug 2025 08:49:58 +1000 Subject: [PATCH 071/962] please like me, mypy and pytest --- bookwyrm/tests/models/test_housekeeping.py | 77 +++++++++++++--------- bookwyrm/utils/images.py | 5 +- 2 files changed, 48 insertions(+), 34 deletions(-) diff --git a/bookwyrm/tests/models/test_housekeeping.py b/bookwyrm/tests/models/test_housekeeping.py index fb6ccfd6a3..7df7ae0cd0 100644 --- a/bookwyrm/tests/models/test_housekeeping.py +++ b/bookwyrm/tests/models/test_housekeeping.py @@ -2,9 +2,9 @@ from datetime import datetime, timedelta, timezone from os import listdir import pathlib -import tempfile from unittest.mock import patch +from PIL import Image import responses from django.core.files.base import ContentFile @@ -187,37 +187,44 @@ def setUpTestData(cls): "cover": {"url": "https://example.com/images/covers/test_image.jpeg"}, } - cls.image_one = ContentFile(b"..", name="test_image.jpeg") - cls.image_two = ContentFile(b"..", name="test_image2.jpeg") - cls.image_three = ContentFile(b"..", name="test_image3.jpeg") + def setUp(self): + """image file for testing""" + + image = Image.new("RGB", (1, 1)) + image.save("test_image.jpg", xmp=b"...") def test_get_cover_from_identifer(self): """Get missing cover from remote source""" - responses.add( - responses.GET, - "https://example.com/images/covers/test_image.jpeg", - self.image_one, - ) + with open("test_image.jpg", "r+b") as f: - self.assertEqual(self.first_edition.cover, None) + self.second_edition.cover.save("test_image.jpeg", f) + responses.add( + responses.GET, + "https://example.com/images/covers/test_image.jpeg", + f, + ) - with patch( - "bookwyrm.models.housekeeping.search", return_value=self.query_response - ), patch( - "bookwyrm.models.housekeeping.get_data", return_value=self.book_json - ), patch( - "bookwyrm.models.housekeeping.set_cover_from_url", - return_value=["test_image.jpeg", self.image_one], - ): - get_cover_from_identifiers(self.first_edition) + self.assertEqual(self.first_edition.cover, None) + + with patch( + "bookwyrm.models.housekeeping.search", return_value=self.query_response + ), patch( + "bookwyrm.models.housekeeping.get_data", return_value=self.book_json + ), patch( + "bookwyrm.models.housekeeping.set_cover_from_url", + return_value=["test_image.jpeg", f], + ): + get_cover_from_identifiers(self.first_edition) - self.assertNotEqual(self.first_edition.cover, None) + self.assertNotEqual(self.first_edition.cover, None) def test_get_covers_with_incorrect_filepaths(self): """does get_coverless_books return books with wrong cover filepaths?""" - self.second_edition.cover.save("test_image2.jpeg", self.image_two) + with open("test_image.jpg", "r+b") as f: + + self.second_edition.cover.save("test_image2.jpeg", f) self.assertNotEqual(self.second_edition.cover, None) @@ -243,22 +250,28 @@ def test_trigger_job_for_missing_covers(self): def test_trigger_job_for_wrong_filepath(self): """create a job and add editions with incorrect cover paths to it""" - self.second_edition.cover.save("test_image3.jpeg", self.image_three) - self.second_edition.cover.name = "wrong/name.png" - self.second_edition.save(update_fields=["cover"]) + with open("test_image.jpg", "r+b") as f: + self.second_edition.cover.save("test_image3.jpeg", f) + self.second_edition.cover.name = "wrong/name.png" + self.second_edition.save(update_fields=["cover"]) - self.assertEqual(FindMissingCoversJob.objects.count(), 0) + self.assertEqual(FindMissingCoversJob.objects.count(), 0) - with patch("bookwyrm.models.housekeeping.get_missing_cover_task.delay"): - run_missing_covers_job(user_id=self.user.id, type="wrong_path") + with patch("bookwyrm.models.housekeeping.get_missing_cover_task.delay"): + run_missing_covers_job(user_id=self.user.id, type="wrong_path") - self.assertEqual(FindMissingCoversJob.objects.count(), 1) - edition = FindMissingCoversJob.objects.first().editions.first() - self.assertEqual(edition.isbn_13, "9781784708276") + self.assertEqual(FindMissingCoversJob.objects.count(), 1) + edition = FindMissingCoversJob.objects.first().editions.first() + self.assertEqual(edition.isbn_13, "9781784708276") def tearDown(self): """clean up files""" - for filename in ["test_image.jpeg", "test_image2.jpeg", "test_image3.jpeg"]: + for filename in [ + "test_image.jpg", + "covers/test_image.jpeg", + "covers/test_image2.jpeg", + "covers/test_image3.jpeg", + ]: - pathlib.Path(f"covers/{filename}").unlink(missing_ok=True) + pathlib.Path(filename).unlink(missing_ok=True) diff --git a/bookwyrm/utils/images.py b/bookwyrm/utils/images.py index acc00b04be..88aed8aaec 100644 --- a/bookwyrm/utils/images.py +++ b/bookwyrm/utils/images.py @@ -2,6 +2,7 @@ import logging from io import BytesIO +from typing import Any from uuid import uuid4 from PIL import Image, UnidentifiedImageError @@ -48,13 +49,13 @@ def remove_uploaded_image_exif(source: UploadedFile) -> UploadedFile: return source -def set_cover_from_url(url): +def set_cover_from_url(url: str) -> None | list[Any]: """load cover image from a url""" try: image_content, extension = get_image(url) except: # pylint: disable=bare-except return None - if not image_content: + if not image_content or not extension: return None image_name = str(uuid4()) + "." + extension return [image_name, image_content] From dd395bba264448acff4d4db2873f55c0e99cec46 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Tue, 9 Sep 2025 21:10:43 +1000 Subject: [PATCH 072/962] fix url path and recreate migration --- .../migrations/0219_findmissingcoversjob.py | 54 +++++++++++++++++++ bookwyrm/templates/settings/files.html | 2 +- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 bookwyrm/migrations/0219_findmissingcoversjob.py diff --git a/bookwyrm/migrations/0219_findmissingcoversjob.py b/bookwyrm/migrations/0219_findmissingcoversjob.py new file mode 100644 index 0000000000..8b89b0509f --- /dev/null +++ b/bookwyrm/migrations/0219_findmissingcoversjob.py @@ -0,0 +1,54 @@ +# Generated by Django 5.2.3 on 2025-09-09 10:48 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0218_merge_0217_merge_20250816_0749_0217_usersession"), + ] + + operations = [ + migrations.CreateModel( + name="FindMissingCoversJob", + fields=[ + ( + "parentjob_ptr", + models.OneToOneField( + auto_created=True, + on_delete=django.db.models.deletion.CASCADE, + parent_link=True, + primary_key=True, + serialize=False, + to="bookwyrm.parentjob", + ), + ), + ( + "job_type", + models.CharField( + choices=[("missing", "Missing"), ("wrong_path", "Wrong Path")], + default="missing", + max_length=10, + null=True, + ), + ), + ("completed_tasks", models.IntegerField(default=0)), + ( + "editions", + models.ManyToManyField( + related_name="missing_covers_job", to="bookwyrm.edition" + ), + ), + ( + "found_covers", + models.ManyToManyField(related_name="+", to="bookwyrm.edition"), + ), + ], + options={ + "abstract": False, + }, + bases=("bookwyrm.parentjob",), + ), + ] diff --git a/bookwyrm/templates/settings/files.html b/bookwyrm/templates/settings/files.html index 24dde0bbce..98b425f1be 100644 --- a/bookwyrm/templates/settings/files.html +++ b/bookwyrm/templates/settings/files.html @@ -56,7 +56,7 @@

      {% trans "Schedule file deletion" %}

      -
      + {% csrf_token %}
      From 4039f7874c7cc0180b4e5ec391e470ba38634cdf Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Tue, 9 Sep 2025 21:20:56 +1000 Subject: [PATCH 073/962] remove migration --- .../migrations/0218_findmissingcoversjob.py | 54 ------------------- 1 file changed, 54 deletions(-) delete mode 100644 bookwyrm/migrations/0218_findmissingcoversjob.py diff --git a/bookwyrm/migrations/0218_findmissingcoversjob.py b/bookwyrm/migrations/0218_findmissingcoversjob.py deleted file mode 100644 index 82bd26698c..0000000000 --- a/bookwyrm/migrations/0218_findmissingcoversjob.py +++ /dev/null @@ -1,54 +0,0 @@ -# Generated by Django 5.2.3 on 2025-08-16 09:31 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0217_merge_20250816_0749"), - ] - - operations = [ - migrations.CreateModel( - name="FindMissingCoversJob", - fields=[ - ( - "parentjob_ptr", - models.OneToOneField( - auto_created=True, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="bookwyrm.parentjob", - ), - ), - ( - "job_type", - models.CharField( - choices=[("missing", "Missing"), ("wrong_path", "Wrong Path")], - default="missing", - max_length=10, - null=True, - ), - ), - ("completed_tasks", models.IntegerField(default=0)), - ( - "editions", - models.ManyToManyField( - related_name="missing_covers_job", to="bookwyrm.edition" - ), - ), - ( - "found_covers", - models.ManyToManyField(related_name="+", to="bookwyrm.edition"), - ), - ], - options={ - "abstract": False, - }, - bases=("bookwyrm.parentjob",), - ), - ] From 647a95ac6ad8d008bd18e8c7fa163f74ab6472fc Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Wed, 15 Oct 2025 20:57:38 +0300 Subject: [PATCH 074/962] book: fix validation for 979 prefixed isbn-13 --- bookwyrm/models/book.py | 24 ++++++++++++------------ bookwyrm/tests/models/test_book_model.py | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 164f8e9322..f15d5c940b 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -538,18 +538,18 @@ def validate_isbn13(maybe_isbn: str) -> None: _("%(value)s doesn't look like an ISBN"), params={"value": maybe_isbn} ) - if (isbn10_version := isbn_13_to_10(normalized_isbn)) is None: - raise ValidationError( - _("%(value)s doesn't look like an ISBN"), params={"value": maybe_isbn} - ) - - if (checksum_version := isbn_10_to_13(isbn10_version)) is None: - raise ValidationError( - _("%(value)s doesn't look like an ISBN"), params={"value": maybe_isbn} - ) + # calculate checksum version + checksum_version = normalized_isbn[:-1] + checksum = sum(int(i) for i in checksum_version[::2]) + sum( + int(i) * 3 for i in checksum_version[1::2] + ) + checkdigit = checksum % 10 + if checkdigit != 0: + checkdigit = 10 - checkdigit + checksum_version += str(checkdigit) - # We might have 978 or 979 prefix, so ignore that on comparing - if checksum_version[3:] != normalized_isbn[3:]: + # Check if we got same checksum + if checksum_version != normalized_isbn: raise ValidationError( _( "%(value)s doesn't have correct ISBN checksum, " @@ -741,7 +741,7 @@ def isbn_10_to_13(isbn_10): def isbn_13_to_10(isbn_13): """convert isbn 13 to 10, if possible""" - if isbn_13[:3] not in ["978", "979"]: + if isbn_13[:3] not in ["978"]: return None isbn_13 = re.sub(r"[^0-9X]", "", isbn_13) diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index 5da8b6ba02..e54561115b 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -115,8 +115,9 @@ def test_validate_isbn13(self): ] validate_isbn13("9781234567897") validate_isbn13("9781234567880") - validate_isbn13("9791234567880") + validate_isbn13("9791234567889") validate_isbn13("978-84-17121-94-5") + validate_isbn13("9791038704022") for isbn, _desc in invalid_isbn13: with self.subTest(isbn=isbn): From 5d5f89ff5d188d77336f9ad3fa316915a90de2a7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 15 Oct 2025 11:14:35 -0700 Subject: [PATCH 075/962] Updates migration path --- ...stitem_options_suggestionlist_and_more.py} | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) rename bookwyrm/migrations/{0210_suggestionlist_alter_listitem_options_and_more.py => 0219_alter_listitem_options_suggestionlist_and_more.py} (84%) diff --git a/bookwyrm/migrations/0210_suggestionlist_alter_listitem_options_and_more.py b/bookwyrm/migrations/0219_alter_listitem_options_suggestionlist_and_more.py similarity index 84% rename from bookwyrm/migrations/0210_suggestionlist_alter_listitem_options_and_more.py rename to bookwyrm/migrations/0219_alter_listitem_options_suggestionlist_and_more.py index 1864701dec..24146ecfe0 100644 --- a/bookwyrm/migrations/0210_suggestionlist_alter_listitem_options_and_more.py +++ b/bookwyrm/migrations/0219_alter_listitem_options_suggestionlist_and_more.py @@ -1,19 +1,23 @@ -# Generated by Django 4.2.15 on 2024-08-27 17:27 +# Generated by Django 5.2.3 on 2025-10-15 18:14 import bookwyrm.models.activitypub_mixin import bookwyrm.models.fields +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ("bookwyrm", "0209_user_show_ratings"), + ("bookwyrm", "0218_merge_0217_merge_20250816_0749_0217_usersession"), ] operations = [ + migrations.AlterModelOptions( + name="listitem", + options={}, + ), migrations.CreateModel( name="SuggestionList", fields=[ @@ -50,6 +54,21 @@ class Migration(migrations.Migration): max_length=255, ), ), + ( + "suggests_for", + bookwyrm.models.fields.OneToOneField( + on_delete=django.db.models.deletion.PROTECT, + related_name="suggestion_list", + to="bookwyrm.work", + ), + ), + ( + "user", + bookwyrm.models.fields.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + to=settings.AUTH_USER_MODEL, + ), + ), ], options={ "ordering": ("-updated_date",), @@ -60,10 +79,6 @@ class Migration(migrations.Migration): models.Model, ), ), - migrations.AlterModelOptions( - name="listitem", - options={}, - ), migrations.CreateModel( name="SuggestionListItem", fields=[ @@ -131,23 +146,9 @@ class Migration(migrations.Migration): model_name="suggestionlist", name="books", field=models.ManyToManyField( - through="bookwyrm.SuggestionListItem", to="bookwyrm.edition" - ), - ), - migrations.AddField( - model_name="suggestionlist", - name="suggests_for", - field=bookwyrm.models.fields.OneToOneField( - on_delete=django.db.models.deletion.PROTECT, - related_name="suggestion_list", - to="bookwyrm.work", - ), - ), - migrations.AddField( - model_name="suggestionlist", - name="user", - field=bookwyrm.models.fields.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL + through="bookwyrm.SuggestionListItem", + through_fields=("book_list", "book"), + to="bookwyrm.edition", ), ), ] From edfdfd25e4b3993e2730f8aa55be923ce73b11b4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 15 Oct 2025 11:58:13 -0700 Subject: [PATCH 076/962] Updates UI for better handling of null and logged out states --- bookwyrm/templates/book/suggestion_list/list.html | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index efda10e555..7749ab74b1 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -1,11 +1,14 @@ {% load i18n %} {% load humanize %} -

      +{% if request.user.is_authenticated or suggestion_list %} +

      {% trans "Suggestions" %} + {% if suggestion_list and items.length > 0 %} {% trans "View all suggestions" %} + {% endif %}

      {% if suggestion_list %} @@ -35,12 +38,15 @@

      {% endif %} {% else %} -
      + +
      {% csrf_token %} - +

      {% trans "Have a recommendation for someone who liked this book?" %}

      +
      {% endif %} +{% endif %} From 45486e632bd8e99747a403d98b7d5bf87f204d06 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 15 Oct 2025 12:18:51 -0700 Subject: [PATCH 077/962] Fixes suggestion mode in regular list for for suggestion list --- bookwyrm/templates/book/suggestion_list/list.html | 2 +- bookwyrm/templates/lists/list.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 7749ab74b1..cd066ae08d 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -4,7 +4,7 @@ {% if request.user.is_authenticated or suggestion_list %}

      {% trans "Suggestions" %} - {% if suggestion_list and items.length > 0 %} + {% if suggestion_list and items|length > 0 %} {% trans "View all suggestions" %} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index d5f6d5fd09..e1f5fcd9e1 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -172,7 +172,7 @@

      {% trans "Suggest Books" %} {% endif %}

      - {% include "lists/suggestion_search.html" with query_param="q" search_url=request.path %} + {% include "lists/suggestion_search.html" with query_param="q" search_url=request.path is_suggestion=list.suggests_for %} {% endif %}

      From e8278fc2c991c0a7fd3dc686f13fcf103d348d1f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 15 Oct 2025 12:41:37 -0700 Subject: [PATCH 078/962] Show number of items by "view all" link --- bookwyrm/templates/book/suggestion_list/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index cd066ae08d..e264b83616 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -6,7 +6,7 @@

      {% trans "Suggestions" %} {% if suggestion_list and items|length > 0 %} - {% trans "View all suggestions" %} + {% trans "View all suggestions" %} ({{ items|length }}) {% endif %}

      From 0725dae35c470fa016dfa22679f9b1fe78a35725 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 15 Oct 2025 14:01:02 -0700 Subject: [PATCH 079/962] Adds inbox test and tweaks serialization --- bookwyrm/activitypub/__init__.py | 2 +- bookwyrm/activitypub/ordered_collection.py | 12 +++- bookwyrm/models/list.py | 1 + bookwyrm/tests/views/inbox/test_inbox_add.py | 59 ++++++++++++++++++++ 4 files changed, 72 insertions(+), 2 deletions(-) diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py index 0705dc2410..bd33ece2fc 100644 --- a/bookwyrm/activitypub/__init__.py +++ b/bookwyrm/activitypub/__init__.py @@ -14,7 +14,7 @@ from .note import Review, Rating from .note import Tombstone from .ordered_collection import OrderedCollection, OrderedCollectionPage -from .ordered_collection import CollectionItem, ListItem, ShelfItem +from .ordered_collection import CollectionItem, ListItem, ShelfItem, SuggestionListItem from .ordered_collection import BookList, SuggestionList, Shelf from .person import Person, PublicKey from .response import ActivitypubResponse diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py index a88d373287..b844566f2a 100644 --- a/bookwyrm/activitypub/ordered_collection.py +++ b/bookwyrm/activitypub/ordered_collection.py @@ -3,6 +3,7 @@ from typing import List from .base_activity import ActivityObject +from .book import Work # pylint: disable=invalid-name @@ -47,7 +48,7 @@ class SuggestionList(OrderedCollectionPrivate): """structure of an ordered collection activity""" summary: str = None - book: str = None + book: Work = None type: str = "SuggestionList" @@ -82,6 +83,15 @@ class ListItem(CollectionItem): type: str = "ListItem" +@dataclass(init=False) +class SuggestionListItem(CollectionItem): + """a book on a list""" + + book: str + notes: str = None + type: str = "SuggestionListItem" + + @dataclass(init=False) class ShelfItem(CollectionItem): """a book on a list""" diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 1becf8f080..50537d7c42 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -280,3 +280,4 @@ class SuggestionListItem(AbstractListItem): book_list = models.ForeignKey("SuggestionList", on_delete=models.CASCADE) endorsement = models.ManyToManyField("User", related_name="suggestion_endorsers") + activity_serializer = activitypub.SuggestionListItem diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index b3d50fe46f..31fb9f2a33 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -44,6 +44,11 @@ def setUpTestData(cls): remote_id="https://example.com/book/37292", parent_work=work, ) + cls.another_book = models.Edition.objects.create( + title="Another Test", + remote_id="https://example.com/book/79", + parent_work=models.Work.objects.create(title="blah"), + ) models.SiteSettings.objects.create() @@ -134,3 +139,57 @@ def test_handle_add_book_to_list(self): self.assertEqual(booklist.books.first(), self.book) self.assertEqual(listitem.remote_id, "https://example.com/listbook/6189") self.assertEqual(listitem.notes, "hi hello") + + @responses.activate + def test_handle_add_book_to_suggestion_list(self): + """listing a book""" + responses.add( + responses.GET, + "https://example.com/book/suggestion/list", + json={ + "id": "https://example.com/book/{self.another_book.id}/suggestions", + "type": "SuggestionList", + "totalItems": 1, + "book": self.another_book.parent_work.to_activity(), + "first": f"https://example.com/book/{self.another_book.id}/suggestions?page=1", + "last": f"https://example.com/book/{self.another_book.id}/suggestions?page=1", + "name": "Test List", + "owner": "https://example.com/user/mouse", + "to": ["https://www.w3.org/ns/activitystreams#Public"], + "cc": ["https://example.com/user/mouse/followers"], + "summary": "summary text", + "curation": "open", + "@context": "https://www.w3.org/ns/activitystreams", + }, + ) + responses.add( + responses.GET, + self.another_book.parent_work.remote_id, + json=self.another_book.parent_work.to_activity(), + ) + + activity = { + "id": f"https://example.com/book/{self.another_book.id}/suggestions#add", + "type": "Add", + "actor": "https://example.com/users/rat", + "object": { + "actor": self.remote_user.remote_id, + "type": "SuggestionListItem", + "book": self.book.remote_id, + "id": f"https://example.com/list/suggestion/item", + "notes": "hi hello", + "order": 1, + }, + "target": "https://example.com/book/suggestion/list", + "@context": "https://www.w3.org/ns/activitystreams", + } + views.inbox.activity_task(activity) + + booklist = models.SuggestionList.objects.get() + listitem = models.SuggestionListItem.objects.get() + self.assertEqual( + booklist.name, f"Suggestions for {self.another_book.parent_work.title}" + ) + self.assertEqual(booklist.suggests_for, self.another_book.parent_work) + self.assertEqual(booklist.books.first(), self.book) + self.assertEqual(listitem.notes, "hi hello") From acb92806c166e83d9607114625b091c81f908c10 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 15 Oct 2025 14:09:36 -0700 Subject: [PATCH 080/962] Fixing linting issue --- bookwyrm/tests/views/inbox/test_inbox_add.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index 31fb9f2a33..aa8de2f2a0 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -176,7 +176,7 @@ def test_handle_add_book_to_suggestion_list(self): "actor": self.remote_user.remote_id, "type": "SuggestionListItem", "book": self.book.remote_id, - "id": f"https://example.com/list/suggestion/item", + "id": "https://example.com/list/suggestion/item", "notes": "hi hello", "order": 1, }, From 498d0de16106162646bdc48bbf4aeab3bc40dca2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 15 Oct 2025 14:27:24 -0700 Subject: [PATCH 081/962] Suppress line too long warning in suggestions test --- bookwyrm/tests/views/inbox/test_inbox_add.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index aa8de2f2a0..9305e1e36b 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -140,6 +140,7 @@ def test_handle_add_book_to_list(self): self.assertEqual(listitem.remote_id, "https://example.com/listbook/6189") self.assertEqual(listitem.notes, "hi hello") + # pylint: disable=line-too-long @responses.activate def test_handle_add_book_to_suggestion_list(self): """listing a book""" From 34cb06b8f5ad1561b78b75e04e6c34a3a76bcdf6 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Thu, 16 Oct 2025 20:09:08 +0300 Subject: [PATCH 082/962] fix(book): handle isbn_13_to_10 case where checksum would be 11 --- bookwyrm/models/book.py | 4 +++- bookwyrm/tests/models/test_book_model.py | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index f15d5c940b..5f71221ea8 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -755,7 +755,9 @@ def isbn_13_to_10(isbn_13): except ValueError: return None checkdigit = checksum % 11 - checkdigit = 11 - checkdigit + checkdigit = ( + 11 - checkdigit + ) % 11 # we calculate checkdigit to make the whole sum % 11 == 0 if checkdigit == 10: checkdigit = "X" return converted + str(checkdigit) diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index e54561115b..ac5c9f93ad 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -72,6 +72,11 @@ def test_isbn_10_to_13(self): isbn_13 = isbn_10_to_13(isbn_10) self.assertEqual(isbn_13, "9781788161640") + # test checksum 11 case + isbn_10 = "2253002690" + isbn_13 = isbn_10_to_13(isbn_10) + self.assertEqual(isbn_13, "9782253002697") + def test_isbn_13_to_10(self): """checksums and so on""" isbn_13 = "9781788161671" @@ -82,6 +87,10 @@ def test_isbn_13_to_10(self): isbn_10 = isbn_13_to_10(isbn_13) self.assertEqual(isbn_10, "178816167X") + isbn_13 = "978-2253002697" + isbn_10 = isbn_13_to_10(isbn_13) + self.assertEqual(isbn_10, "2253002690") + def test_normalize_isbn(self): """Remove misc characters from ISBNs""" self.assertEqual(normalize_isbn("978-0-4633461-1-2"), "9780463346112") @@ -100,6 +109,9 @@ def test_validate_isbn10(self): validate_isbn10("0123456789") validate_isbn10("123456789X") validate_isbn10("0-201-53082-1") + validate_isbn10("2253002690") + validate_isbn10("0-596-52068-9") + validate_isbn10("0596520689") for isbn, _desc in invalid_isbn10: with self.subTest(isbn=isbn): @@ -118,6 +130,7 @@ def test_validate_isbn13(self): validate_isbn13("9791234567889") validate_isbn13("978-84-17121-94-5") validate_isbn13("9791038704022") + validate_isbn13("978-2253002697") for isbn, _desc in invalid_isbn13: with self.subTest(isbn=isbn): From 4a94746bc0eba442aed0863e0c373549a972265c Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Sat, 18 Oct 2025 12:26:46 +0300 Subject: [PATCH 083/962] book: add migration to fix isbn10 entries that have 11 digits Fixes isbn-10 cases where the isbn10 would be 11 digits and ends up in '11' when it should end in '0'. --- ..._datamigration_fix_isbn10_20251017_1810.py | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 bookwyrm/migrations/0219_datamigration_fix_isbn10_20251017_1810.py diff --git a/bookwyrm/migrations/0219_datamigration_fix_isbn10_20251017_1810.py b/bookwyrm/migrations/0219_datamigration_fix_isbn10_20251017_1810.py new file mode 100644 index 0000000000..f375966d31 --- /dev/null +++ b/bookwyrm/migrations/0219_datamigration_fix_isbn10_20251017_1810.py @@ -0,0 +1,24 @@ +# Generated by Django 5.2.3 on 2025-10-19 12:31 + +from django.db import migrations +from django.db.models.functions import Length + + +def fix_isbn10_entries(apps, schema_editor): + Edition = apps.get_model("bookwyrm", "Edition") + editions_to_fix = Edition.objects.annotate(isbn_10_length=Length("isbn_10")).filter( + isbn_10_length__gt=10 + ) + + for edition_to_fix in editions_to_fix: + if edition_to_fix.isbn_10.endswith("11"): + edition_to_fix.isbn_10 = edition_to_fix.isbn_10[:9] + "0" + edition_to_fix.save(broadcast=False) + + +class Migration(migrations.Migration): + dependencies = [ + ("bookwyrm", "0218_merge_0217_merge_20250816_0749_0217_usersession"), + ] + + operations = [migrations.RunPython(fix_isbn10_entries)] From 8506d399f925cc0fcb9b4bf4c62720092d924c34 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Sun, 19 Oct 2025 19:12:22 +0300 Subject: [PATCH 084/962] edit_book: improve author search matching on some names and aliases Change rank limit in author search, as short author names will get lower rank. And for some reason, they get smaller than B amount of rank even without normalization. Some main names also get lower than 0.4 rank with normalization, so lower the treshold. --- bookwyrm/tests/views/books/test_edit_book.py | 54 ++++++++++++++++++++ bookwyrm/views/books/edit_book.py | 2 +- 2 files changed, 55 insertions(+), 1 deletion(-) diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py index 05a4d68ac7..cddcf9e8d1 100644 --- a/bookwyrm/tests/views/books/test_edit_book.py +++ b/bookwyrm/tests/views/books/test_edit_book.py @@ -382,6 +382,60 @@ def test_add_authors_helper(self): self.assertEqual(result["author_matches"][0]["name"], "Sappho") self.assertEqual(result["author_matches"][1]["name"], "Some Guy") + def test_existings_authors_names_add_author_helper(self): + """converts form input into author matches""" + for author_name in [ + "YX", + "Medium author", + "幌田", + "long author name that exceeds normal limits", + ]: + author = models.Author.objects.create(name=author_name) + author.save() + form = forms.EditionForm(instance=self.book) + form.data["title"] = "New Title" + form.data["last_edited_by"] = self.local_user.id + form.data["add_author"] = [author_name] + request = self.factory.post("", form.data) + request.user = self.local_user + + with patch("bookwyrm.utils.isni.find_authors_by_name") as mock: + mock.return_value = [] + result = add_authors(request, form.data) + + self.assertTrue(result["confirm_mode"]) + self.assertEqual(result["add_author"], [author_name]) + self.assertTrue(len(result["author_matches"]) >= 1) + self.assertEqual(result["author_matches"][0]["name"], author_name) + + def test_existings_authors_aliases_add_author_helper(self): + """converts form input into author matches""" + for author_name in [ + "YX", + "Medium author", + "幌田", + "long author name that exceeds normal limits", + ]: + author = models.Author.objects.create( + name="Mystery author", aliases=[author_name] + ) + author.save() + form = forms.EditionForm(instance=self.book) + form.data["title"] = "New Title" + form.data["last_edited_by"] = self.local_user.id + form.data["add_author"] = [author_name] + request = self.factory.post("", form.data) + request.user = self.local_user + + with patch("bookwyrm.utils.isni.find_authors_by_name") as mock: + mock.return_value = [] + result = add_authors(request, form.data) + + self.assertTrue(result["confirm_mode"]) + self.assertEqual(result["add_author"], [author_name]) + self.assertEqual(len(result["author_matches"]), 1) + self.assertEqual(result["author_matches"][0]["name"], author_name) + def test_create_book_get(self): """there are so many views, this just makes sure it LOADS""" view = views.CreateBook.as_view() diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index 8af675026a..fbff8a5ec4 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -190,7 +190,7 @@ def add_authors(request, data): author_matches = ( models.Author.objects.annotate(search=vector) .annotate(rank=SearchRank(vector, author, normalization=32)) - .filter(rank__gt=0.4) + .filter(rank__gt=0.19) # short alias names like XY get rank around 0.1956 .order_by("-rank")[:5] ) From 751467b72d97ba98f76835500295bcc9230574c6 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 20 Oct 2025 12:06:53 +1100 Subject: [PATCH 085/962] parse review dates for book imports fixes #3713 --- bookwyrm/models/import_job.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index 5a6ba3f512..25cab635d3 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -302,6 +302,11 @@ def date_read(self): """the date a book was completed""" return self._parse_datefield("date_finished") + @property + def date_reviewed(self): + """the date a book was reviewed""" + return self._parse_datefield("review_published") + @property def reads(self): """formats a read through dataset for the book in this line""" @@ -447,7 +452,7 @@ def handle_imported_book(item): # pylint: disable=too-many-branches # but "now" is a bad guess unless we have no choice published_date_guess = ( - item.review_published or item.date_read or item.date_added or timezone.now() + item.date_reviewed or item.date_read or item.date_added or timezone.now() ) if item.review: From c28981980ce51f57b900438bdfc987898945b328 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 20 Oct 2025 05:39:14 -0700 Subject: [PATCH 086/962] New translations django.po (Italian) --- locale/it_IT/LC_MESSAGES/django.po | 72 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/locale/it_IT/LC_MESSAGES/django.po b/locale/it_IT/LC_MESSAGES/django.po index 374f7dda2f..e879025ca1 100644 --- a/locale/it_IT/LC_MESSAGES/django.po +++ b/locale/it_IT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-10-11 15:08\n" +"POT-Creation-Date: 2025-10-13 22:43+0000\n" +"PO-Revision-Date: 2025-10-20 12:39\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Italian\n" "Language: it\n" @@ -460,7 +460,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s ha valutato %(book_title)s: %(display_rating).1f stella" msgstr[1] "%(display_name)s ha valutato %(book_title)s: %(display_rating).1f stelle" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Recensioni" @@ -826,7 +826,7 @@ msgstr "La loro lettura più breve quest’anno…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +918,24 @@ msgid "View ISNI record" msgstr "Visualizza record ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Vedi su ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Carica dati" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Visualizza su OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Visualizza su Inventaire" @@ -1044,7 +1044,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1068,7 @@ msgstr "Salva" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1108,97 +1108,97 @@ msgstr "Il caricamento dei dati si connetterà a %(source_name)sdifferent edition of this book is on your %(shelf_name)s shelf." msgstr "Un’a edizione diversa di questo libro si trova nella tua libreria %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Le tue attività di lettura" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Aggiungi data di lettura" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Non hai alcuna attività di lettura per questo libro." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Le tue recensioni" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "I tuoi commenti" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Le tue citazioni" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Argomenti" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Luoghi" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1213,11 @@ msgstr "Luoghi" msgid "Lists" msgstr "Liste" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Aggiungi all'elenco" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -4872,7 +4872,7 @@ msgstr "SO" #: bookwyrm/templates/preferences/security.html:129 msgid "Web Browser" -msgstr "" +msgstr "Browser Web" #: bookwyrm/templates/preferences/security.html:129 msgid "Browser" @@ -5812,7 +5812,7 @@ msgstr "" #: bookwyrm/templates/settings/files.html:17 msgid "Schedule file deletion" -msgstr "" +msgstr "Programma eliminazione file" #: bookwyrm/templates/settings/files.html:21 msgid "This job deletes uploaded user export and import files that have reached the expiry age." @@ -5820,7 +5820,7 @@ msgstr "" #: bookwyrm/templates/settings/files.html:102 msgid "Export file expiration" -msgstr "" +msgstr "Scadenza del file di esportazione" #: bookwyrm/templates/settings/files.html:109 msgid "Maximum age of export files, in hours" From 0ac5fdec35a6d641eb3eb1adbf7f4dd5c9eed385 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 20 Oct 2025 06:41:55 -0700 Subject: [PATCH 087/962] New translations django.po (French) --- locale/fr_FR/LC_MESSAGES/django.po | 162 ++++++++++++++--------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 475cef844d..cb0ba4ea3c 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-10-13 22:43+0000\n" +"PO-Revision-Date: 2025-10-20 13:41\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -198,12 +198,12 @@ msgstr "Livre broché" #: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" -msgstr "" +msgstr "%(value)s ne ressemble pas à un numéro ISBN" #: bookwyrm/models/book.py:515 bookwyrm/models/book.py:555 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" -msgstr "" +msgstr "%(value)s n'a pas la somme de contrôle ISBN correcte, nous nous attendions à %(check_version)s" #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:84 #: bookwyrm/templates/settings/reports/report.html:115 @@ -236,7 +236,7 @@ msgstr "Bloquer" #: bookwyrm/models/bookwyrm_import_job.py:398 msgid "Unknown error importing book" -msgstr "" +msgstr "Erreur inconnue lors de l'importation du livre" #: bookwyrm/models/bookwyrm_import_job.py:496 msgid "unauthorized" @@ -244,7 +244,7 @@ msgstr "non autorisé" #: bookwyrm/models/bookwyrm_import_job.py:502 msgid "Unknown error importing book status" -msgstr "" +msgstr "Erreur inconnue lors de l'importation du statut du livre" #: bookwyrm/models/bookwyrm_import_job.py:696 #: bookwyrm/models/bookwyrm_import_job.py:722 @@ -257,7 +257,7 @@ msgstr "relation invalide" #: bookwyrm/models/bookwyrm_import_job.py:740 msgid "Unkown error importing relationship" -msgstr "" +msgstr "Erreur inconnue lors de l'importation de la relation" #: bookwyrm/models/federated_server.py:11 #: bookwyrm/templates/settings/federation/edit_instance.html:55 @@ -431,7 +431,7 @@ msgstr "Item supprimé" #: bookwyrm/models/session.py:42 msgid "Unknown" -msgstr "" +msgstr "Inconnu" #: bookwyrm/models/status.py:192 #, python-format @@ -460,7 +460,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s a noté « %(book_title)s » : %(display_rating).1f étoile" msgstr[1] "%(display_name)s a noté « %(book_title)s » : %(display_rating).1f étoiles" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Critiques" @@ -826,7 +826,7 @@ msgstr "Sa lecture la plus courte l’année…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +918,24 @@ msgid "View ISNI record" msgstr "Voir l’enregistrement ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Voir sur ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Charger les données" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Voir sur OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Voir sur Inventaire" @@ -1044,7 +1044,7 @@ msgid "ISNI:" msgstr "ISNI :" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1068,7 @@ msgstr "Enregistrer" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1108,97 +1108,97 @@ msgstr "Le chargement des données se connectera à %(source_name)sdifferent edition of this book is on your %(shelf_name)s shelf." msgstr "Une édition différente de ce livre existe sur votre étagère %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Votre activité de lecture" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Ajouter des dates de lecture" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 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:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Vos critiques" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Vos commentaires" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Vos citations" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Sujets" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1213,11 @@ msgstr "Lieux" msgid "Lists" msgstr "Listes" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Ajouter à la liste" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -4688,8 +4688,8 @@ msgstr "Les fichiers d'exportation de l'utilisateur afficheront \"complet\" une #, python-format msgid "Export files will be deleted after %(expiry_hours)s hour." msgid_plural "Export files will be deleted after %(expiry_hours)s hours." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Les fichiers d'exportation seront supprimés après %(expiry_hours)s heure." +msgstr[1] "Les fichiers d'exportation seront supprimés après %(expiry_hours)s heures." #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 @@ -4729,7 +4729,7 @@ msgstr "Compte" #: bookwyrm/templates/preferences/layout.html:24 msgid "Security Settings" -msgstr "" +msgstr "Paramètres de sécurité" #: bookwyrm/templates/preferences/layout.html:32 msgid "Move Account" @@ -4770,7 +4770,7 @@ msgstr "Entrez le nom d'utilisateur du compte que vous souhaitez faire migrer (e #: bookwyrm/templates/preferences/security.html:4 #: bookwyrm/templates/preferences/security.html:7 msgid "Account Security" -msgstr "" +msgstr "Sécurité du compte" #: bookwyrm/templates/preferences/security.html:13 msgid "Two Factor Authentication" @@ -4835,55 +4835,55 @@ msgstr "Configurer l’authentification à deux facteurs" #: bookwyrm/templates/preferences/security.html:111 msgid "Sessions" -msgstr "" +msgstr "Sessions" #: bookwyrm/templates/preferences/security.html:114 msgid "Some legacy sessions may not be displayed." -msgstr "" +msgstr "Certaines sessions héritées peuvent ne pas s'afficher." #: bookwyrm/templates/preferences/security.html:119 msgid "You are logged in to the following sessions:" -msgstr "" +msgstr "Vous êtes connecté aux sessions suivantes :" #: bookwyrm/templates/preferences/security.html:126 msgid "Date first logged in" -msgstr "" +msgstr "Date de la première connexion" #: bookwyrm/templates/preferences/security.html:127 msgid "IP address" -msgstr "" +msgstr "Adresse IP" #: bookwyrm/templates/preferences/security.html:127 msgid "IP" -msgstr "" +msgstr "IP" #: bookwyrm/templates/preferences/security.html:128 msgid "Operating System" -msgstr "" +msgstr "Système d'exploitation" #: bookwyrm/templates/preferences/security.html:128 msgid "OS" -msgstr "" +msgstr "OS" #: bookwyrm/templates/preferences/security.html:129 msgid "Web Browser" -msgstr "" +msgstr "Navigateur" #: bookwyrm/templates/preferences/security.html:129 msgid "Browser" -msgstr "" +msgstr "Navigateur" #: bookwyrm/templates/preferences/security.html:143 msgid "You" -msgstr "" +msgstr "Vous" #: bookwyrm/templates/preferences/security.html:147 msgid "Log Out" -msgstr "" +msgstr "Déconnexion" #: bookwyrm/templates/preferences/security.html:161 msgid "Currently your logged-in sessions are unable to be displayed." -msgstr "" +msgstr "Actuellement, vos sessions connectées ne peuvent pas être affichées." #: bookwyrm/templates/reading_progress/finish.html:5 #, python-format @@ -5409,11 +5409,11 @@ msgstr "Erreurs" #: bookwyrm/templates/settings/connectors/available.html:15 msgid "Finna.fi is a search service that collects material from hundreds of Finnish organisations under one roof." -msgstr "" +msgstr "Finna.fi est un service de recherche qui rassemble sous un même service les ressources de centaines d'organisations finlandaises." #: bookwyrm/templates/settings/connectors/available.html:28 msgid "Create new connector" -msgstr "" +msgstr "Créer un nouveau connecteur" #: bookwyrm/templates/settings/connectors/connector.html:35 #: bookwyrm/templates/settings/connectors/update.html:33 @@ -5424,29 +5424,29 @@ msgstr "Raison de la désactivation :" #: bookwyrm/templates/settings/connectors/connector.html:50 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" -msgstr "" +msgstr "Désactiver" #: bookwyrm/templates/settings/connectors/connector.html:61 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" -msgstr "" +msgstr "Activer" #: bookwyrm/templates/settings/connectors/connectors.html:4 #: bookwyrm/templates/settings/connectors/connectors.html:6 msgid "Connector Settings" -msgstr "" +msgstr "Paramètres du connecteur" #: bookwyrm/templates/settings/connectors/connectors.html:11 msgid "Connectors are sources of data about books and authors." -msgstr "" +msgstr "Les connecteurs sont des sources d'informations sur les livres et les auteurs." #: bookwyrm/templates/settings/connectors/connectors.html:12 msgid "The priority determines the order in which search results appear. The highest priority is 1. The default priority is 2." -msgstr "" +msgstr "La priorité détermine l'ordre dans lequel les résultats de recherche apparaissent. La priorité la plus élevée est 1. La priorité par défaut est 2." #: bookwyrm/templates/settings/connectors/connectors.html:14 msgid "Connector settings only determine whether a connector will be used to deliver search results. To manage more interactions with other federated servers, including domain blocks, see" -msgstr "" +msgstr "Les paramètres du connecteur déterminent uniquement si un connecteur sera utilisé pour fournir des résultats de recherche. Pour gérer davantage d'interactions avec d'autres serveurs fédérés, y compris les blocs de domaine, consultez" #: bookwyrm/templates/settings/connectors/connectors.html:14 #: bookwyrm/templates/settings/federation/edit_instance.html:12 @@ -5460,7 +5460,7 @@ msgstr "Instances fédérées" #: bookwyrm/templates/settings/connectors/update.html:66 msgid "should be updated. Check recent release notes for more information." -msgstr "" +msgstr "doit être mis à jour. Consultez les notes de mise à jour récentes pour plus d'informations." #: bookwyrm/templates/settings/connectors/update.html:76 #: bookwyrm/templates/snippets/create_status/post_options_block.html:19 @@ -5803,35 +5803,35 @@ msgstr "Aucune instance trouvée" #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" -msgstr "" +msgstr "Maintenance des fichiers" #: bookwyrm/templates/settings/files.html:17 msgid "Schedule file deletion" -msgstr "" +msgstr "Planifier la suppression de fichiers" #: bookwyrm/templates/settings/files.html:21 msgid "This job deletes uploaded user export and import files that have reached the expiry age." -msgstr "" +msgstr "Cette tâche supprime les fichiers d'exportation et d'importation téléchargés par les utilisateurs qui ont atteint leur date d'expiration." #: bookwyrm/templates/settings/files.html:102 msgid "Export file expiration" -msgstr "" +msgstr "Expiration du fichier d'exportation" #: bookwyrm/templates/settings/files.html:109 msgid "Maximum age of export files, in hours" -msgstr "" +msgstr "Âge maximal des fichiers d'exportation, en heures" #: bookwyrm/templates/settings/files.html:122 msgid "Files older than this will be deleted." -msgstr "" +msgstr "Les fichiers plus anciens que cela seront supprimés." #: bookwyrm/templates/settings/files.html:125 msgid "Set expiry hours" -msgstr "" +msgstr "Définir les heures d'expiration" #: bookwyrm/templates/settings/files.html:138 msgid "Expired files" -msgstr "" +msgstr "Fichiers expirés" #: bookwyrm/templates/settings/files.html:186 #: bookwyrm/templates/settings/imports/imports.html:184 @@ -5841,7 +5841,7 @@ msgstr "Terminé" #: bookwyrm/templates/settings/files.html:210 msgid "Successfully updated expiry time" -msgstr "" +msgstr "Heure d'expiration mise à jour avec succès" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 @@ -6149,7 +6149,7 @@ msgstr "Signalements" #: bookwyrm/templates/settings/layout.html:61 msgid "Auto-Moderation Rules" -msgstr "" +msgstr "Règles d'auto-modération" #: bookwyrm/templates/settings/layout.html:73 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 @@ -6163,11 +6163,11 @@ msgstr "Système" #: bookwyrm/templates/settings/layout.html:90 msgid "Scheduled Tasks" -msgstr "" +msgstr "Tâches planifiées" #: bookwyrm/templates/settings/layout.html:102 msgid "Files Maintenance" -msgstr "" +msgstr "Maintenance des fichiers" #: bookwyrm/templates/settings/layout.html:107 msgid "Instance Settings" @@ -6788,7 +6788,7 @@ msgstr "Votre domaine semble être mal configuré. Il ne doit pas inclure de pro #: bookwyrm/templates/setup/config.html:42 msgid "You are running BookWyrm with localhost. This should never be used in a production environment." -msgstr "" +msgstr "Vous exécutez BookWyrm avec localhost. Cela ne doit jamais être utilisé dans un environnement de production." #: bookwyrm/templates/setup/config.html:52 bookwyrm/templates/user_menu.html:44 msgid "Settings" @@ -6800,7 +6800,7 @@ msgstr "Domaine de l'instance :" #: bookwyrm/templates/setup/config.html:62 msgid "Instance base URL:" -msgstr "" +msgstr "URL de base de l'instance :" #: bookwyrm/templates/setup/config.html:75 msgid "Using S3:" @@ -7726,7 +7726,7 @@ msgstr "Voir le profil et plus" #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28 #, python-format msgid "File exceeds maximum size: %(max_size)sMB" -msgstr "" +msgstr "Le fichier dépasse la taille maximale : %(max_size)sMB" #: bookwyrm/templatetags/list_page_tags.py:14 #, python-format From f136dea188b4060e02a96ec6782b959276fd833f Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Mon, 20 Oct 2025 19:02:53 +0300 Subject: [PATCH 088/962] isbn_10: add management command to check incorrect checksum entries --- .../management/commands/fix_isbn10_entries.py | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 bookwyrm/management/commands/fix_isbn10_entries.py diff --git a/bookwyrm/management/commands/fix_isbn10_entries.py b/bookwyrm/management/commands/fix_isbn10_entries.py new file mode 100644 index 0000000000..2f865de815 --- /dev/null +++ b/bookwyrm/management/commands/fix_isbn10_entries.py @@ -0,0 +1,28 @@ +from django.core.management.base import BaseCommand +from django.db.models.functions import Length +from bookwyrm import models + + +def find_long_isbn10_editions(): + """Fix isbn-10 entries that have incorrect checksum""" + entries_to_fix = models.Edition.objects.annotate( + isbn10_length=Length("isbn_10") + ).filter(isbn10_length__gt=10) + + print(f"{entries_to_fix.count()} editions to find") + + for edition_to_fix in entries_to_fix: + if edition_to_fix.isbn_10.endswith("11"): + edition_to_fix.isbn_10 = edition_to_fix.isbn_10[:9] + "0" + edition_to_fix.save(broadcast=True, update_fields=["isbn_10"]) + + +class Command(BaseCommand): + """Fix isbn-10 entries that have incorrect checksum""" + + help = "Find and fix isbn-10 entries that have incorrect checksum" + + # pylint: disable=no-self-use,unused-argument + def handle(self, *args, **options): + """run fix""" + find_long_isbn10_editions() From 7891b10e7d1c30196b598845909b6fcb884d52d5 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 26 Oct 2025 14:12:53 -0700 Subject: [PATCH 089/962] New translations django.po (Catalan) --- locale/ca_ES/LC_MESSAGES/django.po | 76 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/locale/ca_ES/LC_MESSAGES/django.po b/locale/ca_ES/LC_MESSAGES/django.po index 8caab30132..1219e81220 100644 --- a/locale/ca_ES/LC_MESSAGES/django.po +++ b/locale/ca_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-10-08 02:52\n" +"POT-Creation-Date: 2025-10-13 22:43+0000\n" +"PO-Revision-Date: 2025-10-26 21:12\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -436,22 +436,22 @@ msgstr "Desconegut" #: bookwyrm/models/status.py:192 #, python-format msgid "%(display_name)s's status" -msgstr "l'estat de %(display_name)s" +msgstr "Estat de %(display_name)s" #: bookwyrm/models/status.py:367 #, python-format msgid "%(display_name)s's comment on %(book_title)s" -msgstr "el comentari de %(display_name)s quant a %(book_title)s" +msgstr "Comentari de %(display_name)s sobre %(book_title)s" #: bookwyrm/models/status.py:418 #, python-format msgid "%(display_name)s's quote from %(book_title)s" -msgstr "la cita de %(display_name)s quant a %(book_title)s" +msgstr "Cita de %(display_name)s sobre %(book_title)s" #: bookwyrm/models/status.py:454 #, python-format msgid "%(display_name)s's review of %(book_title)s" -msgstr "la revisió de %(display_name)s de %(book_title)s" +msgstr "Ressenya de %(display_name)s sobre %(book_title)s" #: bookwyrm/models/status.py:486 #, python-format @@ -460,7 +460,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "%(display_name)s ha valorat %(book_title)s: %(display_rating). 1f estrelles" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Ressenya" @@ -653,7 +653,7 @@ msgstr "%(site_name)s és part de BookWyrm, una xarxa de comunitats ind #: bookwyrm/templates/about/about.html:45 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." -msgstr "%(title)s és el llibre preferit de %(site_name)s, amb una valoració promig de %(rating)s sobre 5." +msgstr "%(title)s és el llibre preferit de %(site_name)s, amb una valoració mitjana de %(rating)s sobre 5." #: bookwyrm/templates/about/about.html:64 #, python-format @@ -826,7 +826,7 @@ msgstr "La seva lectura més breu d'aquest any…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +918,24 @@ msgid "View ISNI record" msgstr "Veure el registre ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Veure a ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Carregueu dades" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Veure a OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Veure a Inventaire" @@ -1044,7 +1044,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1068,7 @@ msgstr "Desa" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1108,97 +1108,97 @@ msgstr "La càrrega de les dades es connectarà a %(source_name)sdifferent edition of this book is on your %(shelf_name)s shelf." msgstr "Una edició diferent d'aquest llibre és al teu %(shelf_name)s prestatge." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Les vostres lectures" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Afegiu dates de lectura" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "No tens cap activitat de lectura per aquest llibre." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Les vostres ressenyes" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "El vostres comentaris" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Les teves cites" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Temes" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Llocs" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1213,11 @@ msgstr "Llocs" msgid "Lists" msgstr "Llistes" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Afegiu a la llista" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 From 0108d0bf39a004cfcad8ef26bcdeb11c4d625398 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 1 Nov 2025 18:27:22 -0700 Subject: [PATCH 090/962] Recompiles locales --- locale/ca_ES/LC_MESSAGES/django.mo | Bin 169743 -> 169732 bytes locale/en_US/LC_MESSAGES/django.po | 7 +++---- locale/fr_FR/LC_MESSAGES/django.mo | Bin 170098 -> 175295 bytes locale/it_IT/LC_MESSAGES/django.mo | Bin 167008 -> 167220 bytes 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/locale/ca_ES/LC_MESSAGES/django.mo b/locale/ca_ES/LC_MESSAGES/django.mo index 97a589fa941485375c70cbe1cfbb32989d6d794c..48a2a74fa7db9147b1d05a142a5b9eb022c476ea 100644 GIT binary patch delta 13221 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\n" "Language-Team: English \n" @@ -196,7 +196,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -356,11 +355,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index a02bc02a457ec9861418647a8f75d7c63277a93c..83fed12630b0467e5a1630f4e47090ef7706fc65 100644 GIT binary patch delta 39373 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

      #-H4*kF#Qi*<;vLv7k98_mahO4O#Fjv;su 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 G?EeQc={*Dh delta 34740 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 From 73ea980424429d06585a9872f4de35cb834e72c6 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 1 Nov 2025 18:27:53 -0700 Subject: [PATCH 091/962] Bump version to 0.8.1. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a3df0a6959..6f4eebdf6f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.0 +0.8.1 From 2987e01a856cc9f9e344104b40422e4390068d50 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 2 Nov 2025 03:39:07 -0800 Subject: [PATCH 092/962] New translations django.po (Italian) --- locale/it_IT/LC_MESSAGES/django.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/locale/it_IT/LC_MESSAGES/django.po b/locale/it_IT/LC_MESSAGES/django.po index e879025ca1..e310280585 100644 --- a/locale/it_IT/LC_MESSAGES/django.po +++ b/locale/it_IT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-10-13 22:43+0000\n" -"PO-Revision-Date: 2025-10-20 12:39\n" +"POT-Creation-Date: 2025-11-02 01:26+0000\n" +"PO-Revision-Date: 2025-11-02 11:39\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Italian\n" "Language: it\n" @@ -195,7 +195,6 @@ msgstr "Brossura" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "“%(value)s” non rispetta il formato previsto per un ISBN" @@ -355,11 +354,11 @@ msgstr "Interrotto" msgid "Import stopped" msgstr "Importazione interrotta" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Errore nel caricamento del libro" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Impossibile trovare una corrispondenza per il libro" @@ -4852,7 +4851,7 @@ msgstr "" #: bookwyrm/templates/preferences/security.html:126 msgid "Date first logged in" -msgstr "" +msgstr "Data di prima connessione" #: bookwyrm/templates/preferences/security.html:127 msgid "IP address" @@ -5846,7 +5845,7 @@ msgstr "Completati" #: bookwyrm/templates/settings/files.html:210 msgid "Successfully updated expiry time" -msgstr "" +msgstr "Ora di scadenza aggiornata correttamente" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 @@ -6154,7 +6153,7 @@ msgstr "Reports" #: bookwyrm/templates/settings/layout.html:61 msgid "Auto-Moderation Rules" -msgstr "" +msgstr "Regole Di Auto-Moderazione" #: bookwyrm/templates/settings/layout.html:73 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 @@ -6168,7 +6167,7 @@ msgstr "Sistema" #: bookwyrm/templates/settings/layout.html:90 msgid "Scheduled Tasks" -msgstr "" +msgstr "Operazioni pianificate" #: bookwyrm/templates/settings/layout.html:102 msgid "Files Maintenance" @@ -6892,7 +6891,7 @@ msgstr "Elimina scaffale" #: bookwyrm/templates/shelf/shelf.html:160 #: bookwyrm/templates/shelf/shelf.html:186 msgid "Shelved" -msgstr "Scaffali" +msgstr "Archiviato" #: bookwyrm/templates/shelf/shelf.html:161 #: bookwyrm/templates/shelf/shelf.html:189 From 69dd966d0693b95db4d14cf31c03a780ad9606c2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 2 Nov 2025 11:23:32 -0800 Subject: [PATCH 093/962] Comments out inefficient queries I decided to leave these queries in place but just not call them so that they can be re-instated in the future when I or someone else has the interest in writing them correctly and not repeating my mistake of making the gnarliest SQL of all time. I also didn't want to delete them because that would remove the translations that already exist, and if we do bring them back, we would lose all the work that translators have put in. --- bookwyrm/templates/about/about.html | 4 +++- bookwyrm/templates/settings/dashboard/dashboard.html | 7 ++++++- bookwyrm/views/admin/dashboard.py | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/about/about.html b/bookwyrm/templates/about/about.html index ef3f340371..95b7c20c74 100644 --- a/bookwyrm/templates/about/about.html +++ b/bookwyrm/templates/about/about.html @@ -11,6 +11,7 @@ {% block about_content %} {% get_current_language as LANGUAGE_CODE %} + {# seven day cache #} {% cache 604800 about_page_superlatives LANGUAGE_CODE %} @@ -31,6 +32,7 @@

      +

      {% blocktrans trimmed %} Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. diff --git a/bookwyrm/templates/settings/dashboard/dashboard.html b/bookwyrm/templates/settings/dashboard/dashboard.html index d43b3bade0..f0c79ac1f6 100644 --- a/bookwyrm/templates/settings/dashboard/dashboard.html +++ b/bookwyrm/templates/settings/dashboard/dashboard.html @@ -74,6 +74,7 @@

      {% trans "Works" %}

      {% endif %}
      + {% endblock %} {% block scripts %} + +{# {% include 'settings/dashboard/user_chart.html' %} {% include 'settings/dashboard/status_chart.html' %} {% include 'settings/dashboard/registration_chart.html' %} {% include 'settings/dashboard/works_chart.html' %} +#} {% endblock %} diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index 2bfd272e76..5fa814ba4a 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -35,7 +35,7 @@ class Dashboard(View): ) def get(self, request): """list of users""" - data = get_charts_and_stats(request) + data = {} # get_charts_and_stats(request) # Make sure email looks properly configured email_config_error = re.findall( From 4fae972e06f9bf25f7db0a5e6cd1454e672a8381 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Mon, 3 Nov 2025 20:19:23 +0200 Subject: [PATCH 094/962] isbn_10: fix datamigration and management command --- bookwyrm/management/commands/fix_isbn10_entries.py | 13 +++++++------ .../0219_datamigration_fix_isbn10_20251017_1810.py | 13 ++++++++----- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/bookwyrm/management/commands/fix_isbn10_entries.py b/bookwyrm/management/commands/fix_isbn10_entries.py index 2f865de815..dea0ed97c2 100644 --- a/bookwyrm/management/commands/fix_isbn10_entries.py +++ b/bookwyrm/management/commands/fix_isbn10_entries.py @@ -5,16 +5,17 @@ def find_long_isbn10_editions(): """Fix isbn-10 entries that have incorrect checksum""" - entries_to_fix = models.Edition.objects.annotate( - isbn10_length=Length("isbn_10") - ).filter(isbn10_length__gt=10) + entries_to_fix = ( + models.Edition.objects.annotate(isbn10_length=Length("isbn_10")) + .filter(isbn10_length__gt=10) + .filter(isbn_10__endswith="11") + ) print(f"{entries_to_fix.count()} editions to find") for edition_to_fix in entries_to_fix: - if edition_to_fix.isbn_10.endswith("11"): - edition_to_fix.isbn_10 = edition_to_fix.isbn_10[:9] + "0" - edition_to_fix.save(broadcast=True, update_fields=["isbn_10"]) + edition_to_fix.isbn_10 = edition_to_fix.isbn_10[:9] + "0" + edition_to_fix.save(broadcast=True, update_fields=["isbn_10"]) class Command(BaseCommand): diff --git a/bookwyrm/migrations/0219_datamigration_fix_isbn10_20251017_1810.py b/bookwyrm/migrations/0219_datamigration_fix_isbn10_20251017_1810.py index f375966d31..0a0516ee9e 100644 --- a/bookwyrm/migrations/0219_datamigration_fix_isbn10_20251017_1810.py +++ b/bookwyrm/migrations/0219_datamigration_fix_isbn10_20251017_1810.py @@ -6,14 +6,17 @@ def fix_isbn10_entries(apps, schema_editor): Edition = apps.get_model("bookwyrm", "Edition") - editions_to_fix = Edition.objects.annotate(isbn_10_length=Length("isbn_10")).filter( - isbn_10_length__gt=10 + db_alias = schema_editor.connection.alias + editions_to_fix = ( + Edition.objects.using(db_alias) + .annotate(isbn_10_length=Length("isbn_10")) + .filter(isbn_10_length__gt=10) + .filter(isbn_10__endswith="11") ) for edition_to_fix in editions_to_fix: - if edition_to_fix.isbn_10.endswith("11"): - edition_to_fix.isbn_10 = edition_to_fix.isbn_10[:9] + "0" - edition_to_fix.save(broadcast=False) + edition_to_fix.isbn_10 = edition_to_fix.isbn_10[:9] + "0" + edition_to_fix.save(update_fields=["isbn_10"]) class Migration(migrations.Migration): From 8ec51083e02b0fb7810125b1a83dd6a2a5ed0dfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Nov 2025 20:06:44 +0000 Subject: [PATCH 095/962] Bump django from 5.2.3 to 5.2.8 Bumps [django](https://github.com/django/django) from 5.2.3 to 5.2.8. - [Commits](https://github.com/django/django/compare/5.2.3...5.2.8) --- updated-dependencies: - dependency-name: django dependency-version: 5.2.8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0931b9de35..1fe88baf6b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ boto3==1.34.74 bw-file-resubmit==0.6.0rc2 celery==5.3.6 colorthief==0.2.1 -Django==5.2.3 +Django==5.2.8 django-celery-beat==2.8.1 django-compressor==4.4 django-csp==3.8 From 8773c6c9eb2871c0f76ca12e37534a4778ebae79 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 8 Nov 2025 04:05:09 -0800 Subject: [PATCH 096/962] New translations django.po (Slovak) --- locale/sk_SK/LC_MESSAGES/django.po | 77 +++++++++++++++--------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/locale/sk_SK/LC_MESSAGES/django.po b/locale/sk_SK/LC_MESSAGES/django.po index 2f6a2b4b2b..e0b42e92d2 100644 --- a/locale/sk_SK/LC_MESSAGES/django.po +++ b/locale/sk_SK/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-02 01:26+0000\n" +"PO-Revision-Date: 2025-11-08 12:05\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Slovak\n" "Language: sk\n" @@ -157,7 +157,7 @@ msgstr "Samo zmazanie" #: bookwyrm/models/base_model.py:20 msgid "Self deactivation" -msgstr "" +msgstr "Samo-deaktivácia" #: bookwyrm/models/base_model.py:21 msgid "Moderator suspension" @@ -195,10 +195,9 @@ msgstr "Brožovaná väzba" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" -msgstr "" +msgstr "%(value)s nevyzerá ako ISBN" #: bookwyrm/models/book.py:515 bookwyrm/models/book.py:555 #, python-format @@ -240,7 +239,7 @@ msgstr "" #: bookwyrm/models/bookwyrm_import_job.py:496 msgid "unauthorized" -msgstr "" +msgstr "neoprávnené" #: bookwyrm/models/bookwyrm_import_job.py:502 msgid "Unknown error importing book status" @@ -355,11 +354,11 @@ msgstr "Zastavené" msgid "Import stopped" msgstr "Nahrávanie zastavené" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Chyba pri načítaní knihy" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Pri knihe sa nepodarila nájsť zhoda" @@ -462,7 +461,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Recenzie" @@ -832,7 +831,7 @@ msgstr "Ich najkratšie čítanie tohto roku…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -928,24 +927,24 @@ msgid "View ISNI record" msgstr "Zobraziť ISNI záznam" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Zobraziť na ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Načítať dáta" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Zobraziť na OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Zobraziť na Inventaire" @@ -1054,7 +1053,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1078,7 +1077,7 @@ msgstr "Uložiť" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1118,31 +1117,31 @@ msgstr "" msgid "Confirm" msgstr "Potvrdiť" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Upraviť knihu" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Kliknite pre pridanie obalu" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Nepodarilo sa načítať obal" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Kliknite pre zväčšenie" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1151,17 +1150,17 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Pridať popis" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Popis:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1170,49 +1169,49 @@ msgstr[1] "%(count)s edícií" msgstr[2] "%(count)s edícií" msgstr[3] "%(count)s edície" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Túto edíciu ste dali do knihovníčky:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Vaša čitateľská aktivita" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Pridať dátumy čítania" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Nemáte žiadnu čítaciu činnosť pre túto knihu." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Vaše recenzie" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Vaše komentáre" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Vaše citácie" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Témy" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Miesta" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,11 +1226,11 @@ msgstr "Miesta" msgid "Lists" msgstr "Zoznamy" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Pridať do zoznamu" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 From b66229a2d08652435dee51d21a95384d9dfb8f98 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 15 Nov 2025 12:26:22 -0800 Subject: [PATCH 097/962] Change delete user flow to use confirmation checkbox --- bookwyrm/forms/edit_user.py | 6 ------ bookwyrm/models/user.py | 1 + .../templates/preferences/delete_user.html | 7 ++++--- .../settings/users/delete_user_form.html | 10 +++++----- .../views/preferences/test_delete_user.py | 6 +++--- bookwyrm/views/admin/reports.py | 20 +++++-------------- bookwyrm/views/preferences/delete_user.py | 16 ++++----------- 7 files changed, 22 insertions(+), 44 deletions(-) diff --git a/bookwyrm/forms/edit_user.py b/bookwyrm/forms/edit_user.py index 13ac285d82..da69243e11 100644 --- a/bookwyrm/forms/edit_user.py +++ b/bookwyrm/forms/edit_user.py @@ -65,12 +65,6 @@ class Meta: } -class DeleteUserForm(CustomForm): - class Meta: - model = models.User - fields = ["password"] - - class MoveUserForm(CustomForm): target = forms.CharField(widget=forms.TextInput) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 2f411fb5ad..dc24240918 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -417,6 +417,7 @@ def delete(self, *args, **kwargs): self.is_active = False self.allow_reactivation = False self.is_deleted = True + self.set_unusable_password() self.erase_user_data() self.erase_user_statuses() diff --git a/bookwyrm/templates/preferences/delete_user.html b/bookwyrm/templates/preferences/delete_user.html index 20ca8eac19..a564be55cd 100644 --- a/bookwyrm/templates/preferences/delete_user.html +++ b/bookwyrm/templates/preferences/delete_user.html @@ -32,10 +32,11 @@

      {% trans "Permanently delete account" %}

      {% csrf_token %}
      - - + - {% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_password" %}
      diff --git a/bookwyrm/templates/settings/users/delete_user_form.html b/bookwyrm/templates/settings/users/delete_user_form.html index 267e26ae93..ab25e8c54c 100644 --- a/bookwyrm/templates/settings/users/delete_user_form.html +++ b/bookwyrm/templates/settings/users/delete_user_form.html @@ -10,14 +10,14 @@ {% csrf_token %}

      {% blocktrans trimmed with username=user.localname %} - Are you sure you want to delete {{username}}'s account? This action cannot be undone. To proceed, please enter your password to confirm deletion. + Are you sure you want to delete {{username}}'s account? This action cannot be undone. {% endblocktrans %}

      - - - - {% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_password" %} +
      diff --git a/bookwyrm/tests/views/preferences/test_delete_user.py b/bookwyrm/tests/views/preferences/test_delete_user.py index 68a1ebc3bf..c523e14c37 100644 --- a/bookwyrm/tests/views/preferences/test_delete_user.py +++ b/bookwyrm/tests/views/preferences/test_delete_user.py @@ -74,9 +74,7 @@ def test_delete_user_page(self, _): def test_delete_user(self, *_): """use a form to update a user""" view = views.DeleteUser.as_view() - form = forms.DeleteUserForm() - form.data["password"] = "password" - request = self.factory.post("", form.data) + request = self.factory.post("") request.user = self.local_user middleware = SessionMiddleware(request) middleware.process_request(request) @@ -97,6 +95,7 @@ def test_delete_user(self, *_): self.local_user.refresh_from_db() self.assertFalse(self.local_user.is_active) + self.assertFalse(self.local_user.has_usable_password()) self.assertEqual(self.local_user.deactivation_reason, "self_deletion") def test_deactivate_user(self, _): @@ -113,6 +112,7 @@ def test_deactivate_user(self, _): self.local_user.refresh_from_db() self.assertFalse(self.local_user.is_active) + self.assertTrue(self.local_user.has_usable_password()) self.assertEqual(self.local_user.deactivation_reason, "self_deactivation") def test_reactivate_user_get(self, _): diff --git a/bookwyrm/views/admin/reports.py b/bookwyrm/views/admin/reports.py index 1a17f588e4..65332ad770 100644 --- a/bookwyrm/views/admin/reports.py +++ b/bookwyrm/views/admin/reports.py @@ -125,22 +125,12 @@ def moderator_delete_user(request, user_id, report_id=None): if not user.local: raise PermissionDenied() - form = forms.DeleteUserForm(request.POST, instance=user) + user.deactivation_reason = "moderator_deletion" + user.delete() - moderator = models.User.objects.get(id=request.user.id) - # check the moderator's password - if form.is_valid() and moderator.check_password(form.cleaned_data["password"]): - user.deactivation_reason = "moderator_deletion" - user.delete() - - # make a note of the fact that we did this - models.Report.record_action(report_id, USER_DELETION, request.user) - return redirect_to_referer(request, "settings-user", user.id) - - form.errors["password"] = ["Invalid password"] - - data = {"user": user, "group_form": forms.UserGroupForm(), "form": form} - return TemplateResponse(request, "settings/users/user.html", data) + # make a note of the fact that we did this + models.Report.record_action(report_id, USER_DELETION, request.user) + return redirect_to_referer(request, "settings-user", user.id) @login_required diff --git a/bookwyrm/views/preferences/delete_user.py b/bookwyrm/views/preferences/delete_user.py index c8b19ec09a..415b9babcf 100644 --- a/bookwyrm/views/preferences/delete_user.py +++ b/bookwyrm/views/preferences/delete_user.py @@ -19,25 +19,17 @@ class DeleteUser(View): def get(self, request): """delete page for a user""" data = { - "form": forms.DeleteUserForm(), "user": request.user, } return TemplateResponse(request, "preferences/delete_user.html", data) def post(self, request): """There's no going back from this""" - form = forms.DeleteUserForm(request.POST, instance=request.user) - # idk why but I couldn't get check_password to work on request.user user = models.User.objects.get(id=request.user.id) - if form.is_valid() and user.check_password(form.cleaned_data["password"]): - user.deactivation_reason = "self_deletion" - user.delete() - logout(request) - return redirect("/") - - form.errors["password"] = ["Invalid password"] - data = {"form": form, "user": request.user} - return TemplateResponse(request, "preferences/delete_user.html", data) + user.deactivation_reason = "self_deletion" + user.delete() + logout(request) + return redirect("/") @method_decorator(login_required, name="dispatch") From 4ceecb1ea000a0c93dd56081609ef893b8e4b278 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 15 Nov 2025 12:39:22 -0800 Subject: [PATCH 098/962] Adds migration to garble passwords of deleted users --- .../migrations/0220_auto_20251115_2033.py | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 bookwyrm/migrations/0220_auto_20251115_2033.py diff --git a/bookwyrm/migrations/0220_auto_20251115_2033.py b/bookwyrm/migrations/0220_auto_20251115_2033.py new file mode 100644 index 0000000000..f9cd0cea65 --- /dev/null +++ b/bookwyrm/migrations/0220_auto_20251115_2033.py @@ -0,0 +1,25 @@ +# Generated by Django 5.2.3 on 2025-11-15 20:33 + +from django.db import migrations +from django.contrib.auth.hashers import make_password + + +def set_unusable_passwords(apps, schema_editor): + user_model = apps.get_model("bookwyrm", "User") + deleted_users = user_model.objects.filter(is_deleted=True, allow_reactivation=False) + for user in deleted_users: + user.password = make_password(None) + user.save() + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0219_datamigration_fix_isbn10_20251017_1810"), + ] + + operations = [ + migrations.RunPython( + set_unusable_passwords, reverse_code=migrations.RunPython.noop + ) + ] From 101e8e45041eccafcda79d4c19a6e512b46274a1 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 15 Nov 2025 14:01:26 -0800 Subject: [PATCH 099/962] Removed test that is no longer relevant --- bookwyrm/tests/views/admin/test_reports.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/bookwyrm/tests/views/admin/test_reports.py b/bookwyrm/tests/views/admin/test_reports.py index 146e40a9bb..7205769a59 100644 --- a/bookwyrm/tests/views/admin/test_reports.py +++ b/bookwyrm/tests/views/admin/test_reports.py @@ -169,16 +169,3 @@ def test_delete_user(self, *_): self.rat.refresh_from_db() self.assertFalse(self.rat.is_active) self.assertEqual(self.rat.deactivation_reason, "moderator_deletion") - - def test_delete_user_error(self, *_): - """toggle whether a user is able to log in""" - self.assertTrue(self.rat.is_active) - request = self.factory.post("", {"password": "wrong password"}) - request.user = self.local_user - - result = views.moderator_delete_user(request, self.rat.id) - self.assertIsInstance(result, TemplateResponse) - validate_html(result.render()) - - self.rat.refresh_from_db() - self.assertTrue(self.rat.is_active) From 95f2d2613a96203c5eb6296d82bb1d27ea624edd Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 15 Nov 2025 13:22:01 -0800 Subject: [PATCH 100/962] Adds flow to force users to reset their passwords --- bookwyrm/forms/landing.py | 18 +++ .../0221_user_force_password_reset.py | 27 +++++ bookwyrm/models/user.py | 1 + .../landing/force_password_reset.html | 104 ++++++++++++++++++ bookwyrm/urls.py | 5 + bookwyrm/views/__init__.py | 2 +- bookwyrm/views/landing/login.py | 5 + bookwyrm/views/landing/password.py | 53 ++++++++- 8 files changed, 212 insertions(+), 3 deletions(-) create mode 100644 bookwyrm/migrations/0221_user_force_password_reset.py create mode 100644 bookwyrm/templates/landing/force_password_reset.html diff --git a/bookwyrm/forms/landing.py b/bookwyrm/forms/landing.py index 4f5b3223f8..6e43dbad49 100644 --- a/bookwyrm/forms/landing.py +++ b/bookwyrm/forms/landing.py @@ -96,6 +96,24 @@ def clean(self): validate_password(new_password) except ValidationError as err: self.add_error("password", err) + return cleaned_data + + +class ForcePasswordResetForm(PasswordResetForm): + current_password = forms.CharField(widget=forms.PasswordInput) + + def clean(self): + """Make sure we aren't re-using the same password""" + cleaned_data = super().clean() + current_password = cleaned_data.get("current_password") + new_password = cleaned_data.get("password") + + if current_password == new_password: + self.add_error( + "password", + _("Password cannot be the same as your current password"), + ) + return cleaned_data class Confirm2FAForm(CustomForm): diff --git a/bookwyrm/migrations/0221_user_force_password_reset.py b/bookwyrm/migrations/0221_user_force_password_reset.py new file mode 100644 index 0000000000..a809eed99a --- /dev/null +++ b/bookwyrm/migrations/0221_user_force_password_reset.py @@ -0,0 +1,27 @@ +# Generated by Django 5.2.3 on 2025-11-15 20:52 + +from django.db import migrations, models + + +def force_admin_reset(apps, schema_editor): + user_model = apps.get_model("bookwyrm", "User") + user_model.objects.filter( + models.Q(groups__name__in=["moderator", "admin"]) | models.Q(is_superuser=True), + is_active=True, + ).distinct().update(force_password_reset=True) + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0220_auto_20251115_2033"), + ] + + operations = [ + migrations.AddField( + model_name="user", + name="force_password_reset", + field=models.BooleanField(default=False), + ), + migrations.RunPython(force_admin_reset, reverse_code=migrations.RunPython.noop), + ] diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index dc24240918..c1e6d9fb1f 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -55,6 +55,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): username = fields.UsernameField() email = models.EmailField(unique=True, null=True) is_deleted = models.BooleanField(default=False) + force_password_reset = models.BooleanField(default=False) key_pair = fields.OneToOneField( "KeyPair", diff --git a/bookwyrm/templates/landing/force_password_reset.html b/bookwyrm/templates/landing/force_password_reset.html new file mode 100644 index 0000000000..325794fe7f --- /dev/null +++ b/bookwyrm/templates/landing/force_password_reset.html @@ -0,0 +1,104 @@ +{% load layout %} +{% load sass_tags %} +{% load i18n %} +{% load static %} + + + + + {% block title %}{% trans "Reset Password" %}{% endblock %} + + + + + +
      +
      +
      +
      + {% block header %} +

      {% trans "Reset Password" %}

      +

      + {% trans "You must set a new password before logging in." %} +

      + {% endblock %} +
      + +
      + {% if errors %} +
      + {% for error in errors %} +

      + {{ error }} +

      + {% endfor %} +
      + {% endif %} + +
      + {% csrf_token %} +
      + +
      + + {% include 'snippets/form_errors.html' with errors_list=form.current_password.errors id="desc_current_password" %} +
      +
      +
      +
      + +
      + + {% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_password" %} +
      +
      +
      + +
      + {{ form.confirm_password }} + {% include 'snippets/form_errors.html' with errors_list=form.confirm_password.errors id="desc_confirm_password" %} +
      +
      +
      +
      + +
      +
      +
      +
      +
      +
      +
      + {% include 'snippets/footer.html' %} + + diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 56680e24f8..632a3d234c 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -88,6 +88,11 @@ re_path( r"^password-reset/(?P[A-Za-z0-9]+)/?$", views.PasswordReset.as_view() ), + re_path( + r"^force-password-reset/?$", + views.ForcePasswordReset.as_view(), + name="force-password-reset", + ), # admin re_path( r"^settings/dashboard/?$", views.Dashboard.as_view(), name="settings-dashboard" diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 7deb7f49dd..261d572816 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -96,7 +96,7 @@ from .landing.login import Login, Logout from .landing.register import Register from .landing.register import ConfirmEmail, ConfirmEmailCode, ResendConfirmEmail -from .landing.password import PasswordResetRequest, PasswordReset +from .landing.password import PasswordResetRequest, PasswordReset, ForcePasswordReset # shelves from .shelf.shelf import Shelf diff --git a/bookwyrm/views/landing/login.py b/bookwyrm/views/landing/login.py index 15371cf98a..959622e9f5 100644 --- a/bookwyrm/views/landing/login.py +++ b/bookwyrm/views/landing/login.py @@ -47,6 +47,11 @@ def post(self, request): user = authenticate(request, username=username, password=password) if user is not None: + # do they need to reset their password? + if user.force_password_reset: + request.session["force_reset_password_user"] = user.username + return redirect("force-password-reset") + # if 2fa is set, don't log them in until they enter the right code if user.two_factor_auth: request.session["2fa_user"] = user.username diff --git a/bookwyrm/views/landing/password.py b/bookwyrm/views/landing/password.py index 7487b94144..15d89a11b6 100644 --- a/bookwyrm/views/landing/password.py +++ b/bookwyrm/views/landing/password.py @@ -1,8 +1,10 @@ """ class views for password management """ from django.contrib.auth import login -from django.core.exceptions import PermissionDenied +from django.core.exceptions import PermissionDenied, ObjectDoesNotExist +from django.http import HttpResponseBadRequest from django.shortcuts import redirect from django.template.response import TemplateResponse +from django.utils.translation import gettext_lazy as _ from django.views import View from bookwyrm import forms, models @@ -47,7 +49,7 @@ class PasswordReset(View): """set new password""" def get(self, request, code): - """endpoint for sending invites""" + """endpoint for password reset""" if request.user.is_authenticated: return redirect("/") try: @@ -80,3 +82,50 @@ def post(self, request, code): login(request, user) reset_code.delete() return redirect("/") + + +class ForcePasswordReset(View): + """require user to set new password""" + + def get(self, request): + """endpoint for forced password resets""" + if request.user.is_authenticated: + return redirect("/") + + # only show this view to users that need to reset their passwords + if not models.User.objects.filter( + username=request.session.get("force_reset_password_user"), + force_password_reset=True, + ).exists(): + return redirect("/") + + data = {"form": forms.ForcePasswordResetForm()} + return TemplateResponse(request, "landing/force_password_reset.html", data) + + def post(self, request): + """require a user to change their password""" + try: + user = models.User.objects.get( + username=request.session.get("force_reset_password_user"), + force_password_reset=True, + ) + except ObjectDoesNotExist: + return HttpResponseBadRequest("Invalid user") + + form = forms.ForcePasswordResetForm(request.POST, instance=user) + if not user.check_password(form.data["current_password"]): + form.add_error("current_password", _("Incorrect password")) + return TemplateResponse( + request, "landing/force_password_reset.html", {"form": form} + ) + if not form.is_valid(): + return TemplateResponse( + request, "landing/force_password_reset.html", {"form": form} + ) + + new_password = form.cleaned_data["password"] + user.set_password(new_password) + user.force_password_reset = False + user.save(broadcast=False, update_fields=["password", "force_password_reset"]) + login(request, user) + return redirect("/") From 009b1529b6d4474c7bf238a1b2d66b1c11cba1d3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 15 Nov 2025 15:13:43 -0800 Subject: [PATCH 101/962] I merged my own removal of the charts preemptively, this fixes the stats --- .../settings/dashboard/dashboard.html | 11 +++--- bookwyrm/views/admin/dashboard.py | 36 ++++++++++++------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/bookwyrm/templates/settings/dashboard/dashboard.html b/bookwyrm/templates/settings/dashboard/dashboard.html index f0c79ac1f6..0515a529c8 100644 --- a/bookwyrm/templates/settings/dashboard/dashboard.html +++ b/bookwyrm/templates/settings/dashboard/dashboard.html @@ -137,16 +137,15 @@

      {% trans "Works created" %}

      --> + {% endblock %} {% block scripts %} -{# -{% include 'settings/dashboard/user_chart.html' %} -{% include 'settings/dashboard/status_chart.html' %} -{% include 'settings/dashboard/registration_chart.html' %} -{% include 'settings/dashboard/works_chart.html' %} -#} + +{#{% include 'settings/dashboard/status_chart.html' %}#} +{#{% include 'settings/dashboard/registration_chart.html' %}#} +{#{% include 'settings/dashboard/works_chart.html' %}#} {% endblock %} diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index 5fa814ba4a..9786b55607 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -35,7 +35,8 @@ class Dashboard(View): ) def get(self, request): """list of users""" - data = {} # get_charts_and_stats(request) + data = get_stats() + # data |= get_charts(request) # Make sure email looks properly configured email_config_error = re.findall( @@ -91,7 +92,27 @@ def post(self, request): return redirect("settings-dashboard") -def get_charts_and_stats(request): +def get_stats(): + """Defines the dashboard charts""" + now = timezone.now() + user_queryset = models.User.objects.filter(local=True) + status_queryset = models.Status.objects.filter(user__local=True, deleted=False) + return { + "users": user_queryset.filter(is_active=True).count(), + "active_users": user_queryset.filter( + is_active=True, last_active_date__gte=now - timedelta(days=31) + ).count(), + "statuses": status_queryset.count(), + "works": models.Work.objects.count(), + "reports": models.Report.objects.filter(resolved=False).count(), + "pending_domains": models.LinkDomain.objects.filter(status="pending").count(), + "invite_requests": models.InviteRequest.objects.filter( + ignored=False, invite__isnull=True + ).count(), + } + + +def get_charts(request): """Defines the dashboard charts""" interval = int(request.GET.get("days", 1)) now = timezone.now() @@ -158,17 +179,6 @@ def get_charts_and_stats(request): "start": start.strftime("%Y-%m-%d"), "end": end.strftime("%Y-%m-%d"), "interval": interval, - "users": user_queryset.filter(is_active=True).count(), - "active_users": user_queryset.filter( - is_active=True, last_active_date__gte=now - timedelta(days=31) - ).count(), - "statuses": status_queryset.count(), - "works": models.Work.objects.count(), - "reports": models.Report.objects.filter(resolved=False).count(), - "pending_domains": models.LinkDomain.objects.filter(status="pending").count(), - "invite_requests": models.InviteRequest.objects.filter( - ignored=False, invite__isnull=True - ).count(), "user_stats": user_chart.get_chart(start, end, interval), "status_stats": status_chart.get_chart(start, end, interval), "register_stats": register_chart.get_chart(start, end, interval), From f9b53f946948977d3952ce0079903547ca34866e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 15 Nov 2025 16:57:21 -0800 Subject: [PATCH 102/962] Adds middleware to log out and user who needs to reset their passwordt --- bookwyrm/middleware/__init__.py | 1 + bookwyrm/middleware/force_logout.py | 15 +++++++++++++++ bookwyrm/settings.py | 1 + 3 files changed, 17 insertions(+) create mode 100644 bookwyrm/middleware/force_logout.py diff --git a/bookwyrm/middleware/__init__.py b/bookwyrm/middleware/__init__.py index 85c3a56fe8..5b9c658832 100644 --- a/bookwyrm/middleware/__init__.py +++ b/bookwyrm/middleware/__init__.py @@ -2,3 +2,4 @@ from .timezone_middleware import TimezoneMiddleware from .ip_middleware import IPBlocklistMiddleware from .file_too_big import FileTooBig +from .force_logout import ForceLogoutMiddleware diff --git a/bookwyrm/middleware/force_logout.py b/bookwyrm/middleware/force_logout.py new file mode 100644 index 0000000000..02cd28a31e --- /dev/null +++ b/bookwyrm/middleware/force_logout.py @@ -0,0 +1,15 @@ +""" Check if user needs to reset their password and log them out """ + +from django.contrib.auth import logout + + +class ForceLogoutMiddleware: + """Log out any users who are flagged as needing a password reset""" + + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + if request.user.is_authenticated and request.user.force_password_reset: + logout(request) + return self.get_response(request) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index b877c9f878..c170ec4f8f 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -126,6 +126,7 @@ "django.contrib.messages.middleware.MessageMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", "bookwyrm.middleware.FileTooBig", + "bookwyrm.middleware.ForceLogoutMiddleware", ] ROOT_URLCONF = "bookwyrm.urls" From 7c08530beff2542c0a8cb383a1f68a6df0ff9ce2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 15 Nov 2025 16:17:02 -0800 Subject: [PATCH 103/962] Adds admin panel for triggering forced password resets --- bookwyrm/templates/settings/layout.html | 6 +++ .../settings/users/force_password_reset.html | 42 +++++++++++++++++++ bookwyrm/urls.py | 5 +++ bookwyrm/views/__init__.py | 1 + bookwyrm/views/admin/user_admin.py | 35 ++++++++++++++++ 5 files changed, 89 insertions(+) create mode 100644 bookwyrm/templates/settings/users/force_password_reset.html diff --git a/bookwyrm/templates/settings/layout.html b/bookwyrm/templates/settings/layout.html index 489e77125c..f231623a62 100644 --- a/bookwyrm/templates/settings/layout.html +++ b/bookwyrm/templates/settings/layout.html @@ -47,6 +47,12 @@

      {% trans "Manage Users" %}

      {% trans "Federated Instances" %}
      4. {% endif %} + {% if perms.bookwyrm.moderate_user %} +
    4. + {% url 'settings-force-password-reset' as url %} + {% trans "Force Password Reset" %} +
      5. + {% endif %} {% endif %} {% if perms.bookwyrm.moderate_user %} diff --git a/bookwyrm/templates/settings/users/force_password_reset.html b/bookwyrm/templates/settings/users/force_password_reset.html new file mode 100644 index 0000000000..c39f9dd787 --- /dev/null +++ b/bookwyrm/templates/settings/users/force_password_reset.html @@ -0,0 +1,42 @@ +{% extends 'settings/layout.html' %} +{% load i18n %} +{% load utilities %} + +{% block title %} +{% trans "Force Password Reset" %} +{% endblock %} + +{% block header %} +{% trans "Force Password Reset" %} +{% endblock %} + +{% block panel %} + +

      + {% trans "All users in the selected category will be logged out and required to set a new password to log back in." %} + {% trans "If your account is in the group, you will be logged out out after submitting." %} +

      +{% if submitted %} +

      + {% trans "Users given password resets:" %} {{ force_count}} +

      +{% endif %} + +
      +
      + {% csrf_token %} +
      +
      + +
      +
      + +
      +
      + +{% endblock %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 632a3d234c..e2f1f5ee1a 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -225,6 +225,11 @@ views.ActivateUserAdmin.as_view(), name="settings-activate-user", ), + re_path( + r"^settings/force-password-reset/?$", + views.ForcePasswordResetAdmin.as_view(), + name="settings-force-password-reset", + ), re_path( r"^settings/federation/(?P(federated|blocked))?/?$", views.Federation.as_view(), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 261d572816..a368e880ce 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -53,6 +53,7 @@ from .admin.site import Site, Registration, RegistrationLimited from .admin.themes import Themes, delete_theme, test_theme from .admin.user_admin import UserAdmin, UserAdminList, ActivateUserAdmin +from .admin.user_admin import ForcePasswordResetAdmin # user preferences from .preferences.change_password import ChangePassword diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py index 9749101831..1f9308315f 100644 --- a/bookwyrm/views/admin/user_admin.py +++ b/bookwyrm/views/admin/user_admin.py @@ -1,5 +1,6 @@ """ manage user """ from django.contrib.auth.decorators import login_required, permission_required +from django.contrib.auth.models import Group from django.core.paginator import Paginator from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse @@ -117,3 +118,37 @@ def post(self, request, user_id): user = get_object_or_404(models.User, id=user_id) user.reactivate() return redirect("settings-user", user.id) + + +@method_decorator(login_required, name="dispatch") +@method_decorator( + permission_required("bookwyrm.moderate_user", raise_exception=True), + name="dispatch", +) +class ForcePasswordResetAdmin(View): + """Require a group of users to reset their passwords""" + + def get(self, request): + """user view""" + data = {"groups": Group.objects.all()} + return TemplateResponse( + request, "settings/users/force_password_reset.html", data + ) + + def post(self, request): + """force password reset and log out groups of users""" + group = request.POST.get("group") + user_queryset = models.User.objects.filter(local=True) + if group: + user_queryset = user_queryset.filter(group__name=group) + + user_queryset.update(force_password_reset=True) + + data = { + "groups": Group.objects.all(), + "force_count": user_queryset.count(), + "submitted": True, + } + return TemplateResponse( + request, "settings/users/force_password_reset.html", data + ) From 36e4fabf30768bbd3348c3dab7fa00fa266f2e05 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 15 Nov 2025 18:36:05 -0800 Subject: [PATCH 104/962] Bump version to 0.8.2. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6f4eebdf6f..100435be13 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.8.1 +0.8.2 From c840e3cb7498dd1081a3f02723f7bc0f61e73326 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 15 Nov 2025 18:59:40 -0800 Subject: [PATCH 105/962] Tweak to forced password reset migration --- bookwyrm/migrations/0220_auto_20251115_2033.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bookwyrm/migrations/0220_auto_20251115_2033.py b/bookwyrm/migrations/0220_auto_20251115_2033.py index f9cd0cea65..881b7f01ec 100644 --- a/bookwyrm/migrations/0220_auto_20251115_2033.py +++ b/bookwyrm/migrations/0220_auto_20251115_2033.py @@ -6,7 +6,9 @@ def set_unusable_passwords(apps, schema_editor): user_model = apps.get_model("bookwyrm", "User") - deleted_users = user_model.objects.filter(is_deleted=True, allow_reactivation=False) + deleted_users = user_model.objects.filter( + is_deleted=True, allow_reactivation=False, local=True + ) for user in deleted_users: user.password = make_password(None) user.save() From ec4e1ee8297a1412d7382e733c15d99c95b560d3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 09:16:06 -0800 Subject: [PATCH 106/962] Adds confirm step and includes implicit "users" group --- .../settings/users/force_password_reset.html | 25 ++++++++++++++++--- bookwyrm/views/admin/user_admin.py | 20 ++++++++++++--- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/settings/users/force_password_reset.html b/bookwyrm/templates/settings/users/force_password_reset.html index c39f9dd787..8aa9e8302c 100644 --- a/bookwyrm/templates/settings/users/force_password_reset.html +++ b/bookwyrm/templates/settings/users/force_password_reset.html @@ -1,6 +1,7 @@ {% extends 'settings/layout.html' %} {% load i18n %} {% load utilities %} +{% load humanize %} {% block title %} {% trans "Force Password Reset" %} @@ -23,20 +24,38 @@ {% endif %}
      -
      - {% csrf_token %} + {% if count != 0 and not count %} +
      +
      + + {% else %} + +

      {% trans "Number of users that will be effected:" %} {{ count|intcomma }}

      +
      + {% csrf_token %} + +

      + {% trans "Are you sure you want to force password reset for these users:" %} +

      + +
      + + {% endif %}
      {% endblock %} diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py index 1f9308315f..eae2c67f6e 100644 --- a/bookwyrm/views/admin/user_admin.py +++ b/bookwyrm/views/admin/user_admin.py @@ -130,7 +130,17 @@ class ForcePasswordResetAdmin(View): def get(self, request): """user view""" - data = {"groups": Group.objects.all()} + group = request.GET.get("group") + data = {"groups": Group.objects.all(), "group": group} + + user_queryset = models.User.objects.filter(local=True, is_deleted=False) + if group == "all": + data["count"] = user_queryset.count() + elif group == "user": + data["count"] = user_queryset.filter(groups__isnull=True).count() + elif group: + data["count"] = user_queryset.filter(groups__name=group).count() + return TemplateResponse( request, "settings/users/force_password_reset.html", data ) @@ -138,9 +148,11 @@ def get(self, request): def post(self, request): """force password reset and log out groups of users""" group = request.POST.get("group") - user_queryset = models.User.objects.filter(local=True) - if group: - user_queryset = user_queryset.filter(group__name=group) + user_queryset = models.User.objects.filter(local=True, is_deleted=False) + if group == "user": + user_queryset = user_queryset.filter(groups__isnull=True) + elif group != "all": + user_queryset = user_queryset.filter(groups__name=group) user_queryset.update(force_password_reset=True) From 3972296272a544bcf6f8b7dde7002ba3cc8ec207 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 09:32:25 -0800 Subject: [PATCH 107/962] Adds test for force password admin page --- bookwyrm/tests/views/admin/test_user_admin.py | 94 ++++++++++++++++++- 1 file changed, 89 insertions(+), 5 deletions(-) diff --git a/bookwyrm/tests/views/admin/test_user_admin.py b/bookwyrm/tests/views/admin/test_user_admin.py index 48fd7202e3..b0defc30ba 100644 --- a/bookwyrm/tests/views/admin/test_user_admin.py +++ b/bookwyrm/tests/views/admin/test_user_admin.py @@ -18,6 +18,11 @@ class UserAdminViews(TestCase): @classmethod def setUpTestData(cls): """we need basic test data and mocks""" + initdb.init_groups() + initdb.init_permissions() + moderator = Group.objects.get(name="moderator") + editor = Group.objects.get(name="editor") + models.SiteSettings.objects.create() with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), @@ -30,11 +35,30 @@ def setUpTestData(cls): local=True, localname="mouse", ) - initdb.init_groups() - initdb.init_permissions() - group = Group.objects.get(name="moderator") - cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() + cls.user_user = models.User.objects.create_user( + "user@local.com", + "user@user.user", + "password", + local=True, + localname="user", + ) + cls.user_editor = models.User.objects.create_user( + "editor@local.com", + "editor@editor.editor", + "password", + local=True, + localname="editor", + ) + cls.user_editor_2 = models.User.objects.create_user( + "editor_2@local.com", + "editor_2@editor_2.editor_2", + "password", + local=True, + localname="editor_2", + ) + cls.local_user.groups.set([moderator]) + cls.user_editor.groups.set([editor]) + cls.user_editor_2.groups.set([editor]) def setUp(self): """individual test setup""" @@ -120,3 +144,63 @@ def test_user_admin_page_post_with_report(self, *_): report=report, action_type=USER_PERMS ).exists() ) + + def test_force_password_reset_page(self): + """Force password resets from admin panel""" + view = views.ForcePasswordResetAdmin.as_view() + request = self.factory.get("") + request.user = self.local_user + + result = view(request) + validate_html(result.render()) + + def test_force_password_reset_page_confirm(self): + """Confirm selection for force password reset page""" + view = views.ForcePasswordResetAdmin.as_view() + request = self.factory.get("", {"group": "all"}) + request.user = self.local_user + + result = view(request) + validate_html(result.render()) + self.assertEqual(result.context_data["count"], 4) + + request = self.factory.get("", {"group": "moderator"}) + request.user = self.local_user + result = view(request) + validate_html(result.render()) + self.assertEqual(result.context_data["count"], 1) + + request = self.factory.get("", {"group": "editor"}) + request.user = self.local_user + result = view(request) + validate_html(result.render()) + self.assertEqual(result.context_data["count"], 2) + + request = self.factory.get("", {"group": "user"}) + request.user = self.local_user + result = view(request) + validate_html(result.render()) + self.assertEqual(result.context_data["count"], 1) + + def test_force_password_reset_page_post(self): + """Force reset for users""" + view = views.ForcePasswordResetAdmin.as_view() + request = self.factory.post("", {"group": "editor"}) + request.user = self.local_user + + result = view(request) + validate_html(result.render()) + + self.assertEqual(result.context_data["force_count"], 2) + + self.user_editor.refresh_from_db() + self.assertTrue(self.user_editor.force_password_reset) + + self.user_editor_2.refresh_from_db() + self.assertTrue(self.user_editor_2.force_password_reset) + + self.user_user.refresh_from_db() + self.assertFalse(self.user_user.force_password_reset) + + self.local_user.refresh_from_db() + self.assertFalse(self.local_user.force_password_reset) From e9cc36a70a2a17f87788f8269f87f66dbd87cadd Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 10:31:50 -0800 Subject: [PATCH 108/962] Adds missing merge migration --- bookwyrm/migrations/0222_merge_20251116_1831.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0222_merge_20251116_1831.py diff --git a/bookwyrm/migrations/0222_merge_20251116_1831.py b/bookwyrm/migrations/0222_merge_20251116_1831.py new file mode 100644 index 0000000000..c5f28dd872 --- /dev/null +++ b/bookwyrm/migrations/0222_merge_20251116_1831.py @@ -0,0 +1,13 @@ +# Generated by Django 5.2.3 on 2025-11-16 18:31 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0219_findmissingcoversjob"), + ("bookwyrm", "0221_user_force_password_reset"), + ] + + operations = [] From 1c1ff16dce763e3942998de23e7b7db495ead780 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:23:54 -0800 Subject: [PATCH 109/962] Updates and re-compiles locale files Plus some temporary fixes that I also made in Crowdin on the Turkish locale --- locale/en_US/LC_MESSAGES/django.po | 300 ++++++++++++++++++++--------- locale/tr_TR/LC_MESSAGES/django.mo | Bin 62797 -> 62514 bytes locale/tr_TR/LC_MESSAGES/django.po | 6 +- 3 files changed, 211 insertions(+), 95 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 37e5cafd3f..a8ba5733aa 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: 2025-11-02 01:26+0000\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -38,15 +38,15 @@ msgstr "" msgid "Unlimited" msgstr "" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -82,7 +82,11 @@ msgstr "" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -326,12 +330,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +357,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -476,19 +490,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +511,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -639,54 +653,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -1084,6 +1098,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,10 +1115,12 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" @@ -1629,6 +1646,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1802,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2053,6 +2071,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2099,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3156,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3536,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3645,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4508,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4536,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4726,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5098,7 +5131,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5116,13 +5149,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5204,42 +5237,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5284,7 +5326,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5313,7 +5355,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5473,7 +5515,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5487,31 +5529,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5585,7 +5627,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5611,7 +5653,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5838,7 +5880,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6112,7 +6190,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6137,49 +6215,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6187,7 +6271,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6603,11 +6687,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 diff --git a/locale/tr_TR/LC_MESSAGES/django.mo b/locale/tr_TR/LC_MESSAGES/django.mo index 1d2d484f7bf470ad2928467d76ff9eb9b22d4436..814582467b38d6db722f89127997a3e8ab59c696 100644 GIT binary patch delta 12761 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 Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" -msgstr "..." +msgstr "" #: bookwyrm/templates/preferences/export-user.html:6 #: bookwyrm/templates/preferences/export-user.html:9 @@ -4665,12 +4665,12 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:72 #, python-format msgid "On average, recent exports have taken %(hours)s hours." -msgstr "Ortalama olarak, son dışa aktarmalar%(saat) saat sürmüştür." +msgstr "Ortalama olarak, son dışa aktarmalar %(hours)s saat sürmüştür." #: bookwyrm/templates/preferences/export-user.html:76 #, python-format msgid "On average, recent exports have taken %(minutes)s minutes." -msgstr "." +msgstr "" #: bookwyrm/templates/preferences/export-user.html:88 msgid "Create user export file" From 37228fd323d54953b9b2115879677efad04eab11 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:25:09 -0800 Subject: [PATCH 110/962] Allow an instance to disable federation (#3421) * Adds site setting to disable federation * Don't use bookwyrm connectors when federation is disabled * Adds decorator for views that require federation to be enabled * Adds help text to federation settings page * Use PermissionDenied instead of Connector exception for disallow federation * Disable activitypub requests in get_data * Show banner on remote user page if federation is disabled * Hide remote follow button when federation is disabled * Disable API view when federation is disabled * Adds typing to site model file Did I do this right? * Use classmethod for disable federation check * Use custom get method so tests pass * Changes accessor to site model object * Fixes decorator eating function results * Fixes migration path * Removes require federation from wellknown endpoint Plus a linting fix * Updates tests * Re-adds line accidentally removed in merge * Move the migration file again * Restores correct order of admin menu bar * No need to disable federation for search endpoint * Fixes logic in suggestion users query --- bookwyrm/connectors/abstract_connector.py | 7 ++- bookwyrm/connectors/bookwyrm_connector.py | 4 ++ bookwyrm/connectors/connector_manager.py | 6 ++- bookwyrm/connectors/inventaire.py | 6 +-- bookwyrm/connectors/openlibrary.py | 4 +- bookwyrm/context_processors.py | 2 +- bookwyrm/decorators.py | 14 +++++ bookwyrm/emailing.py | 2 +- bookwyrm/forms/admin.py | 14 +++++ bookwyrm/importers/importer.py | 2 +- bookwyrm/management/commands/admin_code.py | 2 +- .../0223_sitesettings_disable_federation.py | 18 +++++++ bookwyrm/models/activitypub_mixin.py | 11 ++++ bookwyrm/models/site.py | 53 +++++++++++-------- bookwyrm/preview_images.py | 4 +- bookwyrm/suggested_users.py | 2 + bookwyrm/templates/get_started/users.html | 4 ++ .../ostatus/remote_follow_button.html | 2 +- .../settings/federation/settings.html | 51 ++++++++++++++++++ bookwyrm/templates/settings/layout.html | 21 +++++--- .../templates/snippets/follow_button.html | 2 + bookwyrm/templates/user/user.html | 9 ++++ .../tests/importers/test_bookwyrm_import.py | 1 - .../tests/importers/test_calibre_import.py | 1 - .../tests/importers/test_goodreads_import.py | 1 - bookwyrm/tests/importers/test_importer.py | 3 +- .../importers/test_librarything_import.py | 1 - .../importers/test_openlibrary_import.py | 1 - .../tests/importers/test_storygraph_import.py | 1 - bookwyrm/tests/test_context_processors.py | 2 +- bookwyrm/tests/test_emailing.py | 1 - bookwyrm/tests/test_merge.py | 2 - bookwyrm/tests/test_preview_images.py | 2 +- bookwyrm/tests/test_signing.py | 2 +- .../tests/views/admin/test_announcements.py | 2 - bookwyrm/tests/views/admin/test_automod.py | 1 - bookwyrm/tests/views/admin/test_celery.py | 1 - bookwyrm/tests/views/admin/test_dashboard.py | 2 - .../tests/views/admin/test_email_blocks.py | 2 - .../tests/views/admin/test_email_config.py | 1 - bookwyrm/tests/views/admin/test_federation.py | 2 - bookwyrm/tests/views/admin/test_imports.py | 1 - .../tests/views/admin/test_ip_blocklist.py | 2 - .../tests/views/admin/test_link_domains.py | 2 - bookwyrm/tests/views/admin/test_reports.py | 1 - bookwyrm/tests/views/admin/test_site.py | 4 +- bookwyrm/tests/views/admin/test_themes.py | 2 +- bookwyrm/tests/views/admin/test_user_admin.py | 1 - bookwyrm/tests/views/books/test_book.py | 2 - bookwyrm/tests/views/books/test_edit_book.py | 1 - bookwyrm/tests/views/books/test_editions.py | 2 - bookwyrm/tests/views/books/test_links.py | 2 - bookwyrm/tests/views/imports/test_import.py | 1 - .../tests/views/imports/test_import_review.py | 1 - .../views/imports/test_import_troubleshoot.py | 1 - .../tests/views/imports/test_user_import.py | 2 +- bookwyrm/tests/views/inbox/test_inbox.py | 1 - bookwyrm/tests/views/inbox/test_inbox_add.py | 2 - .../tests/views/inbox/test_inbox_announce.py | 2 - .../tests/views/inbox/test_inbox_block.py | 2 - .../tests/views/inbox/test_inbox_create.py | 1 - .../tests/views/inbox/test_inbox_delete.py | 2 - .../tests/views/inbox/test_inbox_follow.py | 2 - bookwyrm/tests/views/inbox/test_inbox_like.py | 2 - .../tests/views/inbox/test_inbox_remove.py | 2 - .../tests/views/inbox/test_inbox_update.py | 2 - bookwyrm/tests/views/landing/test_invite.py | 1 - bookwyrm/tests/views/landing/test_landing.py | 3 +- bookwyrm/tests/views/landing/test_login.py | 4 +- bookwyrm/tests/views/landing/test_password.py | 1 - bookwyrm/tests/views/landing/test_register.py | 7 +-- bookwyrm/tests/views/lists/test_curate.py | 2 - bookwyrm/tests/views/lists/test_embed.py | 2 - bookwyrm/tests/views/lists/test_list.py | 2 - bookwyrm/tests/views/lists/test_list_item.py | 2 - bookwyrm/tests/views/lists/test_lists.py | 2 - .../tests/views/preferences/test_block.py | 2 - .../views/preferences/test_change_password.py | 1 - .../views/preferences/test_delete_user.py | 2 - .../tests/views/preferences/test_edit_user.py | 2 - .../views/preferences/test_export_user.py | 2 +- bookwyrm/tests/views/shelf/test_shelf.py | 1 - .../tests/views/shelf/test_shelf_actions.py | 1 - bookwyrm/tests/views/test_annual_summary.py | 1 - bookwyrm/tests/views/test_author.py | 1 - bookwyrm/tests/views/test_directory.py | 1 - bookwyrm/tests/views/test_discover.py | 1 - bookwyrm/tests/views/test_feed.py | 1 - bookwyrm/tests/views/test_follow.py | 1 - bookwyrm/tests/views/test_get_started.py | 1 - bookwyrm/tests/views/test_goal.py | 1 - bookwyrm/tests/views/test_group.py | 1 - bookwyrm/tests/views/test_hashtag.py | 2 - bookwyrm/tests/views/test_isbn.py | 1 - bookwyrm/tests/views/test_notifications.py | 1 - bookwyrm/tests/views/test_report.py | 1 - bookwyrm/tests/views/test_rss_feed.py | 1 - bookwyrm/tests/views/test_search.py | 1 - bookwyrm/tests/views/test_setup.py | 4 +- bookwyrm/tests/views/test_status.py | 1 - bookwyrm/tests/views/test_updates.py | 1 - bookwyrm/tests/views/test_user.py | 1 - bookwyrm/tests/views/test_wellknown.py | 1 - bookwyrm/urls.py | 5 ++ bookwyrm/views/__init__.py | 1 + bookwyrm/views/admin/dashboard.py | 2 +- bookwyrm/views/admin/federation_settings.py | 36 +++++++++++++ bookwyrm/views/admin/imports.py | 14 ++--- bookwyrm/views/admin/site.py | 12 ++--- bookwyrm/views/follow.py | 5 ++ bookwyrm/views/helpers.py | 13 ++++- bookwyrm/views/imports/import_data.py | 4 +- bookwyrm/views/inbox.py | 2 + bookwyrm/views/landing/about.py | 2 +- bookwyrm/views/landing/landing.py | 2 +- bookwyrm/views/preferences/export.py | 2 +- bookwyrm/views/search.py | 6 ++- bookwyrm/views/setup.py | 6 +-- bookwyrm/views/wellknown.py | 7 +++ 119 files changed, 314 insertions(+), 178 deletions(-) create mode 100644 bookwyrm/decorators.py create mode 100644 bookwyrm/migrations/0223_sitesettings_disable_federation.py create mode 100644 bookwyrm/templates/settings/federation/settings.html create mode 100644 bookwyrm/views/admin/federation_settings.py diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 178601f2ff..6bd9f54eb4 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -190,7 +190,7 @@ def get_or_create_book(self, remote_id: str) -> Optional[models.Book]: def get_book_data(self, remote_id: str) -> JsonDict: # pylint: disable=no-self-use """this allows connectors to override the default behavior""" - return get_data(remote_id) + return get_data(remote_id, is_activitypub=False) def create_edition_from_data( self, @@ -309,8 +309,13 @@ def get_data( url: str, params: Optional[dict[str, str]] = None, timeout: int = settings.QUERY_TIMEOUT, + is_activitypub: bool = True, ) -> JsonDict: """wrapper for request.get""" + # make sure this isn't a forbidden federated request + if is_activitypub: + models.SiteSettings.raise_federation_disabled() + # check if the url is blocked raise_not_valid_url(url) diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py index 4064f4b4c5..9aaa562648 100644 --- a/bookwyrm/connectors/bookwyrm_connector.py +++ b/bookwyrm/connectors/bookwyrm_connector.py @@ -10,6 +10,10 @@ class Connector(AbstractMinimalConnector): """this is basically just for search""" + def __init__(self, identifier: str): + models.SiteSettings.raise_federation_disabled() + super().__init__(identifier) + def get_or_create_book(self, remote_id: str) -> models.Edition: return activitypub.resolve_remote_id(remote_id, model=models.Edition) diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py index 9965586da2..a0ff1d4bb1 100644 --- a/bookwyrm/connectors/connector_manager.py +++ b/bookwyrm/connectors/connector_manager.py @@ -111,7 +111,11 @@ def first_search_result( def get_connectors() -> Iterator[abstract_connector.AbstractConnector]: """load all connectors""" - for info in models.Connector.objects.filter(active=True).order_by("priority").all(): + queryset = models.Connector.objects.filter(active=True) + if models.SiteSettings.get().disable_federation: + queryset = queryset.exclude(connector_file="bookwyrm_connector") + + for info in queryset.order_by("priority").all(): yield load_connector(info) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 53aade98d0..3f4c179e8c 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -66,7 +66,7 @@ def get_remote_id(self, value: str) -> str: return f"{self.books_url}?action=by-uris&uris={value}" def get_book_data(self, remote_id: str) -> JsonDict: - data = get_data(remote_id) + data = get_data(remote_id, is_activitypub=False) extracted = list(data.get("entities", {}).values()) try: data = extracted[0] @@ -131,7 +131,7 @@ def load_edition_data(self, work_uri: str) -> JsonDict: """get a list of editions for a work""" # pylint: disable=line-too-long url = f"{self.books_url}?action=reverse-claims&property=wdt:P629&value={work_uri}&sort=true" - return get_data(url) + return get_data(url, is_activitypub=False) def get_edition_from_work_data(self, data: JsonDict) -> JsonDict: work_uri = data.get("uri") @@ -230,7 +230,7 @@ def get_description(self, links: JsonDict) -> str: title = link.get("title") url = f"{self.base_url}/api/data?action=wp-extract&lang=en&title={title}" try: - data = get_data(url) + data = get_data(url, is_activitypub=False) except ConnectorException: return "" return str(data.get("extract", "")) diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index b6ecc4cd54..4778a32332 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -103,10 +103,10 @@ def __init__(self, identifier: str): ] def get_book_data(self, remote_id: str) -> JsonDict: - data = get_data(remote_id) + data = get_data(remote_id, is_activitypub=False) if data.get("type", {}).get("key") == "/type/redirect": remote_id = self.base_url + data.get("location", "") - return get_data(remote_id) + return get_data(remote_id, is_activitypub=False) return data def get_remote_id_from_data(self, data: JsonDict) -> str: diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index bec704a2c7..1dac54997d 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -8,7 +8,7 @@ def site_settings(request): if not request.is_secure(): request_protocol = "http://" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() theme = "css/themes/bookwyrm-light.scss" if ( hasattr(request, "user") diff --git a/bookwyrm/decorators.py b/bookwyrm/decorators.py new file mode 100644 index 0000000000..b8285cfb85 --- /dev/null +++ b/bookwyrm/decorators.py @@ -0,0 +1,14 @@ +""" Custom view decorators """ +from functools import wraps +from bookwyrm.models.site import SiteSettings + + +def require_federation(function): + """Ensure that federation is allowed before proceeding with this view""" + + @wraps(function) + def wrap(request, *args, **kwargs): + SiteSettings.raise_federation_disabled() + return function(request, *args, **kwargs) + + return wrap diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py index ccc0aea612..4a0ae7423e 100644 --- a/bookwyrm/emailing.py +++ b/bookwyrm/emailing.py @@ -9,7 +9,7 @@ def email_data(): """fields every email needs""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() return { "site_name": site.name, "logo": site.logo_small_url, diff --git a/bookwyrm/forms/admin.py b/bookwyrm/forms/admin.py index 783c78d50b..e3586cd342 100644 --- a/bookwyrm/forms/admin.py +++ b/bookwyrm/forms/admin.py @@ -177,6 +177,20 @@ class Meta: exclude = ["remote_id"] +class FederationSettings(CustomForm): + class Meta: + model = models.SiteSettings + fields = [ + "disable_federation", + ] + + widgets = { + "disable_federation": forms.CheckboxInput( + attrs={"aria-describedby": "desc_disable_federation"} + ), + } + + class AutoModRuleForm(CustomForm): class Meta: model = models.AutoMod diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index d2a11d7f21..e321303f1f 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -141,7 +141,7 @@ def normalize_row( # pylint: disable=no-self-use def get_import_limit(self, user: User) -> tuple[int, int]: """check if import limit is set and return how many imports are left""" - site_settings = SiteSettings.objects.get() + site_settings = SiteSettings.get() import_size_limit = site_settings.import_size_limit import_limit_reset = site_settings.import_limit_reset enforce_limit = import_size_limit and import_limit_reset diff --git a/bookwyrm/management/commands/admin_code.py b/bookwyrm/management/commands/admin_code.py index ee69b78cb9..75322163f5 100644 --- a/bookwyrm/management/commands/admin_code.py +++ b/bookwyrm/management/commands/admin_code.py @@ -6,7 +6,7 @@ def get_admin_code(): """get that code""" - return models.SiteSettings.objects.get().admin_code + return models.SiteSettings.get().admin_code class Command(BaseCommand): diff --git a/bookwyrm/migrations/0223_sitesettings_disable_federation.py b/bookwyrm/migrations/0223_sitesettings_disable_federation.py new file mode 100644 index 0000000000..118bdf0cb1 --- /dev/null +++ b/bookwyrm/migrations/0223_sitesettings_disable_federation.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.3 on 2025-11-16 18:49 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0222_merge_20251116_1831"), + ] + + operations = [ + migrations.AddField( + model_name="sitesettings", + name="disable_federation", + field=models.BooleanField(default=False), + ), + ] diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index 71f7b0ed90..dfce4d5af9 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -15,6 +15,7 @@ from Crypto.Signature import pkcs1_15 from Crypto.Hash import SHA256 from django.apps import apps +from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator from django.db.models import Q from django.utils.http import http_date @@ -129,6 +130,11 @@ def find_existing(cls, data): def broadcast(self, activity, sender, software=None, queue=BROADCAST): """send out an activity""" + site_model = apps.get_model("bookwyrm.SiteSettings", require_ready=True) + try: + site_model.raise_federation_disabled() + except PermissionDenied: + return # if we're posting about ShelfBooks, set a delay to give the base activity # time to add the book on remote servers first to avoid race conditions @@ -528,6 +534,11 @@ def unfurl_related_field(related_field, sort_field=None): @app.task(queue=BROADCAST) def broadcast_task(sender_id: int, activity: str, recipients: list[str]): """the celery task for broadcast""" + # checking this here ought to be redundant unless there are already-spawned tasks + # when federation is turned off. In that case this should prevent them from running. + site_model = apps.get_model("bookwyrm.SiteSettings", require_ready=True) + site_model.raise_federation_disabled() + user_model = apps.get_model("bookwyrm.User", require_ready=True) sender = user_model.objects.select_related("key_pair").get(id=sender_id) asyncio.run(async_broadcast(recipients, sender, activity)) diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index 31e77e7e2b..dafa185fee 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -1,6 +1,7 @@ """ the particulars for this instance of BookWyrm """ +from __future__ import annotations import datetime -from typing import Optional, Iterable +from typing import Any, Optional, Iterable from urllib.parse import urljoin import uuid @@ -31,7 +32,7 @@ class Meta: abstract = True # pylint: disable=no-self-use - def raise_not_editable(self, viewer): + def raise_not_editable(self, viewer: User) -> None: """Check if the user has the right permissions""" if viewer.has_perm("bookwyrm.edit_instance_settings"): return @@ -83,6 +84,7 @@ class SiteSettings(SiteModel): invite_question_text = models.CharField( max_length=255, blank=True, default="What is your favourite book?" ) + # images logo = models.ImageField(upload_to="logos/", null=True, blank=True) logo_small = models.ImageField(upload_to="logos/", null=True, blank=True) @@ -103,12 +105,13 @@ class SiteSettings(SiteModel): import_limit_reset = models.IntegerField(default=0) user_exports_enabled = models.BooleanField(default=False) user_import_time_limit = models.IntegerField(default=48) + disable_federation = models.BooleanField(default=False) export_files_lifetime_hours = models.IntegerField(default=72) field_tracker = FieldTracker(fields=["name", "instance_tagline", "logo"]) @classmethod - def get(cls): + def get(cls) -> SiteSettings: """gets the site settings db entry or defaults""" try: return cls.objects.get(id=1) @@ -117,29 +120,37 @@ def get(cls): default_settings.save() return default_settings + @classmethod + def raise_federation_disabled(cls) -> None: + """Don't connect to the outside world""" + if cls.get().disable_federation: + raise PermissionDenied("Federation is disabled") + @property - def logo_url(self): + def logo_url(self) -> Any: """helper to build the logo url""" return self.get_url("logo", "images/logo.png") @property - def logo_small_url(self): + def logo_small_url(self) -> Any: """helper to build the logo url""" return self.get_url("logo_small", "images/logo-small.png") @property - def favicon_url(self): + def favicon_url(self) -> Any: """helper to build the logo url""" return self.get_url("favicon", "images/favicon.png") - def get_url(self, field, default_path): + def get_url(self, field: str, default_path: str) -> Any: """get a media url or a default static path""" uploaded = getattr(self, field, None) if uploaded: return get_absolute_url(uploaded) return urljoin(STATIC_FULL_URL, default_path) - def save(self, *args, update_fields: Optional[Iterable[str]] = None, **kwargs): + def save( + self, *args, update_fields: Optional[Iterable[str]] = None, **kwargs + ) -> None: """if require_confirm_email is disabled, make sure no users are pending, if enabled, make sure invite_question_text is not empty""" if not self.invite_question_text: @@ -162,7 +173,7 @@ class Theme(SiteModel): path = models.CharField(max_length=50, unique=True) loads = models.BooleanField(null=True, blank=True) - def __str__(self): + def __str__(self) -> str: # pylint: disable=invalid-str-returned return self.name @@ -179,20 +190,20 @@ class SiteInvite(models.Model): invitees = models.ManyToManyField(User, related_name="invitees") # pylint: disable=no-self-use - def raise_not_editable(self, viewer): + def raise_not_editable(self, viewer: User) -> None: """Admins only""" if viewer.has_perm("bookwyrm.create_invites"): return raise PermissionDenied() - def valid(self): + def valid(self) -> bool: """make sure it hasn't expired or been used""" return (self.expiry is None or self.expiry > timezone.now()) and ( self.use_limit is None or self.times_used < self.use_limit ) @property - def link(self): + def link(self) -> str: """formats the invite link""" return f"{BASE_URL}/invite/{self.code}" @@ -208,20 +219,20 @@ class InviteRequest(BookWyrmModel): invite_sent = models.BooleanField(default=False) ignored = models.BooleanField(default=False) - def raise_not_editable(self, viewer): + def raise_not_editable(self, viewer: User) -> None: """Only check perms on edit, not create""" if not self.id or viewer.has_perm("bookwyrm.create_invites"): return raise PermissionDenied() - def save(self, *args, **kwargs): + def save(self, *args, **kwargs) -> None: """don't create a request for a registered email""" if not self.id and User.objects.filter(email=self.email).exists(): raise IntegrityError() super().save(*args, **kwargs) -def get_password_reset_expiry(): +def get_password_reset_expiry() -> datetime.datetime: """give people a limited time to use the link""" now = timezone.now() return now + datetime.timedelta(days=1) @@ -234,19 +245,19 @@ class PasswordReset(models.Model): expiry = models.DateTimeField(default=get_password_reset_expiry) user = models.OneToOneField(User, on_delete=models.CASCADE) - def valid(self): + def valid(self) -> bool: """make sure it hasn't expired or been used""" return self.expiry > timezone.now() @property - def link(self): + def link(self) -> str: """formats the invite link""" return f"{BASE_URL}/password-reset/{self.code}" # pylint: disable=unused-argument @receiver(models.signals.post_save, sender=SiteSettings) -def preview_image(instance, *args, **kwargs): +def preview_image(instance: SiteSettings, *args, **kwargs) -> None: """Update image preview for the default site image""" if not ENABLE_PREVIEW_IMAGES: return @@ -257,10 +268,10 @@ def preview_image(instance, *args, **kwargs): @app.task(queue=MISC) -def check_for_updates_task(): +def check_for_updates_task() -> None: """See if git remote knows about a new version""" - site = SiteSettings.objects.get() - release = get_data(RELEASE_API, timeout=3) + site = SiteSettings.get() + release = get_data(RELEASE_API, timeout=3, is_activitypub=False) available_version = release.get("tag_name", None) if available_version: site.available_version = available_version diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 66d2e2d4b9..446199c397 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -172,7 +172,7 @@ def generate_instance_layer(content_width): """Places components for instance preview""" font_instance = get_font("light", size=28) - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() if site.logo_small: with Image.open(site.logo_small) as logo_img: @@ -426,7 +426,7 @@ def generate_site_preview_image_task(): if not settings.ENABLE_PREVIEW_IMAGES: return - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() if site.logo: logo = site.logo diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py index 3e1cf17bde..9f31a97bf6 100644 --- a/bookwyrm/suggested_users.py +++ b/bookwyrm/suggested_users.py @@ -92,6 +92,8 @@ def remove_suggestion(self, user, suggested_user): def get_suggestions(self, user, local=False): """get suggestions""" + local = local or models.SiteSettings.get().disable_federation + values = self.get_store(self.store_id(user), withscores=True) annotations = [ When(pk=int(pk), then=self.get_counts_from_rank(score)["mutuals"]) diff --git a/bookwyrm/templates/get_started/users.html b/bookwyrm/templates/get_started/users.html index 136efe3785..83ea836d40 100644 --- a/bookwyrm/templates/get_started/users.html +++ b/bookwyrm/templates/get_started/users.html @@ -5,7 +5,11 @@

      {% trans "Who to follow" %}

      + {% if not site.disable_federation %}

      {% trans "You can follow users on other BookWyrm instances and federated services like Mastodon." %}

      + {% else %} +

      {% trans "You can follow other users on this BookWyrm instance." %}

      + {% endif %}
      diff --git a/bookwyrm/templates/ostatus/remote_follow_button.html b/bookwyrm/templates/ostatus/remote_follow_button.html index 60e841c4d9..40842bac83 100644 --- a/bookwyrm/templates/ostatus/remote_follow_button.html +++ b/bookwyrm/templates/ostatus/remote_follow_button.html @@ -1,5 +1,5 @@ {% load i18n %} -{% if request.user == user %} +{% if request.user == user or site.disable_federation %} {% else %}
      diff --git a/bookwyrm/templates/settings/federation/settings.html b/bookwyrm/templates/settings/federation/settings.html new file mode 100644 index 0000000000..665bc29528 --- /dev/null +++ b/bookwyrm/templates/settings/federation/settings.html @@ -0,0 +1,51 @@ +{% extends 'settings/layout.html' %} +{% load i18n %} +{% block title %}{% trans "Federation Settings" %}{% endblock %} + +{% block header %}{% trans "Federated Settings" %}{% endblock %} + +{% block panel %} +{% if success %} +
      + + + {% trans "Settings saved" %} + +
      +{% endif %} + +{% if form.errors %} +
      + + + {% trans "Unable to save settings" %} + +
      +{% endif %} + + + {% csrf_token %} +
      +
      + + + {% trans "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." %} + +
      +
      +
      + +
      + + + +{% endblock %} + diff --git a/bookwyrm/templates/settings/layout.html b/bookwyrm/templates/settings/layout.html index f231623a62..d0ed90a5d7 100644 --- a/bookwyrm/templates/settings/layout.html +++ b/bookwyrm/templates/settings/layout.html @@ -41,12 +41,6 @@

      {% trans "Manage Users" %}

      {% url 'settings-invites' as alt_url %} {% trans "Invites" %} - {% if perms.bookwyrm.control_federation %} -
    5. - {% url 'settings-federation' as url %} - {% trans "Federated Instances" %} -
      6. - {% endif %} {% if perms.bookwyrm.moderate_user %}
    6. {% url 'settings-force-password-reset' as url %} @@ -55,6 +49,21 @@

      {% trans "Manage Users" %}

      {% endif %} {% endif %} + {% if perms.bookwyrm.control_federation %} +

      {% trans "Federation" %}

      + + {% endif %} {% if perms.bookwyrm.moderate_user %}

      {% trans "Moderation" %}

        diff --git a/bookwyrm/templates/snippets/follow_button.html b/bookwyrm/templates/snippets/follow_button.html index 28b9799879..90dee4f32b 100644 --- a/bookwyrm/templates/snippets/follow_button.html +++ b/bookwyrm/templates/snippets/follow_button.html @@ -3,6 +3,8 @@ {% if request.user == user or not request.user.is_authenticated %} {# nothing to see here -- either it's yourself or your logged out #} +{% elif site.disable_federation and not user.local %} +{# can't follow remote users without federation #} {% else %} {% get_relationship user as relationship %} diff --git a/bookwyrm/templates/user/user.html b/bookwyrm/templates/user/user.html index 05a2eeabc2..cd06fefc48 100755 --- a/bookwyrm/templates/user/user.html +++ b/bookwyrm/templates/user/user.html @@ -22,9 +22,18 @@

        {% trans "User Profile" %}

      7. {% endif %}
      + +{% if site.disable_federation and not user.local %} +
      +

      + {% trans "Federation is currently disabled, so you will not be able to interact with this user." %} +

      +
      +{% endif %} {% endblock %} {% block panel %} + {% if user.bookwyrm_user %}

      diff --git a/bookwyrm/tests/importers/test_bookwyrm_import.py b/bookwyrm/tests/importers/test_bookwyrm_import.py index eeeb937864..86cf08e815 100644 --- a/bookwyrm/tests/importers/test_bookwyrm_import.py +++ b/bookwyrm/tests/importers/test_bookwyrm_import.py @@ -43,7 +43,6 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) - models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", diff --git a/bookwyrm/tests/importers/test_calibre_import.py b/bookwyrm/tests/importers/test_calibre_import.py index d27ef7d81b..1d3d5fe8a4 100644 --- a/bookwyrm/tests/importers/test_calibre_import.py +++ b/bookwyrm/tests/importers/test_calibre_import.py @@ -37,7 +37,6 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) - models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index d643cd7d8a..dedae57098 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -43,7 +43,6 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) - models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 7166f2f548..5eb4487193 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -47,7 +47,6 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) - models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", @@ -366,7 +365,7 @@ def test_handle_imported_book_reviews_disabled(self, *_): def test_import_limit(self, *_): """checks if import limit works""" - site_settings = models.SiteSettings.objects.get() + site_settings = models.SiteSettings.get() site_settings.import_size_limit = 2 site_settings.import_limit_reset = 2 site_settings.save() diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index 48ef57a188..5453f2b53d 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -45,7 +45,6 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mmai", "mmai@mmai.mmai", "password", local=True ) - models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py index ceb83762db..aa330e2299 100644 --- a/bookwyrm/tests/importers/test_openlibrary_import.py +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -43,7 +43,6 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) - models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", diff --git a/bookwyrm/tests/importers/test_storygraph_import.py b/bookwyrm/tests/importers/test_storygraph_import.py index 859760085a..182fa794ca 100644 --- a/bookwyrm/tests/importers/test_storygraph_import.py +++ b/bookwyrm/tests/importers/test_storygraph_import.py @@ -43,7 +43,6 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) - models.SiteSettings.objects.create() work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", diff --git a/bookwyrm/tests/test_context_processors.py b/bookwyrm/tests/test_context_processors.py index 7a58b05d80..7c1fbb1dd6 100644 --- a/bookwyrm/tests/test_context_processors.py +++ b/bookwyrm/tests/test_context_processors.py @@ -28,7 +28,7 @@ def setUpTestData(cls): ) cls.anonymous_user = AnonymousUser cls.anonymous_user.is_authenticated = False - cls.site = models.SiteSettings.objects.create() + cls.site = models.SiteSettings.get() def setUp(self): """other test data""" diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py index c507a059f6..186cce9302 100644 --- a/bookwyrm/tests/test_emailing.py +++ b/bookwyrm/tests/test_emailing.py @@ -26,7 +26,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create() def setUp(self): """other test data""" diff --git a/bookwyrm/tests/test_merge.py b/bookwyrm/tests/test_merge.py index 46f39384e5..07313e47de 100644 --- a/bookwyrm/tests/test_merge.py +++ b/bookwyrm/tests/test_merge.py @@ -12,8 +12,6 @@ class MergeBookDataModel(TestCase): @classmethod def setUpTestData(cls): """shared data""" - models.SiteSettings.objects.create() - cls.jrr_tolkien = models.Author.objects.create( name="J.R.R. Tolkien", aliases=["JRR Tolkien", "Tolkien"], diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 12fb56d07d..726118de14 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -92,7 +92,7 @@ def setUp(self): parent_work=self.work, ) - self.site = models.SiteSettings.objects.create() + self.site = models.SiteSettings.get() settings.ENABLE_PREVIEW_IMAGES = True diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 2e0105c1c4..45ffbde20d 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -56,10 +56,10 @@ def setUpTestData(cls): cls.cat = models.User.objects.create_user( f"cat@{DOMAIN}", "cat@example.com", "", local=True, localname="cat" ) - models.SiteSettings.objects.create() def setUp(self): """test data""" + self.site = models.SiteSettings.get() private_key, public_key = create_key_pair() self.fake_remote = Sender( "http://localhost/user/remote", KeyPair(private_key, public_key) diff --git a/bookwyrm/tests/views/admin/test_announcements.py b/bookwyrm/tests/views/admin/test_announcements.py index 62fb86d166..7e8925d214 100644 --- a/bookwyrm/tests/views/admin/test_announcements.py +++ b/bookwyrm/tests/views/admin/test_announcements.py @@ -27,8 +27,6 @@ def setUpTestData(cls): localname="mouse", ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/admin/test_automod.py b/bookwyrm/tests/views/admin/test_automod.py index 27f98163eb..d1dbd79096 100644 --- a/bookwyrm/tests/views/admin/test_automod.py +++ b/bookwyrm/tests/views/admin/test_automod.py @@ -34,7 +34,6 @@ def setUpTestData(cls): initdb.init_permissions() group = Group.objects.get(name="moderator") cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/admin/test_celery.py b/bookwyrm/tests/views/admin/test_celery.py index 513d69944b..9233552fa9 100644 --- a/bookwyrm/tests/views/admin/test_celery.py +++ b/bookwyrm/tests/views/admin/test_celery.py @@ -33,7 +33,6 @@ def setUpTestData(cls): initdb.init_permissions() group = Group.objects.get(name="admin") cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/admin/test_dashboard.py b/bookwyrm/tests/views/admin/test_dashboard.py index 35fcb25a4d..3289ad9f68 100644 --- a/bookwyrm/tests/views/admin/test_dashboard.py +++ b/bookwyrm/tests/views/admin/test_dashboard.py @@ -34,8 +34,6 @@ def setUpTestData(cls): group = Group.objects.get(name="moderator") cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/admin/test_email_blocks.py b/bookwyrm/tests/views/admin/test_email_blocks.py index 08a131c3a6..4315c40c97 100644 --- a/bookwyrm/tests/views/admin/test_email_blocks.py +++ b/bookwyrm/tests/views/admin/test_email_blocks.py @@ -34,8 +34,6 @@ def setUpTestData(cls): group = Group.objects.get(name="moderator") cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/admin/test_email_config.py b/bookwyrm/tests/views/admin/test_email_config.py index 22f4b7a050..b8218a284c 100644 --- a/bookwyrm/tests/views/admin/test_email_config.py +++ b/bookwyrm/tests/views/admin/test_email_config.py @@ -33,7 +33,6 @@ def setUpTestData(cls): initdb.init_permissions() group = Group.objects.get(name="admin") cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/admin/test_federation.py b/bookwyrm/tests/views/admin/test_federation.py index 6dcd5535f0..818c949f5a 100644 --- a/bookwyrm/tests/views/admin/test_federation.py +++ b/bookwyrm/tests/views/admin/test_federation.py @@ -46,8 +46,6 @@ def setUpTestData(cls): group = Group.objects.get(name="moderator") cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/admin/test_imports.py b/bookwyrm/tests/views/admin/test_imports.py index 211407ff6b..a8fdfbf04c 100644 --- a/bookwyrm/tests/views/admin/test_imports.py +++ b/bookwyrm/tests/views/admin/test_imports.py @@ -33,7 +33,6 @@ def setUpTestData(cls): initdb.init_permissions() group = Group.objects.get(name="admin") cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/admin/test_ip_blocklist.py b/bookwyrm/tests/views/admin/test_ip_blocklist.py index 491915edac..dfbc067973 100644 --- a/bookwyrm/tests/views/admin/test_ip_blocklist.py +++ b/bookwyrm/tests/views/admin/test_ip_blocklist.py @@ -34,8 +34,6 @@ def setUpTestData(cls): group = Group.objects.get(name="moderator") cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/admin/test_link_domains.py b/bookwyrm/tests/views/admin/test_link_domains.py index 20d28896f5..57e909567f 100644 --- a/bookwyrm/tests/views/admin/test_link_domains.py +++ b/bookwyrm/tests/views/admin/test_link_domains.py @@ -41,8 +41,6 @@ def setUpTestData(cls): added_by=cls.local_user, ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/admin/test_reports.py b/bookwyrm/tests/views/admin/test_reports.py index 7205769a59..73fbef40f7 100644 --- a/bookwyrm/tests/views/admin/test_reports.py +++ b/bookwyrm/tests/views/admin/test_reports.py @@ -41,7 +41,6 @@ def setUpTestData(cls): initdb.init_permissions() group = Group.objects.get(name="moderator") cls.local_user.groups.set([group]) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/admin/test_site.py b/bookwyrm/tests/views/admin/test_site.py index 277bfbc85a..0804bfe890 100644 --- a/bookwyrm/tests/views/admin/test_site.py +++ b/bookwyrm/tests/views/admin/test_site.py @@ -34,7 +34,7 @@ def setUpTestData(cls): group = Group.objects.get(name="admin") cls.local_user.groups.set([group]) - cls.site = models.SiteSettings.objects.create() + cls.site = models.SiteSettings.get() def setUp(self): """individual test setup""" @@ -73,7 +73,7 @@ def test_site_post(self): validate_html(result.render()) self.assertEqual(result.status_code, 200) - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() self.assertEqual(site.name, "Name!") def test_site_post_invalid(self): diff --git a/bookwyrm/tests/views/admin/test_themes.py b/bookwyrm/tests/views/admin/test_themes.py index af46bf060f..d7d4f8bf30 100644 --- a/bookwyrm/tests/views/admin/test_themes.py +++ b/bookwyrm/tests/views/admin/test_themes.py @@ -42,7 +42,7 @@ def setUpTestData(cls): group = Group.objects.get(name="admin") cls.local_user.groups.set([group]) - cls.site = models.SiteSettings.objects.create() + cls.site = models.SiteSettings.get() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/admin/test_user_admin.py b/bookwyrm/tests/views/admin/test_user_admin.py index b0defc30ba..d2bda4f96e 100644 --- a/bookwyrm/tests/views/admin/test_user_admin.py +++ b/bookwyrm/tests/views/admin/test_user_admin.py @@ -22,7 +22,6 @@ def setUpTestData(cls): initdb.init_permissions() moderator = Group.objects.get(name="moderator") editor = Group.objects.get(name="editor") - models.SiteSettings.objects.create() with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index ee6e7d8b47..3adc2c0886 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -52,8 +52,6 @@ def setUpTestData(cls): parent_work=cls.work, ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py index cddcf9e8d1..0ef6bf4bdb 100644 --- a/bookwyrm/tests/views/books/test_edit_book.py +++ b/bookwyrm/tests/views/books/test_edit_book.py @@ -49,7 +49,6 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=cls.work, ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/books/test_editions.py b/bookwyrm/tests/views/books/test_editions.py index ef7404e51b..e54f0eb13b 100644 --- a/bookwyrm/tests/views/books/test_editions.py +++ b/bookwyrm/tests/views/books/test_editions.py @@ -37,8 +37,6 @@ def setUpTestData(cls): physical_format="paperback", ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/books/test_links.py b/bookwyrm/tests/views/books/test_links.py index 8cf3106ab0..d8918ed2be 100644 --- a/bookwyrm/tests/views/books/test_links.py +++ b/bookwyrm/tests/views/books/test_links.py @@ -47,8 +47,6 @@ def setUpTestData(cls): parent_work=cls.work, ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/imports/test_import.py b/bookwyrm/tests/views/imports/test_import.py index 763fcc19fc..de73f4134a 100644 --- a/bookwyrm/tests/views/imports/test_import.py +++ b/bookwyrm/tests/views/imports/test_import.py @@ -31,7 +31,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/imports/test_import_review.py b/bookwyrm/tests/views/imports/test_import_review.py index 026efac11a..989560c6ac 100644 --- a/bookwyrm/tests/views/imports/test_import_review.py +++ b/bookwyrm/tests/views/imports/test_import_review.py @@ -26,7 +26,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create() cls.job = models.ImportJob.objects.create(user=cls.local_user, mappings={}) work = models.Work.objects.create(title="Test Work") diff --git a/bookwyrm/tests/views/imports/test_import_troubleshoot.py b/bookwyrm/tests/views/imports/test_import_troubleshoot.py index 2e76da3738..1ed04d208f 100644 --- a/bookwyrm/tests/views/imports/test_import_troubleshoot.py +++ b/bookwyrm/tests/views/imports/test_import_troubleshoot.py @@ -27,7 +27,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/imports/test_user_import.py b/bookwyrm/tests/views/imports/test_user_import.py index 3e097fb0fa..d5e9aef510 100644 --- a/bookwyrm/tests/views/imports/test_user_import.py +++ b/bookwyrm/tests/views/imports/test_user_import.py @@ -16,6 +16,7 @@ class ImportUserViews(TestCase): def setUp(self): """we need basic test data and mocks""" + self.site = models.SiteSettings.get() self.factory = RequestFactory() with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), @@ -29,7 +30,6 @@ def setUp(self): local=True, localname="mouse", ) - models.SiteSettings.objects.create() def test_get_user_import_page(self): """there are so many views, this just makes sure it LOADS""" diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index 6deae38b77..b3e69b4d6c 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -54,7 +54,6 @@ def setUpTestData(cls): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() def test_inbox_invalid_get(self): """shouldn't try to handle if the user is not found""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index b3d50fe46f..3ada89ec29 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -45,8 +45,6 @@ def setUpTestData(cls): parent_work=work, ) - models.SiteSettings.objects.create() - @responses.activate def test_handle_add_book_to_shelf(self): """shelving a book""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 1bc508d115..6afb2e0e95 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -48,8 +48,6 @@ def setUpTestData(cls): remote_id="https://example.com/status/1", ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.create_json = { diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 923a87a761..956c736b43 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -37,8 +37,6 @@ def setUpTestData(cls): outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() - def test_handle_blocks(self): """create a "block" database entry from an activity""" self.local_user.followers.add(self.remote_user) diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index 0bb3907af5..73a35665ab 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -47,7 +47,6 @@ def setUp(self): "cc": ["https://example.com/user/mouse/followers"], "object": {}, } - models.SiteSettings.objects.create() def test_create_status_transaction(self, *_): """the "it justs works" mode""" diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 8d7582a21b..52b26e00a3 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -44,8 +44,6 @@ def setUpTestData(cls): remote_id="https://example.com/status/1", ) - models.SiteSettings.objects.create() - def test_delete_status(self): """remove a status""" self.assertFalse(self.status.deleted) diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index ccc58c974b..058d660052 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -38,8 +38,6 @@ def setUpTestData(cls): outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() - def test_follow(self): """remote user wants to follow local user""" activity = { diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index 88dc24fbb6..3675e91760 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -47,8 +47,6 @@ def setUpTestData(cls): remote_id="https://example.com/status/1", ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.create_json = { diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index 89f66c9bb8..4bd5840fbd 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -44,8 +44,6 @@ def setUpTestData(cls): parent_work=cls.work, ) - models.SiteSettings.objects.create() - def test_handle_unshelve_book(self): """remove a book from a shelf""" shelf = models.Shelf.objects.create(user=self.remote_user, name="Test Shelf") diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index a0f74a3fb0..d22a598629 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -39,8 +39,6 @@ def setUpTestData(cls): outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.update_json = { diff --git a/bookwyrm/tests/views/landing/test_invite.py b/bookwyrm/tests/views/landing/test_invite.py index 8adc64f4fd..eca0fa0b16 100644 --- a/bookwyrm/tests/views/landing/test_invite.py +++ b/bookwyrm/tests/views/landing/test_invite.py @@ -29,7 +29,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/landing/test_landing.py b/bookwyrm/tests/views/landing/test_landing.py index c68c9cd532..26d9b4b937 100644 --- a/bookwyrm/tests/views/landing/test_landing.py +++ b/bookwyrm/tests/views/landing/test_landing.py @@ -29,7 +29,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" @@ -94,7 +93,7 @@ def test_impressum_page_off(self): def test_impressum_page_on(self): """there are so many views, this just makes sure it LOADS""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() site.show_impressum = True site.save() diff --git a/bookwyrm/tests/views/landing/test_login.py b/bookwyrm/tests/views/landing/test_login.py index 6224c1a6de..be08c13ad2 100644 --- a/bookwyrm/tests/views/landing/test_login.py +++ b/bookwyrm/tests/views/landing/test_login.py @@ -51,7 +51,9 @@ def setUpTestData(cls): localname="badger", two_factor_auth=True, ) - models.SiteSettings.objects.create(id=1, require_confirm_email=False) + site = models.SiteSettings.get() + site.require_confirm_email = False + site.save() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/landing/test_password.py b/bookwyrm/tests/views/landing/test_password.py index ad3110b025..33ada7dd89 100644 --- a/bookwyrm/tests/views/landing/test_password.py +++ b/bookwyrm/tests/views/landing/test_password.py @@ -31,7 +31,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create(id=1) def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/landing/test_register.py b/bookwyrm/tests/views/landing/test_register.py index 7db6775db1..3c93da8f82 100644 --- a/bookwyrm/tests/views/landing/test_register.py +++ b/bookwyrm/tests/views/landing/test_register.py @@ -35,9 +35,10 @@ def setUpTestData(cls): local=True, localname="mouse", ) - cls.settings = models.SiteSettings.objects.create( - id=1, require_confirm_email=False, allow_registration=True - ) + cls.settings = models.SiteSettings.get() + cls.settings.require_confirm_email = False + cls.settings.allow_registration = True + cls.settings.save() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/lists/test_curate.py b/bookwyrm/tests/views/lists/test_curate.py index 458d0b1e83..bb6dfb0601 100644 --- a/bookwyrm/tests/views/lists/test_curate.py +++ b/bookwyrm/tests/views/lists/test_curate.py @@ -43,8 +43,6 @@ def setUpTestData(cls): ): cls.list = models.List.objects.create(name="Test List", user=cls.local_user) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/lists/test_embed.py b/bookwyrm/tests/views/lists/test_embed.py index 69462a0075..ea8760cbf3 100644 --- a/bookwyrm/tests/views/lists/test_embed.py +++ b/bookwyrm/tests/views/lists/test_embed.py @@ -43,8 +43,6 @@ def setUpTestData(cls): ): cls.list = models.List.objects.create(name="Test List", user=cls.local_user) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/lists/test_list.py b/bookwyrm/tests/views/lists/test_list.py index 38af920a19..724d693de6 100644 --- a/bookwyrm/tests/views/lists/test_list.py +++ b/bookwyrm/tests/views/lists/test_list.py @@ -72,8 +72,6 @@ def setUpTestData(cls): ): cls.list = models.List.objects.create(name="Test List", user=cls.local_user) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/lists/test_list_item.py b/bookwyrm/tests/views/lists/test_list_item.py index bb64329f04..bc7d829989 100644 --- a/bookwyrm/tests/views/lists/test_list_item.py +++ b/bookwyrm/tests/views/lists/test_list_item.py @@ -38,8 +38,6 @@ def setUpTestData(cls): ): cls.list = models.List.objects.create(name="Test List", user=cls.local_user) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/lists/test_lists.py b/bookwyrm/tests/views/lists/test_lists.py index cb86e94359..43deb9379e 100644 --- a/bookwyrm/tests/views/lists/test_lists.py +++ b/bookwyrm/tests/views/lists/test_lists.py @@ -35,8 +35,6 @@ def setUpTestData(cls): "rat@local.com", "rat@rat.com", "ratword", local=True, localname="rat" ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/preferences/test_block.py b/bookwyrm/tests/views/preferences/test_block.py index e208886590..0e35425333 100644 --- a/bookwyrm/tests/views/preferences/test_block.py +++ b/bookwyrm/tests/views/preferences/test_block.py @@ -39,8 +39,6 @@ def setUpTestData(cls): outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/preferences/test_change_password.py b/bookwyrm/tests/views/preferences/test_change_password.py index 75a17e462c..76ad5d8efc 100644 --- a/bookwyrm/tests/views/preferences/test_change_password.py +++ b/bookwyrm/tests/views/preferences/test_change_password.py @@ -27,7 +27,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create(id=1) def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/preferences/test_delete_user.py b/bookwyrm/tests/views/preferences/test_delete_user.py index c523e14c37..9566524832 100644 --- a/bookwyrm/tests/views/preferences/test_delete_user.py +++ b/bookwyrm/tests/views/preferences/test_delete_user.py @@ -52,8 +52,6 @@ def setUpTestData(cls): shelf=cls.local_user.shelf_set.first(), ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/preferences/test_edit_user.py b/bookwyrm/tests/views/preferences/test_edit_user.py index c31c8237e5..8c1b8c8d5f 100644 --- a/bookwyrm/tests/views/preferences/test_edit_user.py +++ b/bookwyrm/tests/views/preferences/test_edit_user.py @@ -50,8 +50,6 @@ def setUpTestData(cls): shelf=cls.local_user.shelf_set.first(), ) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/preferences/test_export_user.py b/bookwyrm/tests/views/preferences/test_export_user.py index 1d844676aa..01d86cba91 100644 --- a/bookwyrm/tests/views/preferences/test_export_user.py +++ b/bookwyrm/tests/views/preferences/test_export_user.py @@ -13,8 +13,8 @@ class ExportUserViews(TestCase): """exporting user data""" def setUp(self): + self.site = models.SiteSettings.get() self.factory = RequestFactory() - models.SiteSettings.objects.create() with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), diff --git a/bookwyrm/tests/views/shelf/test_shelf.py b/bookwyrm/tests/views/shelf/test_shelf.py index 9c2b0a645a..72c4fe9a26 100644 --- a/bookwyrm/tests/views/shelf/test_shelf.py +++ b/bookwyrm/tests/views/shelf/test_shelf.py @@ -46,7 +46,6 @@ def setUpTestData(cls): cls.shelf = models.Shelf.objects.create( name="Test Shelf", identifier="test-shelf", user=cls.local_user ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/shelf/test_shelf_actions.py b/bookwyrm/tests/views/shelf/test_shelf_actions.py index d4727d9c5c..73155b61a6 100644 --- a/bookwyrm/tests/views/shelf/test_shelf_actions.py +++ b/bookwyrm/tests/views/shelf/test_shelf_actions.py @@ -52,7 +52,6 @@ def setUpTestData(cls): cls.shelf = models.Shelf.objects.create( name="Test Shelf", identifier="test-shelf", user=cls.local_user ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_annual_summary.py b/bookwyrm/tests/views/test_annual_summary.py index 1ee4322f73..ff86cfa8da 100644 --- a/bookwyrm/tests/views/test_annual_summary.py +++ b/bookwyrm/tests/views/test_annual_summary.py @@ -44,7 +44,6 @@ def setUpTestData(cls): parent_work=cls.work, pages=300, ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index ed65fc30bb..0d023f0adb 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -46,7 +46,6 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=cls.work, ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py index 3ea2241542..96dcd36924 100644 --- a/bookwyrm/tests/views/test_directory.py +++ b/bookwyrm/tests/views/test_directory.py @@ -29,7 +29,6 @@ def setUpTestData(cls): localname="mouse", remote_id="https://example.com/users/mouse", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py index 15732b9242..f93913df29 100644 --- a/bookwyrm/tests/views/test_discover.py +++ b/bookwyrm/tests/views/test_discover.py @@ -26,7 +26,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index be4956c648..28a8e1bd30 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -48,7 +48,6 @@ def setUpTestData(cls): title="Example Edition", remote_id="https://example.com/book/1", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index c26a9372a9..1074de1182 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -20,7 +20,6 @@ class FollowViews(TestCase): @classmethod def setUpTestData(cls): """we need basic test data and mocks""" - models.SiteSettings.objects.create() with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch("bookwyrm.activitystreams.populate_stream_task.delay"), diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index b33948c19d..d84435df78 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -39,7 +39,6 @@ def setUpTestData(cls): title="Example Edition", remote_id="https://example.com/book/1", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py index d682b727d1..a7309e4aa3 100644 --- a/bookwyrm/tests/views/test_goal.py +++ b/bookwyrm/tests/views/test_goal.py @@ -43,7 +43,6 @@ def setUpTestData(cls): title="Example Edition", remote_id="https://example.com/book/1", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py index 4f8264cb9d..5b8a2d5aa0 100644 --- a/bookwyrm/tests/views/test_group.py +++ b/bookwyrm/tests/views/test_group.py @@ -48,7 +48,6 @@ def setUpTestData(cls): cls.membership = models.GroupMember.objects.create( group=cls.testgroup, user=cls.local_user ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_hashtag.py b/bookwyrm/tests/views/test_hashtag.py index d9679fe5a0..ebf3662f83 100644 --- a/bookwyrm/tests/views/test_hashtag.py +++ b/bookwyrm/tests/views/test_hashtag.py @@ -67,8 +67,6 @@ def setUpTestData(cls): for status in cls.statuses_bookclub: status.mention_hashtags.add(cls.hashtag_bookclub) - models.SiteSettings.objects.create() - def setUp(self): """individual test setup""" self.factory = RequestFactory() diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py index 60a81f3a23..517090212d 100644 --- a/bookwyrm/tests/views/test_isbn.py +++ b/bookwyrm/tests/views/test_isbn.py @@ -37,7 +37,6 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=cls.work, ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index 878a64c2c8..fe80a1dfef 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -32,7 +32,6 @@ def setUpTestData(cls): ) with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): cls.status = models.Status.objects.create(content="hi", user=cls.local_user) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_report.py b/bookwyrm/tests/views/test_report.py index f07887bfe5..4f545aa1ea 100644 --- a/bookwyrm/tests/views/test_report.py +++ b/bookwyrm/tests/views/test_report.py @@ -41,7 +41,6 @@ def setUpTestData(cls): user=cls.local_user, content="Test status", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 2952315a98..658f3671d8 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -28,7 +28,6 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=work, ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index 3b3e78e178..8a10018209 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -39,7 +39,6 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=cls.work, ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_setup.py b/bookwyrm/tests/views/test_setup.py index 4b3d9d7a51..a34497a5bf 100644 --- a/bookwyrm/tests/views/test_setup.py +++ b/bookwyrm/tests/views/test_setup.py @@ -17,7 +17,9 @@ class SetupViews(TestCase): @classmethod def setUpTestData(cls): """we need basic test data and mocks""" - cls.site = models.SiteSettings.objects.create(install_mode=True) + cls.site = models.SiteSettings.get() + cls.site.install_mode = True + cls.site.save() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index af8a6dc3fc..5d31ad4bcb 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -118,7 +118,6 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=work, ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py index 7230f3324a..f35daf8c63 100644 --- a/bookwyrm/tests/views/test_updates.py +++ b/bookwyrm/tests/views/test_updates.py @@ -27,7 +27,6 @@ def setUpTestData(cls): local=True, localname="mouse", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index e7d69232cd..187e232133 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -65,7 +65,6 @@ def setUpTestData(cls): shelf=cls.local_user.shelf_set.first(), shelved_date=make_date(2024, 7, 1), ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index 444d88d17d..14309a87ad 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -41,7 +41,6 @@ def setUpTestData(cls): inbox="https://example.com/users/rat/inbox", outbox="https://example.com/users/rat/outbox", ) - models.SiteSettings.objects.create() def setUp(self): """individual test setup""" diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index a21cd4947d..58fd357bed 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -245,6 +245,11 @@ views.ActivateUserAdmin.as_view(), name="settings-activate-user", ), + re_path( + r"^settings/federation-settings/?$", + views.FederationSettings.as_view(), + name="settings-federation-settings", + ), re_path( r"^settings/force-password-reset/?$", views.ForcePasswordResetAdmin.as_view(), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 81e3e2d6bb..d89cfd48fe 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -18,6 +18,7 @@ from .admin.federation import Federation, FederatedServer from .admin.federation import AddFederatedServer, ImportServerBlocklist from .admin.federation import block_server, unblock_server, refresh_server +from .admin.federation_settings import FederationSettings from .admin.files_maintenance import ( FilesMaintenance, run_export_deletions, diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index 9786b55607..15bb214912 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -48,7 +48,7 @@ def get(self, request): "email_sender" ] = f"{settings.EMAIL_SENDER_NAME}@{settings.EMAIL_SENDER_DOMAIN}" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() # pylint: disable=protected-access data["missing_conduct"] = ( not site.code_of_conduct diff --git a/bookwyrm/views/admin/federation_settings.py b/bookwyrm/views/admin/federation_settings.py new file mode 100644 index 0000000000..6230dd3ec7 --- /dev/null +++ b/bookwyrm/views/admin/federation_settings.py @@ -0,0 +1,36 @@ +""" big picture settings about how the instance shares data """ +from django.contrib.auth.decorators import login_required, permission_required +from django.template.response import TemplateResponse +from django.utils.decorators import method_decorator +from django.views import View + +from bookwyrm import forms, models + + +# pylint: disable= no-self-use +@method_decorator(login_required, name="dispatch") +@method_decorator( + permission_required("bookwyrm.control_federation", raise_exception=True), + name="dispatch", +) +class FederationSettings(View): + """what servers do we federate with""" + + def get(self, request): + """show the current settings""" + site = models.SiteSettings.get() + data = { + "form": forms.FederationSettings(instance=site), + } + return TemplateResponse(request, "settings/federation/settings.html", data) + + def post(self, request): + """Update federation settings""" + site = models.SiteSettings.get() + form = forms.FederationSettings(request.POST, instance=site) + if not form.is_valid(): + data = {"form": form} + return TemplateResponse(request, "settings/federation/settings.html", data) + form.save(request) + data = {"form": forms.FederationSettings(instance=site), "success": True} + return TemplateResponse(request, "settings/federation/settings.html", data) diff --git a/bookwyrm/views/admin/imports.py b/bookwyrm/views/admin/imports.py index ad704a2e86..882ec3ea45 100644 --- a/bookwyrm/views/admin/imports.py +++ b/bookwyrm/views/admin/imports.py @@ -47,7 +47,7 @@ def get(self, request, status="active"): user_paginated = Paginator(user_imports, PAGE_LENGTH) user_page = user_paginated.get_page(request.GET.get("page")) - site_settings = models.SiteSettings.objects.get() + site_settings = models.SiteSettings.get() data = { "imports": page, "user_imports": user_page, @@ -75,7 +75,7 @@ def post(self, request, import_id): # pylint: disable=unused-argument def disable_imports(request): """When you just need people to please stop starting imports""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() site.imports_enabled = False site.save(update_fields=["imports_enabled"]) return redirect("settings-imports") @@ -86,7 +86,7 @@ def disable_imports(request): # pylint: disable=unused-argument def enable_imports(request): """When you just need people to please stop starting imports""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() site.imports_enabled = True site.save(update_fields=["imports_enabled"]) return redirect("settings-imports") @@ -96,7 +96,7 @@ def enable_imports(request): @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) def set_import_size_limit(request): """Limit the amount of books users can import at once""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() import_size_limit = int(request.POST.get("limit")) import_limit_reset = int(request.POST.get("reset")) site.import_size_limit = import_size_limit @@ -120,7 +120,7 @@ def set_user_import_completed(request, import_id): @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) def set_user_import_limit(request): """Limit how ofter users can import and export their account""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() site.user_import_time_limit = int(request.POST.get("limit")) site.save(update_fields=["user_import_time_limit"]) return redirect("settings-imports") @@ -131,7 +131,7 @@ def set_user_import_limit(request): # pylint: disable=unused-argument def enable_user_exports(request): """Allow users to export account data""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() site.user_exports_enabled = True site.save(update_fields=["user_exports_enabled"]) return redirect("settings-imports") @@ -142,7 +142,7 @@ def enable_user_exports(request): # pylint: disable=unused-argument def disable_user_exports(request): """Don't allow users to export account data""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() site.user_exports_enabled = False site.save(update_fields=["user_exports_enabled"]) return redirect("settings-imports") diff --git a/bookwyrm/views/admin/site.py b/bookwyrm/views/admin/site.py index 4b0a9c7d82..3dfda91e4b 100644 --- a/bookwyrm/views/admin/site.py +++ b/bookwyrm/views/admin/site.py @@ -18,13 +18,13 @@ class Site(View): def get(self, request): """edit form""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() data = {"site_form": forms.SiteForm(instance=site)} return TemplateResponse(request, "settings/site.html", data) def post(self, request): """edit the site settings""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() form = forms.SiteForm(request.POST, request.FILES, instance=site) if not form.is_valid(): data = {"site_form": form} @@ -45,13 +45,13 @@ class RegistrationLimited(View): def get(self, request): """edit form""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() data = {"form": forms.RegistrationLimitedForm(instance=site)} return TemplateResponse(request, "settings/registration_limited.html", data) def post(self, request): """edit the site settings""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() form = forms.RegistrationLimitedForm(request.POST, request.FILES, instance=site) if not form.is_valid(): data = {"form": form} @@ -72,13 +72,13 @@ class Registration(View): def get(self, request): """edit form""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() data = {"form": forms.RegistrationForm(instance=site)} return TemplateResponse(request, "settings/registration.html", data) def post(self, request): """edit the site settings""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() form = forms.RegistrationForm(request.POST, request.FILES, instance=site) if not form.is_valid(): data = {"form": form} diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 5001ca9174..5a0bb28ab3 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -9,6 +9,7 @@ from django.views.decorators.http import require_POST from bookwyrm import models +from bookwyrm.decorators import require_federation from bookwyrm.models.relationship import clear_cache from bookwyrm.utils import regex from .helpers import ( @@ -132,6 +133,7 @@ def delete_follow_request(request): return redirect(f"/user/{request.user.localname}") +@require_federation def ostatus_follow_request(request): """prepare an outgoing remote follow request""" uri = urllib.parse.unquote(request.GET.get("acct")) @@ -171,6 +173,7 @@ def ostatus_follow_request(request): @login_required +@require_federation def ostatus_follow_success(request): """display success message for remote follow""" user = get_user_from_username(request.user, request.GET.get("following")) @@ -178,6 +181,7 @@ def ostatus_follow_success(request): return TemplateResponse(request, "ostatus/success.html", data) +@require_federation def remote_follow_page(request): """display remote follow page""" user = get_user_from_username(request.user, request.GET.get("user")) @@ -186,6 +190,7 @@ def remote_follow_page(request): @require_POST +@require_federation def remote_follow(request): """direct user to follow from remote account using ostatus subscribe protocol""" remote_user = request.POST.get("remote_user") diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index b3307ab424..aa8c254299 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -48,10 +48,15 @@ def get_user_from_username(viewer, username): def is_api_request(request): """check whether a request is asking for html or data""" - return "json" in request.headers.get("Accept", "") or re.match( + is_api = "json" in request.headers.get("Accept", "") or re.match( r".*\.json/?$", request.path ) + if is_api: + # don't allow API requests if federation is disabled + models.SiteSettings.raise_federation_disabled() + return is_api + def is_bookwyrm_request(request): """check if the request is coming from another bookwyrm instance""" @@ -63,6 +68,9 @@ def is_bookwyrm_request(request): def handle_remote_webfinger(query, unknown_only=False, refresh=False): """webfingerin' other servers""" + # SHOULD we do a remote webfinger? Is it allowed? + models.SiteSettings.raise_federation_disabled() + user = None # usernames could be @user@domain or user@domain @@ -107,6 +115,9 @@ def handle_remote_webfinger(query, unknown_only=False, refresh=False): def subscribe_remote_webfinger(query): """get subscribe template from other servers""" + # SHOULD we do a remote webfinger? Is it allowed? + models.SiteSettings.raise_federation_disabled() + template = None # usernames could be @user@domain or user@domain if not query: diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py index c26d816232..63270260d1 100644 --- a/bookwyrm/views/imports/import_data.py +++ b/bookwyrm/views/imports/import_data.py @@ -56,7 +56,7 @@ def get(self, request, invalid=False): elif seconds: data["recent_avg_minutes"] = seconds / 60 - site_settings = models.SiteSettings.objects.get() + site_settings = models.SiteSettings.get() time_range = timezone.now() - datetime.timedelta( days=site_settings.import_limit_reset ) @@ -73,7 +73,7 @@ def get(self, request, invalid=False): def post(self, request): """ingest a book data csv""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() if not site.imports_enabled: raise PermissionDenied() diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py index 2fd36f2eb0..d21c5ca0c1 100644 --- a/bookwyrm/views/inbox.py +++ b/bookwyrm/views/inbox.py @@ -13,6 +13,7 @@ from django.views.decorators.csrf import csrf_exempt from bookwyrm import activitypub, models +from bookwyrm.decorators import require_federation from bookwyrm.tasks import app, INBOX from bookwyrm.signatures import Signature from bookwyrm.utils import regex @@ -25,6 +26,7 @@ class UserIsGoneError(Exception): @method_decorator(csrf_exempt, name="dispatch") +@method_decorator(require_federation, name="dispatch") # pylint: disable=no-self-use class Inbox(View): """requests sent by outside servers""" diff --git a/bookwyrm/views/landing/about.py b/bookwyrm/views/landing/about.py index 0bcdfd8365..1beecf2426 100644 --- a/bookwyrm/views/landing/about.py +++ b/bookwyrm/views/landing/about.py @@ -42,7 +42,7 @@ def privacy(request): @require_GET def impressum(request): """more information about the instance""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() if not site.show_impressum: raise Http404() return TemplateResponse(request, "about/impressum.html") diff --git a/bookwyrm/views/landing/landing.py b/bookwyrm/views/landing/landing.py index 87119f465f..ca2b7ccc3f 100644 --- a/bookwyrm/views/landing/landing.py +++ b/bookwyrm/views/landing/landing.py @@ -16,7 +16,7 @@ def get(self, request): if request.user.is_authenticated: feed_view = Feed.as_view() return feed_view(request, "home") - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() if site.install_mode: return redirect("setup") diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index bd0d0e93b7..e13d488d46 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -168,7 +168,7 @@ def new_export_blocked_until(self): last_job = self.user_jobs.first() if not last_job: return None - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() blocked_until = last_job.created_date + timedelta( hours=site.user_import_time_limit ) diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index 23ff1e0781..498196c5b9 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -3,6 +3,7 @@ import re from django.contrib.postgres.search import TrigramSimilarity, SearchRank, SearchQuery +from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator from django.db.models import F from django.db.models.functions import Greatest @@ -131,7 +132,10 @@ def user_search(request): # use webfinger for mastodon style account@domain.com username to load the user if # they don't exist locally (handle_remote_webfinger will check the db) if re.match(regex.FULL_USERNAME, query) and viewer.is_authenticated: - handle_remote_webfinger(query) + try: + handle_remote_webfinger(query) + except PermissionDenied: + return TemplateResponse(request, "search/user.html", data) results = ( models.User.viewer_aware_objects(viewer) diff --git a/bookwyrm/views/setup.py b/bookwyrm/views/setup.py index 18576ff6a5..8d67f35c67 100644 --- a/bookwyrm/views/setup.py +++ b/bookwyrm/views/setup.py @@ -22,7 +22,7 @@ class InstanceConfig(View): def get(self, request): """Check out this cool instance""" # only allow this view when an instance is being configured - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() if not site.install_mode: raise PermissionDenied() @@ -58,7 +58,7 @@ class CreateAdmin(View): def get(self, request): """Create admin user form""" # only allow this view when an instance is being configured - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() if not site.install_mode: raise PermissionDenied() @@ -68,7 +68,7 @@ def get(self, request): @transaction.atomic def post(self, request): """Create that user""" - site = models.SiteSettings.objects.get() + site = models.SiteSettings.get() # you can't create an admin user if you're in config mode if not site.install_mode: raise PermissionDenied() diff --git a/bookwyrm/views/wellknown.py b/bookwyrm/views/wellknown.py index 8916d2d1d3..531ab3486b 100644 --- a/bookwyrm/views/wellknown.py +++ b/bookwyrm/views/wellknown.py @@ -9,10 +9,12 @@ from django.views.decorators.http import require_GET from bookwyrm import models +from bookwyrm.decorators import require_federation from bookwyrm.settings import BASE_URL, DOMAIN, VERSION, LANGUAGE_CODE @require_GET +@require_federation def webfinger(request): """allow other servers to ask about a user""" resource = request.GET.get("resource") @@ -42,6 +44,7 @@ def webfinger(request): @require_GET +@require_federation def nodeinfo_pointer(_): """direct servers to nodeinfo""" return JsonResponse( @@ -57,6 +60,7 @@ def nodeinfo_pointer(_): @require_GET +@require_federation def nodeinfo(_): """basic info about the server""" status_count = models.Status.objects.filter(user__local=True, deleted=False).count() @@ -92,6 +96,7 @@ def nodeinfo(_): @require_GET +@require_federation def instance_info(_): """let's talk about your cool unique instance""" user_count = models.User.objects.filter(is_active=True, local=True).count() @@ -121,6 +126,7 @@ def instance_info(_): @require_GET +@require_federation def peers(_): """list of federated servers this instance connects with""" names = models.FederatedServer.objects.filter(status="federated").values_list( @@ -130,6 +136,7 @@ def peers(_): @require_GET +@require_federation def host_meta(request): """meta of the host""" return TemplateResponse(request, "host_meta.xml", {"DOMAIN": DOMAIN}) From 73f437e559c667f034ea0d80077bd4c24fce6cad Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:29:04 -0800 Subject: [PATCH 111/962] Adds merge migration --- bookwyrm/migrations/0224_merge_20251116_1928.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0224_merge_20251116_1928.py diff --git a/bookwyrm/migrations/0224_merge_20251116_1928.py b/bookwyrm/migrations/0224_merge_20251116_1928.py new file mode 100644 index 0000000000..94b6b1c279 --- /dev/null +++ b/bookwyrm/migrations/0224_merge_20251116_1928.py @@ -0,0 +1,13 @@ +# Generated by Django 5.2.3 on 2025-11-16 19:28 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0219_alter_listitem_options_suggestionlist_and_more"), + ("bookwyrm", "0223_sitesettings_disable_federation"), + ] + + operations = [] From d25222124e269f8f09256b6bf474f456818df0ce Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:04 -0800 Subject: [PATCH 112/962] New translations django.po (Italian) --- locale/it_IT/LC_MESSAGES/django.po | 306 ++++++++++++++++++++--------- 1 file changed, 211 insertions(+), 95 deletions(-) diff --git a/locale/it_IT/LC_MESSAGES/django.po b/locale/it_IT/LC_MESSAGES/django.po index e310280585..81ef6783a1 100644 --- a/locale/it_IT/LC_MESSAGES/django.po +++ b/locale/it_IT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-11-02 01:26+0000\n" -"PO-Revision-Date: 2025-11-02 11:39\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Italian\n" "Language: it\n" @@ -37,15 +37,15 @@ msgstr "Non scade" msgid "Unlimited" msgstr "Illimitato" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Password errata" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "La password non corrisponde" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Password errata" @@ -81,7 +81,11 @@ msgstr "Esiste già un'utenza con questo indirizzo email." msgid "This email address cannot be registered." msgstr "Questo indirizzo email non può essere registrato." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Codice errato" @@ -325,12 +329,21 @@ msgstr "Followers" msgid "Private" msgstr "Privata" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -343,6 +356,7 @@ msgstr "Attivo" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Completato" @@ -475,19 +489,19 @@ msgstr "Citazioni" msgid "Everything else" msgstr "Tutto il resto" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "La tua timeline" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Home" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Timeline dei libri" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -496,91 +510,91 @@ msgstr "Timeline dei libri" msgid "Books" msgstr "Libri" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Inglese)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (catalano)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Tedesco)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Spagnolo)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galiziano)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Finlandese)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Francese)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (Olandese)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvegese)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Polacco)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portoghese Brasiliano)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portoghese europeo)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Rumeno (Romanian)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Svedese)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (ucraino)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Cinese Semplificato)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Cinese Tradizionale)" @@ -638,54 +652,54 @@ msgstr "Qualcosa è andato storto! Ci dispiace." msgid "About" msgstr "Informazioni su" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Benvenuto su %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s fa parte di BookWyrm, una rete di comunità indipendenti e autonome per lettori. Pur potendo interagire senza problemi con gli utenti di tutta la rete BookWyrm, questa comunità è unica nel suo genere." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s è il libro più amato di %(site_name)s, con una valutazione media di %(rating)s su 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Più utenti di %(site_name)s desiderano leggere %(title)s rispetto a qualsiasi altro libro." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s è il libro con le valutazioni più contrastanti su %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Tieni traccia delle tue letture, parla di libri, scrivi recensioni e scopri cosa leggere dopo. Sempre senza pubblicità, anti-corporate e orientato alla comunità, BookWyrm è un software su misura per le persone, progettato per rimanere piccolo e personale. Se hai richieste di funzionalità, segnalazioni di bug o grandi sogni, contattaci e fai sentire la tua voce." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Incontra gli amministratori" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "I moderatori e gli amministratori di %(site_name)s mantengono il sito attivo e funzionante, fanno rispettare il codice di condotta e intervengono quando gli utenti segnalano spam o comportamenti scorretti." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderatori" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -1083,6 +1097,7 @@ msgstr "Salva" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1099,10 +1114,12 @@ msgstr "Il caricamento dei dati si connetterà a %(source_name)s%(email)s if there is an account using that email address." @@ -4475,17 +4511,9 @@ msgstr "Modifica Password" msgid "Successfully changed password" msgstr "La password è stata modificata con successo" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Password attuale:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nuova password:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4511,6 +4539,10 @@ msgstr "Cancellare permanentemente l'account" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "L'eliminazione del tuo account non può essere annullata. Il nome utente non sarà disponibile per la registrazione in futuro." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4697,6 +4729,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Data" @@ -5103,7 +5136,7 @@ msgstr "Modifica" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Annunci" @@ -5121,13 +5154,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Data d'inizio:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Data di fine:" @@ -5209,42 +5242,51 @@ msgstr "Gli utenti o gli stati che sono già stati segnalati (a prescindere dal #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Pianificazione:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Ultima esecuzione:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Numero di esecuzioni totali:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Attivato:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Elimina pianificazione" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Esegui ora" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "L'ultima data di esecuzione non sarà aggiornata" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Pianifica una scansione" @@ -5289,7 +5331,7 @@ msgstr "Rimuovi regola" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Stato di Celery" @@ -5318,7 +5360,7 @@ msgid "Import triggered" msgstr "Importazione attivata" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Connettori" @@ -5478,7 +5520,7 @@ msgid "Dashboard" msgstr "Dashboard" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Totale utenti" @@ -5492,31 +5534,31 @@ msgstr "Attivo questo mese" msgid "Works" msgstr "Lavori" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Attività di Istanza" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervallo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Giorni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Settimane" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Attività di registrazione dell'utente" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Attività di stato" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Opere create" @@ -5590,7 +5632,7 @@ msgstr "Dominio:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Lista email bloccate" @@ -5616,7 +5658,7 @@ msgstr "Nessun dominio email attualmente bloccato" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Configurazione email" @@ -5843,7 +5885,43 @@ msgstr "File scaduti" msgid "Completed" msgstr "Completati" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "Ora di scadenza aggiornata correttamente" @@ -6117,7 +6195,7 @@ msgstr "È possibile bloccare gli intervalli IP usando la sintassi CIDR." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Elenco Indirizzo IP bloccati" @@ -6142,49 +6220,55 @@ msgid "Manage Users" msgstr "Gestione utenti" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderazione" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Reports" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "Regole Di Auto-Moderazione" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Link ai domini" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Sistema" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "Operazioni pianificate" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Impostazioni dell'istanza" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Impostazioni Sito" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6192,7 +6276,7 @@ msgstr "Impostazioni Sito" msgid "Registration" msgstr "Registrazione" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6608,12 +6692,44 @@ msgstr "Elimina definitivamente utente" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Sei sicuro di voler eliminare l'account di %(username)s? Questa azione non può essere annullata. Per procedere, inserisci la tua password per confermare l'eliminazione." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "La tua password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 14cb5a18a0cb745925cccfcafd42c4e0e58e816e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:05 -0800 Subject: [PATCH 113/962] New translations django.po (Slovak) --- locale/sk_SK/LC_MESSAGES/django.po | 304 ++++++++++++++++++++--------- 1 file changed, 210 insertions(+), 94 deletions(-) diff --git a/locale/sk_SK/LC_MESSAGES/django.po b/locale/sk_SK/LC_MESSAGES/django.po index e0b42e92d2..4f9d2f06bc 100644 --- a/locale/sk_SK/LC_MESSAGES/django.po +++ b/locale/sk_SK/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-11-02 01:26+0000\n" -"PO-Revision-Date: 2025-11-08 12:05\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Slovak\n" "Language: sk\n" @@ -37,15 +37,15 @@ msgstr "Nevyprší" msgid "Unlimited" msgstr "Neobmedzené" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Nesprávne heslo" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Heslá sa nezhodujú" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Nesprávne heslo" @@ -81,7 +81,11 @@ msgstr "Užívateľ s týmto emailom už existuje." msgid "This email address cannot be registered." msgstr "Táto emailová adresa nemôže byť zaregistrovaná." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Nesprávny kód" @@ -325,12 +329,21 @@ msgstr "Nasledovatelia" msgid "Private" msgstr "Súkromne" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -343,6 +356,7 @@ msgstr "Aktívny" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Hotovo" @@ -477,19 +491,19 @@ msgstr "Citácie" msgid "Everything else" msgstr "Všetko ostatné" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Domáca časová os" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Domov" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Časová os kníh" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -498,91 +512,91 @@ msgstr "Časová os kníh" msgid "Books" msgstr "Knihy" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Angličtina" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Nemecky" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Španielsky" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Taliansky" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "Kórejsky" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Fínsky" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Francúzky" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Dánsky" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Nórsky" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Poľsky" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Rumunsky" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Švédsky" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Ukrajinsky" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -640,54 +654,54 @@ msgstr "Niečo sa pokazilo! Ospravedlňujeme sa za to." msgid "About" msgstr "O" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Vitajte na %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s je na %(site_name)s najobľúbenejšou knihou, s priemerným hodnotením %(rating)s z 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Viac užívateľov %(site_name)s chce čítať %(title)s, než akúkoľvek inú knihu." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Sleduj svoje čítanie, diskutuj o knihách, píš recenzie a objavuj, čo čítať ďalej. Vždy bez reklám, protikorporátny a komunitne orientovaný, BookWyrm je softvér ľudskej veľkosti, navrhnutý tak, aby ostal malý a osobný. Pokiaľ máte nápady na zlepšenie, hlásenie chýb, alebo veľké sny, ozvite sa a dajte o sebe vedieť." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Stretni tvojich administrátorov" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderátor" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Správca" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -1093,6 +1107,7 @@ msgstr "Uložiť" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1109,10 +1124,12 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Potvrdiť" @@ -1642,6 +1659,7 @@ msgstr "Doména" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1797,7 +1815,7 @@ msgstr "Potvrdzujúci kód:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Odoslať" @@ -2070,6 +2088,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2096,8 +2116,10 @@ msgstr "Toto je testovací email." msgid "Test email" msgstr "Skúšobný email" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3157,7 +3179,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Nahrania" @@ -3541,6 +3563,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Potvrdiť heslo:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3630,12 +3672,6 @@ msgstr "Zabudli ste svoje heslo?" msgid "More about this site" msgstr "Viac o tejto stránke" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Potvrdiť heslo:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4509,17 +4545,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4545,6 +4573,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4733,6 +4765,7 @@ msgstr[3] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5139,7 +5172,7 @@ msgstr "Upraviť" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Oznámenia" @@ -5157,13 +5190,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Počiatočný dátum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Konečný dátum:" @@ -5245,42 +5278,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Naplánované:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Poslednýkrát bežalo:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Celkový počet spustení:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Povolené:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Vymazať naplánovanie" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Spustiť teraz" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5325,7 +5367,7 @@ msgstr "Odstrániť pravidlá" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5354,7 +5396,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5514,7 +5556,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Užívateľov celkom" @@ -5528,31 +5570,31 @@ msgstr "Aktívni tento mesiac" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Aktivita instancie" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Týždne" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Aktivita príspevkov" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Vytvorených diel" @@ -5632,7 +5674,7 @@ msgstr "Doména:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5660,7 +5702,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Nastavenie emailu" @@ -5887,7 +5929,43 @@ msgstr "" msgid "Completed" msgstr "Hotovo" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6161,7 +6239,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6186,49 +6264,55 @@ msgid "Manage Users" msgstr "Spravovať užívateľov" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Nahlásenia" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Systém" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Nastavenia instancie" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Nastavenia stránky" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6236,7 +6320,7 @@ msgstr "Nastavenia stránky" msgid "Registration" msgstr "Registrácia" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6652,12 +6736,44 @@ msgstr "Natrvalo vymazať užívateľa" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Vaše heslo:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 95aa1ecf1566b2e6e0f6499d3dd7e03fa9e00040 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:07 -0800 Subject: [PATCH 114/962] New translations django.po (Romanian) --- locale/ro_RO/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/ro_RO/LC_MESSAGES/django.po b/locale/ro_RO/LC_MESSAGES/django.po index d086b7cb44..5fb379f11d 100644 --- a/locale/ro_RO/LC_MESSAGES/django.po +++ b/locale/ro_RO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Romanian\n" "Language: ro\n" @@ -37,15 +37,15 @@ msgstr "Nu expiră" msgid "Unlimited" msgstr "Nelimitat" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Parolă incorectă" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Parola nu se potrivește" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -81,7 +81,11 @@ msgstr "Un utilizator cu această adresă de email există deja." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -195,7 +199,6 @@ msgstr "Broșură" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Urmăritori" msgid "Private" msgstr "Privat" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Activ" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Eroare la încărcarea cărții" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Nu a putut fi găsită o potrivire pentru carte" @@ -461,7 +474,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Recenzii" @@ -477,19 +490,19 @@ msgstr "Citate" msgid "Everything else" msgstr "Orice altceva" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Friză cronologică principală" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Acasă" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Friză cronologică de cărți" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -498,91 +511,91 @@ msgstr "Friză cronologică de cărți" msgid "Books" msgstr "Cărți" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (engleză)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (catalană)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (germană)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (spaniolă)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (galiciană)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (italiană)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (finlandeză)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (franceză)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (lituaniană)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (norvegiană)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugheză braziliană)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugheză europeană)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (română)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (suedeză)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (chineză simplificată)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (chineză tradițională)" @@ -640,54 +653,54 @@ msgstr "Ceva a mers prost! Ne pare rău pentru asta." msgid "About" msgstr "Despre" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Bine ați venit în %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s este cartea cea mai iubită a %(site_name)s, cu un rating mediu de %(rating)s din 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Utilizatorii %(site_name)s vor să citească %(title)s mai mult decât oricare altă carte." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s are ratingul cel mai divizat față de orice altă carte a %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Întâlniți-vă adminii" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Moderatorii și administratorii %(site_name)s mențin site-ul în picioare, impun codul de conduită și răspund când utilizatorii raportează spam și comportament neadecvat." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderator" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -829,7 +842,7 @@ msgstr "Cea mai scurtă lectură a sa…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -923,24 +936,24 @@ msgid "View ISNI record" msgstr "Vizualizați intrarea ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Încărcați date" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Vizualizați în OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Vizualizați în Inventaire" @@ -1049,7 +1062,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1073,7 +1086,7 @@ msgstr "Salvați" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1089,6 +1102,7 @@ msgstr "Salvați" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1105,39 +1119,41 @@ msgstr "Încărcatul de date se va conecta la %(source_name)s #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Confirmați" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Nu s-a putut stabili conexiunea la distanță." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Editați carte" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Adăugați o copertă" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Eșec la încărcarea coperții" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Clic pentru a mări" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1145,17 +1161,17 @@ msgstr[0] "(%(review_count)s recenzie)" msgstr[1] "" msgstr[2] "(%(review_count)s recenzii)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Adăugați o descriere" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descriere:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1163,49 +1179,49 @@ msgstr[0] "%(count)s ediție" msgstr[1] "" msgstr[2] "%(count)s ediții" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Ați pus această ediție pe raftul:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "O ediție diferită a acestei cărți este pe %(shelf_name)s raftul vostru." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Activitatea dvs. de lectură" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Adăugați date de lectură" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Nu aveți nicio activitate de lectură pentru această carte." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Recenziile dvs." -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Comentariile dvs." -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Citatele dvs." -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Subiecte" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Locuri" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1220,11 +1236,11 @@ msgstr "Locuri" msgid "Lists" msgstr "Liste" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Adăugați la listă" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1636,6 +1652,7 @@ msgstr "Domeniu" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1791,7 +1808,7 @@ msgstr "Cod de confirmare:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Trimiteți" @@ -2062,6 +2079,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Ați solicitat reinițializarea parolei dvs. pentru %(site_name)s. Clic pe legătura de dedesubt pentru a alege o nouă parolă și a vă autentifica la contul dvs." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2088,8 +2107,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3146,7 +3167,7 @@ msgstr "Reîncercați stare" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importuri" @@ -3528,6 +3549,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Parola curentă:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Parolă nouă:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Confirmați parola:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3617,12 +3658,6 @@ msgstr "Parolă uitată?" msgid "More about this site" msgstr "Mai multe despre acest site" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Confirmați parola:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4491,17 +4526,9 @@ msgstr "Schimbați parola" msgid "Successfully changed password" msgstr "Parolă schimbată cu succes" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Parola curentă:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Parolă nouă:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4527,6 +4554,10 @@ msgstr "Ștergeți permanent contul" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Ștersul contului dvs. nu poate fi revocată. Numele de utilizator nu va fi valabil pentru înregistrare mai târziu." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4714,6 +4745,7 @@ msgstr[2] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5119,7 +5151,7 @@ msgstr "Editați" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Anunțuri" @@ -5137,13 +5169,13 @@ msgstr "Fals" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Data de început:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Data de sfârșit:" @@ -5225,42 +5257,51 @@ msgstr "Utilizatorii sau stările care au fost deja raportate (indiferent dacă #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Program:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Ultima rulare:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Numărul total de rulări:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Activat:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Ștergeți programul" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Rulați acum" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Ultima dată de rulare nu va fi actualizată" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Programați scanare" @@ -5305,7 +5346,7 @@ msgstr "Eliminați regulă" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5334,7 +5375,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5494,7 +5535,7 @@ msgid "Dashboard" msgstr "Tablou de bord" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Număr total de utilizatori" @@ -5508,31 +5549,31 @@ msgstr "Activi această lună" msgid "Works" msgstr "Opere" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Activitatea instanței" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Interval:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Zile" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Săptămâni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Activitate de înscriere a utilizatorilor" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Activitate stare" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Opere create" @@ -5609,7 +5650,7 @@ msgstr "Domeniu:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Listă neagră de email-uri" @@ -5636,7 +5677,7 @@ msgstr "Niciun domeniu email blocat în prezent" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5863,7 +5904,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6137,7 +6214,7 @@ msgstr "Puteți bloca o plajă de adrese IP folosind sintaxa CIDR." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Lista de adrese IP blocate" @@ -6162,49 +6239,55 @@ msgid "Manage Users" msgstr "Gestionați utilizatorii" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderare" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Raporturi" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Legături către domenii" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Setările instanței" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Setările site-ului" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6212,7 +6295,7 @@ msgstr "Setările site-ului" msgid "Registration" msgstr "Înregistrare" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6628,12 +6711,44 @@ msgstr "Ștergeți utilizatorul permanent" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Sunteți sigur că vreți să ștergeți contul %(username)s? Această acțiune nu poate fi revocată. Pentru a continua, vă rugăm introduceți parola dvs. pentru a confirma ștergerea." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Parola dvs.:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From f9f16b0f39324946d1983bc9c8a0cf3ac71e41ab Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:08 -0800 Subject: [PATCH 115/962] New translations django.po (French) --- locale/fr_FR/LC_MESSAGES/django.po | 311 ++++++++++++++++++++--------- 1 file changed, 213 insertions(+), 98 deletions(-) diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index cb0ba4ea3c..71eeaa4b38 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-10-13 22:43+0000\n" -"PO-Revision-Date: 2025-10-20 13:41\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -37,15 +37,15 @@ msgstr "Sans expiration" msgid "Unlimited" msgstr "Sans limite" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Mot de passe incorrect" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Le mot de passe ne correspond pas" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Mot de passe incorrect" @@ -81,7 +81,11 @@ msgstr "Cet email est déjà associé à un compte." msgid "This email address cannot be registered." msgstr "Cette adresse de courriel ne peut pas être enregistrée." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Code incorrect" @@ -195,7 +199,6 @@ msgstr "Livre broché" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s ne ressemble pas à un numéro ISBN" @@ -326,12 +329,21 @@ msgstr "Abonné(e)s" msgid "Private" msgstr "Privé" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Actif" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Terminé" @@ -355,11 +368,11 @@ msgstr "Interrompu" msgid "Import stopped" msgstr "Import arrêté" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Erreur lors du chargement du livre" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Impossible de trouver une correspondance pour le livre" @@ -476,19 +489,19 @@ msgstr "Citations" msgid "Everything else" msgstr "Tout le reste" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Mon fil d’actualité" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Accueil" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Mon fil d’actualité littéraire" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Mon fil d’actualité littéraire" msgid "Books" msgstr "Livres" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Catalan)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Espéranto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galicien)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italien)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Coréen)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Finnois)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituanien)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (néerlandais)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvégien)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Polonais)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugais brésilien)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugais européen)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Roumain)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Suédois)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainien)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简化字" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (chinois traditionnel)" @@ -639,54 +652,54 @@ msgstr "Une erreur s’est produite ; désolé !" msgid "About" msgstr "À propos" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Bienvenue sur %(site_name)s !" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s est sur BookWyrm, un réseau de communautés indépendantes et autogérées, à destination des lecteurs. Bien que vous puissiez interagir sans limite avec n’importe quel compte dans le réseau BookWyrm, cette communauté est unique." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s est le livre le plus aimé de %(site_name)s, avec une note moyenne de %(rating)s sur 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Sur %(site_name)s, c’est %(title)s que tout le monde veut lire plus que n’importe quel autre livre." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s divise les critiques plus que n’importe quel autre livre sur %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Gardez trace de vos lectures, parlez de livres, écrivez des critiques et découvrez quoi lire ensuite. BookWyrm est un logiciel à taille humaine, sans publicité, anti-capitaliste et axé sur la communauté, conçu pour rester petit et personnel. Si vous avez des demandes de fonctionnalités, des rapports de bogue ou des rêves grandioses, rejoignez-nous et faites-vous entendre." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Rencontrez vos admins" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "L’administration et la modération de %(site_name)s maintiennent le site opérationnel, font respecter le code de conduite, et interviennent lorsque les utilisateurs signalent du spam et des mauvais comportements." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Modérateur/modératrice" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -1084,6 +1097,7 @@ msgstr "Enregistrer" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,10 +1114,12 @@ msgstr "Le chargement des données se connectera à %(source_name)s%(site_name)s a été initialisée. Cliquez le lien suivant pour définir un nouveau mot de passe et vous connecter à votre compte." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Ceci est un e-mail de test." msgid "Test email" msgstr "E-mail de test" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Statut de la nouvelle tentative" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importations" @@ -3514,6 +3535,26 @@ msgstr "Type de relation" msgid "Reason" msgstr "Motif" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Mot de passe actuel :" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Nouveau mot de passe :" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Confirmez le mot de passe :" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Mot de passe oublié ?" msgid "More about this site" msgstr "En savoir plus sur ce site" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Confirmez le mot de passe :" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Changer le mot de passe" msgid "Successfully changed password" msgstr "Le mot de passe a bien été changé" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Mot de passe actuel :" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nouveau mot de passe :" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Supprimer définitivement le compte" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "La suppression de votre compte ne peut pas être annulée. Le nom d'utilisateur ne sera plus disponible pour vous enregistrer dans le futur." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "Les fichiers d'exportation seront supprimés après %(expiry_hours)s #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Date" @@ -5099,7 +5131,7 @@ msgstr "Modifier" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Annonces" @@ -5117,13 +5149,13 @@ msgstr "Faux" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Date de début :" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Date de fin :" @@ -5205,42 +5237,51 @@ msgstr "Les comptes ou statuts qui ont déjà été signalés (que le rapport ai #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Planification :" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Dernière exécution :" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Nombre total d’exécutions :" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Activé :" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Supprimer la planification" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Lancer maintenant" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "La date de dernière exécution ne sera pas mise à jour" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Planifier une analyse" @@ -5285,7 +5326,7 @@ msgstr "Supprimer la règle" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Statut de Celery" @@ -5314,7 +5355,7 @@ msgid "Import triggered" msgstr "Import déclenché" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Connecteurs" @@ -5474,7 +5515,7 @@ msgid "Dashboard" msgstr "Tableau de bord" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Nombre total d'utilisateurs·rices" @@ -5488,31 +5529,31 @@ msgstr "Actifs ce mois" msgid "Works" msgstr "Œuvres" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Activité de l'instance" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervalle :" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Jours" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Semaines" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Nouvelles inscriptions" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Nouveaux statuts" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Œuvres créées" @@ -5586,7 +5627,7 @@ msgstr "Domaine :" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Liste des e-mails bloqués" @@ -5612,7 +5653,7 @@ msgstr "Aucun domaine de messagerie n’est actuellement bloqué" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Configuration de la messagerie" @@ -5839,7 +5880,43 @@ msgstr "Fichiers expirés" msgid "Completed" msgstr "Terminé" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "Heure d'expiration mise à jour avec succès" @@ -6113,7 +6190,7 @@ msgstr "Vous pouvez bloquer des plages d'adresses IP en utilisant la syntaxe CID #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Liste des adresses IP bloquées" @@ -6138,49 +6215,55 @@ msgid "Manage Users" msgstr "Gérer les comptes" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Modération" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Signalements" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "Règles d'auto-modération" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Domaines liés" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Système" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "Tâches planifiées" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "Maintenance des fichiers" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Paramètres de l’instance" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Paramètres du site" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6188,7 +6271,7 @@ msgstr "Paramètres du site" msgid "Registration" msgstr "Inscription" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6604,12 +6687,44 @@ msgstr "Supprimer définitivement l'utilisateur" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Êtes-vous sûr de vouloir supprimer le compte de %(username)s? Cette action ne peut pas être annulée. Pour continuer, veuillez entrer votre mot de passe pour confirmer la suppression." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Votre mot de passe:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 847b480937fba2b7631b1679d88e7e67c541cbab Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:09 -0800 Subject: [PATCH 116/962] New translations django.po (Spanish) --- locale/es_ES/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po index 61725040c6..3420a408bc 100644 --- a/locale/es_ES/LC_MESSAGES/django.po +++ b/locale/es_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-15 08:36\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -37,15 +37,15 @@ msgstr "No expira" msgid "Unlimited" msgstr "Sin límite" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Contraseña incorrecta" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "La contraseña no coincide" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Contraseña incorrecta" @@ -81,7 +81,11 @@ msgstr "Ya existe un usuario con ese correo electrónico." msgid "This email address cannot be registered." msgstr "No se puede registrar esta dirección de correo electrónico." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Código incorrecto" @@ -195,7 +199,6 @@ msgstr "Tapa blanda" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s no se parece a un ISBN" @@ -326,12 +329,21 @@ msgstr "Seguidores" msgid "Private" msgstr "Privado" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Activo" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Completado" @@ -355,11 +368,11 @@ msgstr "Detenido" msgid "Import stopped" msgstr "Importación detenida" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Error en cargar libro" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "No se pudo encontrar el libro" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Reseñas" @@ -476,19 +489,19 @@ msgstr "Citas" msgid "Everything else" msgstr "Todo lo demás" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Línea de tiempo principal" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Línea temporal de libros" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Línea temporal de libros" msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Catalán)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Alemán)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskera" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (gallego)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (finés)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Francés)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Países bajos (holandés)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (noruego)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Polaco)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugués brasileño)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (rumano)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (ucraniano)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chino simplificado)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chino tradicional)" @@ -639,54 +652,54 @@ msgstr "¡Algo salió mal! Disculpa." msgid "About" msgstr "Acerca de" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "¡Bienvenido a %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s es parte de BookWyrm, una red de comunidades independientes y autoguiadas para los lectores. Aunque puedes interactuar sin problemas con los usuarios en cualquier lugar de la red de BookWyrm, esta comunidad es única." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s es el libro más querido de %(site_name)s, con una valoración promedio de %(rating)s sobre 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Los usuarios de %(site_name)s quieren leer %(title)s más que cualquier otro libro." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "Las valoraciones de %(title)s están más divididas que las de cualquier otro libro en %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Haz un registro de tu lectura, habla de libros, escribe reseñas, y descubre qué leer a continuación. BookWyrm es un software de escala humana, sin anuncios, anticorporativo y orientado a la comunidad, diseñado para mantenerse pequeño y personal. Si tienes solicitudes de características, reportes de errores o grandes sueños, contacta con nosotros y hazte oír." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Conoce a tus administradores" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Los moderadores y administradores de %(site_name)s mantienen el sitio en funcionamiento, hacen cumplir el Código de conducta y responden cuando les usuaries informan de spam y mal comportamiento." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderadore" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Admin." -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "El libro más corto que ha leído este año…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Ver registro ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Ver en ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Cargar datos" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Ver en OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Ver en Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Guardar" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Guardar" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "La carga de datos se conectará a %(source_name)s y com #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Confirmar" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "No se ha podido conectar con la fuente remota." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Editar Libro" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Haz clic para añadir portada" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "No se pudo cargar la portada" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Haz clic para ampliar" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, 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:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Agregar descripción" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descripción:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s edición" msgstr[1] "%(count)s ediciones" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Has guardado esta edición en:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, 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 estantería %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Tu actividad de lectura" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Agregar fechas de lectura" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 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:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Tus reseñas" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Tus comentarios" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Tus citas" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Temas" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Agregar a lista" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Dominio" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Tú solicitaste reestablecer tu %(site_name)s contraseña. Haz clic en el enlace a continuación para establecer una nueva contraseña e ingresar a tu cuenta." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Este es un correo electrónico de prueba." msgid "Test email" msgstr "Correo electrónico de prueba" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Estado del Reintento" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importaciones" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Contraseña actual:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Nueva contraseña:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Confirmar contraseña:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "¿Olvidaste tu contraseña?" msgid "More about this site" msgstr "Más sobre este sitio" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Confirmar contraseña:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Cambiar contraseña" msgid "Successfully changed password" msgstr "Tu contraseña fue modificada satisfactoriamente" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Contraseña actual:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nueva contraseña:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Eliminar cuenta permanentemente" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "La eliminación de tu cuenta no se puede deshacer. El nombre de usuario no estará disponible para registrarse en el futuro." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Fecha" @@ -5100,7 +5132,7 @@ msgstr "Editar" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Anuncios" @@ -5118,13 +5150,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Fecha de inicio:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Fecha final:" @@ -5206,42 +5238,51 @@ msgstr "No se marcarán les usuaries que ya hayan sido denunciades (sin importar #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Programar:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Última ejecución:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Ejecuciones totales:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Habilitada:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Eliminar programación" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Ejecutar" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "La última ejecución no se actualizará" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Programar escaneo" @@ -5286,7 +5327,7 @@ msgstr "Quitar regla" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Estado de Celery" @@ -5315,7 +5356,7 @@ msgid "Import triggered" msgstr "Importación activada" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Conectores" @@ -5475,7 +5516,7 @@ msgid "Dashboard" msgstr "Tablero" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Número de usuarios" @@ -5489,31 +5530,31 @@ msgstr "Activos este mes" msgid "Works" msgstr "Obras" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Actividad de instancia" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Actividad de inscripciones de usuarios" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Actividad de estado" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Obras creadas" @@ -5587,7 +5628,7 @@ msgstr "Dominio:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Lista de bloqueo de correos electrónicos" @@ -5613,7 +5654,7 @@ msgstr "No hay dominios de correo electrónico bloqueados actualmente" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Configuración del Correo Electrónico" @@ -5840,7 +5881,43 @@ msgstr "" msgid "Completed" msgstr "Completado" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6114,7 +6191,7 @@ msgstr "Puedes bloquear rangos de IP usando la sintaxis CIDR." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Lista de direcciones IP bloqueadas" @@ -6139,49 +6216,55 @@ msgid "Manage Users" msgstr "Administrar usuarios" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderación" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Informes" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Dominios de enlaces" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Sistema" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Configurar instancia" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Configurar sitio" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6189,7 +6272,7 @@ msgstr "Configurar sitio" msgid "Registration" msgstr "Registración" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6605,12 +6688,44 @@ msgstr "Eliminar usuario permanentemente" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "¿Estás seguro que quieres eliminar la cuenta de %(username)s's? Esta acción no se puede deshacer. Para continuar, por favor, ingrese tu contraseña para confirmar eliminación." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Tu contraseña:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 1e22254e78d0bec21aecf25126571ed5c337c7ac Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:11 -0800 Subject: [PATCH 117/962] New translations django.po (Afrikaans) --- locale/af_ZA/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/af_ZA/LC_MESSAGES/django.po b/locale/af_ZA/LC_MESSAGES/django.po index e5804c9dbb..9015d9beac 100644 --- a/locale/af_ZA/LC_MESSAGES/django.po +++ b/locale/af_ZA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Afrikaans\n" "Language: af\n" @@ -37,15 +37,15 @@ msgstr "" msgid "Unlimited" msgstr "" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -81,7 +81,11 @@ msgstr "" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -195,7 +199,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -476,19 +489,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -639,54 +652,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5114,13 +5146,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5485,31 +5526,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5609,7 +5650,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,11 +6684,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From f6a1e3d525195d34d28b0bb136d1d595b80e471c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:12 -0800 Subject: [PATCH 118/962] New translations django.po (Arabic) --- locale/ar_SA/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/ar_SA/LC_MESSAGES/django.po b/locale/ar_SA/LC_MESSAGES/django.po index 77c8f3e20a..c8b7bcb253 100644 --- a/locale/ar_SA/LC_MESSAGES/django.po +++ b/locale/ar_SA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-10-11 13:53\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Arabic\n" "Language: ar\n" @@ -37,15 +37,15 @@ msgstr "لا تنتهي صلاحيتها" msgid "Unlimited" msgstr "غير محدود" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "كلمة سر خاطئة" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "كلمة سر غير متطابقة" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "كلمة سر خاطئة" @@ -81,7 +81,11 @@ msgstr "يوجد بالفعل مستخدم بهذا البريد الإلكتر msgid "This email address cannot be registered." msgstr "لا يمكن تسجيل عنوان البريد الإلكتروني هذا." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "الرمز غير صحيح" @@ -195,7 +199,6 @@ msgstr "غلاف ورقي" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s لا يبدو مثل ISBN" @@ -326,12 +329,21 @@ msgstr "المتابِعون" msgid "Private" msgstr "خاص" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "نشيطٌ" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "مكتمل" @@ -355,11 +368,11 @@ msgstr "أوقف" msgid "Import stopped" msgstr "تم إيقاف الاستيراد" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "خطأ في تحميل الكتب" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -464,7 +477,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -480,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "كل شيء آخر" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "الخط الزمني الرئيسي" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "الصفحة الرئيسية" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "الخط الزمني اللكتب" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -501,91 +514,91 @@ msgstr "الخط الزمني اللكتب" msgid "Books" msgstr "الكتب" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "الإنجليزية" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (الألمانية)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (الإسبانية)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (الفرنسية)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "بولندي (البولندية)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "السويدية (السويدي)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -643,54 +656,54 @@ msgstr "حدث خطأ ما! عفواً." msgid "About" msgstr "عن" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "مرحبا بك في %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "مُشرف" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "المدير" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -838,7 +851,7 @@ msgstr "أقصر قراءتهم هذا العام…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -938,24 +951,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "تحميل البيانات" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "عرض على OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1064,7 +1077,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1088,7 +1101,7 @@ msgstr "حفظ" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1104,6 +1117,7 @@ msgstr "حفظ" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1120,39 +1134,41 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "تأكيد" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "تعديل الكتاب" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "انقر لإضافة غلاف" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "إخفاق في تحميل الغلاف" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "اضغط للتوسيع" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1163,17 +1179,17 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "إضافة وصف" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "الوصف:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1184,49 +1200,49 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "ليس لديك أي نشاط للقراءة لهذا الكتاب." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "تعليقاتك" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "الإقتباسات الخاصة بك" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "المواضيع" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "الأماكن" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1241,11 +1257,11 @@ msgstr "الأماكن" msgid "Lists" msgstr "القوائم" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "إضافة إلى قائمة" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1657,6 +1673,7 @@ msgstr "النطاق" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1812,7 +1829,7 @@ msgstr "رمز التأكيد:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "قدم" @@ -2089,6 +2106,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2115,8 +2134,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3182,7 +3203,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3570,6 +3591,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "الكلمة السرية الجديدة:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "أَكِد كلمة المرور:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3659,12 +3700,6 @@ msgstr "نسيت كلمة المرور الخاصة بك؟" msgid "More about this site" msgstr "مزيد من المعلومات عن هذا الموقع" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "أَكِد كلمة المرور:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4548,17 +4583,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "الكلمة السرية الجديدة:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4584,6 +4611,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4774,6 +4805,7 @@ msgstr[5] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5184,7 +5216,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5202,13 +5234,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5290,42 +5322,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5370,7 +5411,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5399,7 +5440,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5559,7 +5600,7 @@ msgid "Dashboard" msgstr "لوحة التحكم" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "إجمالي المستخدمين" @@ -5573,31 +5614,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "أيام" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "أسابيع" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5683,7 +5724,7 @@ msgstr "النطاق:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5713,7 +5754,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5940,7 +5981,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6214,7 +6291,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6239,49 +6316,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6289,7 +6372,7 @@ msgstr "" msgid "Registration" msgstr "التسجيل" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6705,11 +6788,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From c4fc3e8dd06172a804fd5e8265d9a2ea0bf0588c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:13 -0800 Subject: [PATCH 119/962] New translations django.po (Bulgarian) --- locale/bg_BG/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/bg_BG/LC_MESSAGES/django.po b/locale/bg_BG/LC_MESSAGES/django.po index 372950c584..29c521e357 100644 --- a/locale/bg_BG/LC_MESSAGES/django.po +++ b/locale/bg_BG/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bulgarian\n" "Language: bg\n" @@ -37,15 +37,15 @@ msgstr "Няма краен срок" msgid "Unlimited" msgstr "Неограничено" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Грешна парола" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Паролата не съответства" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Грешна парола" @@ -81,7 +81,11 @@ msgstr "Потребител с този e-mail вече съществува." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Неправилен код" @@ -195,7 +199,6 @@ msgstr "Меки корици" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -476,19 +489,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -639,54 +652,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5114,13 +5146,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5485,31 +5526,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5609,7 +5650,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,11 +6684,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From f36decc8383254dbe599f4b3ab1e57ed67b11ddc Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:15 -0800 Subject: [PATCH 120/962] New translations django.po (Catalan) --- locale/ca_ES/LC_MESSAGES/django.po | 311 ++++++++++++++++++++--------- 1 file changed, 213 insertions(+), 98 deletions(-) diff --git a/locale/ca_ES/LC_MESSAGES/django.po b/locale/ca_ES/LC_MESSAGES/django.po index 1219e81220..c170154224 100644 --- a/locale/ca_ES/LC_MESSAGES/django.po +++ b/locale/ca_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-10-13 22:43+0000\n" -"PO-Revision-Date: 2025-10-26 21:12\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -37,15 +37,15 @@ msgstr "No caduca" msgid "Unlimited" msgstr "Il·limitat" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "La contrasenya no és correcta" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "La contrasenya no coincideix" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "La contrasenya no és correcta" @@ -81,7 +81,11 @@ msgstr "Ja existeix un usuari amb aquesta adreça electrònica." msgid "This email address cannot be registered." msgstr "Aquesta adreça de correu electrònic no pot ser registrada." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "El codi no és correcte" @@ -195,7 +199,6 @@ msgstr "Edició de butxaca" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s no semblen ISBN" @@ -326,12 +329,21 @@ msgstr "Seguidors" msgid "Private" msgstr "Privat" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Actiu" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Complet" @@ -355,11 +368,11 @@ msgstr "Aturat" msgid "Import stopped" msgstr "S'ha aturat la importació" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Error en carregar el llibre" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "No s'ha trobat el llibre" @@ -476,19 +489,19 @@ msgstr "Citacions" msgid "Everything else" msgstr "Tota la resta" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Línia de temps Inici" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Inici" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Cronologia dels llibres" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Cronologia dels llibres" msgid "Books" msgstr "Llibres" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Anglès)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Alemany)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (espanyol)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskera (Basc)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (gallec)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (italià)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Coreà)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (finès)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (francès)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituà)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Països Baixos (Holandès)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (noruec)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (polonès)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portuguès del Brasil)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portuguès europeu)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (romanès)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (suec)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Ucraïnès)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (xinès simplificat)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (xinès tradicional)" @@ -639,54 +652,54 @@ msgstr "Malauradament quelcom ha anat malament." msgid "About" msgstr "Sobre nosaltres " -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Benvingut a %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s és part de BookWyrm, una xarxa de comunitats independents i autogestionades per a lectors. Tot i que pots interactuar sense problemes amb els usuaris de qualsevol part de la xarxa BookWyrm, aquesta comunitat és única." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s és el llibre preferit de %(site_name)s, amb una valoració mitjana de %(rating)s sobre 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "El llibre que volen llegir la majoria de membres de %(site_name)s és %(title)s." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s es el llibre amb valoracions més dispars a %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Feu seguiment de les vostres lectures, parleu sobre llibres, escriviu valoracions i descobriu properes lectures. Bookwyrm és un programari d'escala humana, dissenyat per a ser petit i personal i amb el compromís de no tenir mai publicitat, ser anticorporatiu i orientat a la comunitat. Si teniu suggeriments de característiques noves, informes d'errors o grans projectes, code of conduct, and respond when users report spam and bad behavior." msgstr "Les persones moderadores i administradores de %(site_name)s mantenen en funcionament aquest lloc, fan complir el codi de conducta i responen els informes de brossa i mal comportament que puguin enviar els usuaris." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderació" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Administració" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -1084,6 +1097,7 @@ msgstr "Desa" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,10 +1114,12 @@ msgstr "La càrrega de les dades es connectarà a %(source_name)s%(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Canvia la contrasenya" msgid "Successfully changed password" msgstr "La contrasenya ha estat canviada satisfactòriament" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Contrasenya actual:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nova Contrasenya:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Elimina el teu compte de manera permanent" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "L'acció d'eliminar el teu compte no es pot desfer. El teu nom d'usuari no estarà disponible per registrar-se en un futur." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "Els fitxers d'exportació s'eliminaran després de %(expiry_hours)s h #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Data" @@ -5100,7 +5132,7 @@ msgstr "Edita" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Avisos" @@ -5118,13 +5150,13 @@ msgstr "Fals" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Data d'inici:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Data final:" @@ -5206,42 +5238,51 @@ msgstr "Les usuàries o estats que ja han estat denunciades (encara que la denú #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Programació:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Última execució:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Número total d'execucions:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Activat:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Suprimeix la programació" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Executa ara" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "La data de l'última execució no s'actualitzarà" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Programa un escaneig" @@ -5286,7 +5327,7 @@ msgstr "Elimina la norma" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Estat del Celery" @@ -5315,7 +5356,7 @@ msgid "Import triggered" msgstr "Inicia la importació" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Connectors" @@ -5475,7 +5516,7 @@ msgid "Dashboard" msgstr "Panell de control" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Total d'usuàries" @@ -5489,31 +5530,31 @@ msgstr "Actives aquest mes" msgid "Works" msgstr "Treballs" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Activitat de la instància" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Interval:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dies" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Setmanes" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Activitat de registre d'usuàries" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Activitat de l'estat" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Treballs creats" @@ -5587,7 +5628,7 @@ msgstr "Domini:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Llista d'adreces de correu bloquejades" @@ -5613,7 +5654,7 @@ msgstr "Cap domini de correu a la llista negra" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Configuració del correu electrònic" @@ -5840,7 +5881,43 @@ msgstr "Arxius caducats" msgid "Completed" msgstr "Completat" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "El temps de venciment s'ha actualitzat correctament" @@ -6114,7 +6191,7 @@ msgstr "Podeu bloquejar rangs d'IP utilitzant la sintaxi CIDR." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Llista d'adreces IP bloquejades" @@ -6139,49 +6216,55 @@ msgid "Manage Users" msgstr "Gestiona usuaris" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderació" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Informes" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "Normes d'auto-moderació" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Dominis dels enllaços" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Sistema" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "Tasques programades" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "Manteniment de fitxers" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Configuració d'instància" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Configuració del lloc" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6189,7 +6272,7 @@ msgstr "Configuració del lloc" msgid "Registration" msgstr "Registre" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6605,12 +6688,44 @@ msgstr "Suprimeix l'usuari de manera permanent" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Esteu segur que voleu eliminar el compte de %(username)s? Aquesta acció no es pot desfer. Per continuar, si us plau, entreu la contrasenya per confirmar l'eliminació." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Contrasenya:" +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 5d70f72eafc5b58403764335a2d9372707909164 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:16 -0800 Subject: [PATCH 121/962] New translations django.po (Czech) --- locale/cs_CZ/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/cs_CZ/LC_MESSAGES/django.po b/locale/cs_CZ/LC_MESSAGES/django.po index 9b0a72c229..a9ca280f63 100644 --- a/locale/cs_CZ/LC_MESSAGES/django.po +++ b/locale/cs_CZ/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Czech\n" "Language: cs\n" @@ -37,15 +37,15 @@ msgstr "Nevyprší" msgid "Unlimited" msgstr "Neomezené" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Neplatné heslo" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Heslo se neshoduje" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Chybné heslo" @@ -81,7 +81,11 @@ msgstr "Uživatel s tímto e-mailem již existuje." msgid "This email address cannot be registered." msgstr "Tato e-mailová adresa nemůže být zaregistrována." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Neplatný kód" @@ -195,7 +199,6 @@ msgstr "Měkká vazba" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s nevypadá jako ISBN" @@ -326,12 +329,21 @@ msgstr "Sledující" msgid "Private" msgstr "Soukromý" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktivní" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Dokončeno" @@ -355,11 +368,11 @@ msgstr "Zastaveno" msgid "Import stopped" msgstr "Import byl zastaven" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Chyba při načítání knihy" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Nelze najít hledanou knihu" @@ -462,7 +475,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Hodnocení" @@ -478,19 +491,19 @@ msgstr "Citace" msgid "Everything else" msgstr "Vše ostatní" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Domovská časová osa" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Domov" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Zeď knih" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -499,91 +512,91 @@ msgstr "Zeď knih" msgid "Books" msgstr "Knihy" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Anglicky" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (katalánština)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (němčina)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (španělština)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (galicijština)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (italština)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Korejština)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (finština)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (francouzština)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (litevština)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (Nizozemština)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (norština)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (polština)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugalština (Brazílie))" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugalština (Evropa))" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (rumunština)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (švédština)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrajinština)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (zjednodušená čínština)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (tradiční čínština)" @@ -641,54 +654,54 @@ msgstr "Něco se pokazilo! Omlouváme se." msgid "About" msgstr "Podrobnosti" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Vítejte na %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s je součástí BookWyrm, sítě nezávislých samosprávných komunit pro čtenáře. Zatímco můžete bezproblémově komunikovat s uživateli kdekoli v BookWyrmové síti, tato komunita je jedinečná." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s je nejmilovanější kniha na %(site_name)s s průměrným hodnocením %(rating)s z 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Více %(site_name)s uživatelů chce přečíst %(title)s než kteroukoliv jinou knihu." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s má nejrozporuplnější hodnocení ze všech knih na %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Zaznamenávejte si své čtení, povídejte si o knihách, pište hodnocení a objevujte další knihy ke čtení. BookWyrm je komunitně orientovaným software, bez reklam a proti korporátní, který je navržen tak, aby zůstal malý i osobní. Objevili jste chybu, nebo máte nápady na zlepšení či velkolepé sny, nebojte se ozvat." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Seznamte se s vašimi administrátory" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Moderátoři a administrátoři %(site_name)s udržují tuto stránku v provozu, prosazuj kodex chování a nahlašuj spam a špatné chování." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderátor" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Správce" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -832,7 +845,7 @@ msgstr "Nejkratší četbou v tomto roce…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -928,24 +941,24 @@ msgid "View ISNI record" msgstr "Zobrazit ISNI záznam" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Prohlédnout na ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Načíst data" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Zobrazit na OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Zobrazit na Inventaire" @@ -1054,7 +1067,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1078,7 +1091,7 @@ msgstr "Uložit" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1094,6 +1107,7 @@ msgstr "Uložit" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1110,39 +1124,41 @@ msgstr "Načítání dat se připojí k %(source_name)s a zkont #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Potvrdit" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Nelze se připojit ke vzdálenému zdroji." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Upravit knihu" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Klepnutím přidáte obal" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Nezdařilo se obálku načíst" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Kliknutím zvětšíte" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1151,17 +1167,17 @@ msgstr[1] "(%(review_count)s hodnocení)" msgstr[2] "(%(review_count)s hodnocení)" msgstr[3] "(%(review_count)s hodnocení)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Přidat popis" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Popis:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1170,49 +1186,49 @@ msgstr[1] "%(count)s vydání" msgstr[2] "%(count)s vydání" msgstr[3] "%(count)s vydání" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Toto vydání bylo odloženo v:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Jiné vydání této knihy je na vaší poličce %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Vaše aktivita čtení" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Přidat datum přečtení" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Tuto knihu jste ještě nečetly." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Tvoje hodnocení" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Vaše komentáře" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Vaše citace" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Témata" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Místa" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,11 +1243,11 @@ msgstr "Místa" msgid "Lists" msgstr "Seznamy" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Přidat na seznam" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1643,6 +1659,7 @@ msgstr "Doména" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1798,7 +1815,7 @@ msgstr "Potvrzovací kód:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Odeslat" @@ -2071,6 +2088,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Požádali jste o obnovení hesla %(site_name)s. Pro nastavení nového hesla a přihlášení k vašemu účtu klikněte na odkaz níže." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2097,8 +2116,10 @@ msgstr "Toto je testovací email." msgid "Test email" msgstr "Testovací email" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3158,7 +3179,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importy" @@ -3542,6 +3563,26 @@ msgstr "Vztah" msgid "Reason" msgstr "Příčina" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Potvrďte své heslo:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3631,12 +3672,6 @@ msgstr "Zapomněli jste heslo?" msgid "More about this site" msgstr "Více o této stránce" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Potvrďte své heslo:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4510,17 +4545,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4546,6 +4573,10 @@ msgstr "Trvale odstranit účet" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Odstranění vašeho účtu nelze vrátit zpět. Uživatelské jméno nebude k dispozici pro budoucí registraci." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4734,6 +4765,7 @@ msgstr[3] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5142,7 +5174,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5160,13 +5192,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5248,42 +5280,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5328,7 +5369,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5357,7 +5398,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5517,7 +5558,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5531,31 +5572,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5635,7 +5676,7 @@ msgstr "Doména:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5663,7 +5704,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5890,7 +5931,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6164,7 +6241,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6189,49 +6266,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6239,7 +6322,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6655,11 +6738,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 951019394760d3c93ca9196967e3dca44510db19 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:17 -0800 Subject: [PATCH 122/962] New translations django.po (Danish) --- locale/da_DK/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/da_DK/LC_MESSAGES/django.po b/locale/da_DK/LC_MESSAGES/django.po index cdb4621ff0..a5be86745d 100644 --- a/locale/da_DK/LC_MESSAGES/django.po +++ b/locale/da_DK/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Danish\n" "Language: da\n" @@ -37,15 +37,15 @@ msgstr "Udløber Ikke" msgid "Unlimited" msgstr "Ubegrænset" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Forkert adgangskode" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Adgangskode stemmer ikke overens" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Forkert adgangskode" @@ -81,7 +81,11 @@ msgstr "Der findes allerede en bruger med den e-mailadresse." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Forkert kode" @@ -195,7 +199,6 @@ msgstr "Paperback" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Følgere" msgid "Private" msgstr "Privat" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktiv" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Gennemført" @@ -355,11 +368,11 @@ msgstr "Stoppet" msgid "Import stopped" msgstr "Import stoppet" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Fejl under indlæsning af bog" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Kunne ikke finde et match til bogen" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Anmeldelser" @@ -476,19 +489,19 @@ msgstr "Citater" msgid "Everything else" msgstr "Alt det andet" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Hjem-tidslinje" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Hjem" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Bøger-tidslinje" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Bøger-tidslinje" msgid "Books" msgstr "Bøger" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Engelsk" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (catalansk)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (tysk)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (spansk)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Baskisk)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (galicisk)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (italiensk)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (finsk)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (fransk)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (litauisk)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (hollandsk)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (norsk)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (polsk)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasiliansk portugisisk)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (europæisk portugisisk)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (rumænsk)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (svensk)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainsk)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (forenklet kinesisk)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (traditionelt kinesisk)" @@ -639,54 +652,54 @@ msgstr "Beklager! Noget gik galt." msgid "About" msgstr "Om" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Velkommen til %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s er en del af BookWyrm – et netværk af uafhængige, selvstyrende fællesskaber for læsere. Samtidig med, at du kan interagere problemfrit med brugere overalt i BookWyrm-netværket, er dette fællesskab helt unikt." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s er %(site_name)ss mest elskede bog, med en gennemsnitlig bedømmelse på %(rating)s ud af 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "%(title)s er den bog, som flest %(site_name)s-brugere ønsker at læse." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s har de mest delte bedømmelser af nogen bog på %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Hold styr på din læsning, tal om bøger, skriv anmeldelser, og find ud af, hvad du skal læse som det næste. BookWyrm er altid reklamefri, ikkecommerciel og fællesskabsorienteret software i øjenhøjde, som er designet til at forblive et lille og personligt fællesskab. Hvis du har funktionsanmodninger, fejlrapporter, eller store drømme, så tag kontakt og lad os høre dine forslag." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Mød dine administratorer" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s's moderatorer og administratorer holder siden kørende, håndhæver ordensreglerne, og reagerer, når brugerne rapporterer spam og dårlig adfærd." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderator" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Administrator" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Vedkommendes korteste læsning i år…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Se ISNI-optegnelse" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Se på ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Indlæs data" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Se på OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Se på Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Gem" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Gem" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Indlæsning af data vil forbinde til %(source_name)s og #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Bekræft" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Kan ikke forbinde til ekstern kilde." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Rediger bog" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Klik for at tilføje omslag" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Kunne ikke indlæse omslag" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Klik for at forstørre" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s anmeldelse)" msgstr[1] "(%(review_count)s anmeldelser)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Tilføj beskrivelse" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Beskrivelse:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s udgave" msgstr[1] "%(count)s udgaver" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Du har tilføjet denne udgave til hylden:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "En anden udgave af denne bog er på din %(shelf_name)s hylde." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Din læseaktivitet" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Tilføj læste datoer" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Du har ikke nogen læseaktivitet for denne bog." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Dine anmeldelser" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Dine kommentarer" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Dine citater" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Emner" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Steder" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Steder" msgid "Lists" msgstr "Lister" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Tilføj til liste" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Domæne" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Bekræftelseskode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Send" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5114,13 +5146,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Forbindelser" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5485,31 +5526,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5609,7 +5650,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,11 +6684,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 81fda1b27ddd0d8f516be926eb004b34e0f82174 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:19 -0800 Subject: [PATCH 123/962] New translations django.po (German) --- locale/de_DE/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 59fd11fb86..cd7a103687 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -37,15 +37,15 @@ msgstr "Läuft nicht ab" msgid "Unlimited" msgstr "Unbegrenzt" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Falsches Passwort" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Passwort stimmt nicht überein" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Falsches Passwort" @@ -81,7 +81,11 @@ msgstr "Es existiert bereits ein Benutzer*inkonto mit dieser E-Mail-Adresse." msgid "This email address cannot be registered." msgstr "Diese E-Mail-Adresse kann nicht registriert werden." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Falscher Code" @@ -195,7 +199,6 @@ msgstr "Taschenbuch" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s sieht nicht wie eine ISBN aus" @@ -326,12 +329,21 @@ msgstr "Follower*innen" msgid "Private" msgstr "Privat" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktiv" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Abgeschlossen" @@ -355,11 +368,11 @@ msgstr "Gestoppt" msgid "Import stopped" msgstr "Import gestoppt" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Fehler beim Laden des Buches" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Keine Übereinstimmung für das Buch gefunden" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s bewertete %(book_title)s: %(display_rating).1f Stern" msgstr[1] "%(display_name)s bewertete %(book_title)s: %(display_rating).1f Sterne" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Rezensionen" @@ -476,19 +489,19 @@ msgstr "Zitate" msgid "Everything else" msgstr "Alles andere" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Start-Zeitleiste" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Startseite" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Bücher-Timeline" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Bücher-Timeline" msgid "Books" msgstr "Bücher" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Englisch)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Katalanisch)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Spanisch)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Baskisch)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galizisch)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italienisch)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Koreanisch)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Finnisch)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Französisch)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisch)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (Niederländisch)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwegisch)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Polnisch)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasilianisches Portugiesisch)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugiesisch)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Rumänisch)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Schwedisch)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainisch)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (vereinfachtes Chinesisch)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinesisch, traditionell)" @@ -639,54 +652,54 @@ msgstr "Etwas ist schief gelaufen! Tut uns leid." msgid "About" msgstr "Über" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Willkommen auf %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s ist Teil von BookWyrm, einem Netzwerk von unabhängigen, selbst verwalteten Communities von Bücherfreund*innen. Obwohl du nahtlos mit anderen überall im BookWyrm-Netzwerk interagieren kannst, ist die Community hier einzigartig." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s ist mit einer durchschnittlichen Bewertung von %(rating)s (von 5) das beliebtestes Buch auf %(site_name)s." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Das Buch %(title)s wollen mehr Benutzer*innen von %(site_name)s lesen als jedes andere Buch." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s hat die unterschiedlichsten Bewertungen aller Bücher auf %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Tracke dein Leseverhalten, sprich über Bücher, schreibe Rezensionen und entdecke Neues zum Lesen. BookWyrm ist eine Software, die immer übersichtlich, werbefrei und gemeinschaftsorientiert sein wird. Wenn du Feature-Anfragen, Fehlerberichte oder große Träume hast, wende dich hier hin und verschaffe Dir Gehör." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Lerne deine Admins kennen" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Die Moderator*innen und Administrator*innen von %(site_name)s halten diese Seite am Laufen, setzen den Verhaltenskodex durch und reagieren, wenn Benutzer*innen Spam oder schlechtes Verhalten melden." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderator*in" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Administration" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Das am schnellsten gelesene Buch dieses Jahr…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "ISNI-Datensatz anzeigen" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Auf ISFDB ansehen" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Lade Daten" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Auf OpenLibrary ansehen" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Auf Inventaire anzeigen" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Speichern" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Speichern" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Das Laden von Daten wird eine Verbindung zu %(source_name)sdifferent edition of this book is on your %(shelf_name)s shelf." msgstr "Eine andere Ausgabe dieses Buches befindet sich in deinem %(shelf_name)s Regal." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Deine Leseaktivität" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Lesedaten hinzufügen" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 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:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Deine Rezensionen" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Deine Kommentare" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Deine Zitate" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Themen" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Orte" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Orte" msgid "Lists" msgstr "Listen" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Zur Liste hinzufügen" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Domain" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Bestätigungscode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Absenden" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Du hast beantragt, dein %(site_name)s-Passwort zu ändern. Klicke auf den Link unten, um ein neues Passwort zu erstellen und dich anzumelden." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Dies ist eine Test-Email." msgid "Test email" msgstr "Test-Email" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Wiederholungsstatus" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importe" @@ -3514,6 +3535,26 @@ msgstr "Beziehungen" msgid "Reason" msgstr "Grund" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Aktuelles Passwort:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Neues Passwort:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Passwort bestätigen:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Passwort vergessen?" msgid "More about this site" msgstr "Mehr über diese Seite" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Passwort bestätigen:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Passwort ändern" msgid "Successfully changed password" msgstr "Passwort erfolgreich geändert" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Aktuelles Passwort:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Neues Passwort:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Benutzer*inkonto dauerhaft löschen" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Das Löschen des Benutzer*inkonto kann nicht rückgängig gemacht werden. Der Benutzer*inname kann nicht erneut registriert werden." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Zeitpunkt" @@ -5100,7 +5132,7 @@ msgstr "Ändern" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Ankündigungen" @@ -5118,13 +5150,13 @@ msgstr "Nein" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Startdatum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Enddatum:" @@ -5206,42 +5238,51 @@ msgstr "Accounts oder Status, die bereits gemeldet wurden (unabhängig davon, ob #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Zeitplan:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Letzte Ausführung:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Gesamtanzahl:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Aktiviert:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Zeitplan löschen" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Jetzt ausführen" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Letztes Ausführungsdatum wird nicht aktualisiert" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Scan planen" @@ -5286,7 +5327,7 @@ msgstr "Regel entfernen" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Celery-Status" @@ -5315,7 +5356,7 @@ msgid "Import triggered" msgstr "Import ausgelöst" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Konnektoren" @@ -5475,7 +5516,7 @@ msgid "Dashboard" msgstr "Übersicht" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Benutzer*innen insgesamt" @@ -5489,31 +5530,31 @@ msgstr "Diesen Monat aktiv" msgid "Works" msgstr "Werke" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Instanzaktivität" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervall:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Tage" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Wochen" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Neuanmeldungen" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Statusaktivitäten" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Erstellte Werke" @@ -5587,7 +5628,7 @@ msgstr "Domain:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "E-Mail-Sperrliste" @@ -5613,7 +5654,7 @@ msgstr "Derzeit sind keine E-Mail-Domains gesperrt" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "E-Mail-Konfiguration" @@ -5840,7 +5881,43 @@ msgstr "" msgid "Completed" msgstr "Abgeschlossen" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6114,7 +6191,7 @@ msgstr "Du kannst IP-Bereiche mittels CIDR-Syntax sperren." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "IP-Addressen-Sperrliste" @@ -6139,49 +6216,55 @@ msgid "Manage Users" msgstr "Benutzer*innen verwalten" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderation" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Meldungen" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Link-Domains" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "System" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Instanzeinstellungen" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Seiteneinstellungen" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6189,7 +6272,7 @@ msgstr "Seiteneinstellungen" msgid "Registration" msgstr "Registrierung" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6605,12 +6688,44 @@ msgstr "Benutzer*in dauerhaft löschen" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Bist du sicher, dass du das Benutzer*inkonto „%(username)s“ löschen möchtest? Diese Aktion kann nicht rückgängig gemacht werden. Zur Bestätigung gib bitte dein Passwort ein." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Dein Passwort:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From e86ba060fd17a5c56f95adf4a82b13ae539003a8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:20 -0800 Subject: [PATCH 124/962] New translations django.po (Greek) --- locale/el_GR/LC_MESSAGES/django.po | 371 +++++++++++++++++++---------- 1 file changed, 243 insertions(+), 128 deletions(-) diff --git a/locale/el_GR/LC_MESSAGES/django.po b/locale/el_GR/LC_MESSAGES/django.po index 7170956416..f84cbca5bf 100644 --- a/locale/el_GR/LC_MESSAGES/django.po +++ b/locale/el_GR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Greek\n" "Language: el\n" @@ -37,15 +37,15 @@ msgstr "Δεν λήγει" msgid "Unlimited" msgstr "Απεριόριστα" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Λάθος κωδικός" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Οι κωδικοί πρόσβασης δεν ταιριάζουν" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Λάθος Κωδικός" @@ -81,7 +81,11 @@ msgstr "Το συγκεκριμένο email χρησιμοποιείται ήδ msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Λανθασμένος κωδικός" @@ -195,7 +199,6 @@ msgstr "Χαρτόδετο" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Ακόλουθοι" msgid "Private" msgstr "Ιδιωτικό" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Ενεργός" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Ολοκλήρωμένα" @@ -355,11 +368,11 @@ msgstr "Διακόπηκε" msgid "Import stopped" msgstr "Η εισαγωγή σταμάτησε" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Σφάλμα φόρτωσης βιβλίου" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Αδυναμία εύρεσης ενός ταιριάσματος για το βιβλίο" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Κριτικές" @@ -476,19 +489,19 @@ msgstr "" msgid "Everything else" msgstr "Οτιδήποτε άλλο" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Αρχική σελίδα" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Χρονολόγιο Βιβλίων" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Χρονολόγιο Βιβλίων" msgid "Books" msgstr "Βιβλία" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Αγγλικά" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Καταλανικά)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Γερμανικά)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Ισπανικά)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Ιταλικά)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Φινλανδικά)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Γαλλικά)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Λιθουανικά)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Νορβηγικά)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Πολωνικά)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Πορτογαλικά Βραζιλίας)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Ευρωπαϊκά Πορτογαλικά)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Ρουμανικά)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Σουηδικά)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Απλοποιημένα Κινέζικα)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Παραδοσιακά Κινέζικα)" @@ -639,54 +652,54 @@ msgstr "Κάτι πήγε στραβά! Λυπούμαστε γι' αυτό." msgid "About" msgstr "Σχετικά με" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Καλώς ήλθατε στο %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Γνωρίστε τους διαχειριστές σας" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Επόπτης" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Διαχειριστής" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Το πιο σύντομο διάβασμα φέτος…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Προβολή αρχείου ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Φόρτωση δεδομένων" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Προβολή στο OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Προβολή στο Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Αποθήκευση" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Αποθήκευση" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Loading data will connect to %(source_name)s and check #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Επιβεβαίωση" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Αδυναμία σύνδεσης με την απομακρυσμένη πηγή." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Επεξεργασία Βιβλίου" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Κλικ για προσθήκη εξωφύλλου" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Αποτυχία φόρτωσης εξωφύλλου" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Κλικ για μεγέθυνση" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s αξιολόγηση)" msgstr[1] "(%(review_count)s αξιολογήσεις)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Προσθήκη Περιγραφής" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Περιγραφή:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s έκδοση" msgstr[1] "%(count)s εκδόσεις" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Έχετε κρατήσει αυτή την έκδοση στο:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, 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:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Η δραστηριότητα ανάγνωσής σας" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Προσθήκη ημερομηνιών ανάγνωσης" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Δεν έχετε καμία δραστηριότητα ανάγνωσης για αυτό το βιβλίο." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Οι κριτικές σας" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Τα σχόλιά σας" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Τα αποσπάσματά σας" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Θέματα" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Τοποθεσίες" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Τοποθεσίες" msgid "Lists" msgstr "Λίστες" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Προσθήκη σε λίστα" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Τομέας" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Κωδικός επιβεβαίωσης:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Υποβολή" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Ζητήσατε να επαναφέρετε τον %(site_name)s κωδικό πρόσβασής σας. Κάντε κλικ στον παρακάτω σύνδεσμο για να ορίσετε ένα νέο κωδικό πρόσβασης και να συνδεθείτε στον λογαριασμό σας." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Αυτό είναι ένα τεστ email." msgid "Test email" msgstr "Τεστ email" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Εισαγωγές" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Τρέχον κωδικός πρόσβασης:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Νέος κωδικός πρόσβασης:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Επιβεβαίωση κωδικού:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Ξεχάσατε τον κωδικό σας;" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Επιβεβαίωση κωδικού:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Αλλαγή Κωδικού πρόσβασης" msgid "Successfully changed password" msgstr "Επιτυχής αλλαγή κωδικού πρόσβασης" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Τρέχον κωδικός πρόσβασης:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Νέος κωδικός πρόσβασης:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Οριστική διαγραφή λογαριασμού" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Η διαγραφή του λογαριασμού σας δεν μπορεί να αναιρεθεί. Το όνομα χρήστη δεν θα είναι διαθέσιμο για εγγραφή στο μέλλον." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5098,7 +5130,7 @@ msgstr "Επεξεργασία" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Ανακοινώσεις" @@ -5116,13 +5148,13 @@ msgstr "Ψευδές" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Ημερομηνία έναρξης:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Ημερομηνία λήξης:" @@ -5204,42 +5236,51 @@ msgstr "Χρήστες ή καταστάσεις που έχουν ήδη ανα #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Χρονοδιάγραμμα:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Τελευταία εκτέλεση:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Ενεργό:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Διαγραφή χρονοδιαγράμματος" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Έναρξη τώρα" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Η τελευταία ημερομηνία εκτέλεσης δεν θα ενημερωθεί" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Προγραμματισμός σάρωσης" @@ -5284,7 +5325,7 @@ msgstr "Αφαίρεση κανόνα" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5313,7 +5354,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5473,7 +5514,7 @@ msgid "Dashboard" msgstr "Πίνακας Ελέγχου" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Σύνολο χρηστών" @@ -5487,31 +5528,31 @@ msgstr "Ενεργοί αυτόν το μήνα" msgid "Works" msgstr "Έργα" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Ημέρες" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Εβδομάδες" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5585,7 +5626,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5611,7 +5652,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5838,7 +5879,43 @@ msgstr "" msgid "Completed" msgstr "Ολοκληρωμένα" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6112,7 +6189,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6137,49 +6214,55 @@ msgid "Manage Users" msgstr "Διαχείριση Χρηστών" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Συντονισμός" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Αναφορές" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Σύστημα" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Ρυθμίσεις Ιστοσελίδας" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6187,7 +6270,7 @@ msgstr "Ρυθμίσεις Ιστοσελίδας" msgid "Registration" msgstr "Εγγραφή" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6603,12 +6686,44 @@ msgstr "Μόνιμη διαγραφή χρήστη" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Ο κωδικός πρόσβασής σας:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From ff825e9aba7ab05a53f71e431d31c56526182203 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:21 -0800 Subject: [PATCH 125/962] New translations django.po (Basque) --- locale/eu_ES/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/eu_ES/LC_MESSAGES/django.po b/locale/eu_ES/LC_MESSAGES/django.po index 95ea29db2f..d0ff1989d5 100644 --- a/locale/eu_ES/LC_MESSAGES/django.po +++ b/locale/eu_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Basque\n" "Language: eu\n" @@ -37,15 +37,15 @@ msgstr "Ez da iraungitzen" msgid "Unlimited" msgstr "Mugagabea" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Pasahitz okerra" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Pasahitzak ez datoz bat" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Pasahitz okerra" @@ -81,7 +81,11 @@ msgstr "Mezu elektroniko hau duen erabiltzailea dagoeneko badago." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Kode okerra" @@ -195,7 +199,6 @@ msgstr "Azal biguna" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Jarraitzaileak" msgid "Private" msgstr "Pribatua" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktiboa" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Osatuta" @@ -355,11 +368,11 @@ msgstr "Geldituta" msgid "Import stopped" msgstr "Inportazioa gelditu da" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Errorea liburua kargatzean" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Ezin izan da libururako parekorik aurkitu" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s erabiltzaileak %(book_title)s liburua baloratu du: %(display_rating).1f izar" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Kritikak" @@ -476,19 +489,19 @@ msgstr "Aipuak" msgid "Everything else" msgstr "Gainerako guztia" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Hasierako denbora-lerroa" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Hasiera" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Liburuen denbora-lerroa" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Liburuen denbora-lerroa" msgid "Books" msgstr "Liburuak" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Ingelesa)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (katalana)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (alemana)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperantoa" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (espainiera)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galiziera)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italiera)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (koreera)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (finlandiera)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (frantses)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lituano (lituaniera)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Herbehereak (nederlandera)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvegiera)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (poloniera)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brasilgo Portugesa)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europako Portugesa)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (errumaniera)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (suediera)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainera)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Txinera soildua)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Txinera tradizionala)" @@ -639,54 +652,54 @@ msgstr "Arazoren bat izan da! Barkatu eragozpenak." msgid "About" msgstr "Honi buruz" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Ongi etorri %(site_name)s(e)ra!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s BookWyrmen parte da, irakurleentzako komunitate independente eta auto-kudeatuen sarea. BookWyrm sareko edozein instantziako kideekin egin dezakezu harremana, baina gure komunitate honek bere ezaugarri propioak ditu." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s da %(site_name)s(e)ko libururik maitatuena, 5etik %(rating)s puntuko balorazioarekin batez beste." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "%(title)s irakurri nahian dabiltzan %(site_name)s(e)ko erabiltzaile gehien dituen liburua da." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s da %(site_name)s(e)n balorazio zatituenak dituen liburua." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Erakutsi zure irakurketak, hitz egin liburuei buruz, idatzi iritzi eta balorazioak eta deskubritu zer ikurri hurrengo. Publizitaterik gabe, korporazio handien aurka eta komunitatera bideratuta, BookWyrm giza mailako softwarea da, txikia eta pertsonala izateko diseinatua. Funtzionalitateen eskaerak, akatsen txostenak edo amets handiak badituzu, jar zaitez gurekin harremanetan eta partekatu gurekin zure ikuspegia." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Ezagutu zure administratzaileak" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s(e)ko moderatzaileek eta administratzaileek webgunea martxan mantentzen dute, jokabide-kodea betearazi eta erabiltzaileek spama eta portaera txarra salatzen dutenean erantzuna ematen dute." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderatzailea" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Administratzailea" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Aurtengo irakurketarik laburrena…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Ikusi ISNI erregistroa" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Ikus ISFDB webgunean" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Kargatu datuak" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "OpenLibraryn ikusi" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Inventairen ikusi" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Gorde" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Gorde" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Datuak kargatzean %(source_name)s(e)ra konektatu eta he #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Berretsi" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Ezin izan da urruneko edukira konektatu." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Editatu liburua" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Egin klik azala gehitzeko" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Ezin izan da azala kargatu" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Egin click handitzeko" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(berrikuspen %(review_count)s)" msgstr[1] "(%(review_count)s berrikuspen)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Gehitu deskribapena" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Deskribapena:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "Edizio %(count)s" msgstr[1] "%(count)s edizio" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Edizio hau gorde duzu:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Liburu honen edizio desberdinak %(shelf_name)s apalean dituzu." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Zure irakurketa jarduera" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Gehitu irakurketa datak" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Ez duzu liburu honetarako irakurketa jarduerarik." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Zure kritikak" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Zure iruzkinak" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Zure aipuak" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Gaiak" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Lekuak" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Lekuak" msgid "Lists" msgstr "Zerrendak" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Gehitu zerrendara" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Domeinua" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Berrespen kodea:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Bidali" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "%(site_name)s(r)en pasahitza berrezartzeko eskatu duzu. Egin klik esteka honetan pasahitz berri bat ezartzeko eta zure kontuan saioa hasteko." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Hau, proba mezu bat da." msgid "Test email" msgstr "Proba mezua" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Saiakeraren egoera" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Inportazioak" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Oraingo pasahitza:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Pasahitz Berria:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Berretsi pasahitza:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Zure pasahitza ahaztu duzu?" msgid "More about this site" msgstr "Gune honi buruz gehiago jakin" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Berretsi pasahitza:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Pasahitza aldatu" msgid "Successfully changed password" msgstr "Pasahitza behar bezala aldatu da" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Oraingo pasahitza:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Pasahitz Berria:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Behin-betirako ezabatu kontua" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Zure kontua ezabatzea ezin da desegin. Erabiltzaile-izena ez da erabilgarri egongo etorkizunean izena emateko." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Data" @@ -5099,7 +5131,7 @@ msgstr "Editatu" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Iragarpenak" @@ -5117,13 +5149,13 @@ msgstr "Gezurra" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Hasiera data:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Amaiera data:" @@ -5205,42 +5237,51 @@ msgstr "Dagoeneko salatuta dauden erabiltzaile edo egoerak (salaketa argituta eg #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Programazioa:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Azken aldiz exekutatua:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Betearazpenak, guztira:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Gaituta:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Ezabatu programazioa" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Exekutatu berehala" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Azkenekoz exekutatutako data ez da eguneratuko" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Progamatu eskaneatzea" @@ -5285,7 +5326,7 @@ msgstr "Ezabatu araua" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Celery-ren egoera" @@ -5314,7 +5355,7 @@ msgid "Import triggered" msgstr "Inportazioa abiarazi da" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Konektoreak" @@ -5474,7 +5515,7 @@ msgid "Dashboard" msgstr "Arbela" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Erabiltzaileak guztira" @@ -5488,31 +5529,31 @@ msgstr "Aktibo hilabete honetan" msgid "Works" msgstr "Liburuak" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Instantziaren aktibitatea" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Tartea:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Egunak" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Asteak" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Erabiltzaileen izen-emate aktibitatea" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Egoeren aktibitatea" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Sortutako liburuak" @@ -5586,7 +5627,7 @@ msgstr "Domeinua:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Blokeatutako emailen zerrenda" @@ -5612,7 +5653,7 @@ msgstr "Ez dago email domeinurik bloketatua une honetan" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Epostaren konfigurazioa" @@ -5839,7 +5880,43 @@ msgstr "" msgid "Completed" msgstr "Osatuta" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6113,7 +6190,7 @@ msgstr "IP biterteak blokea ditzakezu CIDR sintaxia erabiliz." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Blokeatutako IP helbide zerrenda" @@ -6138,49 +6215,55 @@ msgid "Manage Users" msgstr "Kudeatu erabiltzaileak" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderazioa" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Salaketak" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Esteka domeinuak" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Sistema" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Instantziaren ezarpenak" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Gunearen ezarpenak" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6188,7 +6271,7 @@ msgstr "Gunearen ezarpenak" msgid "Registration" msgstr "Izen-ematea" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6604,12 +6687,44 @@ msgstr "Behin-betirako ezabatu erabiltzailea" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Ziur zaude %(username)s erabiltzailearen kontua ezabatu nahi duzula? Ekintza hori ezin da desegin. Horretarako, sartu pasahitza ezabaketa baieztatzeko." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Zure pasahitza:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From b046830c598b3444fa8e8802a456609acf618827 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:23 -0800 Subject: [PATCH 126/962] New translations django.po (Finnish) --- locale/fi_FI/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/fi_FI/LC_MESSAGES/django.po b/locale/fi_FI/LC_MESSAGES/django.po index 6909574817..c6f6175a31 100644 --- a/locale/fi_FI/LC_MESSAGES/django.po +++ b/locale/fi_FI/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-10 07:31\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Finnish\n" "Language: fi\n" @@ -37,15 +37,15 @@ msgstr "ei koskaan" msgid "Unlimited" msgstr "rajattomasti" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Väärä salasana" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Salasanat eivät täsmää" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Virheellinen salasana" @@ -81,7 +81,11 @@ msgstr "Sähköpostiosoite on jo jonkun käyttäjän käytössä." msgid "This email address cannot be registered." msgstr "Tätä sähköpostiosoitetta ei voida rekisteröidä." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Virheellinen koodi" @@ -195,7 +199,6 @@ msgstr "Pehmeäkantinen" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s ei näytä olevan ISBN" @@ -326,12 +329,21 @@ msgstr "Seuraajat" msgid "Private" msgstr "Yksityinen" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktiivinen" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Valmis" @@ -355,11 +368,11 @@ msgstr "Keskeytetty" msgid "Import stopped" msgstr "Tuonti keskeytetty" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Virhe kirjan lataamisessa" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Kirjaa ei löytynyt tietokannoista" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s arvosteli %(book_title)s: %(display_rating).1f tähti" msgstr[1] "%(display_name)s arvosteli %(book_title)s: %(display_rating).1f tähteä" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Arviot" @@ -476,19 +489,19 @@ msgstr "Lainaukset" msgid "Everything else" msgstr "Muut" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Oma aikajana" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Etusivu" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Kirjavirta" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Kirjavirta" msgid "Books" msgstr "Kirjat" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (englanti)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (katalaani)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (saksa)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (espanja)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (baski)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (galego)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (italia)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (korea)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "suomi" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (ranska)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (liettua)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (hollanti)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (norja)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (puola)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasilianportugali)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugali)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (romania)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (ruotsi)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (ukraina)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (yksinkertaistettu kiina)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (perinteinen kiina)" @@ -639,54 +652,54 @@ msgstr "Jokin meni pieleen." msgid "About" msgstr "Yleistä" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Tämä on %(site_name)s" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s on osa itsenäisten ja itseohjautuvien lukijayhteisöjen BookWyrm-verkostoa. Vaikka yhteisömme on ihan omanlaisensa, kauttamme voi olla vaivattomasti yhteydessä kaikkiin BookWyrm-verkoston käyttäjiin." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s on %(site_name)s-yhteisön pidetyin kirja: sen keskimääräinen arvosana on %(rating)s/5 tähteä." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Monet %(site_name)s-yhteisössä haluavat lukea mm. teoksen %(title)s." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s jakaa %(site_name)s-yhteisön mielipiteitä kaikkein eniten." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Täällä voit pitää kirjaa lukemistasi kirjoista, keskustella kirjoista, kirjoittaa arvioita ja etsiä uutta luettavaa. Täällä ei ole mainoksia eikä korporaatioita, täällä ollaan pienimuotoisia ja ihmisläheisiä. Jos sinulla on BookWyrm-alustaan liittyviä ehdotuksia tai visioita uusista ominaisuuksista tai haluat raportoida virheistä ohjelmistokoodissa, ota toki yhteyttä." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Ylläpitäjät" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s pyörii moderaattorien ja ylläpitäjien työllä. He myös valvovat käyttöehtojen noudattamista ja reagoivat käyttäjien tekemiin ilmoituksiin." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderaattori" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Ylläpitäjä" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Vuoden lyhyin kirja…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Näytä ISNI-tietue" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Näytä ISFDB:ssä" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Lataa tiedot" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Näytä OpenLibraryssa" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Näytä Inventairessa" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Tallenna" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Tallenna" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Tietoja ladattaessa muodostetaan yhteys lähteeseen %(source_nam #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Vahvista" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Lähteeseen ei saada yhteyttä." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Muokkaa kirjaa" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Lisää kansikuva" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Kansikuvan lataus epäonnistui" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Suurenna" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "Näytä Finnassa" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s arvio)" msgstr[1] "(%(review_count)s arviota)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Lisää kuvaus" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Kuvaus:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s laitos" msgstr[1] "%(count)s laitosta" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Olet sijoittanut laitoksen hyllyyn:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Hyllyssäsi %(shelf_name)s on jo toinen tämän kirjan laitos." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Oma lukutoiminta" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Lisää lukupäivämäärät" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Ei kirjaan liittyvää lukutoimintaa." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Omat arviot" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Omat kommentit" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Omat lainaukset" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Aiheet" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Paikat" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Paikat" msgid "Lists" msgstr "Listat" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Lisää listaan" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Verkkotunnus" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Vahvistuskoodi:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Lähetä" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Pyysit palauttamaan %(site_name)s-salasanasi. Aseta uusi salasana ja kirjaudu käyttäjätilillesi seuraavasta linkistä." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Tämä on testiviesti." msgid "Test email" msgstr "Testiviesti" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Uudelleenyrityksen tila" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Tuonnit" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Nykyinen salasana:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Uusi salasana:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Vahvista salasana:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Unohtuiko salasana?" msgid "More about this site" msgstr "Tietoja sivustosta" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Vahvista salasana:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Vaihda salasana" msgid "Successfully changed password" msgstr "Salasanan vaihto onnistui" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Nykyinen salasana:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Uusi salasana:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Poista käyttäjätili pysyvästi" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Käyttäjätilin poistamista ei voi perua. Käyttäjänimeä ei voi myöhemmin rekisteröidä uudelleen." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Pvm" @@ -5098,7 +5130,7 @@ msgstr "Muokkaa" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Tiedotteet" @@ -5116,13 +5148,13 @@ msgstr "Epätosi" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Alkaen:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Päättyen:" @@ -5204,42 +5236,51 @@ msgstr "Jo raportoituja käyttäjiä tai tilapäivityksiä (riippumatta siitä, #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Ajastus:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Suoritettu viimeksi:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Suorituskertoja:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Käytössä:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Poista ajastus" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Suorita nyt" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Viimeisintä suoritusaikaa ei päivitetä" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Ajasta skannaus" @@ -5284,7 +5325,7 @@ msgstr "Poista sääntö" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Celeryn tila" @@ -5313,7 +5354,7 @@ msgid "Import triggered" msgstr "Tuonti käynnistetty" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Liitännät" @@ -5473,7 +5514,7 @@ msgid "Dashboard" msgstr "Kojelauta" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Käyttäjiä yhteensä" @@ -5487,31 +5528,31 @@ msgstr "Aktiivisena tässä kuussa" msgid "Works" msgstr "Teoksia" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Palvelimen aktiivisuus" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Aikaväli:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "päivä" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "viikko" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Rekisteröityneitä käyttäjiä" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Tilapäivityksiä" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Luotuja teoksia" @@ -5585,7 +5626,7 @@ msgstr "Verkkotunnus:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Sähköpostiestolista" @@ -5611,7 +5652,7 @@ msgstr "Ei estettyjä sähköpostiverkkotunnuksia" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Sähköpostin määritys" @@ -5838,7 +5879,43 @@ msgstr "" msgid "Completed" msgstr "Valmis" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6112,7 +6189,7 @@ msgstr "IP-osoitealueiden estämisessä voi käyttää CIDR-syntaksia." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "IP-osoitteiden estolista" @@ -6137,49 +6214,55 @@ msgid "Manage Users" msgstr "Käyttäjien hallinta" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderointi" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Raportit" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Linkkien verkkotunnukset" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Järjestelmä" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Palvelimen asetukset" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Sivuston asetukset" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6187,7 +6270,7 @@ msgstr "Sivuston asetukset" msgid "Registration" msgstr "Käyttäjätilien avaaminen" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6603,12 +6686,44 @@ msgstr "Poista käyttäjä pysyvästi" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Haluatko varmasti poistaa käyttäjän %(username)s käyttäjätilin? Toimintoa ei voi perua. Vahvista poisto syöttämällä salasanasi." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Salasana:" +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From af3904648693bde014bdf60d2a0aa9edfe98e288 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:24 -0800 Subject: [PATCH 127/962] New translations django.po (Irish) --- locale/ga_IE/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/ga_IE/LC_MESSAGES/django.po b/locale/ga_IE/LC_MESSAGES/django.po index 2d88907f19..78efa6d403 100644 --- a/locale/ga_IE/LC_MESSAGES/django.po +++ b/locale/ga_IE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Irish\n" "Language: ga\n" @@ -37,15 +37,15 @@ msgstr "" msgid "Unlimited" msgstr "" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -81,7 +81,11 @@ msgstr "" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -195,7 +199,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -463,7 +476,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -479,19 +492,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -500,91 +513,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -642,54 +655,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -835,7 +848,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -933,24 +946,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1059,7 +1072,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1083,7 +1096,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1099,6 +1112,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1115,39 +1129,41 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1157,17 +1173,17 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1177,49 +1193,49 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,11 +1250,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1650,6 +1666,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1805,7 +1822,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2080,6 +2097,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2106,8 +2125,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3170,7 +3191,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3556,6 +3577,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3645,12 +3686,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4529,17 +4564,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4565,6 +4592,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4754,6 +4785,7 @@ msgstr[4] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5162,7 +5194,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5180,13 +5212,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5268,42 +5300,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5348,7 +5389,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5377,7 +5418,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5537,7 +5578,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5551,31 +5592,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5658,7 +5699,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5687,7 +5728,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5914,7 +5955,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6188,7 +6265,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6213,49 +6290,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6263,7 +6346,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6679,11 +6762,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From ecb7ae49d9b6452d1b2f6fc24ab4ae1161946f53 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:25 -0800 Subject: [PATCH 128/962] New translations django.po (Hebrew) --- locale/he_IL/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/he_IL/LC_MESSAGES/django.po b/locale/he_IL/LC_MESSAGES/django.po index 959b2f8ec9..13949753d5 100644 --- a/locale/he_IL/LC_MESSAGES/django.po +++ b/locale/he_IL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Hebrew\n" "Language: he\n" @@ -37,15 +37,15 @@ msgstr "ללא תפוגה" msgid "Unlimited" msgstr "בלתי מוגבלת" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "סיסמה שגויה" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "הסיסמה אינה תואמת" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "ססמה שגויה" @@ -81,7 +81,11 @@ msgstr "משתמש עם כתובת מייל זו כבר קיים." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "קוד שגוי" @@ -195,7 +199,6 @@ msgstr "כריכה רכה" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "עוקבות" msgid "Private" msgstr "פרטי" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "פעיל" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "השלם" @@ -355,11 +368,11 @@ msgstr "עצר" msgid "Import stopped" msgstr "פעולת הייבוא נעצרה" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "שגיאה בטעינת הספר" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "לא נמצאה התאמה עבור הספר" @@ -462,7 +475,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "ביקורות" @@ -478,19 +491,19 @@ msgstr "ציטוטים" msgid "Everything else" msgstr "כל השאר" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "ציר זמן הבית" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "ראשי" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "ציר זמן הספרים" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -499,91 +512,91 @@ msgstr "ציר זמן הספרים" msgid "Books" msgstr "ספרים" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "אנגלית" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (קטלנית)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (גרמנית)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (אספרנטו)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (ספרדית)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (באסקית)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (גליציאנית)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (איטלקית)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (קוריאנית)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (פינית)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (צרפתית)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (ליטאית)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (הולנדית)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (נורווגית)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (פולנית)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (פוטוגזית ברזילאית)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (פורטוגזית אירופאית)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (רומנית)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (שוודית)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (אוקראינית)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (סינית מפושטת)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (סינית מסורתית)" @@ -641,54 +654,54 @@ msgstr "משהו השתבש! סליחה על זה." msgid "About" msgstr "אודות" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "ברוכות הבאות אל %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s הוא חלק מ-BookWyrm, רשת של קהילות עצמאיות המנוהלות ע״י קוראים ועבורם. למרות שניתן לתקשר בקלות עם משתמשים בכל רחבי רשת BookWyrm, קהילה זו היא ייחודית." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s הוא הספר האהוב ביותר של %(site_name)s בדירוג ממוצע של %(rating)s מתוך 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "יותר משתמשים ב-%(site_name)s רוצים לקרוא את %(title)s מאשר כל ספר אחר." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s הוא הספר אודותיו הביקורות ב-%(site_name)s הן השנויות ביותר במחלוקת." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "עקבו אחר הקריאה שלכם, דברו על ספרים, כתבו ביקורות וגלו מה הספרים הבאים שתקראו. Bookwyrm היא תוכנה במימדים של בני אדם, שעוצבה כדי להישאר קטנה ואישית; היא תמיד תישאר ללא פרסומות, אנטי-תאגידית וקהילתית. אם יד לכם בקשות לפיצ׳רים, דיווחי תקלות או חלומות, פנו אלינו כדי שנשמע את מה שיש לכם לומר." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "הכירי את האדמינים שלך" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "המפקחים והמנהלים של %(site_name)s דואגים שהאתר יהיה פעיל ומתפקד, אוכפים את כללי ההתנהגות ומגיבים כשמשתמשים מדווחים על ספאם או התנהגות לא ראויה." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "מגשרת" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "אדמין" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -832,7 +845,7 @@ msgstr "הקריאה הקצרה ביותר שלהם בשנה הזו…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -928,24 +941,24 @@ msgid "View ISNI record" msgstr "צפייה ברשומת ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "לצפייה ב-ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "טען.י מידע" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "צפייה ב-OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "צפייה ב-Inventaire" @@ -1054,7 +1067,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1078,7 +1091,7 @@ msgstr "שמירה" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1094,6 +1107,7 @@ msgstr "שמירה" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1110,39 +1124,41 @@ msgstr "טעינת מידע תוביל לחיבור ל-%(source_name)sdifferent edition of this book is on your %(shelf_name)s shelf." msgstr "קיימת מהדורה אחרת של הספר במדף %(shelf_name)s שלך." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "פעילות הקריאה שלך" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "הוספת תאריכי קריאה" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "אין פעילות קריאה עבור ספר זה." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "הביקורות שלך" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "התגובות שלך" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "הציטוטים שלך" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "נושאים" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "מקומות" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,11 +1243,11 @@ msgstr "מקומות" msgid "Lists" msgstr "רשימות" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "הוספה לרשימה" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1643,6 +1659,7 @@ msgstr "דומיין" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1798,7 +1815,7 @@ msgstr "קוד אימות:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "הגשה" @@ -2071,6 +2088,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "ביקשת לאפס את סיסמתך ל-%(site_name)s. יש ללחוץ על הלינק מטה כדי לקבוע סיסמה חדשה ולהתחבר לחשבונך." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2097,8 +2116,10 @@ msgstr "זהו דוא״ל בדיקה." msgid "Test email" msgstr "דוא״ל בדיקה" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3158,7 +3179,7 @@ msgstr "סטטוס ניסיון מחדש" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "ייבואים" @@ -3542,6 +3563,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "סיסמה נוכחית:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "סיסמא חדשה:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "אשר/י סיסמה:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3631,12 +3672,6 @@ msgstr "שכחת את הסיסמה?" msgid "More about this site" msgstr "אודות אתר זה" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "אשר/י סיסמה:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4510,17 +4545,9 @@ msgstr "החלפת סיסמה" msgid "Successfully changed password" msgstr "הסיסמה שונתה בהצלחה" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "סיסמה נוכחית:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "סיסמא חדשה:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4546,6 +4573,10 @@ msgstr "מחק חשבון לצמיתות" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "לא ניתן לבטל את מחיקת החשבון. שם המשתמש לא יהיה זמין להרשמה בעתיד." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4734,6 +4765,7 @@ msgstr[3] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5142,7 +5174,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5160,13 +5192,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5248,42 +5280,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "לוח זמנים:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "ריצה אחרונה:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "סך כל הריצות:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "מופעל:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "מחק לוח זמנים" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "הרץ עכשיו" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "תאריך הריצה האחרונה לא יעודכן" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "תזמן סריקה" @@ -5328,7 +5369,7 @@ msgstr "הסר כלל" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "מצב Celery" @@ -5357,7 +5398,7 @@ msgid "Import triggered" msgstr "הופעל ייבוא" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5517,7 +5558,7 @@ msgid "Dashboard" msgstr "לוח בקרה" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "סך הכל משתמשים" @@ -5531,31 +5572,31 @@ msgstr "" msgid "Works" msgstr "יצירות" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "פעילות בשרת" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "מרווח זמן:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "ימים" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "שבועות" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "פעילות הרשמה" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5635,7 +5676,7 @@ msgstr "דומיין:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "רשימת חסימות דוא\"ל" @@ -5663,7 +5704,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "הגדרות דוא\"ל" @@ -5890,7 +5931,43 @@ msgstr "" msgid "Completed" msgstr "הושלם" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6164,7 +6241,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6189,49 +6266,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "מערכת" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6239,7 +6322,7 @@ msgstr "" msgid "Registration" msgstr "רישום" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6655,11 +6738,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 171f6eb405f59c002c50346560dadf09ae877954 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:26 -0800 Subject: [PATCH 129/962] New translations django.po (Hungarian) --- locale/hu_HU/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/hu_HU/LC_MESSAGES/django.po b/locale/hu_HU/LC_MESSAGES/django.po index e1d5c29b79..4ed3557ff0 100644 --- a/locale/hu_HU/LC_MESSAGES/django.po +++ b/locale/hu_HU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Hungarian\n" "Language: hu\n" @@ -37,15 +37,15 @@ msgstr "" msgid "Unlimited" msgstr "Korlátlan" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Helytelen jelszó" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "A jelszó nem egyezik" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Helytelen jelszó" @@ -81,7 +81,11 @@ msgstr "Már létezik felhasználó ezzel az email címmel." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Helytelen kód" @@ -195,7 +199,6 @@ msgstr "Puhatáblás" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "Személyes" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Kész" @@ -355,11 +368,11 @@ msgstr "Leállítva" msgid "Import stopped" msgstr "Importálás megszakítva" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Hiba a könyv betöltésekor" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Nem található egyezés a könyvhöz" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -476,19 +489,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Angol)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Katalán)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Német)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Eszperantó)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Spanyol)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Baszk)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galiciai)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Olasz)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Koreai)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Finn)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Francia)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litván)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -639,54 +652,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5114,13 +5146,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5485,31 +5526,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5609,7 +5650,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,11 +6684,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From fabaf3c7cbe9e950afadfa28d0c11129df54019b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:28 -0800 Subject: [PATCH 130/962] New translations django.po (Japanese) --- locale/ja_JP/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/ja_JP/LC_MESSAGES/django.po b/locale/ja_JP/LC_MESSAGES/django.po index 45ae2daace..53854fde86 100644 --- a/locale/ja_JP/LC_MESSAGES/django.po +++ b/locale/ja_JP/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Japanese\n" "Language: ja\n" @@ -37,15 +37,15 @@ msgstr "有効期限なし" msgid "Unlimited" msgstr "無制限" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "パスワードが間違っています" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "パスワードが一致しません" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "パスワードが正しくありません" @@ -81,7 +81,11 @@ msgstr "このメールのユーザーはすでに存在します。" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "コードが正しくありません" @@ -195,7 +199,6 @@ msgstr "ペーパーバック" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "フォロワー" msgid "Private" msgstr "非公開" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "アクティブ" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "完了" @@ -355,11 +368,11 @@ msgstr "中断" msgid "Import stopped" msgstr "インポートを停止しました" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "本の読み込みエラー" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "該当する本が見つかりませんでした" @@ -459,7 +472,7 @@ msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "レビュー" @@ -475,19 +488,19 @@ msgstr "引用" msgid "Everything else" msgstr "他のすべて" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "ホームタイムライン" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "ホーム" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "本のタイムライン" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -496,91 +509,91 @@ msgstr "本のタイムライン" msgid "Books" msgstr "本" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (英語)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català(カタルーニャ語)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (ドイツ語)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (エスペラント)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (スペイン語)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (バスク語)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (ガリシア語)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (イタリア語)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (フィンランド語)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (フランス語)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (リトアニア語)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (オランダ語)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (ノルウェー語)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (ポーランド語)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil(ブラジルポルトガル語)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (ヨーロッパポルトガル語)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (ルーマニア語)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "スウェーデン語 (Swedish)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (簡体字中国語)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (繁体字中国語)" @@ -638,54 +651,54 @@ msgstr "何か問題が発生しました！申し訳ありません。" msgid "About" msgstr "概要" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "%(site_name)sへようこそ！" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s は、読者のための独立した自発的なコミュニティ BookWyrm の一部です。 BookWyrm ネットワーク内のどのユーザともシームレスに交流できますが、このコミュニティは唯一です。" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)sは %(site_name)s で最も愛されている本で、平均評価は5段階中%(rating)sです。" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "%(site_name)s ユーザでは、 %(title)s を読みたがっている人が他のどの本よりも多くいます。" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(site_name)s では、 %(title)s が最も評価が分かれています。" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "読書を記録し、本について話し、レビューを書き、次に読む本を見付けましょう。広告一切なしで大企業に支配されないコミュニティ志向の BookWyrm は、小さく個人的なものに保たれている、人の使いやすいソフトウェアです。機能リクエスト、バグ報告、壮大な夢などをお持ちでしたら、プロジェクトに参加してあなたの声をお聞かせください。" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "管理者の紹介" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s のモデレータと管理者はサイトを維持し、行動規範の遵守を徹底し、ユーザがスパムや悪意ある行動を通報したとき対処します。" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "モデレーター" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "管理者" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -823,7 +836,7 @@ msgstr "最も短かった読み物……" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -913,24 +926,24 @@ msgid "View ISNI record" msgstr "ISNIレコードを表示" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "ISFDBで表示" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "データを読み込む" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "OpenLibraryで表示" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Inventaireで表示" @@ -1039,7 +1052,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1063,7 +1076,7 @@ msgstr "保存" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1079,6 +1092,7 @@ msgstr "保存" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1095,103 +1109,105 @@ msgstr "データのロードでは、 %(source_name)s に接 #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "確認" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "リモートの情報源に接続できませんでした。" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "本を編集" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "クリックしてカバーを追加" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "カバーを読み込めませんでした" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "クリックして拡大" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 件のレビュー)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "説明を追加" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "概要:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s 個の版" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "次の本棚に既に追加されています:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, 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:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "あなたの読書活動" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "読了日を追加" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "あなたはこの本の読書活動をしていません。" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "あなたのレビュー" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "あなたのコメント" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "あなたの引用" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "テーマ" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "場所" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1206,11 +1222,11 @@ msgstr "場所" msgid "Lists" msgstr "リスト" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "リストに追加" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1622,6 +1638,7 @@ msgstr "ドメイン" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1777,7 +1794,7 @@ msgstr "確認用コード:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "送信" @@ -2044,6 +2061,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "%(site_name)s におけるパスワードのリセットをリクエストしました。以下のリンクをクリックして新しいパスワードを設定してからアカウントにログインしてください。" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2070,8 +2089,10 @@ msgstr "これはテストメールです。" msgid "Test email" msgstr "メールをテスト" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3122,7 +3143,7 @@ msgstr "再試行ステータス" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "インポート" @@ -3500,6 +3521,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "現在のパスワード:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "新しいパスワード:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "パスワード（確認用）:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3589,12 +3630,6 @@ msgstr "パスワードをお忘れですか？" msgid "More about this site" msgstr "このサイトの詳細" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "パスワード（確認用）:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4453,17 +4488,9 @@ msgstr "パスワードの変更" msgid "Successfully changed password" msgstr "パスワードの変更に成功しました" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "現在のパスワード:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "新しいパスワード:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4489,6 +4516,10 @@ msgstr "アカウントを完全に削除する" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "アカウントの削除を取り消すことはできません。あなたのユーザーネームは、今後アカウント登録の際に利用できなくなります。" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4674,6 +4705,7 @@ msgstr[0] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5076,7 +5108,7 @@ msgstr "編集" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "お知らせ" @@ -5094,13 +5126,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5182,42 +5214,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "スケジュール:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "有効:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "スケジュールを削除" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "スケジュールスキャン" @@ -5262,7 +5303,7 @@ msgstr "ルールを削除" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5291,7 +5332,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5451,7 +5492,7 @@ msgid "Dashboard" msgstr "ダッシュボード" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "合計ユーザー" @@ -5465,31 +5506,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "インスタンスのアクティビティ" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5560,7 +5601,7 @@ msgstr "ドメイン:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "メールアドレスのブロックリスト" @@ -5585,7 +5626,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Eメール設定" @@ -5812,7 +5853,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6086,7 +6163,7 @@ msgstr "CIDR構文を使用して、IP範囲をブロックすることができ #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "IPアドレスのブロックリスト" @@ -6111,49 +6188,55 @@ msgid "Manage Users" msgstr "ユーザーの管理" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "モデレーション" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "通報" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "システム" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "インスタンス設定" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "サイト設定" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6161,7 +6244,7 @@ msgstr "サイト設定" msgid "Registration" msgstr "新規登録" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6577,12 +6660,44 @@ msgstr "ユーザーを完全に削除" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "%(username)sのアカウントを削除してもよろしいですか？この操作は元に戻せません。続行するには、パスワードを入力して削除を確認してください。" +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "あなたのパスワード:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 238ef523ea88531e90a08985bcd0fa4d512fb322 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:29 -0800 Subject: [PATCH 131/962] New translations django.po (Korean) --- locale/ko_KR/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/ko_KR/LC_MESSAGES/django.po b/locale/ko_KR/LC_MESSAGES/django.po index 5f3ec6d34a..4a6aefb3a7 100644 --- a/locale/ko_KR/LC_MESSAGES/django.po +++ b/locale/ko_KR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 19:59\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Korean\n" "Language: ko\n" @@ -37,15 +37,15 @@ msgstr "만료기간 없음" msgid "Unlimited" msgstr "무제한" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "잘못된 암호" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "암호가 일치하지 않음" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "잘못된 암호" @@ -81,7 +81,11 @@ msgstr "이 이메일을 가진 이용자가 이미 있습니다." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "잘못된 코드" @@ -195,7 +199,6 @@ msgstr "무선제본" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "팔로워" msgid "Private" msgstr "비공개" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "활성화" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "완료" @@ -355,11 +368,11 @@ msgstr "멈춤" msgid "Import stopped" msgstr "가져오기 멈춤" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "책 불러오는 중 오류" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -459,7 +472,7 @@ msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "서평" @@ -475,19 +488,19 @@ msgstr "인용구" msgid "Everything else" msgstr "그 밖의 것들" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "홈 타임라인" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "홈" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "도서 타임라임" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -496,91 +509,91 @@ msgstr "도서 타임라임" msgid "Books" msgstr "도서" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Catalan)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (German)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Spanish)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italian)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Korean)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Finnish)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (French)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lithuanian)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "네덜란드 (Dutch)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwegian)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Polish)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brazilian Portuguese)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (European Portuguese)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Romanian)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Swedish)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (우크라이나)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Simplified Chinese)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Traditional Chinese)" @@ -638,54 +651,54 @@ msgstr "" msgid "About" msgstr "정보" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "%(site_name)s에 어서오세요!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "여기 관리자 만나기" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "중재자" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "관리" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -823,7 +836,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -913,24 +926,24 @@ msgid "View ISNI record" msgstr "ISNI 레코드 보기" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "ISFDB에서 보기" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "데이터 불러오기" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "OpenLibrary 자료 보기" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Inventaire 자료 보기" @@ -1039,7 +1052,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1063,7 +1076,7 @@ msgstr "저장" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1079,6 +1092,7 @@ msgstr "저장" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1095,103 +1109,105 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "확정" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "책 수정" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "클릭하여 표지 추가" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "표지 불러오기 실패" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "확대하려면 클릭" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "설명 추가" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "설명:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s개의 판" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "책 꽂아둔 곳:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "내 독서 활동" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "읽은 날짜 추가" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "이 책에 관한 독서 활동이 없어요." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "내 서평" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "내 코멘트" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "내 인용" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "화제" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "장소" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1206,11 +1222,11 @@ msgstr "장소" msgid "Lists" msgstr "목록" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "목록에 추가" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1622,6 +1638,7 @@ msgstr "도메인" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1777,7 +1794,7 @@ msgstr "확인 코드" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "제출" @@ -2044,6 +2061,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2070,8 +2089,10 @@ msgstr "시험 이메일입니다." msgid "Test email" msgstr "시험 이메일" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3122,7 +3143,7 @@ msgstr "기록 재시도" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "가져오기" @@ -3500,6 +3521,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "현재 암호:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "새 암호:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "암호 확인:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3589,12 +3630,6 @@ msgstr "암호를 잊었나요?" msgid "More about this site" msgstr "이 사이트 더 알아보기" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "암호 확인:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4453,17 +4488,9 @@ msgstr "암호 변경" msgid "Successfully changed password" msgstr "암호 변경 성공" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "현재 암호:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "새 암호:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4489,6 +4516,10 @@ msgstr "계정 영구히 지우기" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "계정을 지우면 되돌릴 수 없어요. 이 이용자 이름은 앞으로 가입 시에 쓸 수 없어요." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4674,6 +4705,7 @@ msgstr[0] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "날짜" @@ -5076,7 +5108,7 @@ msgstr "편집" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "공지사항" @@ -5094,13 +5126,13 @@ msgstr "거짓" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "시작일:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "종료일:" @@ -5182,42 +5214,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "예정:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "예약된 검사" @@ -5262,7 +5303,7 @@ msgstr "규칙 제거" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Celery 상태" @@ -5291,7 +5332,7 @@ msgid "Import triggered" msgstr "가져오기 트리거함" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "커넥터" @@ -5451,7 +5492,7 @@ msgid "Dashboard" msgstr "대시보드" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "전체 이용자" @@ -5465,31 +5506,31 @@ msgstr "이번 달 활동 수" msgid "Works" msgstr "작품 수" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "간격:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "이용자 가입 활동" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "기록 활동" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "등록된 작품" @@ -5560,7 +5601,7 @@ msgstr "도메인:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "이메일 차단록" @@ -5585,7 +5626,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "이메일 구성" @@ -5812,7 +5853,43 @@ msgstr "" msgid "Completed" msgstr "완료됨" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6086,7 +6163,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "IP 주소 차단목록" @@ -6111,49 +6188,55 @@ msgid "Manage Users" msgstr "이용자 관리" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "중재" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "제보" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "링크 도메인" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "시스템" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "인스턴스 설정" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "사이트 설정" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6161,7 +6244,7 @@ msgstr "사이트 설정" msgid "Registration" msgstr "등록" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6577,12 +6660,44 @@ msgstr "이용자 영구 삭제" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "%(username)s 계정을 지울까요? 이 동작은 돌이킬 수 없습니다. 계속 진행하려면 암호를 입력하여 지우기를 확인해 주세요." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "내 암호:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From d2aba8b2173a1d62ea1251756ecec8471e00e7cb Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:30 -0800 Subject: [PATCH 132/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 3ac537d6c2..dc0fec796c 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -37,15 +37,15 @@ msgstr "Galiojimas nesibaigia" msgid "Unlimited" msgstr "Neribota" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Neteisingas slaptažodis" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Slaptažodis nesutampa" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Neteisingas slaptažodis" @@ -81,7 +81,11 @@ msgstr "Vartotojas su šiuo el. pašto adresu jau yra." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Neteisingas kodas" @@ -195,7 +199,6 @@ msgstr "Knyga minkštais viršeliais" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Sekėjai" msgid "Private" msgstr "Privatu" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktyvus" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Užbaigti" @@ -355,11 +368,11 @@ msgstr "Sustabdyta" msgid "Import stopped" msgstr "Importavimas sustojo" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Klaida įkeliant knygą" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Nepavyko rasti tokios knygos" @@ -462,7 +475,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Apžvalgos" @@ -478,19 +491,19 @@ msgstr "Citatos" msgid "Everything else" msgstr "Visa kita" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Pagrindinė siena" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Pagrindinis" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Knygų siena" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -499,91 +512,91 @@ msgstr "Knygų siena" msgid "Books" msgstr "Knygos" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Anglų)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (kataloniečių)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Vokiečių)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Ispanų)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Baskų kalba)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (galisų)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italų (Italian)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (suomių)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Prancūzų)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norvegų (Norwegian)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (lenkų)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português brasileiro (Brazilijos portugalų)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europos portugalų)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (rumunų)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Švedų)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Supaprastinta kinų)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradicinė kinų)" @@ -641,54 +654,54 @@ msgstr "Kažkas nepavyko. Atsiprašome." msgid "About" msgstr "Apie" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Sveiki atvykę į %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s yra BookWyrmdalis – skaitytojų bendruomenių nepriklausomas tinklas. Tai unikali bendruomenė ir čia galite lengvai bendrauti su BookWyrm tinklo nariais." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s yra %(site_name)s's mėgstamiausia knyga, kurios vidutinis įvertinimas yra %(rating)s iš 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Daugiau %(site_name)s narių nori perskaityti %(title)s negu bet kurią kitą knygą." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s labiausiai kontroversiškai reitinguota %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Sekite savo skaitymus, kalbėkite apie knygas, rašykite atsiliepimus ir atraskite, ką dar perskaityti. „BookWyrm“ – tai programinė įranga, kurioje nėra reklamų, biurokratijos. Tai bendruomenei orientuota, nedidelė ir asmeninė įranga, kurią lengva plėsti. Jei norite papildomų funkcijų, įgyvendinti savo svajones ar tiesiog pranešti apie klaidą, susisiekite ir jus išgirsime." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Šio serverio administratoriai" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Svetainės %(site_name)s moderatoriai ir administratoriai nuolat atnaujina puslapį, laikosi elgsenos susitarimo ir atsako, kai naudotojai praneša apie brukalą ir blogą elgesį." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderatorius" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Administravimas" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -832,7 +845,7 @@ msgstr "Trumpiausias skaitinys tais metais…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -928,24 +941,24 @@ msgid "View ISNI record" msgstr "Peržiūrėti ISNI įrašą" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Žiūrėti per ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Įkelti duomenis" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Žiūrėti „OpenLibrary“" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Žiūrėti „Inventaire“" @@ -1054,7 +1067,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1078,7 +1091,7 @@ msgstr "Išsaugoti" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1094,6 +1107,7 @@ msgstr "Išsaugoti" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1110,39 +1124,41 @@ msgstr "Duomenų įkėlimas prisijungs prie %(source_name)s ir #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Patvirtinti" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Nepavyksta prisijungti prie nuotolinio šaltinio." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Redaguoti knygą" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Spausti, kad pridėti viršelį" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Nepavyko įkelti viršelio" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Spustelėkite padidinti" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1151,17 +1167,17 @@ msgstr[1] "(%(review_count)s atsiliepimai)" msgstr[2] "(%(review_count)s atsiliepimų)" msgstr[3] "(%(review_count)s atsiliepimai)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Pridėti aprašymą" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Aprašymas:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1170,49 +1186,49 @@ msgstr[1] "%(count)s leidimai" msgstr[2] "%(count)s leidimai" msgstr[3] "%(count)s leidimai" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Šis leidimas įdėtas į:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "kitas šios knygos leidimas yra jūsų %(shelf_name)s lentynoje." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Jūsų skaitymo veikla" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Pridėti skaitymo datas" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Šios knygos neskaitote." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Tavo atsiliepimai" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Tavo komentarai" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Jūsų citatos" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Temos" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Vietos" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,11 +1243,11 @@ msgstr "Vietos" msgid "Lists" msgstr "Sąrašai" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Pridėti prie sąrašo" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1643,6 +1659,7 @@ msgstr "Domenas" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1798,7 +1815,7 @@ msgstr "Patvirtinimo kodas:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Siųsti" @@ -2071,6 +2088,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Prašėte pakeisti %(site_name)s slaptažodį. Spauskite žemiau, kad pakeisti slaptažodį ir prisijungti prie savo paskyros." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2097,8 +2116,10 @@ msgstr "Tai bandomasis el. laiškas." msgid "Test email" msgstr "Bandomasis elektroninis laiškas" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3158,7 +3179,7 @@ msgstr "Pakartojimo būsena" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importai" @@ -3542,6 +3563,26 @@ msgstr "Sąryšis" msgid "Reason" msgstr "Priežastis" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Dabartinis slaptažodis:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Naujas slaptažodis:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Patvirtinti slaptažodį:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3631,12 +3672,6 @@ msgstr "Pamiršote slaptažodį?" msgid "More about this site" msgstr "Daugiau apie šią svetainę" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Patvirtinti slaptažodį:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4510,17 +4545,9 @@ msgstr "Keisti slaptažodį" msgid "Successfully changed password" msgstr "Slaptažodis sėkmingai pakeistas" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Dabartinis slaptažodis:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Naujas slaptažodis:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4546,6 +4573,10 @@ msgstr "Visam laikui ištrinti paskyrą" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Nebegalėsite atstatyti ištrintos paskyros. Ateityje nebegalėsite naudoti šio naudotojo vardo." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4734,6 +4765,7 @@ msgstr[3] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5142,7 +5174,7 @@ msgstr "Redaguoti" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Pranešimai" @@ -5160,13 +5192,13 @@ msgstr "Netiesa" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Pradžios data:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Pabaigos data:" @@ -5248,42 +5280,51 @@ msgstr "Nebus žymimi naudotojai arba būsenos, apie kurias jau pranešta (nepai #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Tvarkaraštis:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Pastarąjį kartą leista:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Iš viso leista kartų:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Įjungta:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Ištrinti tvarkaraštį" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Paleisti dabar" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Pastarojo leidimo data nebus atnaujinta" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Nustatyti skanavimą" @@ -5328,7 +5369,7 @@ msgstr "Pašalinti taisyklę" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "„Celery“ būsena" @@ -5357,7 +5398,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5517,7 +5558,7 @@ msgid "Dashboard" msgstr "Suvestinė" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Iš viso naudotojų" @@ -5531,31 +5572,31 @@ msgstr "Aktyvūs šį mėnesį" msgid "Works" msgstr "Darbai" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Serverio statistika" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervalas:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dienos" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Savaitės" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Naudotojo prisijungimo veikla" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Būsenos" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Darbai sukurti" @@ -5635,7 +5676,7 @@ msgstr "Domenas:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "El. pašto blokavimo sąrašas" @@ -5663,7 +5704,7 @@ msgstr "Šiuo metu neblokuojamas nė vienas el. pašto domenas" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "El. pašto konfigūracija" @@ -5890,7 +5931,43 @@ msgstr "" msgid "Completed" msgstr "Užbaigta" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6164,7 +6241,7 @@ msgstr "IP rėžius galite blokuoti naudodami CIDR sintaksę." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Juodasis IP adresų sąrašas" @@ -6189,49 +6266,55 @@ msgid "Manage Users" msgstr "Tvarkyti naudotojus" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderavimas" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Pranešimai" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Nuorodų puslapiai" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Sistema" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Serverio nustatymai" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Puslapio nustatymai" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6239,7 +6322,7 @@ msgstr "Puslapio nustatymai" msgid "Registration" msgstr "Registracija" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6655,12 +6738,44 @@ msgstr "Visam laikui ištrinti vartotoją" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Ar tikrai norite ištrinti %(username)s paskyrą? To negalėsite atšaukti. Norėdami tęsti, įveskite savo slaptažodį, kad patvirtintumėte sprendimą trinti." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Jūsų slaptažodis:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From ad30170cc7cada7f8871e4c938f42fd755673e26 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:32 -0800 Subject: [PATCH 133/962] New translations django.po (Dutch) --- locale/nl_NL/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/nl_NL/LC_MESSAGES/django.po b/locale/nl_NL/LC_MESSAGES/django.po index b8f0f60431..e256607646 100644 --- a/locale/nl_NL/LC_MESSAGES/django.po +++ b/locale/nl_NL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-17 17:19\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Dutch\n" "Language: nl\n" @@ -37,15 +37,15 @@ msgstr "Verloopt niet" msgid "Unlimited" msgstr "Onbeperkt" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Onjuist wachtwoord" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Wachtwoord komt niet overeen" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Onjuist wachtwoord" @@ -81,7 +81,11 @@ msgstr "Er bestaat al een gebruiker met dit e-mailadres." msgid "This email address cannot be registered." msgstr "Dit e-mailadres kan niet geregistreerd worden." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Ongeldige code" @@ -195,7 +199,6 @@ msgstr "Zachte kaft" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s lijkt niet op een ISBN" @@ -326,12 +329,21 @@ msgstr "Volgers" msgid "Private" msgstr "Privé" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Actief" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Voltooid" @@ -355,11 +368,11 @@ msgstr "Gestopt" msgid "Import stopped" msgstr "Import gestopt" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Fout bij laden boek" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Kan geen match vinden voor het boek" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s beoordeelde %(book_title)s: %(display_rating).1f ster" msgstr[1] "%(display_name)s beoordeelde %(book_title)s: %(display_rating).1f sterren" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Recensies" @@ -476,19 +489,19 @@ msgstr "Quotes" msgid "Everything else" msgstr "Overig" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Tijdlijnen" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Start" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Boeken tijdlijn" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Boeken tijdlijn" msgid "Books" msgstr "Boeken" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Engels (English)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Catalaans)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Duits (Deutsch)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Spaans (Español)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Baskisch)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galicisch)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italiaans)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Koreaans)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Fins)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Frans (Français)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litouws)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Noors)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Pools)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Braziliaans-Portugees)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeaans Portugees)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Roemeens)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Zweeds)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Oekraïens)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Vereenvoudigd Chinees)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "简体中文 (Traditioneel Chinees)" @@ -639,54 +652,54 @@ msgstr "Er ging iets mis! Sorry daarvoor." msgid "About" msgstr "Over" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Welkom bij %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s maakt deel uit van BookWyrm, een netwerk van onafhankelijke, zelfgestuurde gemeenschappen voor lezers. Hoewel je naadloos kunt communiceren met gebruikers overal in het BookWyrm-netwerk, is deze gemeenschap uniek." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s is het meest geliefde boek van %(site_name)s met een gemiddelde beoordeling van %(rating)s van 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Meer %(site_name)s gebruikers willen %(title)s lezen dan welk ander boek." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s heeft de meest verdelende beoordelingen van elk boek op %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Volg je eigen lezen, praat over boeken, schrijf recensies en ontdek wat je hierna kunt lezen. Altijd advertentievrije, anti-corporatieve en gemeenschap-georiënteerde BookWyrm is menselijkere software, ontworpen om klein en persoonlijk te blijven. Als je functieverzoeken, foutrapporten of grote dromen hebt, neem dan contact op en laat van je horen." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Ontmoet je beheerders" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "De moderators en beheerders van %(site_name)s houden de site online, bewaken de gedragscode, en reageren als gebruikers spam en slecht gedrag melden." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderator" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Beheerder" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Diens kortste lees dit jaar…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "ISNI vermelding bekijken" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Bekijk op ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Gegevens laden" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Bekijk op OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Bekijk op Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Opslaan" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Opslaan" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Bij het laden van gegevens wordt verbinding gemaakt met %(source #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Bevestigen" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Verbinden met externe bron niet mogelijk." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Boek bewerken" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Klik om omslag toe te voegen" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Omslag laden mislukt" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Klik om te vergroten" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s recensie)" msgstr[1] "(%(review_count)s recensies)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Beschrijving toevoegen" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Beschrijving:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s editie" msgstr[1] "%(count)s edities" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Je hebt deze editie op de plank gezet in:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Een andere editie van dit boek staat op je %(shelf_name)s plank." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Jouw leesactiviteit" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Leesdata toevoegen" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Je hebt geen leesactiviteit voor dit boek." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Je recensies" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Jouw opmerkingen" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Jouw citaten" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Onderwerpen" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Plaatsen" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Plaatsen" msgid "Lists" msgstr "Lijsten" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Toevoegen aan lijst" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Domein" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Bevestigingscode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Versturen" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Je heeft gevraagd om uw %(site_name)s wachtwoord opnieuw in te stellen. Klik op de link hieronder om een nieuw wachtwoord in te stellen en log in op je account." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Dit is een test e-mail." msgid "Test email" msgstr "Test e-mail" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Status opnieuw proberen" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Imports" @@ -3514,6 +3535,26 @@ msgstr "Relatie" msgid "Reason" msgstr "Reden" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Huidige wachtwoord:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Nieuw wachtwoord:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Bevestig wachtwoord:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Wachtwoord vergeten?" msgid "More about this site" msgstr "Meer over deze site" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Bevestig wachtwoord:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Wachtwoord wijzigen" msgid "Successfully changed password" msgstr "Wachtwoord succesvol gewijzigd" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Huidige wachtwoord:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nieuw wachtwoord:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Account definitief verwijderen" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Het verwijderen van je account kan niet ongedaan worden gemaakt. De gebruikersnaam zal in de toekomst niet beschikbaar zijn om te registreren." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "Exportbestanden worden verwijderd na %(expiry_hours)s uur." #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Datum" @@ -5100,7 +5132,7 @@ msgstr "Bewerken" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Mededelingen" @@ -5118,13 +5150,13 @@ msgstr "Onwaar" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Begindatum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Einddatum:" @@ -5206,42 +5238,51 @@ msgstr "Gebruikers of statussen die al gemeld zijn (ongeacht of de melding is op #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Schema:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Laatst uitgevoerd:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Totaal aantal uitvoeringen:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Ingeschakeld:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Schema verwijderen" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Nu uitvoeren" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Datum van laatste uitvoering zal niet worden bijgewerkt" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Scan plannen" @@ -5286,7 +5327,7 @@ msgstr "Verwijder regel" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Celery status" @@ -5315,7 +5356,7 @@ msgid "Import triggered" msgstr "Import geactiveerd" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Connectoren" @@ -5475,7 +5516,7 @@ msgid "Dashboard" msgstr "Dashboard" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Totaal aantal gebruikers" @@ -5489,31 +5530,31 @@ msgstr "Actief deze maand" msgid "Works" msgstr "Werken" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Instance activiteit" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Interval:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dagen" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Weken" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Nieuwe registraties" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Statusactiviteit" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Werken aangemaakt" @@ -5587,7 +5628,7 @@ msgstr "Domein:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "E-mail blokkeerlijst" @@ -5613,7 +5654,7 @@ msgstr "Momenteel worden er geen e-maildomeinen geblokkeerd" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "E-mail configuratie" @@ -5840,7 +5881,43 @@ msgstr "Verlopen bestanden" msgid "Completed" msgstr "Voltooid" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "De vervaltijd is succesvol bijgewerkt" @@ -6114,7 +6191,7 @@ msgstr "Je kan IP-prefixes blokkeren met behulp van CIDR-syntax." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "IP-adres blokkeerlijst" @@ -6139,49 +6216,55 @@ msgid "Manage Users" msgstr "Gebruikers beheren" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderatie" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Meldingen" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Link domeinen" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Systeem" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "Geplande taken" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Instance Instellingen" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Site Instellingen" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6189,7 +6272,7 @@ msgstr "Site Instellingen" msgid "Registration" msgstr "Registratie" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6605,12 +6688,44 @@ msgstr "Gebruiker definitief verwijderen" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Weet u zeker dat je het account %(username)swilt verwijderen? Deze handeling kan niet ongedaan worden gemaakt. Om verder te gaan, voer je wachtwoord in om verwijdering te bevestigen." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Jouw wachtwoord:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 7b59d20213b74ba4d6657a341169bafff50a4a8b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:33 -0800 Subject: [PATCH 134/962] New translations django.po (Norwegian) --- locale/no_NO/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/no_NO/LC_MESSAGES/django.po b/locale/no_NO/LC_MESSAGES/django.po index 311d33a7f4..08164f994a 100644 --- a/locale/no_NO/LC_MESSAGES/django.po +++ b/locale/no_NO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Norwegian\n" "Language: no\n" @@ -37,15 +37,15 @@ msgstr "Uendelig" msgid "Unlimited" msgstr "Ubegrenset" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Feil passord" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Passordet samsvarer ikke" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Feil passord" @@ -81,7 +81,11 @@ msgstr "Den e-postadressen er allerede registrert." msgid "This email address cannot be registered." msgstr "Denne e-postadressen kan ikke registreres." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Feil kode" @@ -195,7 +199,6 @@ msgstr "Paperback" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s ser ikke ut som en ISBN" @@ -326,12 +329,21 @@ msgstr "Følgere" msgid "Private" msgstr "Privat" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktiv" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Ferdig" @@ -355,11 +368,11 @@ msgstr "Stoppet" msgid "Import stopped" msgstr "Importering stoppet" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Feilet ved lasting av bok" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Fant ikke den boka" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s vurderte %(book_title)s: %(display_rating).1f stjerne" msgstr[1] "%(display_name)s vurderte %(book_title)s: %(display_rating).1f stjerner" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Omtaler" @@ -476,19 +489,19 @@ msgstr "Sitater" msgid "Everything else" msgstr "Andre ting" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Lokal tidslinje" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Hjem" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Boktidslinja" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Boktidslinja" msgid "Books" msgstr "Bøker" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Engelsk)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (katalansk)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Tysk)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Spansk)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Baskisk)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italiensk)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (koreansk)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (finsk)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Fransk)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisk)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (nederlandsk)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norsk)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Polsk)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português - Brasil (Brasiliansk portugisisk)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisisk)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (romansk)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Svensk)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainsk)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Forenklet kinesisk)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradisjonelt kinesisk)" @@ -639,54 +652,54 @@ msgstr "Beklager, noe gikk galt! Leit, det der." msgid "About" msgstr "Om" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Velkommen til %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s er en del av BookWyrm, et nettverk av selvstendige, selvstyrte samfunn for lesere. Du kan kommunisere sømløst med brukere hvor som helst i BookWyrm-nettverket, men hvert samfunn er unikt." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s er %(site_name)s sin favorittbok, med en gjennomsnittlig vurdering på %(rating)s av 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Flere av %(site_name)s sine medlemmer ønsker å lese %(title)s enn noen annen bok." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s er den boka på %(site_name)s med de mest polariserte vurderingene." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Journalfør lesingen din, snakk om bøker, skriv omtaler, og oppdag din neste bok. Reklamefri, anti-kommers og fellesskapsorientert, BookWyrm er programvare for mennesker, designet for å forbli liten og personlig. Hvis du har funksjonalitetsønsker, feilrapporter eller store vyer, ta kontakt og gjør deg selv hørt." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Møt administratorene" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s sine moderatorer og administratorer holder nettsida oppe og tilgjengelig, håndhever adferdskoden, og svarer på brukernes rapporterer om spam og dårlig atferd." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderator" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Den korteste teksten lest i år…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Vis ISNI-oppføring" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Vis på ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Last inn data" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Vis på OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Vis på Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Lagre" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Lagre" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Laster inn data kobler til %(source_name)s og finner me #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Bekreft" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Kunne ikke koble til ekstern kilde." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Rediger bok" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Klikk for å legge til omslag" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Klarte ikke å laste inn omslag" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Klikk for å forstørre" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s anmeldelse)" msgstr[1] "(%(review_count)s anmeldelser)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Legg til beskrivelse" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Beskrivelse:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s utgave" msgstr[1] "%(count)s utgaver" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Du har lagt denne utgaven i hylla:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "En annen utgave av denne boken ligger i hylla %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Din leseaktivitet" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Legg til lesedatoer" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Du har ikke lagt inn leseaktivitet for denne boka." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Dine omtaler" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Dine kommentarer" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Dine sitater" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Emner" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Steder" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Steder" msgid "Lists" msgstr "Lister" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Legg til i liste" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Domene" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Bekreftelseskode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Send inn" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Du ba om å tilbakestille passordet ditt på %(site_name)s. Klikk på lenka nedenfor for å sette et nytt passord og logge inn." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Dette er en test-e-post." msgid "Test email" msgstr "Test-e-post" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Status for nytt forsøk" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importer" @@ -3514,6 +3535,26 @@ msgstr "Forhold" msgid "Reason" msgstr "Årsak" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Nåværende passord:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Nytt passord:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Gjenta passordet:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Glemt passord?" msgid "More about this site" msgstr "Om dette nettstedet" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Gjenta passordet:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Endre passord" msgid "Successfully changed password" msgstr "Passordet ble endret" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Nåværende passord:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nytt passord:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Slett kontoen din permanent" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Å slette kontoen din kan ikke angres. Brukernavnet vil ikke være tilgjengelig for registrering i fremtiden." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Dato" @@ -5100,7 +5132,7 @@ msgstr "Rediger" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Kunngjøringer" @@ -5118,13 +5150,13 @@ msgstr "Usant" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Startdato:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Sluttdato:" @@ -5206,42 +5238,51 @@ msgstr "Brukere eller statuser som allerede er rapportert (uavhengig av om rappo #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Tidsplan:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Sist kjørt:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Totalt antall kjøringer:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Aktivert:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Slett tidsplan" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Kjør nå" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Siste kjøredato vil ikke bli oppdatert" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Planlegg skanning" @@ -5286,7 +5327,7 @@ msgstr "Fjern regel" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Celery-status" @@ -5315,7 +5356,7 @@ msgid "Import triggered" msgstr "Import utløst" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Koblinger" @@ -5475,7 +5516,7 @@ msgid "Dashboard" msgstr "Kontrollpanel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Totalt antall brukere" @@ -5489,31 +5530,31 @@ msgstr "Aktive denne måneden" msgid "Works" msgstr "Verker" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Instansaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervall:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dager" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Uker" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Brukerregistreringsaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Statusaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Verker laget" @@ -5587,7 +5628,7 @@ msgstr "Domene:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "E-post blokkeringsliste" @@ -5613,7 +5654,7 @@ msgstr "Ingen e-postdomener er for øyeblikket blokkert" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "E-postkonfigurasjon" @@ -5840,7 +5881,43 @@ msgstr "" msgid "Completed" msgstr "Fullført" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6114,7 +6191,7 @@ msgstr "Du kan blokkere IP -områder med CIDR-syntaks." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Blokkerinsgliste over IP -adresser" @@ -6139,49 +6216,55 @@ msgid "Manage Users" msgstr "Administrere brukere" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderering" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Rapporter" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Lenkedomener" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "System" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Instansdetaljer" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Sideinnstillinger" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6189,7 +6272,7 @@ msgstr "Sideinnstillinger" msgid "Registration" msgstr "Registrering" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6605,12 +6688,44 @@ msgstr "Slett medlem for godt" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Er du sikker på at du vil slette %(username)ssin konto? Handlingen kan ikke angres. Bekreft sletting ved å skrive inn passordet ditt." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Passordet ditt:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 68ff36335ca147194e9f263026ec004a4628202f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:34 -0800 Subject: [PATCH 135/962] New translations django.po (Polish) --- locale/pl_PL/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/pl_PL/LC_MESSAGES/django.po b/locale/pl_PL/LC_MESSAGES/django.po index 03be763147..08c0130249 100644 --- a/locale/pl_PL/LC_MESSAGES/django.po +++ b/locale/pl_PL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Polish\n" "Language: pl\n" @@ -37,15 +37,15 @@ msgstr "Nie wygasa" msgid "Unlimited" msgstr "Bez ograniczeń" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Niepoprawne hasło" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Hasła nie są identyczne" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Niepoprawne hasło" @@ -81,7 +81,11 @@ msgstr "Ten e-mail jest już używany." msgid "This email address cannot be registered." msgstr "Nie można zarejestrować tego adresu e-mail." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Niepoprawny kod" @@ -195,7 +199,6 @@ msgstr "Miękka oprawa" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Obserwujący" msgid "Private" msgstr "Prywatne" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktywne" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Zakończone" @@ -355,11 +368,11 @@ msgstr "Wstrzymane" msgid "Import stopped" msgstr "Import wstrzymany" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Błąd wczytywania książki" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Nie znaleziono pasującej książki" @@ -462,7 +475,7 @@ msgstr[1] "%(display_name)s ocenia %(book_title)s: %(display_rating).1f gwiazdki msgstr[2] "%(display_name)s ocenia %(book_title)s: %(display_rating).1f gwiazdek" msgstr[3] "%(display_name)s ocenia %(book_title)s: %(display_rating).1f gwiazdek" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Oceny" @@ -478,19 +491,19 @@ msgstr "Cytaty" msgid "Everything else" msgstr "Wszystko inne" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Strona główna" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Start" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Oś czasu książek" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -499,91 +512,91 @@ msgstr "Oś czasu książek" msgid "Books" msgstr "Książki" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Angielski)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (kataloński)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (niemiecki)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (hiszpański)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (baskijski)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (galicyjski)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (włoski)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (koreański)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (fiński)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (francuski)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (litewski)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (holenderski)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (norweski)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "polski" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugalski — Brazylia)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugalski — Portugalia)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (rumuński)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (szwedzki)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (ukraiński)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (chiński — uproszczony)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (chiński — tradycyjny)" @@ -641,54 +654,54 @@ msgstr "Coś poszło nie tak! Przykro nam." msgid "About" msgstr "Informacje" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Witaj w %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s jest częścią BookWyrm, sieci niezależnych, samostanowiących społeczności czytelników. Możesz bezproblemowo wchodzić w interakcje z użytkownikami gdziekolwiek w sieci BookWyrm." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s jest najbardziej docenioną przez %(site_name)s książką ze średnią oceną %(rating)s z 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Więcej użytkowników %(site_name)s chce przeczytać %(title)s niż jakąkolwiek inną książkę." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s ma najbardziej podzielone opinie na %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Śledź swój postęp czytania, rozmawiaj o książkach, pisz recenzje i odkryj swoją następną książkę. Na zawsze bez reklam, antykorporacyjne i skierowane w stronę społeczności, BookWyrm jest oprogramowaniem dla ludzi, stworzonym, by pozostać małym i personalnym. Jeśli masz pomysł, chcesz zgłosić błąd lub masz wielką wizję, daj znać i pozwól się wysłuchać." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Poznaj swoich administratorów" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Moderatorzy oraz administratorzy %(site_name)s odpowiadają za prawidłowe funkcjonowanie witryny, nadzorują przestrzeganie regulaminu oraz odpowiadają na zgłoszenia spamu lub nieodpowiedniego zachowania." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderator" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Administrator" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -832,7 +845,7 @@ msgstr "Najkrócej wczytano się w…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -928,24 +941,24 @@ msgid "View ISNI record" msgstr "Zobacz wpis ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Zobacz na ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Wczytaj dane" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Pokaż na OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Pokaż na Inventaire" @@ -1054,7 +1067,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1078,7 +1091,7 @@ msgstr "Zapisz" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1094,6 +1107,7 @@ msgstr "Zapisz" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1110,39 +1124,41 @@ msgstr "Wczytanie danych spowoduje połączenie z %(source_name)sdifferent edition of this book is on your %(shelf_name)s shelf." msgstr "Inna edycja tej książki znajduje się już na Twojej półce %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Twoja aktywność czytania" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Dodaj daty czytania" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Nie masz żadnej aktywności czytania dla tej książki." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Twoje opinie" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Twoje komentarze" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Twoje cytaty" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Tematy" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Miejsca" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,11 +1243,11 @@ msgstr "Miejsca" msgid "Lists" msgstr "Listy" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Dodaj do listy" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1643,6 +1659,7 @@ msgstr "Domena" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1798,7 +1815,7 @@ msgstr "Kod potwierdzający:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Prześlij" @@ -2071,6 +2088,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Poproszono o wyzerowanie hasła na %(site_name)s. Naciśnij na poniższy odnośnik, aby ustawić nowe hasło i zalogować się na swoje konto." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2097,8 +2116,10 @@ msgstr "To jest wiadomość testowa." msgid "Test email" msgstr "Wiadomość testowa" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3158,7 +3179,7 @@ msgstr "Ponów status" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importowanie" @@ -3542,6 +3563,26 @@ msgstr "Relacja" msgid "Reason" msgstr "Powód" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Obecne hasło:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Nowe hasło:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Potwierdź hasło:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3631,12 +3672,6 @@ msgstr "Zapomniano hasła?" msgid "More about this site" msgstr "Więcej o tej stronie" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Potwierdź hasło:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4510,17 +4545,9 @@ msgstr "Zmień hasło" msgid "Successfully changed password" msgstr "Hasło zostało zmienione" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Obecne hasło:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nowe hasło:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4546,6 +4573,10 @@ msgstr "Trwale usuń konto" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Usunięcia konta nie można cofnąć. Nazwy użytkownika nie będzie można użyć w przyszłości." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4734,6 +4765,7 @@ msgstr[3] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Data" @@ -5142,7 +5174,7 @@ msgstr "Edytuj" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Ogłoszenia" @@ -5160,13 +5192,13 @@ msgstr "Nie" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Data rozpoczęcia:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Data zakończenia:" @@ -5248,42 +5280,51 @@ msgstr "Użytkownicy lub statusy, które zostały już zgłoszone (niezależenie #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Harmonogram:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Ostatnie uruchomienie:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Uruchomień w sumie:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Włączone:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Usuń harmonogram" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Uruchom teraz" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Data ostatniego uruchomienia nie zostanie zaktualizowana" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Zaplanuj skanowanie" @@ -5328,7 +5369,7 @@ msgstr "Usuń regułę" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Status Celery" @@ -5357,7 +5398,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5517,7 +5558,7 @@ msgid "Dashboard" msgstr "Panel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Użytkowników w sumie" @@ -5531,31 +5572,31 @@ msgstr "Aktywnych w tym miesiącu" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Aktywność instancji" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Częstotliwość:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Tygodnie" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5635,7 +5676,7 @@ msgstr "Domena:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Lista blokowania e-maili" @@ -5663,7 +5704,7 @@ msgstr "Brak obecnie zablokowanych domen e-mail" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Konfiguracja e-mail" @@ -5890,7 +5931,43 @@ msgstr "" msgid "Completed" msgstr "Zakończone" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6164,7 +6241,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Lista blokowania adresów IP" @@ -6189,49 +6266,55 @@ msgid "Manage Users" msgstr "Zarządzaj użytkownikami" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderacja" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Zgłoszenia" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "System" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Ustawienia instancji" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Ustawienia witryny" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6239,7 +6322,7 @@ msgstr "Ustawienia witryny" msgid "Registration" msgstr "Rejestracja" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6655,12 +6738,44 @@ msgstr "Trwale usuń użytkownika" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Czy na pewno chcesz usunąć konto %(username)s? Tej czynności nie można cofnąć. Aby kontynuować, wprowadź swoje hasło, aby potwierdzić usunięcie." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Twoje hasło:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From b658ae5ec15d89cceb3be873d448ea5dd3cb4f71 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:36 -0800 Subject: [PATCH 136/962] New translations django.po (Portuguese) --- locale/pt_PT/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/pt_PT/LC_MESSAGES/django.po b/locale/pt_PT/LC_MESSAGES/django.po index 2b530055fa..877ee279e6 100644 --- a/locale/pt_PT/LC_MESSAGES/django.po +++ b/locale/pt_PT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese\n" "Language: pt\n" @@ -37,15 +37,15 @@ msgstr "Não Expira" msgid "Unlimited" msgstr "Ilimitado" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Palavra-passe incorreta" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Palavras-passe não coincidem" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Palavra-passe Incorreta" @@ -81,7 +81,11 @@ msgstr "Já existe um utilizador com este E-Mail." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Código Incorreto" @@ -195,7 +199,6 @@ msgstr "Capa mole" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s não parece ser um ISBN" @@ -326,12 +329,21 @@ msgstr "Seguidores" msgid "Private" msgstr "Privado" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Ativo" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Concluído" @@ -355,11 +368,11 @@ msgstr "Parado" msgid "Import stopped" msgstr "A importação parou" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Erro ao carregar o livro" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Não foi possível encontrar um resultado para o livro pedido" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Criticas" @@ -476,19 +489,19 @@ msgstr "Citações" msgid "Everything else" msgstr "Tudo o resto" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Cronograma Inicial" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Início" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Cronograma de Livros" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Cronograma de Livros" msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Inglês" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (catalão)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Basco)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (finlandês)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (lituano)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Holanda (Holanda)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Polaco)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português brasileiro)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português (Português Europeu)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Romeno)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (sueco)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (ucraniano)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -639,54 +652,54 @@ msgstr "Ocorreu um erro! Pedimos desculpa por isto." msgid "About" msgstr "Sobre" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Bem-vindo(a) ao %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s faz parte de BookWyrm, uma rede de comunidades independentes e autodirecionadas para leitores. Embora tu possas interagir sem problemas com utilizadores de qualquer comunidade da rede BookWyrm, esta comunidade é única." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s é o livro mais adorado do %(site_name)s, com uma média de %(rating)s de 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Mais %(site_name)s utilizadores querem ler %(title)s do que qualquer outro livro." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s tem as classificações mais divisoras de qualquer livro em %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Acompanhe a tua leitura, fala sobre livros, escreve análises e descobre o que ler a seguir. Sempre sem publicidade, anticorporativo e orientado para a comunidade, o BookWyrm é um software à escala humana, concebido para se manter pequeno e pessoal. Se tens pedidos de novas funcionalidades, relatórios de bugs, ou grandes sonhos, junta-te e faz a tua voz ser ouvida." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Conheça os nossos administradores" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Os moderadores e administradores do %(site_name)s mantêm o site atualizado e em execução, aplicando o código de conduta e respondendo quando o utilizador reporta spam e mau comportamento." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderador" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "A sua menor leitura este ano…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Ver registro do ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Ver no ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Carregar dados" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Ver na OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Ver no Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Salvar" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Salvar" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Carregar os dados irá conectar a %(source_name)s e ver #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Confirmar" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Não foi possível conectar à fonte remota." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Editar Livro" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Clica para adicionar capa" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Não foi possível carregar a capa" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Clica para ampliar" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s crítica)" msgstr[1] "(%(review_count)s criticas)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Adicionar uma descrição" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descrição:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s edição" msgstr[1] "%(count)s edições" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Tu arquivaste esta edição em:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Uma edição diferente deste livro está na tua prateleira %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "A tua atividade de leitura" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Adicionar datas de leitura" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Não tem nenhuma atividade de leitura para este livro." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "As tuas criticas" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Os teus comentários" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "As tuas citações" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Temas/Áreas" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Adicionar à lista" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Domínio" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Código de confirmação:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Submeter" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Pediste para redefinir a tua palavra-passe do %(site_name)s. Clica no link abaixo para definir uma nova palavra-passe e fazer login na tua conta." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Esse é um email de teste." msgid "Test email" msgstr "Email de teste" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Estado de repetição" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importações" @@ -3514,6 +3535,26 @@ msgstr "Relacionamento" msgid "Reason" msgstr "Motivo" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Palavra-passe atual:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Nova Palavra-passe:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Confirmar palavra-passe:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Esqueces-te a tua palavra-passe?" msgid "More about this site" msgstr "Mais sobre este site" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Confirmar palavra-passe:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Alterar Palavra-passe" msgid "Successfully changed password" msgstr "Palavra-passe alterada com sucesso" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Palavra-passe atual:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nova Palavra-passe:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Apagar conta permanentemente" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "A exclusão da tua conta não pode ser desfeita. O nome de utilizador não estará disponível para registo no futuro." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5098,7 +5130,7 @@ msgstr "Editar" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Comunicados" @@ -5116,13 +5148,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Data de início:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Data de conclusão:" @@ -5204,42 +5236,51 @@ msgstr "Os utilizadores ou status que já foram reportados (independentemente de #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Horário:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Última execução:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Contagem total de execuções:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Ativado:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Excluir programação" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Executar agora" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Última data de execução não será atualizada" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Agendar verificação" @@ -5284,7 +5325,7 @@ msgstr "Remover regra" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Estado Celery" @@ -5313,7 +5354,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5473,7 +5514,7 @@ msgid "Dashboard" msgstr "Painel de controlo" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Total de utilizadores" @@ -5487,31 +5528,31 @@ msgstr "Atividade este mês" msgid "Works" msgstr "Obras" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Atividade do domínio" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Atividade de inscrição do utilizador" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Atividade de estado" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Obras criadas" @@ -5585,7 +5626,7 @@ msgstr "Domínio:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Lista de E-Mails bloqueados" @@ -5611,7 +5652,7 @@ msgstr "Nenhum domínio de E-Mail bloqueado atualmente" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Configuração do correio eletrónico" @@ -5838,7 +5879,43 @@ msgstr "" msgid "Completed" msgstr "Completado" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6112,7 +6189,7 @@ msgstr "Podes bloquear intervalos de IP usando a sintaxe CIDR." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Endereços IP Bloqueados" @@ -6137,49 +6214,55 @@ msgid "Manage Users" msgstr "Gerir utilizadores" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderação" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Denúncias" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Domínios de Ligações" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Sistema" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Configurações do domínio" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Configurações do site" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6187,7 +6270,7 @@ msgstr "Configurações do site" msgid "Registration" msgstr "Registo" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6603,12 +6686,44 @@ msgstr "Apagar permanentemente o utilizador" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Tens a certeza que desejas excluir a conta do %(username)s? Esta ação não pode ser desfeita. Para prosseguires, por favor, digita de novo a tua palavra-passe para confirmares a exclusão." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "A tua palavra-passe:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From b1ede3f4048cbcbc6deff432ac6564ca452996c3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:37 -0800 Subject: [PATCH 137/962] New translations django.po (Russian) --- locale/ru_RU/LC_MESSAGES/django.po | 371 +++++++++++++++++++---------- 1 file changed, 243 insertions(+), 128 deletions(-) diff --git a/locale/ru_RU/LC_MESSAGES/django.po b/locale/ru_RU/LC_MESSAGES/django.po index fcacf0755c..13df0917cd 100644 --- a/locale/ru_RU/LC_MESSAGES/django.po +++ b/locale/ru_RU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Russian\n" "Language: ru\n" @@ -37,15 +37,15 @@ msgstr "Не истекает" msgid "Unlimited" msgstr "Без ограничений" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Текущий пароль не правильный" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Пароли не совпадают" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Неверный пароль" @@ -81,7 +81,11 @@ msgstr "Пользователь с этим e-mail адресом уже сущ msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Проверочный код введен неверно" @@ -195,7 +199,6 @@ msgstr "Мягкая обложка" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Подписчики" msgid "Private" msgstr "Частный" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Завершено" @@ -355,11 +368,11 @@ msgstr "Остановлено" msgid "Import stopped" msgstr "Импорт остановлен" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Ошибка при загрузке книги" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Не удалось найти соответствие для книги" @@ -462,7 +475,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Отзывы" @@ -478,19 +491,19 @@ msgstr "Цитаты" msgid "Everything else" msgstr "Всё остальное" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Главная Лента времени" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Главная" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Хронология книг" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -499,91 +512,91 @@ msgstr "Хронология книг" msgid "Books" msgstr "Книги" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Английский)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Каталанский)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (немецкий)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Эсперанто)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (испанский)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Баскский)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Галицкий)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Итальянский)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Корейский)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Финский)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (французский)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (литовский)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Нидерланды (голландский)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (норвежский)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Польский)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Бразильский Португальский)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Европейский Португальский)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (румынский)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Шведский)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Украинский)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (упрощенный китайский)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Традиционный китайский)" @@ -641,54 +654,54 @@ msgstr "Что-то пошло не так! Извините за это." msgid "About" msgstr "О себе" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Добро пожаловать на %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s является частью BookWyrm, сети независимых самоуправляемых сообществ для читателей. Хотя вы можете легко взаимодействовать с пользователями в любом месте сети BookWyrm, это сообщество уникальное." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s - самая любимая книга %(site_name)s, средний рейтинг %(rating)s из 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Больше %(site_name)s пользователей хотят прочитать %(title)s, чем любую другую книга." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Отслеживайте своё чтение, обсуждайте книги, пишите отзывы и узнавайте, что читать дальше. BookWyrm - программное обеспечение человеческого масштаба, свободное от рекламы, анти-корпоративное и ориентированное на сообщество, разработанное, чтобы оставаться небольшим и персональным. Если у вас есть пожелания, отчеты об ошибках или грандиозные мечты, то протяните руку и сделайте так, чтобы вас услышали." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Встречайте ваших администраторов" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Модераторы и администраторы %(site_name)s поддерживают работоспособность сайта, следят за соблюдением .правил поведения и реагируют, когда пользователи сообщают о спаме и плохом поведении." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Модератор" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Администратор" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -832,7 +845,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -928,24 +941,24 @@ msgid "View ISNI record" msgstr "Просмотреть запись ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Загрузить данные" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Просмотреть на OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Посмотреть на Inventaire" @@ -1054,7 +1067,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1078,7 +1091,7 @@ msgstr "Сохранить" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1094,6 +1107,7 @@ msgstr "Сохранить" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1110,39 +1124,41 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Подтвердите" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Не удается подключиться к удаленному источнику." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Редактировать книгу" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Добавить обложку" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Ошибка загрузки обложки" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Нажмите, чтобы увеличить" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1151,17 +1167,17 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Добавить описание" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Описание:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1170,49 +1186,49 @@ msgstr[1] "%(count)s" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Вы отложили это издание в:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, 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:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Ваша активность по чтению" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Добавить даты прочтения" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "У вас нет активности по чтению для этой книги." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Ваши отзывы" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Ваши комментарии" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Ваши цитаты" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Жанры" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Места" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,11 +1243,11 @@ msgstr "Места" msgid "Lists" msgstr "Списки" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Добавить в список" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1643,6 +1659,7 @@ msgstr "Домен" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1798,7 +1815,7 @@ msgstr "Код подтверждения:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Отправить" @@ -2071,6 +2088,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2097,8 +2116,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3158,7 +3179,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3542,6 +3563,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Текущий пароль:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Новый пароль:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Подтвердить пароль:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3631,12 +3672,6 @@ msgstr "Забыли пароль?" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Подтвердить пароль:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4510,17 +4545,9 @@ msgstr "Сменить пароль" msgid "Successfully changed password" msgstr "Пароль успешно изменен" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Текущий пароль:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Новый пароль:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4546,6 +4573,10 @@ msgstr "Навсегда удалить аккаунт" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Удаление вашей учетной записи не может быть отменено. Имя пользователя не будет доступно для регистрации в будущем." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4734,6 +4765,7 @@ msgstr[3] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5142,7 +5174,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5160,13 +5192,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5248,42 +5280,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Расписание:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Последний запуск:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Общее количество запусков:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Включено:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Удалить расписание" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Выполнить сейчас" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Последняя дата запуска не будет обновлена" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Сканирование по расписанию" @@ -5328,7 +5369,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Какой поджанр музыки вам нравится больше всего ( Вам нужно выбрать )" @@ -5357,7 +5398,7 @@ msgid "Import triggered" msgstr "Импорт вызван" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Связи" @@ -5517,7 +5558,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5531,31 +5572,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Дни" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Недели" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5635,7 +5676,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5663,7 +5704,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5890,7 +5931,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6164,7 +6241,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6189,49 +6266,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6239,7 +6322,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6655,11 +6738,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Вы уверены, что хотите удалить аккаунт пользователя %(username)s? Это действие не может быть отменено. Чтобы продолжить, введите пароль для подтверждения удаления." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From eede11f35d90d9ee13134bf4f761ff3cd9fe5045 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:38 -0800 Subject: [PATCH 138/962] New translations django.po (Slovenian) --- locale/sl_SI/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/sl_SI/LC_MESSAGES/django.po b/locale/sl_SI/LC_MESSAGES/django.po index 45eceb6ba3..4f907432bf 100644 --- a/locale/sl_SI/LC_MESSAGES/django.po +++ b/locale/sl_SI/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Slovenian\n" "Language: sl\n" @@ -37,15 +37,15 @@ msgstr "Ne poteče" msgid "Unlimited" msgstr "Neomejeno" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Nepravilno geslo" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Gesli se ne ujemata" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Nepravilno geslo" @@ -81,7 +81,11 @@ msgstr "Uporabnik s to e-pošto že obstaja." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Nepravilna koda" @@ -195,7 +199,6 @@ msgstr "Mehka vezava" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Sledilci" msgid "Private" msgstr "Zasebno" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktivno" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Končano" @@ -355,11 +368,11 @@ msgstr "Ustavljeno" msgid "Import stopped" msgstr "Vnos ustavljen" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Napaka pri vnosu knjige" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -462,7 +475,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Recenzije" @@ -478,19 +491,19 @@ msgstr "Citati" msgid "Everything else" msgstr "Vse ostalo" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Domača časovnica" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Domov" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Knjižna časovnica" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -499,91 +512,91 @@ msgstr "Knjižna časovnica" msgid "Books" msgstr "Knjige" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "angleški (English)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "katalonski (Catalan)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "nemški (German)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "španski (Spanish)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "galicijski (Galician)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "italijanski (Italian)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "finski (Finnish)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "francoski (French)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "litovski (Lithuanian)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "norveški (Norwegian)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "polski (Polish)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "portugalski, brazilski (Brazilian Portuguese)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "portugalski, evropski (European Portuguese)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "romunski (Romanian)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "švedski (Swedish)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "kitajski, poenostavljen (Simplified Chinese)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "kitajski, tradicionalen (Traditional Chinese)" @@ -641,54 +654,54 @@ msgstr "Nekaj je bilo narobe, se opravičujem." msgid "About" msgstr "O" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Dobrodošli na %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderator" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Administrator" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -832,7 +845,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -928,24 +941,24 @@ msgid "View ISNI record" msgstr "Poglej ISNI zapis" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1054,7 +1067,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1078,7 +1091,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1094,6 +1107,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1110,39 +1124,41 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1151,17 +1167,17 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1170,49 +1186,49 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,11 +1243,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1643,6 +1659,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1798,7 +1815,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2071,6 +2088,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2097,8 +2116,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3158,7 +3179,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3542,6 +3563,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3631,12 +3672,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4510,17 +4545,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4546,6 +4573,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4734,6 +4765,7 @@ msgstr[3] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5140,7 +5172,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5158,13 +5190,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5246,42 +5278,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5326,7 +5367,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5355,7 +5396,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5515,7 +5556,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5529,31 +5570,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5633,7 +5674,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5661,7 +5702,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5888,7 +5929,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6162,7 +6239,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6187,49 +6264,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6237,7 +6320,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6653,11 +6736,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 90fffaf9e9598f2cd4062436dba26c713f85b58e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:40 -0800 Subject: [PATCH 139/962] New translations django.po (Serbian (Cyrillic)) --- locale/sr_SP/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/sr_SP/LC_MESSAGES/django.po b/locale/sr_SP/LC_MESSAGES/django.po index aea2e82153..ed3317bf17 100644 --- a/locale/sr_SP/LC_MESSAGES/django.po +++ b/locale/sr_SP/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Serbian (Cyrillic)\n" "Language: sr\n" @@ -37,15 +37,15 @@ msgstr "" msgid "Unlimited" msgstr "" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -81,7 +81,11 @@ msgstr "" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -195,7 +199,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -461,7 +474,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -477,19 +490,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -498,91 +511,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -640,54 +653,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -829,7 +842,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -923,24 +936,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1049,7 +1062,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1073,7 +1086,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1089,6 +1102,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1105,39 +1119,41 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1145,17 +1161,17 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1163,49 +1179,49 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1220,11 +1236,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1636,6 +1652,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1791,7 +1808,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2062,6 +2079,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2088,8 +2107,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3146,7 +3167,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3528,6 +3549,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3617,12 +3658,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4491,17 +4526,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4527,6 +4554,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4714,6 +4745,7 @@ msgstr[2] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5118,7 +5150,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5136,13 +5168,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5224,42 +5256,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5304,7 +5345,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5333,7 +5374,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5493,7 +5534,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5507,31 +5548,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5608,7 +5649,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5635,7 +5676,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5862,7 +5903,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6136,7 +6213,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6161,49 +6238,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6211,7 +6294,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6627,11 +6710,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 15ee157b3e9a53d93b59e82a581e41e573c4ec23 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:41 -0800 Subject: [PATCH 140/962] New translations django.po (Swedish) --- locale/sv_SE/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/sv_SE/LC_MESSAGES/django.po b/locale/sv_SE/LC_MESSAGES/django.po index d918982994..7c2e7f70a1 100644 --- a/locale/sv_SE/LC_MESSAGES/django.po +++ b/locale/sv_SE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-10 21:22\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Swedish\n" "Language: sv\n" @@ -37,15 +37,15 @@ msgstr "Slutar inte gälla" msgid "Unlimited" msgstr "Obegränsad" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Felaktigt lösenord" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Lösenord matchar inte" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Felaktigt lösenord" @@ -81,7 +81,11 @@ msgstr "En användare med den här e-postadressen finns redan." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Felaktig kod" @@ -195,7 +199,6 @@ msgstr "Pocketbok" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Följare" msgid "Private" msgstr "Privat" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktiv" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Slutförd" @@ -355,11 +368,11 @@ msgstr "Avbruten" msgid "Import stopped" msgstr "Import avbröts" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Fel uppstod vid inläsning av boken" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Kunde inte hitta en träff för boken" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s betygsatte %(book_title)s: %(display_rating).1f stjärna" msgstr[1] "%(display_name)s betygsatte %(book_title)s: %(display_rating).1f stjärnor" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Recensioner" @@ -476,19 +489,19 @@ msgstr "Citat" msgid "Everything else" msgstr "Allt annat" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Tidslinje för Hem" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Hem" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Tidslinjer för böcker" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Tidslinjer för böcker" msgid "Books" msgstr "Böcker" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Engelska" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (katalanska)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Tyska (Tysk)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Spanska (Spansk)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Baskiska)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italienska (Italiensk)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (koreanska)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Finland (Finska)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Franska (Fransk)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Litauiska (Litauisk)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederländerna (Holländska)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norska (Norska)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (polska)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português d Brasil (Brasiliansk Portugisiska)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisiska)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Rumänien (Rumänska)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Svenska)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainska)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Förenklad Kinesiska)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Traditionell Kinesiska)" @@ -639,54 +652,54 @@ msgstr "Något gick fel! Förlåt för det." msgid "About" msgstr "Om" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Välkommen till %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s är en del av BookWyrm, ett nätverk av oberoende självstyrda gemenskaper för läsare. Du kan integrera sömlöst med användare vart som helst i BookWyrm-nätverket, men den här gemenskapen är unik." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s är %(site_name)ss mest omtyckta bok med ett genomsnittligt betyg på %(rating)s av 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Flera %(site_name)s användare vill läsa %(title)s än någon annan bok." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s har det mest splittrande betyget av alla böcker på %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Spåra din läsning, diskutera böcker, skriv recensioner och upptäck vad du ska läsa härnäst. BookWyrm är alltid annonsfritt, företagsoberoende och gemenskapsorienterat, human mjukvara som är utformad för att förbli liten och personlig. Om du har önskemål på funktioner, felrapporter eller storslagna drömmar så ta kontakt och gör din röst hörd." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Träffa dina administratörer" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)ss moderatorer och administratörer håller hemsidan uppe och fungerande, upprätthåller uppförandekoden och svarar när användarna rapporterar skräppost och dåligt uppförande." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderator" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Administratör" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Det kortast lästa det här året…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Visa ISNI-samling" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Visa på ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Ladda data" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Visa i OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Visa i Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Spara" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Spara" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Att ladda in data kommer att ansluta till %(source_name)sdifferent edition of this book is on your %(shelf_name)s shelf." msgstr "En annorlunda utgåva av den här boken finns i din %(shelf_name)s hylla." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Din läsningsaktivitet" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Lägg till läsdatum" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Du har ingen läsaktivitet för den här boken." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Dina recensioner" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Dina kommentarer" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Dina citat" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Ämnen" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Platser" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Platser" msgid "Lists" msgstr "Listor" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Lägg till i listan" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Domän" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Bekräftelsekod:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Skicka in" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Du begärde att återställa ditt %(site_name)s-lösenord. Klicka på länken nedan för att ställa in ett nytt lösenord och logga in på ditt konto." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Detta e-postmeddelande är ett test." msgid "Test email" msgstr "Test-epostmeddelande" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Status för nytt försök" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importer" @@ -3514,6 +3535,26 @@ msgstr "Förhållande" msgid "Reason" msgstr "Orsak" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Nuvarande lösenord:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Nytt lösenord:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Bekräfta lösenordet:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Glömt ditt lösenord?" msgid "More about this site" msgstr "Mer om den här sidan" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Bekräfta lösenordet:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Ändra lösenord" msgid "Successfully changed password" msgstr "Ändringen av lösenordet lyckades" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Nuvarande lösenord:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nytt lösenord:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Ta bort kontot permanent" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Borttagning av ditt konto kan inte ångras. Användarnamnet kommer inte att vara tillgängligt att registrera i framtiden." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Datum" @@ -5098,7 +5130,7 @@ msgstr "Redigera" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Tillkännagivanden" @@ -5116,13 +5148,13 @@ msgstr "Falskt" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Startdatum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Slutdatum:" @@ -5204,42 +5236,51 @@ msgstr "Användare eller inlägg som redan blivit anmälda (oavsett anmälningen #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Schema:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Kördes senast:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Totalt antal körningar:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Aktiverad:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Ta bort schema" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Kör nu" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Senaste körningsdatum kommer inte att bli uppdaterat" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Schemalägg skanning" @@ -5284,7 +5325,7 @@ msgstr "Ta bort regel" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Lönestatus" @@ -5313,7 +5354,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5473,7 +5514,7 @@ msgid "Dashboard" msgstr "Översiktspanel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Totalt antal användare" @@ -5487,31 +5528,31 @@ msgstr "Aktiva den här månaden" msgid "Works" msgstr "Verk" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Instansaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervall:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dagar" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Veckor" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Användarens registreringsaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Statusaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Skapade verk" @@ -5585,7 +5626,7 @@ msgstr "Domän:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Blocklista för e-post" @@ -5611,7 +5652,7 @@ msgstr "Inga e-postdomäner är för närvarande blockerade" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "E-postkonfiguration" @@ -5838,7 +5879,43 @@ msgstr "" msgid "Completed" msgstr "Slutförd" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6112,7 +6189,7 @@ msgstr "Du kan blockera IP-intervall med hjälp av CIDR-syntax." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Blockeringslista för IP-adress" @@ -6137,49 +6214,55 @@ msgid "Manage Users" msgstr "Hantera användare" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderering" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Rapporter" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Länka domäner" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "System" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "Schemalagda uppgifter" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Inställningar för instans" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Inställningar för sidan" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6187,7 +6270,7 @@ msgstr "Inställningar för sidan" msgid "Registration" msgstr "Registrering" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6603,12 +6686,44 @@ msgstr "Ta bort användaren permanent" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Är du säker på att du vill ta bort %(username)ss konto? Den här åtgärden kan inte ångras. För att fortsätta, vänligen ange ditt lösenord för att bekräfta raderingen." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Ditt lösenord:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 1f576bfb8ba2bf57e91397bdd93236eaa88e53ef Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:42 -0800 Subject: [PATCH 141/962] New translations django.po (Turkish) --- locale/tr_TR/LC_MESSAGES/django.po | 375 +++++++++++++++++++---------- 1 file changed, 245 insertions(+), 130 deletions(-) diff --git a/locale/tr_TR/LC_MESSAGES/django.po b/locale/tr_TR/LC_MESSAGES/django.po index d1834b3da5..7742bd5367 100644 --- a/locale/tr_TR/LC_MESSAGES/django.po +++ b/locale/tr_TR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Turkish\n" "Language: tr\n" @@ -37,15 +37,15 @@ msgstr "Süresi Geçmez" msgid "Unlimited" msgstr "Sınırsız" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Yanlış şifre" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Şifreler eşleşmiyor" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Hatalı Şifre" @@ -81,7 +81,11 @@ msgstr "Bu email adresi ile bir kullanıcı zaten var." msgid "This email address cannot be registered." msgstr "Bu e-posta adresi kaydedilemiyor." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Hatalı kod" @@ -195,7 +199,6 @@ msgstr "Kâğıt kapak" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Takipçiler" msgid "Private" msgstr "Kişisel" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktif" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Tamamlandı" @@ -355,11 +368,11 @@ msgstr "Durduruldu" msgid "Import stopped" msgstr "Veri aktarımı durduruldu" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Kitabı yüklerken hata" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Kitap için eşleşme bulunamadı" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s %(book_title)s kitabına %(display_rating).1f yıldız verdi" msgstr[1] "%(display_name)s %(book_title)s kitabına %(display_rating).1f yıldız verdi" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Değerlendirmeler" @@ -476,19 +489,19 @@ msgstr "Alıntılar" msgid "Everything else" msgstr "Diğer" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Akış" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Anasayfa" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Kitap Akışı" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Kitap Akışı" msgid "Books" msgstr "Kitaplar" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "İngilizce" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Katalonca)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Almanca)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (İspanyolca)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Baskça)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galiçyaca)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (İtalyanca)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Korece)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Fince)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Fransızca)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litovca)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (Felemenkçe)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norveççe)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Lehçe)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brezilya Portekizcesi)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Avrupa Portekizcesi)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Rumence)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (İsveççe)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Ukraynaca)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Basitleştirilmiş Çince)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Geleneksel Çince)" @@ -639,54 +652,54 @@ msgstr "Kusura bakmayın, bir şeyler yanlış gitti!" msgid "About" msgstr "Hakkında" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Hoşgeldiniz, burası %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s, okuyucular için bağımsız ve kendi kendini yöneten topluluklar olan BookWyrm ağının bir parçası. Bu özel bir topluluk olmasına rağmen, BookWyrm ağındaki her kullanıcıyla sorunsuzca etkileşime girebilirsin." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "5 üzerinden %(rating)s oyu ile, %(title)s %(site_name)s topluluğunun en sevilen kitabı." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "%(site_name)s kullanıcıları, %(title)s kitabını diğer her şeyden daha çok okumak istiyorlar." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s kitabı, %(site_name)s topluluğundaki en bölücü oy dağılımına sahip." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Kitaplar hakkında konuş, okuma sürecini takip et, incelemeler yaz ve okuyacağın bir sonraki kitabı keşfet. Her zaman reklamsız, kurumsallık karşıtı ve topluluğunu öncelikte tutacak olan BookWyrm, küçük ve kişisel kalması için insan ölçeğinde tasarlanmış bir uygulama. İsteklerin, hata raporların veya büyük hayallerin varsa bize ulaş ve sesini duyur." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Yönetimle tanışın" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s topluluğunun moderatörleri ve yöneticileri siteyi ayakta, çalışır, topluluk kurallarını yürürlükte tutar ve kullanıcılar spam ya da zararlı davranışları şikayet ettiğinde ilgilenirler." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderatör" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Yönetici" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Bu yıl okudukları en kısa…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "ISNI kaydını gör" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "ISFDB'de gör" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Veri yükle" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "OpenLibrary'de aç" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Inventaire'de görüntüle" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Kaydet" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Kaydet" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Onayla" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Uzaktaki kaynağa bağlanılamıyor." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Kitabı Düzenle" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Kapak eklemek için tıklayın" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Kapak yüklemesi başarısız" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Büyütmek için tıkla" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "(%(review_count)s incelemeler)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Açıklama Ekle" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Açıklama:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s baskı" msgstr[1] "%(count)s baskılar" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Bu baskıyı rafa kaldırdınız:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Okuma etkinliğiniz" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Okuma tarihlerini ekleyin" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Bu kitap için herhangi bir okuma etkinliğiniz yok." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Değerlendirmelerin" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Yorumların" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Alıntıların" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Konular" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Yerler" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Yerler" msgid "Lists" msgstr "Listeler" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Listeye ekle" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Alan adı" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Doğrulama kodu:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Gönder" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "%(site_name)s şifrenizi sıfırlamayı talep ettiniz. Yeni bir şifre belirlemek ve hesabınıza giriş yapmak için aşağıdaki bağlantıya tıklayın." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Bu bir test e-postasıdır." msgid "Test email" msgstr "Test e-postası" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Yeni şifre:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Yeni şifre:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4596,7 +4627,7 @@ msgstr "Varsayılan ileti gizliliği:" #: bookwyrm/templates/preferences/edit_user.html:142 #, python-format msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" -msgstr "..." +msgstr "" #: bookwyrm/templates/preferences/export-user.html:6 #: bookwyrm/templates/preferences/export-user.html:9 @@ -4665,12 +4696,12 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:72 #, python-format msgid "On average, recent exports have taken %(hours)s hours." -msgstr "Ortalama olarak, son dışa aktarmalar%(saat) saat sürmüştür." +msgstr "Ortalama olarak, son dışa aktarmalar%(hours)s saat sürmüştür." #: bookwyrm/templates/preferences/export-user.html:76 #, python-format msgid "On average, recent exports have taken %(minutes)s minutes." -msgstr "." +msgstr "" #: bookwyrm/templates/preferences/export-user.html:88 msgid "Create user export file" @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5114,13 +5146,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5485,31 +5526,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Haftalar" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Kullanıcı kayıt etkinliği" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "E-posta Engelleme Listesi" @@ -5609,7 +5650,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,11 +6684,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 1984d2ef8d0ddda230029b8f6eb5f4259bb24eae Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:43 -0800 Subject: [PATCH 142/962] New translations django.po (Ukrainian) --- locale/uk_UA/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/uk_UA/LC_MESSAGES/django.po b/locale/uk_UA/LC_MESSAGES/django.po index 560ecf160c..b9629e9e63 100644 --- a/locale/uk_UA/LC_MESSAGES/django.po +++ b/locale/uk_UA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -37,15 +37,15 @@ msgstr "Невичерпний" msgid "Unlimited" msgstr "Без обмежень" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Невірний пароль" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Пароль не збігається" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Неправильний Пароль" @@ -81,7 +81,11 @@ msgstr "Користувач із цією електронною адресою msgid "This email address cannot be registered." msgstr "Ця адреса електронної пошти не може бути зареєстрована." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Неправильний код" @@ -195,7 +199,6 @@ msgstr "М'яка обкладинка" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Бачать тільки підписники" msgid "Private" msgstr "Не бачить ніхто" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "В процесі" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Завершено" @@ -355,11 +368,11 @@ msgstr "Зупинено" msgid "Import stopped" msgstr "Імпорт зупинено" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Помилка при завантаженні книги" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Не вдалося знайти відповідну книгу" @@ -462,7 +475,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Рецензії" @@ -478,19 +491,19 @@ msgstr "Цитати" msgid "Everything else" msgstr "Все інше" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Головна Стрічка" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Головна" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Книжкова Стрічка" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -499,91 +512,91 @@ msgstr "Книжкова Стрічка" msgid "Books" msgstr "Книги" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Англійська" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Каталонська)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Німецька)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Есперанто)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Іспанська)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Баскська)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Галісійська)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Італійська)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Фінська)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Французька)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Литовська)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (Нідерландська)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Норвезька)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Польська)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Бразильська португальська)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Європейська португальська)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Румунська)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Шведська)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainian)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Спрощена китайська)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Традиційна китайська)" @@ -641,54 +654,54 @@ msgstr "Щось пішло не так! Вибачте." msgid "About" msgstr "Про ресурс" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Вітаємо вас на %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s є частиною BookWyrm, мережі незалежних, самокерованих спільнот для читачів. Ви можете безперешкодно взаємодіяти з користувачами з будь-якого інстансу мережі BookWyrm, але саме ця спільнота унікальна." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s є найулюбленішою книгою на %(site_name)s. Її середній рейтинг дорівнює %(rating)s з 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Користувачі %(site_name)s хочуть прочитати %(title)s більше ніж будь-яку іншу книгу." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s має найсуперечливіші оцінки серед усіх книг на %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Відстежуйте що читаєте, обговорюйте книги, пишіть рецензії та знаходьте що читати далі. BookWyrm - це програмне забезпечення для людей, а не прибутку. Завжди без реклами, анти-корпоративне та орієнтоване на спільноту. Воно спроектовано так, щоб залишатися невеличким та особистим. Якщо у вас є побажання, баг-репорти або великі задуми, зв'яжитесь з нами та розкажіть про них." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Адміністратори" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Модератори та адміністратори %(site_name)s підтримують працездатність сайту, слідкують за дотриманням правил поведінки та реагують на скарги користувачів про спам і погану поведінку." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Модератор" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Адміністратор" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -832,7 +845,7 @@ msgstr "Найшвидше прочитана книга цього року…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -928,24 +941,24 @@ msgid "View ISNI record" msgstr "Переглянути запис ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Переглянути на ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Завантажити данні" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Переглянути на OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Переглянути на Inventaire" @@ -1054,7 +1067,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1078,7 +1091,7 @@ msgstr "Зберегти" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1094,6 +1107,7 @@ msgstr "Зберегти" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1110,39 +1124,41 @@ msgstr "Процес завантаження даних з'єднається #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Підтвердити" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Не вдалося під'єднатися до віддаленого джерела." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Редагувати Книгу" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Натисніть, щоб додати обкладинку" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Не вдалося завантажити обкладинку" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Натисніть для збільшення" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1151,17 +1167,17 @@ msgstr[1] "(%(review_count)s рецензії)" msgstr[2] "(%(review_count)s рецензій)" msgstr[3] "(%(review_count)s рецензій)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Додати Опис" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Опис:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1170,49 +1186,49 @@ msgstr[1] "%(count)s видання" msgstr[2] "%(count)s видань" msgstr[3] "%(count)s видань" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Ви відклали це видання на полицю:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, 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:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Ваша читацька активність" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Додати дати коли прочитано" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Ви не маєте жодної читацької активності для цієї книги." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Ваші відгуки" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Ваші коментарі" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Ваші цитати" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Теми" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Місця" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,11 +1243,11 @@ msgstr "Місця" msgid "Lists" msgstr "Списки" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Додати до списку" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1643,6 +1659,7 @@ msgstr "Домен" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1798,7 +1815,7 @@ msgstr "Код підтвердження:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Надіслати" @@ -2071,6 +2088,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Ви надіслали запит на зміну пароля на сайті %(site_name)s. Перейдіть за посиланням нижче, щоб встановити новий пароль і увійти до свого облікового запису." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2097,8 +2116,10 @@ msgstr "Це тест е-пошти." msgid "Test email" msgstr "Перевірка е-пошти" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3158,7 +3179,7 @@ msgstr "Статус Повторення" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Імпорти" @@ -3542,6 +3563,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Підтвердження паролю:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3631,12 +3672,6 @@ msgstr "Забули пароль?" msgid "More about this site" msgstr "Докладніше про цей сайт" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Підтвердження паролю:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4510,17 +4545,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4546,6 +4573,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4734,6 +4765,7 @@ msgstr[3] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5142,7 +5174,7 @@ msgstr "Редагувати" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5160,13 +5192,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5248,42 +5280,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Увімкнено:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5328,7 +5369,7 @@ msgstr "Видалити правило" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Стан Celery" @@ -5357,7 +5398,7 @@ msgid "Import triggered" msgstr "Розпочаті імпорти" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Конектори" @@ -5517,7 +5558,7 @@ msgid "Dashboard" msgstr "Панель керування" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Всього користувачів" @@ -5531,31 +5572,31 @@ msgstr "Активних у цьому місяці" msgid "Works" msgstr "Творів" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Активність Інстансу" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Інтервал:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Дні" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Тижні" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Активність по реєстраціях" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Активність по статусах" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Творів створено" @@ -5635,7 +5676,7 @@ msgstr "Домен:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Заблоковані Email" @@ -5663,7 +5704,7 @@ msgstr "Наразі немає заблокованих доменів" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Налаштування електронної пошти" @@ -5890,7 +5931,43 @@ msgstr "" msgid "Completed" msgstr "Завершені" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6164,7 +6241,7 @@ msgstr "Ви можете заблокувати діапазон IP за доп #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Список Заблокованих IP" @@ -6189,49 +6266,55 @@ msgid "Manage Users" msgstr "Керування Користувачами" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Модерація" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Скарги" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Домени Посилань" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Система" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Налаштування Інстансу" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Налаштування Сайту" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6239,7 +6322,7 @@ msgstr "Налаштування Сайту" msgid "Registration" msgstr "Реєстрація" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6655,12 +6738,44 @@ msgstr "Видалити користувача назавжди" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Ви впевнені, що хочете видалити обліковий запис %(username)s? Цю дію неможливо скасувати. Щоб продовжити, будь ласка, введіть свій пароль для підтвердження видалення." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Ваш пароль:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 2a1e51a356e0003b52578124c4cf45c6650a602e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:45 -0800 Subject: [PATCH 143/962] New translations django.po (Chinese Simplified) --- locale/zh_Hans/LC_MESSAGES/django.po | 373 ++++++++++++++++++--------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 1cd3ff90f5..18783e0013 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -37,15 +37,15 @@ msgstr "永不失效" msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "密码错误" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "两次输入的密码不一致" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "密码错误" @@ -81,7 +81,11 @@ msgstr "已经存在使用该邮箱的用户。" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "验证码错误" @@ -195,7 +199,6 @@ msgstr "平装" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "关注者" msgid "Private" msgstr "私密" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "活跃" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "已完成" @@ -355,11 +368,11 @@ msgstr "已停止" msgid "Import stopped" msgstr "导入停止" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "加载书籍时出错" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "找不到匹配的书" @@ -459,7 +472,7 @@ msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "书评" @@ -475,19 +488,19 @@ msgstr "引用" msgid "Everything else" msgstr "所有其它内容" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "主页时间线" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "主页" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "书目时间线" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -496,91 +509,91 @@ msgstr "书目时间线" msgid "Books" msgstr "书目" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English（英语）" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (加泰罗尼亚语)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch（德语）" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (世界语)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español（西班牙语）" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (巴斯克语)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego（加利西亚语）" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano（意大利语）" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (韩语)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi （Finnish/芬兰语）" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français（法语）" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių（立陶宛语）" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (荷兰语)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk（挪威语）" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (波兰语)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil（巴西葡萄牙语）" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu（欧洲葡萄牙语）" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română （罗马尼亚语）" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska（瑞典语）" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (乌克兰语)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文（繁体中文）" @@ -638,54 +651,54 @@ msgstr "某些东西出错了！对不起啦。" msgid "About" msgstr "关于" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "欢迎来到 %(site_name)s！" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s 是 BookWyrm 的一部分，这是一个为读者建立的独立、自我导向的社区网络。 虽然您可以在 BookWyrm 网络中与任何地方的用户无缝互动，但这个社区是独一无二的。" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s 是 %(site_name)s 最受欢迎的书，平均得分为 %(rating)s（满分五分）。" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "%(site_name)s 上的最用户想读的书籍是 %(title)s。" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "在 %(site_name)s 上，对 %(title)s 这本书的评分争议较大。" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "记录您的阅读、谈论书籍、撰写评论、发现下一本书。 BookWyrm 永远是无广告、反公司化和面向社区的为人设计的软件，其目的是保持小规模和个人性。 如果您有特性请求、错误报告或大梦想， 联系我们，为自己发声。" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "遇见您的管理员" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "%(site_name)s 的仲裁员和管理员负责维持站点运行， 执行 行为守则，并在用户报告垃圾邮件和不良行为时做出回应。" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "仲裁员" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "管理员" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -823,7 +836,7 @@ msgstr "TA 今年阅读最短的…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -913,24 +926,24 @@ msgid "View ISNI record" msgstr "查看 ISNI 记录" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "在 ISFDB 查看" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "加载数据" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "在 OpenLibrary 查看" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "在 Inventaire 查看" @@ -1039,7 +1052,7 @@ msgid "ISNI:" msgstr "ISNI：" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1063,7 +1076,7 @@ msgstr "保存" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1079,6 +1092,7 @@ msgstr "保存" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1095,103 +1109,105 @@ msgstr "加载数据会连接到 %(source_name)s 并检查这 #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "确认" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "无法联系远程资源。" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "编辑书目" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "点击添加封面" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "加载封面失败" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "点击放大" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 则书评)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "添加描述" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s 版次" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "此版本已在你的书架上：" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, 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:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "你的阅读活动" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "添加阅读日期" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "你还没有任何这本书的阅读活动。" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "你的书评" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "你的评论" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "主题" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "地点" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1206,11 +1222,11 @@ msgstr "地点" msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "添加到列表" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1622,6 +1638,7 @@ msgstr "域名" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1777,7 +1794,7 @@ msgstr "确认代码:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "提交" @@ -2044,6 +2061,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "你请求重置你在 %(site_name)s 的密码。点击下面的链接来设置新密码并登录你的帐号。" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2070,8 +2089,10 @@ msgstr "这是一封测试邮件。" msgid "Test email" msgstr "测试邮件" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3122,7 +3143,7 @@ msgstr "重试状态" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "导入" @@ -3500,6 +3521,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "当前密码:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "新密码:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "确认密码:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3589,12 +3630,6 @@ msgstr "忘记了密码？" msgid "More about this site" msgstr "更多关于本站点的信息" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "确认密码:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4453,17 +4488,9 @@ msgstr "更改密码" msgid "Successfully changed password" msgstr "成功修改密码" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "当前密码:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "新密码:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4489,6 +4516,10 @@ msgstr "永久删除帐号" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "删除帐号的操作将无法被撤销。对应用户名也无法被再次注册。" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4674,6 +4705,7 @@ msgstr[0] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "日期" @@ -5076,7 +5108,7 @@ msgstr "编辑" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "公告" @@ -5094,13 +5126,13 @@ msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "开始日期:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "结束日期:" @@ -5182,42 +5214,51 @@ msgstr "已经报告的用户或状态（无论举报是否得到解决）将不 #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "定时计划：" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "上次运行：" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "行数总计：" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "已启用：" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "删除定时计划" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "立即运行" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "最后运行日期将不会被更新" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "定时扫描" @@ -5262,7 +5303,7 @@ msgstr "删除规则" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Celery 状态" @@ -5291,7 +5332,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5451,7 +5492,7 @@ msgid "Dashboard" msgstr "仪表盘" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "用户总数" @@ -5465,31 +5506,31 @@ msgstr "今月活跃" msgid "Works" msgstr "作品" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "实例活动" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "区段：" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "天" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "周" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "用户注册活动" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "状态动态" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "创建的作品" @@ -5560,7 +5601,7 @@ msgstr "域名：" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "邮件屏蔽列表" @@ -5585,7 +5626,7 @@ msgstr "目前没有屏蔽邮件域名" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "电子邮箱配置" @@ -5812,7 +5853,43 @@ msgstr "" msgid "Completed" msgstr "已完成" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6086,7 +6163,7 @@ msgstr "你可以使用 CIDR 语法来进行 IP 段的屏蔽。" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "IP 地址屏蔽列表" @@ -6111,49 +6188,55 @@ msgid "Manage Users" msgstr "管理用户" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "仲裁" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "报告" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "链接域名" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "实例设置" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "站点设置" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6161,7 +6244,7 @@ msgstr "站点设置" msgid "Registration" msgstr "注册" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6577,12 +6660,44 @@ msgstr "永久删除用户" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "你确定要删除 %(username)s 的帐号吗？此操作不能被撤销。请输入你的密码确认删除操作以继续。" +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "你的密码：" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 47d0752fbd974838c0b03bc6ea480c1be154da51 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:46 -0800 Subject: [PATCH 144/962] New translations django.po (Chinese Traditional) --- locale/zh_Hant/LC_MESSAGES/django.po | 369 ++++++++++++++++++--------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index f44b4a04dc..664a32f6b5 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -37,15 +37,15 @@ msgstr "永不失效" msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "密碼不正確" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "密碼不一致" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "密碼不正確" @@ -81,7 +81,11 @@ msgstr "已經存在使用該郵箱的使用者。" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "不正確的代碼" @@ -195,7 +199,6 @@ msgstr "平裝書" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "關注者" msgid "Private" msgstr "私密" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "活躍" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "已完成" @@ -355,11 +368,11 @@ msgstr "已停止" msgid "Import stopped" msgstr "匯入已停止" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "讀取書本時遇到錯誤" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "找不到匹配的書" @@ -459,7 +472,7 @@ msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "書評" @@ -475,19 +488,19 @@ msgstr "引用" msgid "Everything else" msgstr "所有其他內容" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "主頁時間線" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "主頁" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "書目時間線" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -496,91 +509,91 @@ msgstr "書目時間線" msgid "Books" msgstr "書目" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English（英語）" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (加泰羅尼亞語)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch（德語）" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (世界語)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español（西班牙語）" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (巴斯克語)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (加利西亞語)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (意大利語)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (芬蘭語)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français（法語）" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (立陶宛語)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (荷蘭語)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (挪威語)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (波蘭語)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (巴西葡萄牙語)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (歐洲葡萄牙語)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (羅馬尼亞語)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (瑞典語)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "簡體中文" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文" @@ -638,54 +651,54 @@ msgstr "某些東西出錯了！抱歉。" msgid "About" msgstr "關於" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "歡迎來到 %(site_name)s！" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s 是 BookWyrm 的一部分，這是一個為讀者建立的獨立、自我導向的社區網絡。雖然您可以在 BookWyrm 網絡中任何地方的用戶無縫互動，但這個社區是獨一無二的。" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s 是 %(site_name)s 最受歡迎的書，平均得分為 %(rating)s（滿分五分）。" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "管理者" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "管理員" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -823,7 +836,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -913,24 +926,24 @@ msgid "View ISNI record" msgstr "查看 ISNI 記錄" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "在 ISFDB 查看" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "載入資料" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "在 OpenLibrary 檢視" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "在 Inventaire 檢視" @@ -1039,7 +1052,7 @@ msgid "ISNI:" msgstr "ISNI：" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1063,7 +1076,7 @@ msgstr "儲存" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1079,6 +1092,7 @@ msgstr "儲存" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1095,103 +1109,105 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "確認" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "無法連接到遠程數據源。" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "編輯書目" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "點擊添加封面" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "載入封面失敗" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "點擊放大" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 則書評)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "新增描述" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s 版次" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "此版本已在你的書架上：" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, 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:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "你的閱讀活動" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "新增閱讀日期" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "你還未閱讀這本書。" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "你的書評" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "你的評論" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "主題" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "地點" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1206,11 +1222,11 @@ msgstr "地點" msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "新增到列表" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1622,6 +1638,7 @@ msgstr "網域" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1777,7 +1794,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "提交" @@ -2044,6 +2061,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "你請求重置你在 %(site_name)s 的密碼。點選下面的連結來設定新密碼並登入你的帳號。" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2070,8 +2089,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3122,7 +3143,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3500,6 +3521,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "新密碼:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "確認密碼:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3589,12 +3630,6 @@ msgstr "忘記了密碼？" msgid "More about this site" msgstr "關於本網站的更多" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "確認密碼:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4453,17 +4488,9 @@ msgstr "更改密碼" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "新密碼:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4489,6 +4516,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4674,6 +4705,7 @@ msgstr[0] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5074,7 +5106,7 @@ msgstr "編輯" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "公告" @@ -5092,13 +5124,13 @@ msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "開始日期:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "結束日期:" @@ -5180,42 +5212,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5260,7 +5301,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5289,7 +5330,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5449,7 +5490,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5463,31 +5504,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5558,7 +5599,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5810,7 +5851,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6084,7 +6161,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6109,49 +6186,55 @@ msgid "Manage Users" msgstr "管理使用者" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "舉報" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "實例設定" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "網站設定" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6159,7 +6242,7 @@ msgstr "網站設定" msgid "Registration" msgstr "註冊" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6575,11 +6658,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From b003787b4c4011b73793622211fbf498a1090e52 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:47 -0800 Subject: [PATCH 145/962] New translations django.po (Vietnamese) --- locale/vi_VN/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/vi_VN/LC_MESSAGES/django.po b/locale/vi_VN/LC_MESSAGES/django.po index 5365244b06..47504ab258 100644 --- a/locale/vi_VN/LC_MESSAGES/django.po +++ b/locale/vi_VN/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Vietnamese\n" "Language: vi\n" @@ -37,15 +37,15 @@ msgstr "" msgid "Unlimited" msgstr "" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -81,7 +81,11 @@ msgstr "" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -195,7 +199,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -459,7 +472,7 @@ msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -475,19 +488,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -496,91 +509,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -638,54 +651,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -823,7 +836,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -913,24 +926,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1039,7 +1052,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1063,7 +1076,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1079,6 +1092,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1095,103 +1109,105 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1206,11 +1222,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1622,6 +1638,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1777,7 +1794,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2044,6 +2061,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2070,8 +2089,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3122,7 +3143,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3500,6 +3521,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3589,12 +3630,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4453,17 +4488,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4489,6 +4516,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4674,6 +4705,7 @@ msgstr[0] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5074,7 +5106,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5092,13 +5124,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5180,42 +5212,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5260,7 +5301,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5289,7 +5330,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5449,7 +5490,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5463,31 +5504,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5558,7 +5599,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5810,7 +5851,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6084,7 +6161,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6109,49 +6186,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6159,7 +6242,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6575,11 +6658,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 8cdc4639180055a43856479b6b7be8b3620d2528 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:49 -0800 Subject: [PATCH 146/962] New translations django.po (Galician) --- locale/gl_ES/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po index 98ae9850e4..ee451ab113 100644 --- a/locale/gl_ES/LC_MESSAGES/django.po +++ b/locale/gl_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-09 04:44\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -37,15 +37,15 @@ msgstr "Non caduca" msgid "Unlimited" msgstr "Sen límite" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Contrasinal incorrecto" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "O contrasinal non concorda" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Contrasinal incorrecto" @@ -81,7 +81,11 @@ msgstr "Xa existe unha usuaria con este email." msgid "This email address cannot be registered." msgstr "Non se pode rexistrar este enderezo de correo." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Código incorrecto" @@ -195,7 +199,6 @@ msgstr "Libro de bolso" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s non semella ser un ISBN" @@ -326,12 +329,21 @@ msgstr "Seguidoras" msgid "Private" msgstr "Privado" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Activa" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Completa" @@ -355,11 +368,11 @@ msgstr "Detida" msgid "Import stopped" msgstr "Importación detida" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Erro ao cargar o libro" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Non se atopan coincidencias para o libro" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s valorou %(book_title)s: %(display_rating).1f estrela" msgstr[1] "%(display_name)s valorou %(book_title)s: %(display_rating).1f estrelas" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Recensións" @@ -476,19 +489,19 @@ msgstr "Citas" msgid "Everything else" msgstr "As outras cousas" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Cronoloxía de Inicio" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Cronoloxía de libros" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Cronoloxía de libros" msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Catalan)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Alemán)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Español)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Éuscaro)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galego)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Finés)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Francés)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Paises Baixos (Dutch)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Noruegués)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Polaco)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugués brasileiro)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Rumanés)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Ucraíno)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinés simplificado)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinés tradicional)" @@ -639,54 +652,54 @@ msgstr "Algo fallou! Lamentámolo." msgid "About" msgstr "Sobre" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Recibe a benvida a %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s é parte de BookWyrm, unha rede independente, auto-xestionada de comunidades de persoas lectoras. Aínda que podes interactuar con outras usuarias da rede BookWyrm, esta comunidade é única." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s é o libro máis querido de %(site_name)s, cunha valoración media de %(rating)s sobre 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "%(title)s é o libro que máis queren ler as usuarias de %(site_name)s." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s é o libro con valoracións máis diverxentes en %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Rexistra as túas lecturas, conversa sobre os libros, escribe recensións e descubre próximas lecturas. Sempre sen publicidade, anti-corporacións e orientado á comunidade, BookWyrm é software a escala humana, deseñado para ser pequeno e persoal. Se queres propoñer novas ferramentas, informar de fallos, ou colaborar, contacta con nós e deixa oír a túa voz." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Contacta coa administración" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "A moderación e administración de %(site_name)s coidan e xestionan o sitio web, fan cumprir co código de conduta e responden ás denuncias das usuarias sobre spam e mal comportamento." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderación" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "A lectura máis curta deste ano…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Ver rexistro ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Ver en ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Cargar datos" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Ver en OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Ver en Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Gardar" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Gardar" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Ao cargar os datos vas conectar con %(source_name)s e c #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Confirmar" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Non se pode conectar coa fonte remota." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Editar libro" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Preme para engadir portada" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Fallou a carga da portada" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Preme para agrandar" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "Ver en Finna" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s recensión)" msgstr[1] "(%(review_count)s recensións)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Engadir descrición" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descrición:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s edición" msgstr[1] "%(count)s edicións" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Puxeches esta edición no estante:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Hai unha edición diferente deste libro no teu estante %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Actividade lectora" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Engadir datas de lectura" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Non tes actividade lectora neste libro." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "As túas recensións" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Os teus comentarios" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "As túas citas" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Temas" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Engadir á lista" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Dominio" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Solicitaches restablecer o contrasinal en %(site_name)s. Preme na ligazón para establecer un novo contrasinal e acceder á túa conta." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Este é un email de proba." msgid "Test email" msgstr "Email de proba" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Intenta outra vez" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importacións" @@ -3514,6 +3535,26 @@ msgstr "Relación" msgid "Reason" msgstr "Motivo" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Contrasinal actual:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Novo contrasinal:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Confirma o contrasinal:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Esqueceches o contrasinal?" msgid "More about this site" msgstr "Máis sobre este sitio" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Confirma o contrasinal:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Cambiar contrasinal" msgid "Successfully changed password" msgstr "Cambiouse correctamente o contrasinal" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Contrasinal actual:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Novo contrasinal:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Eliminar a conta de xeito definitivo" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Se eliminas a conta non haberá volta atrás. O identificador non estará dispoñible para rexistro no futuro." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "Os ficheiros de exportación vanse eliminar en %(expiry_hours)s horas #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Data" @@ -5100,7 +5132,7 @@ msgstr "Editar" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Anuncios" @@ -5118,13 +5150,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Data de inicio:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Data de fin:" @@ -5206,42 +5238,51 @@ msgstr "Usuarias e estados que xa foron denunciados (independentemente de se xa #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Programar:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Última execución:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Veces executado:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Activado:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Eliminar programación" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Executar agora" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "Non se actualizará a data da última execución" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Programar escaneo" @@ -5286,7 +5327,7 @@ msgstr "Eliminar regra" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Estado de Celery" @@ -5315,7 +5356,7 @@ msgid "Import triggered" msgstr "Comezou a importación" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Conectores" @@ -5475,7 +5516,7 @@ msgid "Dashboard" msgstr "Taboleiro" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Total de usuarias" @@ -5489,31 +5530,31 @@ msgstr "Activas este mes" msgid "Works" msgstr "Traballos" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Actividade na instancia" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Días" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Rexistros de usuarias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Actividade do estado" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Traballos creados" @@ -5587,7 +5628,7 @@ msgstr "Dominio:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Lista de bloqueo de email" @@ -5613,7 +5654,7 @@ msgstr "Non tes dominios de email bloqueados" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Configuración do email" @@ -5840,7 +5881,43 @@ msgstr "Ficheiros caducados" msgid "Completed" msgstr "Completada" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "Actualizouse correctamente a caducidade" @@ -6114,7 +6191,7 @@ msgstr "Podes bloquear rangos de IP utilizando sintaxe CIDR." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Lista de enderezos IP bloqueados" @@ -6139,49 +6216,55 @@ msgid "Manage Users" msgstr "Xestionar usuarias" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderación" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Denuncias" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "Regras para Moderación Automática" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Dominios das ligazóns" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Sistema" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "Tarefas programadas" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "Mantemento de ficheiros" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Axustes da instancia" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Axustes da web" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6189,7 +6272,7 @@ msgstr "Axustes da web" msgid "Registration" msgstr "Rexistro" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6605,12 +6688,44 @@ msgstr "Eliminar definitivamente a usuaria" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Tes a certeza de querer eliminar a conta de %(username)s? Esta acción non ten volta atrás. Para facelo, escribe o teu contrasinal e confirma a eliminación." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Contrasinal:" +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 14b41ad0aee0cafb270886fcd902c6f5951fb3d4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:50 -0800 Subject: [PATCH 147/962] New translations django.po (Portuguese, Brazilian) --- locale/pt_BR/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index b3535fd4a6..537ec19029 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -37,15 +37,15 @@ msgstr "Não expira" msgid "Unlimited" msgstr "Ilimitado" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Senha incorreta" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "As senhas não correspondem" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Senha incorreta" @@ -81,7 +81,11 @@ msgstr "Já existe um usuário com este endereço de e-mail." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Código incorreto" @@ -195,7 +199,6 @@ msgstr "Capa mole" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Seguidores" msgid "Private" msgstr "Particular" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Ativo" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Completo" @@ -355,11 +368,11 @@ msgstr "Parado" msgid "Import stopped" msgstr "Importação interrompida" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Erro ao carregar livro" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Não foi possível encontrar o livro" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s avaliou %(book_title)s: %(display_rating).1f estrela" msgstr[1] "%(display_name)s avaliou %(book_title)s: %(display_rating).1f estrelas" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Resenhas" @@ -476,19 +489,19 @@ msgstr "Citações" msgid "Everything else" msgstr "Todo o resto" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Linha do tempo" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Página inicial" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Linha do tempo dos livros" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Linha do tempo dos livros" msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Inglês)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Catalão)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Basco)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galego)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Finlandês)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Holandês (Alemão)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Polonês)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português do Brasil)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Português Europeu)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Romeno)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (Ucraniano)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -639,54 +652,54 @@ msgstr "Algo deu errado! Foi mal." msgid "About" msgstr "Sobre" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Bem-vindol(a) a %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s faz parte da BookWyrm, uma rede independente e autogestionada de comunidades para leitores. Apesar de você poder interagir perfeitamente com usuários de qualquer parte da rede BookWyrm, esta comunidade é única." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s é o livro favorito da instância %(site_name)s, com uma avaliação média de %(rating)s em 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "O livro mais desejado de toda a instância %(site_name)s é %(title)s." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s tem a avaliação mais polêmica de toda a instância %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Acompanhe a sua leitura, converse sobre livros, escreva avaliações e descubra sua próxima leitura. Sempre livre de anúncios, anti-corporativo, e orientado a comunidades, BookWyrm é um software projetado para humanos, com design para permanecer pequeno e pessoal. Caso tenha alguma sugestão, encontre alguma bug ou tenha grandes sonhos para este projeto, fale conosco e faça-se ouvido." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Conheça a administração" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Moderadores e administradores de %(site_name)s's mantêm o site funcionando, aplicam o código de conduta e respondem quando usuários denunciam spam ou mau comportamento." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Moderador/a" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "A leitura mais curta do ano…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Ver registro ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Veja no ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Carregar informações" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Ver na OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Ver no Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Salvar" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Salvar" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "Para carregar informações nos conectaremos a %(source_name)sdifferent edition of this book is on your %(shelf_name)s shelf." msgstr "Uma edição diferente deste livro está em sua estante %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Andamento da sua leitura" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Adicionar registro de leitura" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Você ainda não registrou sua leitura." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Suas resenhas" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Seus comentários" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Suas citações" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Assuntos" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Adicionar à lista" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Domínio" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Código de confirmação:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Você solicitou a redefinição de sua senha no %(site_name)s. Clique no link abaixo para definir uma nova senha e entrar no site." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Este é um e-mail de teste." msgid "Test email" msgstr "E-mail de teste" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Status da nova tentativa" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importações" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Nova senha:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Confirmar senha:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Esqueceu sua senha?" msgid "More about this site" msgstr "Mais sobre este site" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Confirmar senha:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Alterar senha" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nova senha:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Excluir conta permanentemente" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "A exclusão de sua conta não poderá ser desfeita. O nome de usuário não estará disponível para cadastro no futuro." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5098,7 +5130,7 @@ msgstr "Editar" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Avisos" @@ -5116,13 +5148,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Data de início:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Data final:" @@ -5204,42 +5236,51 @@ msgstr "Usuários ou publicações já denunciados (independente de terem ou nã #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Agendamento:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Última execução:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Número total de execuções:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Habilitado:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Excluir agendamento" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Executar agora" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "A data da última execução não será atualizada" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Agendar verificação" @@ -5284,7 +5325,7 @@ msgstr "Excluir regra" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5313,7 +5354,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5473,7 +5514,7 @@ msgid "Dashboard" msgstr "Painel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Total de usuários" @@ -5487,31 +5528,31 @@ msgstr "Ativo neste mês" msgid "Works" msgstr "Obras" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Atividade da instância" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Dias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Novos usuários" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Publicações" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Obras criadas" @@ -5585,7 +5626,7 @@ msgstr "Domínio:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Lista de bloqueio de e-mails" @@ -5611,7 +5652,7 @@ msgstr "Nenhum domínio de e-mail bloqueado" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5838,7 +5879,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6112,7 +6189,7 @@ msgstr "Você pode bloquear intervalos de IP utilizando a sintaxe CIDR." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Lista de bloqueios de IP" @@ -6137,49 +6214,55 @@ msgid "Manage Users" msgstr "Gerenciar usuários" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderação" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Denúncias" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Domínios de links" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Configurações da instância" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Configurações do site" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6187,7 +6270,7 @@ msgstr "Configurações do site" msgid "Registration" msgstr "Cadastro" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6603,12 +6686,44 @@ msgstr "Excluir usuário permanentemente" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Você tem certeza que quer excluir a conta de %(username)s's? Esta ação não poderá ser desfeita. Para confirmar a exclusão por favor digite sua senha." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Sua senha:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From 3d12857f7d5637ff81f8ad35c7f16eda04f423cb Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:51 -0800 Subject: [PATCH 148/962] New translations django.po (Indonesian) --- locale/id_ID/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/id_ID/LC_MESSAGES/django.po b/locale/id_ID/LC_MESSAGES/django.po index d0390d4f4a..323ebed432 100644 --- a/locale/id_ID/LC_MESSAGES/django.po +++ b/locale/id_ID/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -37,15 +37,15 @@ msgstr "" msgid "Unlimited" msgstr "" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -81,7 +81,11 @@ msgstr "Pengguna dengan surel ini sudah terdaftar." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Kode salah" @@ -195,7 +199,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -459,7 +472,7 @@ msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -475,19 +488,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -496,91 +509,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Bahasa Inggris" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Bahasa Katalan)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Bahasa Jerman)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Bahasa Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Bahasa Spanyol)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Bahasa Italia)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Bahasa Finlandia)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Bahasa Prancis)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Bahasa Lithuania)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (Bahasa Belanda)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Bahasa Norwegia)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Bahasa Polandia)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -638,54 +651,54 @@ msgstr "" msgid "About" msgstr "Tentang" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Selamat datang di %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -823,7 +836,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -913,24 +926,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1039,7 +1052,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1063,7 +1076,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1079,6 +1092,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1095,103 +1109,105 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1206,11 +1222,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1622,6 +1638,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1777,7 +1794,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2044,6 +2061,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2070,8 +2089,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3122,7 +3143,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3500,6 +3521,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3589,12 +3630,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4453,17 +4488,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4489,6 +4516,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4674,6 +4705,7 @@ msgstr[0] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5074,7 +5106,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5092,13 +5124,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5180,42 +5212,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5260,7 +5301,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5289,7 +5330,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5449,7 +5490,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5463,31 +5504,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5558,7 +5599,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5810,7 +5851,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6084,7 +6161,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6109,49 +6186,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6159,7 +6242,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6575,11 +6658,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 53f7bc0b03ce0ab593cac3b959a6c3547a58ad3f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:53 -0800 Subject: [PATCH 149/962] New translations django.po (Bengali) --- locale/bn_BD/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/bn_BD/LC_MESSAGES/django.po b/locale/bn_BD/LC_MESSAGES/django.po index 5a08303d68..abba27f861 100644 --- a/locale/bn_BD/LC_MESSAGES/django.po +++ b/locale/bn_BD/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bengali\n" "Language: bn\n" @@ -37,15 +37,15 @@ msgstr "" msgid "Unlimited" msgstr "অসীম" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "ভুল পাসওয়ার্ড" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "পাসওয়ার্ডটি মিলে নি" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "ভুল পাসওয়ার্ড" @@ -81,7 +81,11 @@ msgstr "এই ইমেইল ঠিকানাধারী একজন ব msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "ভুল কোড" @@ -195,7 +199,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -476,19 +489,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -639,54 +652,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5114,13 +5146,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5485,31 +5526,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5609,7 +5650,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,11 +6684,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From a5a7114f5286df55c3b4fbe812255570d03f0042 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:54 -0800 Subject: [PATCH 150/962] New translations django.po (Welsh) --- locale/cy_GB/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/cy_GB/LC_MESSAGES/django.po b/locale/cy_GB/LC_MESSAGES/django.po index e7effba3fb..42847526de 100644 --- a/locale/cy_GB/LC_MESSAGES/django.po +++ b/locale/cy_GB/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Welsh\n" "Language: cy\n" @@ -37,15 +37,15 @@ msgstr "Ddim yn dod i ben" msgid "Unlimited" msgstr "Diderfyn" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Cyfrinair anghywir" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Nid yw'r cyfrinair yn cyfateb" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Cyfrinair anghywir" @@ -81,7 +81,11 @@ msgstr "Defnyddiwr gyda'r e-bost hwn eisoes yn bodoli." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Côd anghywir" @@ -195,7 +199,6 @@ msgstr "Clawr meddal" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Dilynwr" msgid "Private" msgstr "Preifat" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Gwall llwytho llyfr" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Methu dod o hyd i pariad ar gyfer llyfr" @@ -464,7 +477,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Adolygiadau" @@ -480,19 +493,19 @@ msgstr "Dyfyniadau" msgid "Everything else" msgstr "Popeth arall" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Ffrwd gartref" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Cartref" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Ffrwd lyfrau" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -501,91 +514,91 @@ msgstr "Ffrwd lyfrau" msgid "Books" msgstr "Llyfrau" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "Saesneg" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Almaeneg)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Sbaeneg)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galiseg)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Eidaleg)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomoi (Finneg)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Ffrangeg)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lithwaneg)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwyaidd)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portiwgaleg Brasil)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portiwgaleg Ewropeaidd)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Rwmaneg)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Swedeg)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Tsieinëeg Syml)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tsieinëeg Traddodiadol)" @@ -643,54 +656,54 @@ msgstr "Aeth rhywbeth o'i le! Sori am hynny." msgid "About" msgstr "Amdano" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Croeso i %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)syw %(site_name)s llyfr mwyaf annwyl, gyda sgôr gyfartalog o %(rating)s allan o 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Mae mwy o ddefnyddwyr %(site_name)s eisiau darllen %(title)s nag unrhyw lyfr arall." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "Mae gan %(title)s y gwerthusiadau mwyaf ymrannol o unrhyw lyfr ar %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Traciwch eich darlleniad, siaradwch am lyfrau, ysgrifennwch adolygiadau, a darganfyddwch beth i'w ddarllen nesaf. Bob amser yn ddi-hysbyseb, yn wrth-gorfforaethol, ac yn canolbwyntio ar y gymuned, mae BookWyrm yn feddalwedd ar raddfa ddynol, wedi'i gynllunio i aros yn fach ac yn bersonol. Os oes gennych chi geisiadau nodwedd, adroddiadau nam, neu freuddwydion mawr, estyn allan a gwneud i chi'ch hun glywed." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Cwrdd â'r gweinyddwyr" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "Mae gweinyddwyr a chymedrolwyr yn cadw safle %(site_name)s i fynd, yn goruwchwylio'r côd ymddygiad, ac yn ymateb pan fo defnyddwyr yn adrodd am sbam ac ymddygiad gwrth-gymdeithasol." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Cymedrolwr" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Gweinyddwr" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -838,7 +851,7 @@ msgstr "Eu llyfr byrraf eleni…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -938,24 +951,24 @@ msgid "View ISNI record" msgstr "Gwelwch y cofnod ISNI" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Llwythwch y data" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Gwelwch ar OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Gweld ar Inventaire" @@ -1064,7 +1077,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1088,7 +1101,7 @@ msgstr "Cadw" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1104,6 +1117,7 @@ msgstr "Cadw" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1120,39 +1134,41 @@ msgstr "Cysylltir data a lwythir at %(source_name)s a bydd yn g #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Cadarnhau" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "Methu â chysylltu â'r rhwydwaith." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Golygu'r Llyfr" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Cliciwch i ychwanegu clawr" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Methwyd â llwytho clawr" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Cliciwch i ehangu" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1163,17 +1179,17 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "(adolygiadau %(review_count)s)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Ychwanegu disgrifiad" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Disgrifiad:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1184,49 +1200,49 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "Argraffiadau %(count)s" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Rydych wedi rhoi'r fersiwn yma ar silff:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Mae fersiwn wahanolo'r llyfr hwn ar eich %(shelf_name)ssilff." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Eich darllen" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Ychwanegu dyddiadau darllen" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Does gennych ddim cofnod darllen ar gyfer y llyfr hwn." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Eich adolygiadau" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Eich sylwadau" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Eich dyfyniadau" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Pynciau" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Lleoedd" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1241,11 +1257,11 @@ msgstr "Lleoedd" msgid "Lists" msgstr "Rhestrau" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Ychwanegu i'r rhestr" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1657,6 +1673,7 @@ msgstr "Parth" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1812,7 +1829,7 @@ msgstr "Côd cadarnhau:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Cyflwyno" @@ -2089,6 +2106,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Fe ofynnoch i newid eich cyfrinair %(site_name)s. Cliciwch ar y ddolen isod i newid eich cyfrinair a mewngofnodi i'ch cyfrif." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2115,8 +2134,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3182,7 +3203,7 @@ msgstr "Ailgeisio Statws" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Mewnforiadau" @@ -3570,6 +3591,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3659,12 +3700,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4548,17 +4583,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4584,6 +4611,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4774,6 +4805,7 @@ msgstr[5] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5184,7 +5216,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5202,13 +5234,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5290,42 +5322,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5370,7 +5411,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5399,7 +5440,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5559,7 +5600,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5573,31 +5614,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5683,7 +5724,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5713,7 +5754,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5940,7 +5981,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6214,7 +6291,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6239,49 +6316,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6289,7 +6372,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6705,11 +6788,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 2e2d4aea3a93543bf15892a3d83b6830e600225e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:55 -0800 Subject: [PATCH 151/962] New translations django.po (Faroese) --- locale/fo_FO/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/fo_FO/LC_MESSAGES/django.po b/locale/fo_FO/LC_MESSAGES/django.po index a7edbc9cd4..c0f6ca646d 100644 --- a/locale/fo_FO/LC_MESSAGES/django.po +++ b/locale/fo_FO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Faroese\n" "Language: fo\n" @@ -37,15 +37,15 @@ msgstr "" msgid "Unlimited" msgstr "" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -81,7 +81,11 @@ msgstr "" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -195,7 +199,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -476,19 +489,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -639,54 +652,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5114,13 +5146,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5485,31 +5526,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5609,7 +5650,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,11 +6684,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From e9ec67a796afb0787a4882518afc39b079a2beea Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:57 -0800 Subject: [PATCH 152/962] New translations django.po (Esperanto) --- locale/eo_UY/LC_MESSAGES/django.po | 373 +++++++++++++++++++---------- 1 file changed, 244 insertions(+), 129 deletions(-) diff --git a/locale/eo_UY/LC_MESSAGES/django.po b/locale/eo_UY/LC_MESSAGES/django.po index c1222562ef..09075519af 100644 --- a/locale/eo_UY/LC_MESSAGES/django.po +++ b/locale/eo_UY/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Esperanto\n" "Language: eo\n" @@ -37,15 +37,15 @@ msgstr "Neniam eksvalidiĝas" msgid "Unlimited" msgstr "Senlima" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Malĝusta pasvorto" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Pasvorto ne kongruas" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Malĝusta pasvorto" @@ -81,7 +81,11 @@ msgstr "Uzanto kun tiu ĉi retpoŝtadreso jam ekzistas." msgid "This email address cannot be registered." msgstr "Tiu ĉi retadreso ne registreblas." -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "Malĝusta kodo" @@ -195,7 +199,6 @@ msgstr "Poŝlibro" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "Sekvantoj" msgid "Private" msgstr "Privata" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "Aktiva" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "Finita" @@ -355,11 +368,11 @@ msgstr "Haltigita" msgid "Import stopped" msgstr "Importo haltigita" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Eraro dum la importo de la libro" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Kongrua libro ne troviĝis" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Recenzoj" @@ -476,19 +489,19 @@ msgstr "Citaĵoj" msgid "Everything else" msgstr "Ĉio alia" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Hejma novaĵfluo" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Hejmo" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Libra novaĵfluo" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Libra novaĵfluo" msgid "Books" msgstr "Libroj" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (Angla)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "Català (Kataluna)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (Germana)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (Hispana)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "Euskara (Eŭska)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (Galega)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "Italiano (Itala)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "Suomi (Finna)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (Franca)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litova)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "Nederlands (Nederlanda)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvega)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "Polski (Pola)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brazila portugala)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Eŭropa portugala)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "Română (Rumana)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "Svenska (Sveda)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "Українська (la ukraina)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Simpligita ĉina)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradicia ĉina)" @@ -639,54 +652,54 @@ msgstr "Eraro okazis! Pardonu." msgid "About" msgstr "Pri" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Bonvenon al %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "%(site_name)s estas parto de BookWyrm, kiu estas reto de sendependaj, memregataj komunumoj por legemuloj. Kvankam vi povas senpene interagi kun uzantoj ie ajn en la reto de BookWyrm, ĉi tiu komunumo estas unika." -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "%(title)s estas la plej ŝatata libro de %(site_name)s, kun averaĝa takso de %(rating)s el 5." -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "Pli da uzantoj de %(site_name)s volas legi %(title)s ol iun ajn alian libron." -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "%(title)s havas la plej diversajn taksojn el ĉiuj libroj ĉe %(site_name)s." -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "Notu kion vi legas, parolu pri libroj, verku recenzojn kaj malkovru vian sekvan legaĵon. BookWyrm estas programo konstruita por homoj. Ĝi estas ĉiam sen reklamoj, kontraŭkomerca kaj celas resti malgranda kaj persona. Se vi havas petojn pri novaj trajtoj, raportojn pri cimoj, aŭ grandajn revojn kontaktu nin kaj estu aŭskultata." -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "Renkontu viajn administrantojn" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "La kontrolantoj de %(site_name)s kaj la administrantoj certigas la daŭran funkciadon de la retejo, obeigas la kondutkodon, kaj respondas kiam uzantoj raportas trudmesaĝojn aŭ malbonan konduton." -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "Kontrolanto" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Administranto" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "Ria plej mallonga legaĵo ĉi-jare…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "Vidi la ISNI-registraĵon" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "Vidi ĉe ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Ŝarĝi per la datumaro" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "Vidi ĉe OpenLibrary" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "Vidi ĉe Inventaire" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Konservi" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Konservi" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "La ŝarĝado konektos al %(source_name)s kaj kontrolos #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Konfirmi" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "La konekto al la fora fonto malsukcesis." -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Modifi libron" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "Alklaku por aldoni kovrilon" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Elŝuto de la kovrilo malsukcesis" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "Alklaku por grandigi" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s recenzo)" msgstr[1] "(%(review_count)s recenzoj)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Aldoni priskribon" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Priskribo:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s eldono" msgstr[1] "%(count)s eldonoj" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "Vi surbretigis ĉi tiun eldonon sur:" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Alia eldono de ĉi tiu libro estas sur via breto %(shelf_name)s." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Via lega agado" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Aldoni legodatojn" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "Vi ne havas legan agadon por ĉi tiu libro." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Viaj recenzoj" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Viaj komentoj" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Viaj citaĵoj" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Temoj" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Lokoj" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Lokoj" msgid "Lists" msgstr "Listoj" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Aldoni al la listo" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "Domajno" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Konfirmkodo:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Sendi" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Vi petis restarigon de via pasvorto ĉe %(site_name)s. Alklaku la jenan ligilon por agordi novan pasvorton kaj ensaluti en vian konton." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "Ĉi tio estas provmesaĝo." msgid "Test email" msgstr "Provmesaĝo" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "Stato de reprovo" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "Importoj" @@ -3514,6 +3535,26 @@ msgstr "Rilato" msgid "Reason" msgstr "Kialo" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Aktuala pasvorto:" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "Nova pasvorto:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "Konfirmu la pasvorton:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Ĉu forgesita pasvorto?" msgid "More about this site" msgstr "Pli pri ĉi tiu retejo" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "Konfirmu la pasvorton:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Ŝanĝi pasvorton" msgid "Successfully changed password" msgstr "La pasvorto sukcese ŝanĝiĝis" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "Aktuala pasvorto:" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "Nova pasvorto:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "Porĉiame forigi la konton" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "Ne eblos malfari la forigon de via konto. La uzantonomo ne disponeblos por registriĝo estontece." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "Dato" @@ -5099,7 +5131,7 @@ msgstr "Modifi" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Anoncoj" @@ -5117,13 +5149,13 @@ msgstr "Malvera" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Komenca dato:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Fina dato:" @@ -5205,42 +5237,51 @@ msgstr "Uzantoj aŭ afiŝoj kiujn oni jam raportis (sendepende ĉu la raporto so #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "Plano:" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "Laste rulita:" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "Suma nombro de ruliĝoj:" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "Ŝaltita:" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "Forigi planon" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "Ruli nun" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "La dato de lasta ruliĝo ne ŝanĝiĝos" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "Plani analizon" @@ -5285,7 +5326,7 @@ msgstr "Forigi la regulon" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "Stato de Celery" @@ -5314,7 +5355,7 @@ msgid "Import triggered" msgstr "Importo lanĉiĝis" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "Konektiloj" @@ -5474,7 +5515,7 @@ msgid "Dashboard" msgstr "Panelo" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Suma nombro de uzantoj" @@ -5488,31 +5529,31 @@ msgstr "Aktivaj ĉi-monate" msgid "Works" msgstr "Verkoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Aktiveco de la instanco" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "Intertempo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "Tagoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "Semajnoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Novaj aliĝoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "Novaj afiŝoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "Verkoj kreitaj" @@ -5586,7 +5627,7 @@ msgstr "Domajno:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Listo de blokitaj retadresoj" @@ -5612,7 +5653,7 @@ msgstr "Neniu retpoŝtdomajno estas aktuale blokita" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "Agordoj de retpoŝto" @@ -5839,7 +5880,43 @@ msgstr "" msgid "Completed" msgstr "Finita" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6113,7 +6190,7 @@ msgstr "Vi povas bloki intervalojn de IP-adresoj per la sintakso CIDR." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "Bloklisto de IP-adresoj" @@ -6138,49 +6215,55 @@ msgid "Manage Users" msgstr "Administri uzantojn" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "Moderigado" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "Raportoj" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "Domajnoj de ligiloj" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "Sistemo" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "Agordoj de la instanco" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Agordoj de la retejo" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6188,7 +6271,7 @@ msgstr "Agordoj de la retejo" msgid "Registration" msgstr "Registrado" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6604,12 +6687,44 @@ msgstr "Porĉiame forigi la uzanton" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." -msgstr "Ĉu vi certas ke vi volas forigi la konton de %(username)s? Ne eblos malfari ĉi tiun agon. Por daŭrigi, bonvolu entajpi vian pasvorton por konfirmi la forigon." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "Via pasvorto:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From efb848c823ad564ffac77f8ff1026ca446cac45a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:34:58 -0800 Subject: [PATCH 153/962] New translations django.po (Bashkir) --- locale/ba_RU/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/ba_RU/LC_MESSAGES/django.po b/locale/ba_RU/LC_MESSAGES/django.po index 31c000b504..ee8749d532 100644 --- a/locale/ba_RU/LC_MESSAGES/django.po +++ b/locale/ba_RU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bashkir\n" "Language: ba\n" @@ -37,15 +37,15 @@ msgstr "Бөтмәй" msgid "Unlimited" msgstr "Ваҡытһыҙ" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "Яңылыш пароль" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "Парольдар килешмәйҙәр" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "Яңылыш Пароль" @@ -81,7 +81,11 @@ msgstr "" msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -195,7 +199,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -459,7 +472,7 @@ msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -475,19 +488,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -496,91 +509,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -638,54 +651,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -823,7 +836,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -913,24 +926,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1039,7 +1052,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1063,7 +1076,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1079,6 +1092,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1095,103 +1109,105 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1206,11 +1222,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1622,6 +1638,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1777,7 +1794,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2044,6 +2061,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2070,8 +2089,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3122,7 +3143,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3500,6 +3521,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3589,12 +3630,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4453,17 +4488,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4489,6 +4516,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4674,6 +4705,7 @@ msgstr[0] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5074,7 +5106,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5092,13 +5124,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5180,42 +5212,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5260,7 +5301,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5289,7 +5330,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5449,7 +5490,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5463,31 +5504,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5558,7 +5599,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5810,7 +5851,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6084,7 +6161,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6109,49 +6186,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6159,7 +6242,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6575,11 +6658,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From a4c6f4ac33c546211e18aa0b60101a62f49282dc Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:35:00 -0800 Subject: [PATCH 154/962] New translations django.po (Bengali, India) --- locale/bn_IN/LC_MESSAGES/django.po | 369 +++++++++++++++++++---------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/bn_IN/LC_MESSAGES/django.po b/locale/bn_IN/LC_MESSAGES/django.po index 0685681fae..e9e3fbf7cd 100644 --- a/locale/bn_IN/LC_MESSAGES/django.po +++ b/locale/bn_IN/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bengali, India\n" "Language: bn_IN\n" @@ -37,15 +37,15 @@ msgstr "" msgid "Unlimited" msgstr "অসীম" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "ভুল পাসওয়ার্ড" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "পাসওয়ার্ডটি মিলে নি" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "ভুল পাসওয়ার্ড" @@ -81,7 +81,11 @@ msgstr "এই ইমেইল ঠিকানাধারী একজন ব msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "ভুল কোড" @@ -195,7 +199,6 @@ msgstr "" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "" @@ -476,19 +489,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -639,54 +652,54 @@ msgstr "" msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "" msgid "More about this site" msgstr "" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "" @@ -5114,13 +5146,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "" @@ -5485,31 +5526,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5609,7 +5650,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,11 +6684,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From 2cec3b5fe9b5d59d5314ca901564ed9fb03ef1aa Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:35:01 -0800 Subject: [PATCH 155/962] New translations django.po (Oulipo) --- locale/en_Oulipo/LC_MESSAGES/django.po | 369 ++++++++++++++++--------- 1 file changed, 242 insertions(+), 127 deletions(-) diff --git a/locale/en_Oulipo/LC_MESSAGES/django.po b/locale/en_Oulipo/LC_MESSAGES/django.po index 42e44cdaae..a3f34daf6b 100644 --- a/locale/en_Oulipo/LC_MESSAGES/django.po +++ b/locale/en_Oulipo/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:35\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Oulipo\n" "Language: en_Oulipo\n" @@ -37,15 +37,15 @@ msgstr "No cut-off" msgid "Unlimited" msgstr "No limit" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -81,7 +81,11 @@ msgstr "An account is using this mail." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -195,7 +199,6 @@ msgstr "Softback" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "Could not load book" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "Could not find a match for book" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "Rundowns" @@ -476,19 +489,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "Community Posts" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "Community" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "Book Posts" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "Book Posts" msgid "Books" msgstr "Books" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -639,54 +652,54 @@ msgstr "Sorry, that didn't work." msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "Join in at %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "Admin" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "Confirm" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "Confirm" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "Confirm" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "Modify Book" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "Could not load illustration" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s rundown)" msgstr[1] "(%(review_count)s rundowns)" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "Add About" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "About:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "A variant of this book is on your %(shelf_name)s stack." -#: bookwyrm/templates/book/book.html:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "Your book activity" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Add activity chronology" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "No activity for this book." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "Your rundowns" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "Your annotations" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "Your quotations" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "Topics" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "Locations" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "Locations" msgid "Lists" msgstr "Lists" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "Add to list" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "Confirmation string:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "Forgot your %(site_name)s password? Click this link to fix your password and log in:" #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "Forgot your password?" msgid "More about this site" msgstr "Additional information" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "Modify Password" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "You cannot undo this action. Nobody can add an account with your alias." +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "Modify" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "Community Broadcasts" @@ -5114,13 +5146,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "Start" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "Finish" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "Total accounts" @@ -5485,31 +5526,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "Activity" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "Signup activity" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "Mail Blocklist" @@ -5609,7 +5650,7 @@ msgstr "No domain blocks right now" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "" #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "" msgid "Registration" msgstr "" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,11 +6684,43 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 From ac75016ccd18826a9c33c2ef87dc5462a23d75cb Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:35:02 -0800 Subject: [PATCH 156/962] New translations django.po (Eastern Min) --- locale/cdo/LC_MESSAGES/django.po | 371 ++++++++++++++++++++----------- 1 file changed, 243 insertions(+), 128 deletions(-) diff --git a/locale/cdo/LC_MESSAGES/django.po b/locale/cdo/LC_MESSAGES/django.po index 0c9c1f7b94..2e268ba14b 100644 --- a/locale/cdo/LC_MESSAGES/django.po +++ b/locale/cdo/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-09-08 19:19+0000\n" -"PO-Revision-Date: 2025-09-08 20:00\n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-11-16 19:35\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Eastern Min\n" "Language: cdo\n" @@ -37,15 +37,15 @@ msgstr "儥過期" msgid "Unlimited" msgstr "無限制" -#: bookwyrm/forms/edit_user.py:105 +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:112 bookwyrm/forms/landing.py:93 +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:135 +#: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" msgstr "" @@ -81,7 +81,11 @@ msgstr "已經有儂使這芘電批地址開了帳號." msgid "This email address cannot be registered." msgstr "" -#: bookwyrm/forms/landing.py:127 bookwyrm/forms/landing.py:135 +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" msgstr "" @@ -195,7 +199,6 @@ msgstr "平裝" #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 #: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 -#: bookwyrm/models/book.py:543 bookwyrm/models/book.py:548 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" @@ -326,12 +329,21 @@ msgstr "" msgid "Private" msgstr "秘密" +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 #: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 #: bookwyrm/templates/settings/imports/imports.html:180 #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 @@ -344,6 +356,7 @@ msgstr "𡅏使" #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 #: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 msgid "Complete" msgstr "" @@ -355,11 +368,11 @@ msgstr "" msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:373 bookwyrm/models/import_job.py:398 +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" msgstr "書無辦法掏過來" -#: bookwyrm/models/import_job.py:382 +#: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" msgstr "討儥着卜挃其書" @@ -460,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:333 +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" msgstr "書評" @@ -476,19 +489,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home Timeline" msgstr "頭頁時間線" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:238 msgid "Home" msgstr "頭頁" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 msgid "Books Timeline" msgstr "書其時間線" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -497,91 +510,91 @@ msgstr "書其時間線" msgid "Books" msgstr "書" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:316 msgid "English" msgstr "English (英語)" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:317 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:318 msgid "Deutsch (German)" msgstr "Deutsch (德語)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:320 msgid "Español (Spanish)" msgstr "Español (西語)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:321 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:322 msgid "Galego (Galician)" msgstr "Galego (加利西亞話)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:323 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:324 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:326 msgid "Français (French)" msgstr "Français (法語)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (立陶宛話)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:330 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:333 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (官話)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (官話)" @@ -639,54 +652,54 @@ msgstr "有乇出問題了! 儥好意思." msgid "About" msgstr "" -#: bookwyrm/templates/about/about.html:21 +#: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" msgstr "歡迎來遘 %(site_name)s!" -#: bookwyrm/templates/about/about.html:25 +#: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." msgstr "" -#: bookwyrm/templates/about/about.html:45 +#: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." msgstr "" -#: bookwyrm/templates/about/about.html:64 +#: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." msgstr "" -#: bookwyrm/templates/about/about.html:83 +#: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." msgstr "" -#: bookwyrm/templates/about/about.html:94 +#: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." msgstr "" -#: bookwyrm/templates/about/about.html:105 +#: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" msgstr "" -#: bookwyrm/templates/about/about.html:108 +#: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." msgstr "" -#: bookwyrm/templates/about/about.html:122 +#: bookwyrm/templates/about/about.html:124 msgid "Moderator" msgstr "" -#: bookwyrm/templates/about/about.html:124 bookwyrm/templates/user_menu.html:62 +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" msgstr "管理員" -#: bookwyrm/templates/about/about.html:140 +#: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 @@ -826,7 +839,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:70 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -918,24 +931,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:180 +#: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:147 +#: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" msgstr "去OpenLibrary看" #: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" msgstr "去Inventaire看" @@ -1044,7 +1057,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:246 +#: bookwyrm/templates/book/book.html:249 #: bookwyrm/templates/book/edit/edit_book.html:150 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 @@ -1068,7 +1081,7 @@ msgstr "存下" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:247 +#: bookwyrm/templates/book/book.html:250 #: bookwyrm/templates/book/cover_add_modal.html:33 #: bookwyrm/templates/book/edit/edit_book.html:152 #: bookwyrm/templates/book/edit/edit_book.html:155 @@ -1084,6 +1097,7 @@ msgstr "存下" #: bookwyrm/templates/search/barcode_modal.html:43 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 @@ -1100,105 +1114,107 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:137 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 #: bookwyrm/templates/landing/password_reset.html:52 #: bookwyrm/templates/preferences/security.html:80 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" msgstr "確認" -#: bookwyrm/templates/book/book.html:21 +#: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:78 bookwyrm/templates/book/book.html:79 +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 msgid "Edit Book" msgstr "修改者書" -#: bookwyrm/templates/book/book.html:104 bookwyrm/templates/book/book.html:107 +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:113 +#: bookwyrm/templates/book/book.html:116 msgid "Failed to load cover" msgstr "書皮做儥出" -#: bookwyrm/templates/book/book.html:124 +#: bookwyrm/templates/book/book.html:127 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:190 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:219 +#: bookwyrm/templates/book/book.html:222 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 條書評)" msgstr[1] "（%(review_count)s 條評價）" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:238 msgid "Add Description" msgstr "加添介紹" -#: bookwyrm/templates/book/book.html:242 +#: bookwyrm/templates/book/book.html:245 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "介紹:" -#: bookwyrm/templates/book/book.html:258 +#: bookwyrm/templates/book/book.html:261 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/book.html:275 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:287 +#: bookwyrm/templates/book/book.html:290 #, 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:298 +#: bookwyrm/templates/book/book.html:301 msgid "Your reading activity" msgstr "這幫讀其書" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:307 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "加添讀書時間" -#: bookwyrm/templates/book/book.html:312 +#: bookwyrm/templates/book/book.html:315 msgid "You don't have any reading activity for this book." msgstr "汝故未讀這本書." -#: bookwyrm/templates/book/book.html:338 +#: bookwyrm/templates/book/book.html:341 msgid "Your reviews" msgstr "汝寫其書評" -#: bookwyrm/templates/book/book.html:344 +#: bookwyrm/templates/book/book.html:347 msgid "Your comments" msgstr "汝做其評論" -#: bookwyrm/templates/book/book.html:350 +#: bookwyrm/templates/book/book.html:353 msgid "Your quotes" msgstr "汝抄下其話" -#: bookwyrm/templates/book/book.html:386 +#: bookwyrm/templates/book/book.html:389 msgid "Subjects" msgstr "主題" -#: bookwyrm/templates/book/book.html:398 +#: bookwyrm/templates/book/book.html:401 msgid "Places" msgstr "所在" -#: bookwyrm/templates/book/book.html:409 +#: bookwyrm/templates/book/book.html:412 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1213,11 +1229,11 @@ msgstr "所在" msgid "Lists" msgstr "單單" -#: bookwyrm/templates/book/book.html:421 +#: bookwyrm/templates/book/book.html:424 msgid "Add to list" msgstr "添遘單單裏勢" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:434 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1629,6 +1645,7 @@ msgstr "域名" #: bookwyrm/templates/preferences/export-user.html:113 #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 #: bookwyrm/templates/settings/imports/imports.html:304 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 #: bookwyrm/templates/settings/invites/status_filter.html:5 @@ -1784,7 +1801,7 @@ msgstr "確認碼:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:106 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "交付" @@ -2053,6 +2070,8 @@ msgid "You requested to reset your %(site_name)s password. Click the link below msgstr "汝卜重新介編蜀隻 %(site_name)s 其密碼伓是. 涿蜀下下底其連結, 起蜀隻新其密碼, 介躒裏汝其帳號." #: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 #: bookwyrm/templates/landing/password_reset.html:4 #: bookwyrm/templates/landing/password_reset.html:10 #: bookwyrm/templates/landing/password_reset_request.html:4 @@ -2079,8 +2098,10 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 -#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format @@ -3134,7 +3155,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:45 #: bookwyrm/templates/settings/imports/imports.html:6 #: bookwyrm/templates/settings/imports/imports.html:9 -#: bookwyrm/templates/settings/layout.html:82 +#: bookwyrm/templates/settings/layout.html:88 msgid "Imports" msgstr "攖裏" @@ -3514,6 +3535,26 @@ msgstr "" msgid "Reason" msgstr "" +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "新密碼:" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "確認密碼:" + #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:50 @@ -3603,12 +3644,6 @@ msgstr "密碼儥記去?" msgid "More about this site" msgstr "本站故価其資料" -#: bookwyrm/templates/landing/password_reset.html:43 -#: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:35 -msgid "Confirm password:" -msgstr "確認密碼:" - #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." @@ -4472,17 +4507,9 @@ msgstr "改密碼" msgid "Successfully changed password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:22 -msgid "Current password:" -msgstr "" - -#: bookwyrm/templates/preferences/change_password.html:28 -msgid "New password:" -msgstr "新密碼:" - #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:40 +#: bookwyrm/templates/preferences/delete_user.html:41 #: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" @@ -4508,6 +4535,10 @@ msgstr "" msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "" +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 #: bookwyrm/templates/preferences/security.html:39 @@ -4694,6 +4725,7 @@ msgstr[1] "" #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 msgid "Date" msgstr "" @@ -5096,7 +5128,7 @@ msgstr "修改" #: bookwyrm/templates/settings/announcements/announcements.html:3 #: bookwyrm/templates/settings/announcements/announcements.html:5 #: bookwyrm/templates/settings/announcements/edit_announcement.html:15 -#: bookwyrm/templates/settings/layout.html:111 +#: bookwyrm/templates/settings/layout.html:117 msgid "Announcements" msgstr "告字" @@ -5114,13 +5146,13 @@ msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:84 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 msgid "Start date:" msgstr "開始其日子:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 msgid "End date:" msgstr "結束其日子:" @@ -5202,42 +5234,51 @@ msgstr "" #: bookwyrm/templates/settings/automod/rules.html:26 #: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 msgid "Schedule:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:33 #: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 msgid "Last run:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:40 #: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 msgid "Total run count:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:47 #: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 msgid "Enabled:" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:59 #: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 msgid "Delete schedule" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:63 #: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 msgid "Run now" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:64 #: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 msgid "Last run date will not be updated" msgstr "" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 #: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 msgid "Schedule scan" msgstr "" @@ -5282,7 +5323,7 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:6 #: bookwyrm/templates/settings/celery.html:8 -#: bookwyrm/templates/settings/layout.html:86 +#: bookwyrm/templates/settings/layout.html:92 msgid "Celery Status" msgstr "" @@ -5311,7 +5352,7 @@ msgid "Import triggered" msgstr "" #: bookwyrm/templates/settings/celery.html:57 -#: bookwyrm/templates/settings/layout.html:98 +#: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" msgstr "" @@ -5471,7 +5512,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:113 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 msgid "Total users" msgstr "所有其儂" @@ -5485,31 +5526,31 @@ msgstr "這蜀月日有使其" msgid "Works" msgstr "作品" -#: bookwyrm/templates/settings/dashboard/dashboard.html:78 +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 msgid "Instance Activity" msgstr "實例活動" -#: bookwyrm/templates/settings/dashboard/dashboard.html:96 +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 msgid "Interval:" msgstr "區段:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:100 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Days" msgstr "日" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 msgid "Weeks" msgstr "禮拜" -#: bookwyrm/templates/settings/dashboard/dashboard.html:119 +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 msgid "User signup activity" msgstr "各儂其註冊活動" -#: bookwyrm/templates/settings/dashboard/dashboard.html:125 +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:131 +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 msgid "Works created" msgstr "" @@ -5583,7 +5624,7 @@ msgstr "域名:" #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:65 +#: bookwyrm/templates/settings/layout.html:71 msgid "Email Blocklist" msgstr "" @@ -5609,7 +5650,7 @@ msgstr "" #: bookwyrm/templates/settings/email_config.html:6 #: bookwyrm/templates/settings/email_config.html:8 -#: bookwyrm/templates/settings/layout.html:94 +#: bookwyrm/templates/settings/layout.html:100 msgid "Email Configuration" msgstr "" @@ -5836,7 +5877,43 @@ msgstr "" msgid "Completed" msgstr "" -#: bookwyrm/templates/settings/files.html:210 +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" msgstr "" @@ -6110,7 +6187,7 @@ msgstr "汝會使 CIDR 語法去遮攔 IP 段." #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 #: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 -#: bookwyrm/templates/settings/layout.html:69 +#: bookwyrm/templates/settings/layout.html:75 msgid "IP Address Blocklist" msgstr "乞遮攔其 IP 地址其單單" @@ -6135,49 +6212,55 @@ msgid "Manage Users" msgstr "管理各儂" #: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" msgstr "" -#: bookwyrm/templates/settings/layout.html:57 +#: bookwyrm/templates/settings/layout.html:63 #: bookwyrm/templates/settings/reports/reports.html:8 #: bookwyrm/templates/settings/reports/reports.html:17 msgid "Reports" msgstr "舉報" -#: bookwyrm/templates/settings/layout.html:61 +#: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" msgstr "" -#: bookwyrm/templates/settings/layout.html:73 +#: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" msgstr "" -#: bookwyrm/templates/settings/layout.html:78 +#: bookwyrm/templates/settings/layout.html:84 msgid "System" msgstr "" -#: bookwyrm/templates/settings/layout.html:90 +#: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" msgstr "" -#: bookwyrm/templates/settings/layout.html:102 +#: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" msgstr "" -#: bookwyrm/templates/settings/layout.html:107 +#: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" msgstr "實例設定" -#: bookwyrm/templates/settings/layout.html:115 +#: bookwyrm/templates/settings/layout.html:121 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "網站設定" -#: bookwyrm/templates/settings/layout.html:121 -#: bookwyrm/templates/settings/layout.html:124 +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 #: bookwyrm/templates/settings/registration.html:4 #: bookwyrm/templates/settings/registration.html:6 #: bookwyrm/templates/settings/registration_limited.html:4 @@ -6185,7 +6268,7 @@ msgstr "網站設定" msgid "Registration" msgstr "註冊" -#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/layout.html:136 #: bookwyrm/templates/settings/site.html:107 #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 @@ -6601,12 +6684,44 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format -msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone. To proceed, please enter your password to confirm deletion." +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" msgstr "" -#: bookwyrm/templates/settings/users/delete_user_form.html:17 -msgid "Your password:" -msgstr "汝其密碼:" +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From b3bb96adfa487c938e4b8da206b39205afa0404e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:38:49 -0800 Subject: [PATCH 157/962] Modifies language on "create" step of suggestion list --- bookwyrm/templates/book/suggestion_list/list.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index e264b83616..153d0ed6f7 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -11,16 +11,18 @@

      {% endif %}

      -{% if suggestion_list %} -

      {% blocktrans trimmed with title=book.title %} Readers who liked {{ title }} recommend giving these books a try: {% endblocktrans %}

      + +{% if suggestion_list %} + {% if items|length == 0 %}
      +

      {% trans "Have a recommendation for someone who liked this book?" %}

      {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True %}
      @@ -40,12 +42,12 @@

      {% else %}
      -
      + {% csrf_token %}

      {% trans "Have a recommendation for someone who liked this book?" %}

      - +
      {% endif %} From e312fac681155ea0a83fc3c8a7169550e3985c62 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 16 Nov 2025 11:44:31 -0800 Subject: [PATCH 158/962] Adds shelve button to suggestion item Plus a title on the endorse button to clarify what it is --- bookwyrm/templates/book/suggestion_list/book_card.html | 3 +++ .../templates/book/suggestion_list/endorsement_button.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/suggestion_list/book_card.html b/bookwyrm/templates/book/suggestion_list/book_card.html index a2ead516a6..e0e732ff90 100644 --- a/bookwyrm/templates/book/suggestion_list/book_card.html +++ b/bookwyrm/templates/book/suggestion_list/book_card.html @@ -35,6 +35,9 @@ {% endblocktrans %}

      +
      + {% include "snippets/shelve_button/shelve_button.html" with book=item.book %} +
      {% include "book/suggestion_list/endorsement_button.html" %}
      diff --git a/bookwyrm/templates/book/suggestion_list/endorsement_button.html b/bookwyrm/templates/book/suggestion_list/endorsement_button.html index 9ddad536cd..6d5bdb82f7 100644 --- a/bookwyrm/templates/book/suggestion_list/endorsement_button.html +++ b/bookwyrm/templates/book/suggestion_list/endorsement_button.html @@ -1,7 +1,7 @@ {% load i18n %}
      {% csrf_token %} - diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html index 31a7f25d3e..0355cf5ad3 100644 --- a/bookwyrm/templates/book/edit/edit_book_form.html +++ b/bookwyrm/templates/book/edit/edit_book_form.html @@ -59,29 +59,6 @@

      {% include 'snippets/form_errors.html' with errors_list=form.description.errors id="desc_description" %}

      -
      -
      -
      - - - - {% include 'snippets/form_errors.html' with errors_list=form.series.errors id="desc_series" %} -
      -
      -
      -
      - - {{ form.series_number }} - - {% include 'snippets/form_errors.html' with errors_list=form.series_number.errors id="desc_series_number" %} -
      -
      -
      -
      + +
      +

      + {% trans "Series" %} +

      + +
      +
      + {% if book.series_ids.exists %} + + {# preserve series if the book is unsaved #} + +
      + {% for series in book.series_ids.all %} +
      + +
      + {% endfor %} +
      + {% endif %} + +

      + {% trans "Add Series" %} +

      + + + {% include 'snippets/form_errors.html' with errors_list=form.series.errors id="desc_series" %} +
      +
      + + {{ form.series_number }} + {% include 'snippets/form_errors.html' with errors_list=form.series_number.errors id="desc_series_number" %} +
      +
      + + + + +

      {% trans "Publication" %} diff --git a/bookwyrm/templates/book/edit/edit_series.html b/bookwyrm/templates/book/edit/edit_series.html new file mode 100644 index 0000000000..67d9000b9c --- /dev/null +++ b/bookwyrm/templates/book/edit/edit_series.html @@ -0,0 +1,89 @@ +{% extends 'layout.html' %} +{% load humanize %} +{% load i18n %} +{% load static %} +{% load utilities %} + + +{% block title %} + {% blocktrans with title=series.title %}Edit "{{ title }}"{% endblocktrans %} +{% endblock %} + +{% block content %} + +{% if form.non_field_errors %} +
      +

      {{ form.non_field_errors }}

      +
      +{% endif %} + +

      {% blocktrans with title=series.title %}Edit "{{ title }}"{% endblocktrans %}

      + + + {% csrf_token %} + +
      +
      + + + +
      +
      + + {% for alt in series.alternative_titles %} + + + {% endfor %} + + +
      + + + +
      +
      +
      + + + + + + + + +
      +
      + +
      + {% for book in books %} + {% with book=book %} +
      +
      + + + + {% include 'landing/small-book.html' with book=book.book %} +
      +
      + + +
      +
      + {% endwith %} + {% endfor %} +
      + + + {% trans "Back" %} + + +{% endblock %} + +{% block scripts %} + +{% endblock %} diff --git a/bookwyrm/templates/book/series.html b/bookwyrm/templates/book/series.html index 8b945452f0..52d8e2c0e2 100644 --- a/bookwyrm/templates/book/series.html +++ b/bookwyrm/templates/book/series.html @@ -2,33 +2,87 @@ {% load i18n %} {% load book_display_tags %} -{% block title %}{{ series_name }}{% endblock %} - +{% block title %}{{ series.title }}{% endblock %} {% block content %} -
      -

      {{ series_name }}

      -
      - {% trans "Series by" %} {{ author.name }} + + +
      + {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %} + {% if user_authenticated and can_edit_book %} +
      + + + {% trans "Edit Series" %} +
      + {% endif %} +
      +

      {{ series.title }}

      + {% if series_authors %} +

      + {% trans "by" %} + {% include 'snippets/authors.html' with book=series_authors limit=5 %} +

      + {% endif %} + {% endwith %} +
      +
      + {% if series.alternative_titles%} +
      +

      {% trans "Alternative titles" %}

      +
      + {% for title in series.alternative_titles %} + {{title}} + {% endfor %} +
      +
      + {% endif %} +
      +
      + {% if series.inventaire_id or series.wikidata or series.isfdb %} +
      +

      {% trans "Identifiers" %}

      + {% if series.inventaire_id%} +
      + Inventaire +
      + {% endif %} + + + {% if series.viaf %} +
      + VIAF +
      + {% endif %} + + {% if series.wikidata %} +
      + Wikidata +
      + {% endif %} + + {% if series.isfdb%} +
      + ISFDB +
      + {% endif %} +
      + {% endif %} +
      +
      +
      {% for book in books %} {% with book=book %} - {# @todo Set `hasPart` property in some meaningful way #} -
      -
      - {% if book.series_number %}{% blocktrans with series_number=book.series_number %}Book {{ series_number }}{% endblocktrans %}{% else %}{% trans 'Unsorted Book' %}{% endif %} - {% include 'landing/small-book.html' with book=book %} -
      +
      +
      + + + {% if book.series_number %}{% blocktrans with series_number=book.series_number %}Book #{{ series_number }}{% endblocktrans %}{% endif %} + {% include 'landing/small-book.html' with book=book.book %}
      +
      {% endwith %} {% endfor %}
      diff --git a/bookwyrm/templates/landing/small-book.html b/bookwyrm/templates/landing/small-book.html index 31b0958034..31f80e41f4 100644 --- a/bookwyrm/templates/landing/small-book.html +++ b/bookwyrm/templates/landing/small-book.html @@ -13,7 +13,7 @@

      {{ book.title }}

      - {% if book.authors %} + {% if book.authors.exists %}

      {% trans "by" %} {% include 'snippets/authors.html' with limit=3 %} diff --git a/bookwyrm/templatetags/rating_tags.py b/bookwyrm/templatetags/rating_tags.py index 367463a8f0..ffbc1c9072 100644 --- a/bookwyrm/templatetags/rating_tags.py +++ b/bookwyrm/templatetags/rating_tags.py @@ -13,7 +13,7 @@ def get_rating(book, user): """get the overall rating of a book""" # this shouldn't happen, but it CAN - if not book.parent_work: + if not hasattr(book, "parent_work"): return None return cache.get_or_set( diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 58fd357bed..4211b609f8 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -829,11 +829,6 @@ # books re_path(rf"{BOOK_PATH}(.json)?/?$", views.Book.as_view(), name="book"), re_path(rf"{BOOK_PATH}{regex.SLUG}/?$", views.Book.as_view(), name="book"), - re_path( - r"^series/by/(?P\d+)/?$", - views.BookSeriesBy.as_view(), - name="book-series-by", - ), re_path( rf"{BOOK_PATH}/(?Preview|comment|quote)/?$", views.Book.as_view(), @@ -909,6 +904,20 @@ views.EditAuthor.as_view(), name="edit-author", ), + # series + re_path( + r"^series/(?P\d+)(.json)?/?$", views.Series.as_view(), name="series" + ), + re_path( + r"^series/(?P\d+)/edit/?$", + views.EditSeries.as_view(), + name="edit-series", + ), + re_path( + r"^seriesbook/(?P\d+)(.json)?/?$", + views.SeriesBook.as_view(), + name="seriesbook", + ), # reading progress re_path(r"^edit-readthrough/?$", views.edit_readthrough, name="edit-readthrough"), re_path(r"^delete-readthrough/?$", views.delete_readthrough), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index d89cfd48fe..4c8d107033 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -85,7 +85,7 @@ add_description, resolve_book, ) -from .books.series import BookSeriesBy + from .books.books import update_book_from_remote from .books.edit_book import ( EditBook, @@ -95,6 +95,7 @@ ) from .books.editions import Editions, switch_edition from .books.links import BookFileLinks, AddFileLink, delete_link +from .books.series import Series, SeriesBook, EditSeries # landing from .landing.about import about, privacy, conduct, impressum diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index e0b5f73c86..f344292d32 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -6,6 +6,7 @@ from django.contrib.postgres.search import SearchRank, SearchVector from django.db import transaction from django.http import HttpResponseBadRequest +from django.db.models import Q from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse from django.utils.decorators import method_decorator @@ -13,6 +14,8 @@ from django.views import View from bookwyrm import book_search, forms, models + +from bookwyrm.settings import INSTANCE_ACTOR_USERNAME from bookwyrm.utils.images import remove_uploaded_image_exif, set_cover_from_url # from bookwyrm.activitypub.base_activity import ActivityObject @@ -56,15 +59,24 @@ def post(self, request, book_id): return TemplateResponse(request, "book/edit/edit_book.html", data) data = add_authors(request, data) + data = add_series(request, data) - # either of the above cases requires additional confirmation - if data.get("add_author"): + # adding authors or series requires additional confirmation + if data.get("add_author") or data["form"]["series"]: return TemplateResponse(request, "book/edit/edit_book.html", data) remove_authors = request.POST.getlist("remove_authors") for author_id in remove_authors: book.authors.remove(author_id) + for series_id in request.POST.getlist("remove_series"): + # remove seriesbook and, if it was the only one in the series, delete series + seriesbook = models.SeriesBook.objects.get(id=series_id) + series = seriesbook.series + seriesbook.delete() + if series.seriesbooks.count() == 0: + series.delete() + book = form.save(request, commit=False) url = request.POST.get("cover-url") @@ -119,6 +131,7 @@ def post(self, request): # which only exists after we validate the form ensure_transient_values_persist(request, data, form=form) data = add_authors(request, data) + data = add_series(request, data) # check if this is an edition of an existing work author_text = ", ".join(data.get("add_author", [])) @@ -128,7 +141,7 @@ def post(self, request): )[:5] # go to confirm mode - if not parent_work_id or data.get("add_author"): + if not parent_work_id or data.get("add_author") or data["form"]["series"]: data["confirm_mode"] = True return TemplateResponse(request, "book/edit/edit_book.html", data) @@ -158,6 +171,7 @@ def ensure_transient_values_persist(request, data, **kwargs): if kwargs and kwargs.get("form"): data["book"] = data.get("book") or {} data["book"]["subjects"] = kwargs["form"].cleaned_data["subjects"] + data["book"]["series_ids"] = kwargs["form"].cleaned_data.get("series_ids") data["add_author"] = request.POST.getlist("add_author") elif kwargs and kwargs.get("add_author") is True: data["add_author"] = request.POST.getlist("add_author") @@ -220,6 +234,32 @@ def add_authors(request, data): return data +def add_series(request, data): + """helper for adding series""" + + # need to retain this + data["remove_series"] = request.POST.getlist("remove_series") + # creating or matching a series needs another step + data["confirm_mode"] = True + + # check for existing series + vector = SearchVector("title", weight="A") + SearchVector( + "alternative_titles", weight="B" + ) + series = data["form"]["series"].value() + + matches = ( + models.Series.objects.annotate(search=vector) + .annotate(rank=SearchRank(vector, series, normalization=32)) + .filter(rank__gt=0.015) + .order_by("-rank")[:5] + ) + + data["series_matches"] = matches + + return data + + @require_POST @permission_required("bookwyrm.edit_book", raise_exception=True) def create_book_from_data(request): @@ -242,8 +282,8 @@ def create_book_from_data(request): class ConfirmEditBook(View): """confirm edits to a book""" - # pylint: disable=too-many-locals - # pylint: disable=too-many-branches + # pylint: disable=undefined-variable,too-many-branches + # pylint: disable=too-many-locals,too-many-statements def post(self, request, book_id=None): """edit a book cool""" # returns None if no match is found @@ -310,6 +350,88 @@ def post(self, request, book_id=None): for author_id in request.POST.getlist("remove_authors"): book.authors.remove(author_id) + user = models.User.objects.get(localname=INSTANCE_ACTOR_USERNAME) + + if series_match := request.POST.get("series_match"): + # add known series + if series_match != "0": + series = models.Series.objects.get(id=int(series_match)) + + if not models.SeriesBook.objects.filter( + series=series, book=book, user=user + ).exists(): # don't create a dupe! + + models.SeriesBook.objects.create( + series=series, + book=book, + series_number=book.series_number, + user=user, + ) + else: + + if maybe_series := models.Series.objects.filter( + Q(title=book__series) + | Q(alternative_titles__contains(book__series)) + ): + # is there a SeriesBook already despite what the user claims? + maybe_seriesbooks = models.SeriesBook.filter( + series__in=maybe_series + ) + matches = maybe_seriesbooks.filter(book=book) + + if not matches: + # Can we find a seriesbook with common name and author? + if author_match := maybe_seriesbooks.authors.intersection( + book.authors + ).first(): + series = maybe_seriesbooks.filter( + authors__includes=author_match.first() + ).first() + else: + series = models.Series.objects.create( + title=book.series, user=user + ) + + models.SeriesBook.objects.create( + series=series, + book=book, + series_number=book.series_number, + user=user, + ) + + else: + # Ok it really is a new series + series = models.Series.objects.create( + title=book.series, user=user + ) + models.SeriesBook.objects.create( + series=series, + book=book, + series_number=book.series_number, + user=user, + ) + + elif book.series: + # It's a new series + series = models.Series.objects.create(title=book.series, user=user) + models.SeriesBook.objects.create( + series=series, + book=book, + series_number=book.series_number, + user=user, + ) + + for series_id in request.POST.getlist("remove_series"): + # remove seriesbook + if seriesbook := models.SeriesBook.objects.get( + series__id=series_id, book=book + ): + seriesbook.delete() + series = models.Series.objects.get(id=series_id) + # if it was the only book in the series, delete series + if series.seriesbooks.count() == 0: + series.delete() + # import cover, if requested url = request.POST.get("cover-url") if url: @@ -326,4 +448,9 @@ def post(self, request, book_id=None): # we don't tell the world when creating a book book.save(broadcast=False) + # clear the series and series_number fields + book.series = None + book.series_number = None + book.save(update_fields=["series", "series_number"], broadcast=False) + return redirect(f"/book/{book.id}") diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index 5e4ec05cad..cdd071e94c 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -1,79 +1,126 @@ -""" books belonging to the same series """ +"""book series""" -from sys import float_info -from django.views import View +from django.core.paginator import Paginator +from django.http import Http404 +from django.shortcuts import redirect from django.template.response import TemplateResponse +from django.views import View from django.views.decorators.vary import vary_on_headers -from bookwyrm.views.helpers import is_api_request, get_mergeable_object_or_404 +from bookwyrm.forms import SeriesForm from bookwyrm import models +from bookwyrm.activitypub import ActivitypubResponse +from bookwyrm.settings import PAGE_LENGTH +from bookwyrm.views.helpers import ( + is_api_request, + get_mergeable_object_or_404, +) -def sort_by_series(book): - """sort books using their series number""" - try: - return float(book.series_number) - except ValueError: - return float_info.max - - -# pylint: disable=no-self-use -class BookSeriesBy(View): - """book series by author""" +class Series(View): + """a series of books""" + # pylint: disable=unused-argument,no-self-use @vary_on_headers("Accept") - def get(self, request, author_id): - """lists all books in a series""" - series_name = request.GET.get("series_name") + def get(self, request, series_id, slug=None): + """landing page for a series""" + series = get_mergeable_object_or_404(models.Series, id=series_id) if is_api_request(request): - pass + return ActivitypubResponse(series.to_activity(**request.GET)) - author = get_mergeable_object_or_404(models.Author, id=author_id) + authors = models.Author.objects.none() + books = [] + items = ( + series.seriesbooks.filter(series=series.id) + .prefetch_related("book", "book__authors") + .order_by("series_number") + ) + for item in items: - results = models.Edition.objects.filter(authors=author, series=series_name) + book = ( + item.book.edition + if hasattr(item.book, "edition") + else item.book.work.default_edition + ) - # when there are multiple editions of the same work - # pick the one with a series number or closest - work_ids = results.values_list("parent_work__id", flat=True).distinct() + book_data = {"book": book, "series_number": item.series_number} + books.append(book_data) - # filter out multiple editions of the same work - numbered_books = [] - dated_books = [] - unsortable_books = [] - for work_id in set(work_ids): - result = ( - results.filter(parent_work=work_id) - .order_by("series_number", "-edition_rank") - .first() - ) - if result.series_number: - numbered_books.append(result) - elif result.first_published_date or result.published_date: - dated_books.append(result) - else: - unsortable_books.append(result) - - list_results = ( - sorted(numbered_books, key=sort_by_series) - + sorted( - dated_books, - key=lambda book: ( - book.first_published_date - if book.first_published_date - else book.published_date - ), - ) - + sorted( - unsortable_books, - key=lambda book: book.sort_title if book.sort_title else book.title, - ) - ) + authors = authors.union(item.book.authors.all()) + + paginated = Paginator(items, PAGE_LENGTH) + page = paginated.get_page(request.GET.get("page")) data = { - "series_name": series_name, - "author": author, - "books": list_results, + "series": series, + "books": page, + "series_authors": {"authors": authors}, } return TemplateResponse(request, "book/series.html", data) + + +class EditSeries(View): + """Edit information about series and seriesbooks""" + + # pylint: disable=no-self-use + def get(self, request, series_id=None): + """edit page for series""" + + series = models.Series.objects.filter(id=series_id).first() + seriesbooks = models.SeriesBook.objects.filter(series=series) + data = { + "series": series, + "books": seriesbooks, + "form": SeriesForm(instance=series), + } + + return TemplateResponse(request, "book/edit/edit_series.html", data) + + # pylint: disable=no-self-use + def post(self, request, series_id): + """submit the series edit form""" + + form = SeriesForm(request.POST) + data = {"form": form} + + if not form.is_valid(): + # TODO do we need to persist seriesbook data also? + print("not valid") + print(form.errors) + return TemplateResponse(request, "book/edit/edit_series.html", data) + + instance = models.Series.objects.get(id=series_id) + form = SeriesForm(request.POST, instance=instance) + series = form.save(request) + alt_titles = [] + for title in request.POST.getlist("alternative_titles"): + if title != "": + alt_titles.append(title) + series.alternative_titles = alt_titles + series.save(update_fields=["alternative_titles"]) + + # update seriesbooks as needed + for book in series.seriesbooks.all(): + value = request.POST[f"series_number-{book.id}"] + book.series_number = value + # save the series_number as the value + book.save(update_fields=["series_number"]) + + return redirect("series", series_id) + + +class SeriesBook(View): + """a book in a series""" + + # pylint: disable=no-self-use + @vary_on_headers("Accept") + def get(self, request, seriesbook_id): + """we just need this for resolving AP requests""" + seriesbook = get_mergeable_object_or_404(models.SeriesBook, id=seriesbook_id) + + if is_api_request(request): + return ActivitypubResponse(seriesbook.to_activity()) + + raise Http404() From 423e187540dcdaf96d1b367ed40e5f814271684c Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 3 Nov 2025 15:09:01 +1100 Subject: [PATCH 165/962] add connector logic and fix templates and views --- bookwyrm/connectors/abstract_connector.py | 76 +++++++++++- bookwyrm/connectors/bookwyrm_connector.py | 13 +- bookwyrm/connectors/inventaire.py | 34 ++++++ bookwyrm/templates/book/book.html | 113 +++++++++--------- bookwyrm/templates/book/edit/edit_book.html | 21 ++-- .../templates/book/edit/edit_book_form.html | 13 +- bookwyrm/templates/book/series.html | 11 +- bookwyrm/templatetags/utilities.py | 14 +++ .../connectors/test_abstract_connector.py | 9 +- .../tests/connectors/test_finna_connector.py | 9 +- bookwyrm/tests/models/test_import_model.py | 21 ++-- bookwyrm/tests/views/books/test_edit_book.py | 8 +- bookwyrm/views/books/edit_book.py | 52 ++++---- 13 files changed, 280 insertions(+), 114 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 6bd9f54eb4..2286bb0123 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -14,9 +14,10 @@ from django.core.files.base import ContentFile from django.db import transaction +from django.db.models import Q from bookwyrm import activitypub, models, settings -from bookwyrm.settings import USER_AGENT +from bookwyrm.settings import USER_AGENT, INSTANCE_ACTOR_USERNAME from .connector_manager import load_more_data, ConnectorException, raise_not_valid_url from .format_mappings import format_mappings from ..book_search import SearchResult @@ -110,6 +111,46 @@ async def get_results( logger.info(err) return None + def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use + self, + work: models.Work, + instance: models.Edition, + edition_data: Union[str, JsonDict] = None, + ) -> None: + """series may be a a string or an obj""" + + user = models.User.objects.get(localname=INSTANCE_ACTOR_USERNAME) + series_data = edition_data and edition_data.get("series") + # Inventaire gives us an enriched object + if series_data and isinstance(series_data, list): + # series is a list of dicts + for series_obj in series_data: + activitydata_to_seriesbook( + series_obj, user.remote_id, work.remote_id, instance.series_number + ) + + # otherwise it's just a name as a string + # all legacy BookWyrm data is like this + elif instance.series: + possible_series = models.SeriesBook.objects.filter( + Q(series__title__iexact=series_data) + | Q(series__alternative_titles__icontains=series_data) + ) + + if possible_series.exists(): + if book_in_series := possible_series.filter( + book__authors__in=work.authors.all() + ).first(): + # we already have a series with same title + # and author, let's feel lucky + series_obj = book_in_series.series.to_activity() + else: + series_obj = {"user": user, "title": instance.series} + + activitydata_to_seriesbook( + series_obj, user.remote_id, work.remote_id, instance.series_number + ) + @abstractmethod def get_or_create_book(self, remote_id: str) -> Optional[models.Book]: """pull up a book record by whatever means possible""" @@ -185,6 +226,14 @@ def get_or_create_book(self, remote_id: str) -> Optional[models.Book]: work.authors.add(author) edition = self.create_edition_from_data(work, edition_data) + + self.get_or_create_seriesbook_from_data(work, edition, edition_data) + + # clear these fields once we have a seriesbook + edition.series = None + edition.series_number = None + edition.save(update_fields=["series", "series_number"]) + load_more_data.delay(self.connector.id, work.id) return edition @@ -192,6 +241,12 @@ def get_book_data(self, remote_id: str) -> JsonDict: # pylint: disable=no-self- """this allows connectors to override the default behavior""" return get_data(remote_id, is_activitypub=False) + def get_series_data( # pylint: disable=no-self-use + self, remote_id: str + ) -> JsonDict: + """this allows connectors to override the default behavior""" + return get_data(remote_id) + def create_edition_from_data( self, work: models.Work, @@ -442,3 +497,22 @@ def maybe_isbn(query: str) -> bool: 10, 13, ] # ISBN10 or ISBN13, or maybe ISBN10 missing a leading zero + + +def activitydata_to_seriesbook( + series_obj: Union[str, JsonDict], + user: str, + work: str, + number: str, +) -> None: + """make a series & seriesbook from incoming data""" + + series_obj["user"] = user.remote_id + series = series_obj.to_model(model=models.Series, overwrite=False) + seriesbook_data = { + "user": user, + "book": work, + "series": series.remote_id, + "series_number": number, + } + seriesbook_data.to_model(model=models.SeriesBook, overwrite=False) diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py index 9aaa562648..33d7c8e6c9 100644 --- a/bookwyrm/connectors/bookwyrm_connector.py +++ b/bookwyrm/connectors/bookwyrm_connector.py @@ -15,7 +15,18 @@ def __init__(self, identifier: str): super().__init__(identifier) def get_or_create_book(self, remote_id: str) -> models.Edition: - return activitypub.resolve_remote_id(remote_id, model=models.Edition) + + edition = activitypub.resolve_remote_id(remote_id, model=models.Edition) + + if edition.series: + self.get_or_create_seriesbook_from_data( + work=edition.parent_work, instance=edition + ) + edition.parent_work.series = None + edition.parent_work.series_number = None + edition.parent_work.save(update_fields=["series", "series_number"]) + + return edition def parse_search_data( self, data: list[dict[str, Any]], min_confidence: float diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 3f4c179e8c..f0b872424d 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -27,6 +27,7 @@ def __init__(self, identifier: str): Mapping("title", remote_field="wdt:P1476", formatter=get_first), Mapping("title", remote_field="labels", formatter=get_language_code), Mapping("subtitle", remote_field="wdt:P1680", formatter=get_first), + Mapping("series", remote_field="wdt:P179", formatter=get_series_data), Mapping("inventaireId", remote_field="uri"), Mapping( "description", remote_field="sitelinks", formatter=self.get_description @@ -248,3 +249,36 @@ def get_language_code(options: JsonDict, code: str = "en") -> Any: return result values = list(options.values()) return values[0] if values else None + + +def get_series_data(self, keys: Iterable[str]) -> list[dict]: + """create a list of series data dicts""" + + series_list = [] + for uri in keys: + try: + series_data = self.get_book_data(self.get_remote_id(uri)) + except ConnectorException: + continue + + series = {"alternative_titles": []} + try: + original_lang = series_data.get("originalLang").split("-")[0] + except IndexError: + original_lang = "en" + for k, v in series_data["labels"]: + if k == original_lang: + series["title"] = v + else: + alternative_titles.append(v) + series["wikidata"] = series_data.get("wdId") + if series_data.get("P6947"): + series["goodreads_key"] = series_data.get("P6947")[0] + if series_data.get("P1235"): + series["isfdb"] = series_data.get("P1235")[0] + if series_data.get("P8513"): + series["librarything_key"] = series_data.get("P8513")[0] + + series_list.append(series) + + return series_list diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 85a15bc8bc..f00b84e3d2 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -33,63 +33,61 @@

      {{ book.title }}

      - - {% if book.subtitle or book.parent_work.series_ids %} + {% if book.subtitle or book.series or book.parent_work.seriesbooks %} + {% if book.subtitle %}

      - {% if book.subtitle %} - - - - {{ book.subtitle }} - - {% endif %} - - {% if book.series %} - {% spaceless %} -

      -
      - {% blocktrans with series=book.series %} - This book might be part of the {{series}} series. - {% endblocktrans %} - {% if user_authenticated and can_edit_book %} - Edit it to confirm. - {% endif %} -
      -
      - {% endspaceless %} - {% endif %} - - {% if book.parent_work.seriesbooks %} - {% for sbook in book.parent_work.seriesbooks.all %} -
      - {% spaceless %} - {% if sbook.series_number %} - {% blocktrans with title=sbook.series.title path=sbook.series.local_path number=sbook.series_number %} - - Book {{ number }} in {{ title }} - - {% endblocktrans %} - {% else %} - {% blocktrans with title=sbook.series.title path=sbook.series.local_path %} - - Part of {{ title }} - + + + {{ book.subtitle }} + +

      + {% endif %} + {% if book.series %} + {% spaceless %} +
      +
      + {% blocktrans with series=book.series %} + This book might be part of the {{series}} series. {% endblocktrans %} + {% if user_authenticated and can_edit_book %} + Edit it to confirm. {% endif %} - {% endspaceless %}
      - {% endfor%} +
      + {% endspaceless %} + {% endif %} + + {% if book.parent_work.seriesbooks %} + {% for sbook in book.parent_work.seriesbooks.all %} +
      + {% spaceless %} + {% if sbook.series_number %} + {% blocktrans with title=sbook.series.title path=sbook.series.local_path number=sbook.series_number %} + + Book {{ number }} in {{ title }} + + {% endblocktrans %} + {% else %} + {% blocktrans with title=sbook.series.title path=sbook.series.local_path %} + + Part of {{ title }} + + {% endblocktrans %} {% endif %} -

      + {% endspaceless %} +
      + {% endfor%} + {% endif %} + {% endif %} {% if book.authors.exists %} -
      - {% trans "by" %} {% include 'snippets/authors.html' with book=book %} -
      +
      + {% trans "by" %} {% include 'snippets/authors.html' with book=book %} +
      {% endif %}
      @@ -403,15 +401,15 @@

      {% trans "Your reading activity" %}

      {% if book.subjects %} -
      -

      {% trans "Subjects" %}

      +
      +

      {% trans "Subjects" %}

      -
        - {% for subject in book.subjects %} -
      • {{ subject }}
        • - {% endfor %} -
      -
      +
        + {% for subject in book.subjects %} +
      • {{ subject }}
        • + {% endfor %} +
      +
      {% endif %} {% if book.subject_places %} @@ -462,7 +460,6 @@

      {% trans "Lists" %}

    -
    {% endwith %} {% endblock %} diff --git a/bookwyrm/templates/book/edit/edit_book.html b/bookwyrm/templates/book/edit/edit_book.html index 2bddc9c7eb..2c0fd15be0 100644 --- a/bookwyrm/templates/book/edit/edit_book.html +++ b/bookwyrm/templates/book/edit/edit_book.html @@ -115,7 +115,7 @@

    {% trans "Confirm Book Info" %}

    {% blocktrans with name=add_author %}Creating a new author: {{ name }}{% endblocktrans %}

    {% endif %} - {% if not book.parent_work %} + {% if not book.parent_work.exists %}
    {% if book_matches%} @@ -139,33 +139,36 @@

    {% trans "Confirm Book Info" %}

    {% endif %} - {% if form.series %} + {% if form.series.value %}
    -
    {% if series_matches %} +
    {% trans "Is this book part of one of these series?" %} - {% for series in series_matches %} + {% for series in series_matches %} - {% endfor %} + {% endfor %} +
    {% else %} {% trans "Creating a new series" %}:

    {{ form.series.value }}

    -
    {% endif %}
    {% endif %} diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html index 0355cf5ad3..c78c301722 100644 --- a/bookwyrm/templates/book/edit/edit_book_form.html +++ b/bookwyrm/templates/book/edit/edit_book_form.html @@ -132,25 +132,27 @@

    - {% if book.series_ids.exists %} + {% with seriesbooks=book.parent_work.seriesbooks %} + {% if seriesbooks.exists %} {# preserve series if the book is unsaved #} - +
    - {% for series in book.series_ids.all %} + {% for sb in seriesbooks.all %} {% endfor %}
    {% endif %} + {% endwith %}

    {% trans "Add Series" %} @@ -160,6 +162,7 @@

    {% include 'snippets/form_errors.html' with errors_list=form.series.errors id="desc_series" %} +

    diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html index c78c301722..7f1f12d1d2 100644 --- a/bookwyrm/templates/book/edit/edit_book_form.html +++ b/bookwyrm/templates/book/edit/edit_book_form.html @@ -134,11 +134,9 @@

    {% with seriesbooks=book.parent_work.seriesbooks %} {% if seriesbooks.exists %} -
    {% endif %} @@ -69,7 +68,6 @@

    {% trans "Identifiers" %}

    {% for book in books %} - {% with book=book %}
    @@ -78,7 +76,6 @@

    {% trans "Identifiers" %}

    {% include 'landing/small-book.html' with book=book.book %}
    - {% endwith %} {% endfor %}
    diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index 6c291cf689..9148e29cff 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -105,7 +105,7 @@ def possible_series_hint(seriesbook): title = seriesbook.book.title path = seriesbook.series.local_path author = seriesbook.book.authors.first().name - + # pylint: disable=line-too-long hint = f'Includes "{title}"' if author: hint += f" by {author}" diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index aabd8dc035..4c8cb4f453 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -173,7 +173,6 @@ def ensure_transient_values_persist(request, data, **kwargs): if kwargs and kwargs.get("form"): data["book"] = data.get("book") or {} data["book"]["subjects"] = kwargs["form"].cleaned_data["subjects"] - data["book"]["series_ids"] = kwargs["form"].cleaned_data.get("series_ids") data["add_author"] = request.POST.getlist("add_author") elif kwargs and kwargs.get("add_author") is True: data["add_author"] = request.POST.getlist("add_author") diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index cdd071e94c..4871e0190c 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -33,23 +33,16 @@ def get(self, request, series_id, slug=None): books = [] items = ( series.seriesbooks.filter(series=series.id) - .prefetch_related("book", "book__authors") + .prefetch_related("book__work", "book__authors") .order_by("series_number") ) for item in items: - - book = ( - item.book.edition - if hasattr(item.book, "edition") - else item.book.work.default_edition - ) - + book = item.book.work.default_edition book_data = {"book": book, "series_number": item.series_number} books.append(book_data) - authors = authors.union(item.book.authors.all()) - paginated = Paginator(items, PAGE_LENGTH) + paginated = Paginator(books, PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) data = { From aa5470eb6e71d3fbd2926e881bc3a15bef358134 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Thu, 13 Nov 2025 17:25:57 +1100 Subject: [PATCH 167/962] refactor series models and templates also adds tests --- bookwyrm/activitypub/book.py | 18 +- bookwyrm/connectors/abstract_connector.py | 28 +- bookwyrm/connectors/inventaire.py | 8 +- bookwyrm/forms/books.py | 4 +- ...rgedseries_book_book_series_seriesbook.py} | 23 +- bookwyrm/models/book.py | 20 +- bookwyrm/templates/book/book.html | 4 +- bookwyrm/templates/book/edit/edit_book.html | 2 +- .../templates/book/edit/edit_book_form.html | 2 +- bookwyrm/templates/book/edit/edit_series.html | 12 +- bookwyrm/templates/book/series.html | 12 +- bookwyrm/templatetags/rating_tags.py | 2 +- bookwyrm/tests/activitypub/test_series.py | 285 ++++++++++++++++++ bookwyrm/views/books/edit_book.py | 8 +- bookwyrm/views/books/series.py | 6 +- 15 files changed, 363 insertions(+), 71 deletions(-) rename bookwyrm/migrations/{0219_series_mergedseries_seriesbook.py => 0220_series_mergedseries_book_book_series_seriesbook.py} (92%) create mode 100644 bookwyrm/tests/activitypub/test_series.py diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index d7f85c7b62..3ae9ca2e64 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -4,8 +4,6 @@ from .base_activity import ActivityObject from .image import Document -from .ordered_collection import CollectionItem, OrderedCollection - # pylint: disable=invalid-name @dataclass(init=False) @@ -38,8 +36,7 @@ class Book(BookData): languages: list[str] = field(default_factory=list) series: str = "" # legacy, now deprecated seriesNumber: str = "" # legacy, now deprecated - seriesBooks: list[str] = field(default_factory=list) - seriesIds: list[str] = field(default_factory=list) + bookSeries: list[str] = field(default_factory=list) subjects: list[str] = field(default_factory=list) subjectPlaces: list[str] = field(default_factory=list) @@ -99,19 +96,22 @@ class Author(BookData): @dataclass(init=False) -class Series(OrderedCollection, BookData): +class Series(BookData): """serializes a book series""" - title: str = "" - alternativeTitles: list[str] = field(default_factory=list) + actor: str + name: str + alternativeNames: list[str] = field(default_factory=list) + seriesBooks: list[str] = field(default_factory=list) type: str = "Series" @dataclass(init=False) -class SeriesBook(CollectionItem): +class SeriesBook(ActivityObject): """a book in a series""" + actor: str book: str - series: str + series: str = "" seriesNumber: str = "" type: str = "SeriesBook" diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 5366cd6516..14f98bf7b8 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -125,22 +125,22 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use series_to_process.append(series_obj) elif edition.series: # otherwise it's just a a string - series_to_process.append({"title": edition.series}) + series_to_process.append({"name": edition.series}) work.series_number = edition.series_number for obj in series_to_process: instance = None possible_series = models.SeriesBook.objects.filter( - Q(series__title__iexact=obj["title"]) - | Q(series__alternative_titles__icontains=obj["title"]) - | Q(series__alternative_titles__in=obj["alternative_titles"]) + Q(series__title__iexact=obj["name"]) + | Q(series__alternative_titles__icontains=obj["name"]) + | Q(series__alternative_titles__in=obj["alternative_names"]) ) if possible_series.exists(): if book_in_series := possible_series.filter( book__authors__in=work.authors.all() ).first(): - # we already have a series with same title + # we already have a series with same name # and author, let's feel lucky instance = book_in_series.series @@ -151,9 +151,9 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use edition.series_number = work.series_number edition.save() - return + continue - activitydata_to_seriesbook(user, work, obj, instance) + return activitydata_to_seriesbook(user, work, obj, instance) # now clear all the series fields for book in [work, edition]: @@ -521,23 +521,23 @@ def activitydata_to_seriesbook( "goodreads_key", "wikidata", "isfdb", - "title", + "name", ]: if not getattr(series, field) and getattr(temp, field): setattr(series, field, getattr(temp, field)) - for name in temp.alternative_titles: - if name not in series.alternative_titles and name != series.title: - series.alternative_titles.append(name) + for name in temp.alternative_names: + if name not in series.alternative_names and name != series.name: + series.alternative_names.append(name) series.save() else: - series = temp.user = user - series.save() + temp.user = user + series = temp.save() if not models.SeriesBook.objects.filter(book=work, series=series).exists(): # using the work.series_number for every series is safe because - # Inventaire doesn't record series ordinal when more than one series + # Inventaire doesn't supply series ordinal when more than one series models.SeriesBook.objects.create( user=user, book=work, series=series, series_number=work.series_number ) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 088693109e..2503a18296 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -253,7 +253,7 @@ def format_series(self, keys: Iterable[str]) -> list[dict]: except ConnectorException: continue - alternative_titles = set() + alternative_names = set() series = {} original_lang = series_data.get("originalLang") if original_lang: @@ -263,11 +263,11 @@ def format_series(self, keys: Iterable[str]) -> list[dict]: for k, v in series_data["labels"].items(): if k == original_lang: - series["title"] = v + series["name"] = v else: - alternative_titles.add(v) + alternative_names.add(v) - series["alternativeTitles"] = list(alternative_titles) + series["alternativeNames"] = list(alternative_names) series["inventaireId"] = uri series["wikidata"] = uri.split("wd:")[1] if series_data.get("wdt:P6947"): diff --git a/bookwyrm/forms/books.py b/bookwyrm/forms/books.py index 4efb8835ae..8d9b1605f4 100644 --- a/bookwyrm/forms/books.py +++ b/bookwyrm/forms/books.py @@ -150,8 +150,8 @@ class Meta: model = models.Series fields = [ "user", - "title", - "alternative_titles", + "name", + "alternative_names", "inventaire_id", "wikidata", "isfdb", diff --git a/bookwyrm/migrations/0219_series_mergedseries_seriesbook.py b/bookwyrm/migrations/0220_series_mergedseries_book_book_series_seriesbook.py similarity index 92% rename from bookwyrm/migrations/0219_series_mergedseries_seriesbook.py rename to bookwyrm/migrations/0220_series_mergedseries_book_book_series_seriesbook.py index 8055a9bbd0..89d3cfb43f 100644 --- a/bookwyrm/migrations/0219_series_mergedseries_seriesbook.py +++ b/bookwyrm/migrations/0220_series_mergedseries_book_book_series_seriesbook.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.3 on 2025-11-04 02:17 +# Generated by Django 5.2.3 on 2025-11-09 03:53 import bookwyrm.models.activitypub_mixin import bookwyrm.models.fields @@ -11,7 +11,7 @@ class Migration(migrations.Migration): dependencies = [ - ("bookwyrm", "0218_merge_0217_merge_20250816_0749_0217_usersession"), + ("bookwyrm", "0219_datamigration_fix_isbn10_20251017_1810"), ] operations = [ @@ -108,9 +108,9 @@ class Migration(migrations.Migration): "search_vector", django.contrib.postgres.search.SearchVectorField(null=True), ), - ("title", bookwyrm.models.fields.TextField(max_length=255)), + ("name", bookwyrm.models.fields.TextField(max_length=255)), ( - "alternative_titles", + "alternative_names", bookwyrm.models.fields.ArrayField( base_field=models.CharField(max_length=255), blank=True, @@ -138,11 +138,7 @@ class Migration(migrations.Migration): options={ "abstract": False, }, - bases=( - bookwyrm.models.activitypub_mixin.OrderedCollectionMixin, - bookwyrm.models.activitypub_mixin.ObjectMixin, - models.Model, - ), + bases=(bookwyrm.models.activitypub_mixin.ObjectMixin, models.Model), ), migrations.CreateModel( name="MergedSeries", @@ -161,6 +157,13 @@ class Migration(migrations.Migration): "abstract": False, }, ), + migrations.AddField( + model_name="book", + name="book_series", + field=bookwyrm.models.fields.ManyToManyField( + related_name="books", to="bookwyrm.series" + ), + ), migrations.CreateModel( name="SeriesBook", fields=[ @@ -217,6 +220,6 @@ class Migration(migrations.Migration): options={ "ordering": ("-series_number", "-created_date", "-updated_date"), }, - bases=(bookwyrm.models.activitypub_mixin.CollectionItemMixin, models.Model), + bases=(bookwyrm.models.activitypub_mixin.ObjectMixin, models.Model), ), ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 155fc177b6..e53f38033b 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -31,9 +31,7 @@ from .activitypub_mixin import ( OrderedCollectionPageMixin, - OrderedCollectionMixin, ObjectMixin, - CollectionItemMixin, ) from .base_model import BookWyrmModel from . import fields @@ -260,9 +258,13 @@ class Book(BookDataModel): models.CharField(max_length=255), blank=True, default=list ) - # These legacy fields are still used for editing and as a fallback: + # these legacy fields are still used for editing and as a fallback: series = fields.TextField(max_length=255, blank=True, null=True) series_number = fields.CharField(max_length=255, blank=True, null=True) + # this is the newer field + book_series = fields.ManyToManyField( + "Series", related_name="books", activitypub_field="bookSeries" + ) subjects = fields.ArrayField( models.CharField(max_length=255), blank=True, null=True, default=list @@ -804,11 +806,11 @@ def preview_image(instance, *args, **kwargs): ) -class Series(OrderedCollectionMixin, BookDataModel): +class Series(BookDataModel): """a series of books""" - title = fields.TextField(max_length=255) - alternative_titles = fields.ArrayField( + name = fields.TextField(max_length=255) + alternative_names = fields.ArrayField( models.CharField(max_length=255), blank=True, default=list ) # like aliases on an author user = fields.ForeignKey( @@ -816,6 +818,8 @@ class Series(OrderedCollectionMixin, BookDataModel): ) # for broadcast, should always be instance user but we can't set that here activity_serializer = activitypub.Series + serialize_reverse_fields = [("seriesbooks", "seriesBooks", "-created_date")] + deserialize_reverse_fields = [("seriesbooks", "seriesBooks")] def get_remote_id(self): """series need a remote id""" @@ -837,8 +841,8 @@ def isfdb_link(self): return f"https://www.isfdb.org/cgi-bin/pe.cgi?{self.isfdb}" -class SeriesBook(CollectionItemMixin, BookWyrmModel): - """connect a book to a series""" +class SeriesBook(ObjectMixin, BookWyrmModel): + """connect a book to a series with a series number""" series = fields.ForeignKey( "Series", on_delete=models.CASCADE, related_name="seriesbooks" diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index f00b84e3d2..2381afa73a 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -65,13 +65,13 @@

    {% spaceless %} {% if sbook.series_number %} - {% blocktrans with title=sbook.series.title path=sbook.series.local_path number=sbook.series_number %} + {% blocktrans with title=sbook.series.name path=sbook.series.local_path number=sbook.series_number %} Book {{ number }} in {{ title }} {% endblocktrans %} {% else %} - {% blocktrans with title=sbook.series.title path=sbook.series.local_path %} + {% blocktrans with title=sbook.series.name path=sbook.series.local_path %} Part of {{ title }} diff --git a/bookwyrm/templates/book/edit/edit_book.html b/bookwyrm/templates/book/edit/edit_book.html index 7198d60550..f2b55d1770 100644 --- a/bookwyrm/templates/book/edit/edit_book.html +++ b/bookwyrm/templates/book/edit/edit_book.html @@ -143,7 +143,7 @@

    {% trans "Confirm Book Info" %}

    {% for series in series_matches %}
    - + - + - +
    {% for book in books %} - {% with book=book %}
    - {% include 'landing/small-book.html' with book=book.book %} + {% include 'landing/small-book.html' with book=book.edition %}
    + {% with book=book %} - + + {% endwith %}
    - {% endwith %} {% endfor %}
    diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index 9148e29cff..47d6323794 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -104,7 +104,7 @@ def possible_series_hint(seriesbook): """Returns the hint string for a possible matching series""" title = seriesbook.book.title path = seriesbook.series.local_path - author = seriesbook.book.authors.first().name + author = seriesbook.book.authors.first().name if seriesbook.book.authors.first() else None # pylint: disable=line-too-long hint = f'Includes "{title}"' if author: diff --git a/bookwyrm/tests/activitypub/test_series.py b/bookwyrm/tests/activitypub/test_series.py index 165d47b77c..4a3ab42bcb 100644 --- a/bookwyrm/tests/activitypub/test_series.py +++ b/bookwyrm/tests/activitypub/test_series.py @@ -36,9 +36,6 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", ) - cls.book.book_series.add(cls.series) - cls.book.save(broadcast=False) - cls.seriesbook = models.SeriesBook.objects.create( book=cls.book, series=cls.series, @@ -116,12 +113,6 @@ def test_serialize_seriesbook(self): self.assertEqual(activity["book"], self.book.remote_id) self.assertEqual(activity["series"], self.series.remote_id) - def test_serialize_book_has_bookseries(self): - """check presence of seriesbook fields""" - activity = self.book.to_activity() - - self.assertIsInstance(activity["bookSeries"], list) - self.assertEqual(activity["bookSeries"], [self.series.remote_id]) @responses.activate def test_deserialize_book_with_series(self): @@ -148,6 +139,10 @@ def test_deserialize_book_with_series(self): status=200, ) + + # TODO: + # set_related_field.delay is in play here, we need to mock it so the seriesbook is unfurled + book_data = activitypub.Work(**self.book_data) book = book_data.to_model() @@ -157,32 +152,34 @@ def test_deserialize_book_with_series(self): @responses.activate def test_deserialize_book_series_no_duplicate(self): - """check that new style series don't duplicate""" - - responses.add( - responses.GET, - "https://example.com/series/2", - json=self.series_data, - status=200, - ) - - responses.add( - responses.GET, - "https://example.com/seriesbook/2", - json=self.seriesbook_data, - status=200, - ) - - responses.add( - responses.GET, - "https://example.com/user/instance", - json=self.user.to_activity(), - status=200, - ) - - book_data = activitypub.Work(**self.book_data) - book_data.to_model() - self.assertEqual(models.Series.objects.count(), 2) + """check that new-style series don't duplicate""" + + pass + # responses.add( + # responses.GET, + # "https://example.com/series/2", + # json=self.series_data, + # status=200, + # ) + + # responses.add( + # responses.GET, + # "https://example.com/seriesbook/2", + # json=self.seriesbook_data, + # status=200, + # ) + + # responses.add( + # responses.GET, + # "https://example.com/user/instance", + # json=self.user.to_activity(), + # status=200, + # ) + + # self.assertEqual(models.Series.objects.count(), 1) + # book_data = activitypub.Work(**self.book_data) + # book_data.to_model() + # self.assertEqual(models.Series.objects.count(), 1) @responses.activate def test_deserialize_series(self): diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 97794b151b..00f61213e9 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -1,11 +1,12 @@ """ testing book data connectors """ +import json from unittest.mock import patch from django.test import TestCase import responses from bookwyrm import models from bookwyrm.connectors import abstract_connector, ConnectorException -from bookwyrm.connectors.abstract_connector import Mapping, get_data +from bookwyrm.connectors.abstract_connector import Mapping, get_data, activitydata_to_seriesbook from bookwyrm.settings import BASE_URL, INSTANCE_ACTOR_USERNAME @@ -15,7 +16,7 @@ class AbstractConnector(TestCase): @classmethod def setUpTestData(cls): """we need an example connector in the database""" - models.Connector.objects.create( + cls.connector = models.Connector.objects.create( identifier="example.com", connector_file="openlibrary", base_url="https://example.com", @@ -172,3 +173,103 @@ def test_get_data_invalid_url(self): with self.assertRaises(ConnectorException): get_data("http://127.0.0.1/image/jpg") + + + def test_get_or_create_seriesbook_from_data(self): + """do we make a seriesbook?""" + + work = models.Work.objects.create(title="Test Book") + work.series = json.dumps([{"name": "Test Series 1"}]) + edition = self.book + + self.assertEqual(models.Series.objects.count(), 0) + self.assertEqual(models.SeriesBook.objects.count(), 0) + + self.connector.get_or_create_seriesbook_from_data(work=work, edition=edition) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 1) + + def test_get_or_create_seriesbook_from_existing_series(self): + """do we get a seriesbook with existing series?""" + + author = models.Author.objects.create(name="Sammy") + series = models.Series.objects.create(name="Test Series 1", user=self.local_user) + models.SeriesBook.objects.create(user=self.local_user, book=self.book, series=series) + + work = models.Work.objects.create(title="Test Book") + work.series = json.dumps([{"name": "Test Series 1"}]) + edition = self.book + edition.authors.add(author) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 1) + + self.connector.get_or_create_seriesbook_from_data(work=work, edition=edition) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 2) + + def test_get_or_create_seriesbook_with_ambiguous_series(self): + """do we get series info in the book when we can't match author?""" + + author = models.Author.objects.create(name="Sammy") + series = models.Series.objects.create(name="Test Series 1", user=self.local_user) + models.SeriesBook.objects.create(user=self.local_user, book=self.book, series=series) + + work = models.Work.objects.create(title="Test Book 2") + work.series = json.dumps([{"name": "Test Series 1"}]) + edition = models.Edition.objects.create(title="Test Book 2") + edition.authors.add(author) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 1) + + self.connector.get_or_create_seriesbook_from_data(work=work, edition=edition) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 1) + self.assertEqual(edition.series, "Test Series 1") + + def test_activitydata_to_seriesbook(self): + """ do we get a seriesbook?""" + + work = models.Work.objects.create(title="Test Book 2") + new = models.Series(name="Test Series A") + + self.assertEqual(models.Series.objects.count(), 0) + self.assertEqual(models.SeriesBook.objects.count(), 0) + + activitydata_to_seriesbook(user=self.local_user, work=work, new=new, instance=None) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 1) + + def test_activitydata_to_seriesbook_with_existing_series(self): + """ do we get a seriesbook but not a duplicate series?""" + + work = models.Work.objects.create(title="Test Book 2") + series = models.Series.objects.create(name="Test Series A", user=self.local_user) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 0) + + activitydata_to_seriesbook(user=self.local_user, work=work, new=series, instance=series) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 1) + + def test_activitydata_to_seriesbook_with_existing_seriesbook(self): + """ do we reuse the existing series and seriesbook?""" + + work = models.Work.objects.create(title="Test Book 2") + series = models.Series.objects.create(name="Test Series A", user=self.local_user) + models.SeriesBook.objects.create(user=self.local_user, book=work, series=series) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 1) + + activitydata_to_seriesbook(user=self.local_user, work=work, new=series, instance=None) + + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.SeriesBook.objects.count(), 1) \ No newline at end of file diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index 1cd88195f1..adbb1ceaf4 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -285,3 +285,15 @@ def test_remote_id_from_model(self): self.connector.get_remote_id_from_model(obj), "https://inventaire.io?action=by-uris&uris=123", ) + + + def test_format_series(self): + """make an activitypub object from Inventaire JSON-LD""" + + pass + + + def test_get_or_create_seriesbook_from_data(self): + """create a seriesbook from activityjson""" + + pass \ No newline at end of file diff --git a/bookwyrm/tests/models/test_series.py b/bookwyrm/tests/models/test_series.py new file mode 100644 index 0000000000..90af8dcbcf --- /dev/null +++ b/bookwyrm/tests/models/test_series.py @@ -0,0 +1,41 @@ +""" testing series models """ +import json +from unittest.mock import patch +from django.db import IntegrityError +from django.test import TestCase + +from bookwyrm import models, settings + +class TestSeriesModel(TestCase): + """testing series""" + + @classmethod + def setUpTestData(cls): + """reusable data""" + + cls.instance_user = models.User.objects.create_user( + "instance@local.com", + local=True, + localname=settings.INSTANCE_ACTOR_USERNAME, + remote_id="https://example.com/users/instance_actor", + ) + + cls.work = models.Work.objects.create(title="Test Book") + cls.edition = models.Edition.objects.create(title="Test Book", parent_work=cls.work) + cls.series = models.Series.objects.create(name="Test series", user=cls.instance_user) + + def test_seriesbook(self): + + self.assertEqual(models.SeriesBook.objects.count(), 0) + models.SeriesBook.objects.create(series=self.series, book=self.work, user=self.instance_user) + self.assertEqual(models.SeriesBook.objects.count(), 1) + + def test_seriesbook_fields(self): + + self.assertEqual(models.SeriesBook.objects.count(), 0) + seriesbook = models.SeriesBook.objects.create(series=self.series, book=self.work, user=self.instance_user) + + self.assertEqual(models.SeriesBook.objects.count(), 1) + self.assertEqual(self.work.seriesbooks.first(), seriesbook) + self.assertEqual(self.work.book_series()[0], self.series) + self.assertEqual(self.series.seriesbooks.first(), seriesbook) \ No newline at end of file diff --git a/bookwyrm/tests/views/books/test_series.py b/bookwyrm/tests/views/books/test_series.py new file mode 100644 index 0000000000..2c6dcf46f2 --- /dev/null +++ b/bookwyrm/tests/views/books/test_series.py @@ -0,0 +1,67 @@ +""" 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 django.http.response import Http404 +from bookwyrm import models, views +from bookwyrm.tests.validate_html import validate_html + + +class SeriesViews(TestCase): + """series views""" + + @classmethod + def setUpTestData(cls): + """we need basic test data and mocks""" + + cls.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.com", + "mouseword" + ) + + cls.book = models.Work.objects.create(title="test book") + cls.series = models.Series.objects.create(name="test series", user=cls.local_user) + cls.seriesbook = models.SeriesBook.objects.create(book=cls.book, series=cls.series, user=cls.local_user) + + models.SiteSettings.objects.create() + + def setUp(self): + """individual test setup""" + self.factory = RequestFactory() + + def test_series_page(self): + """there are so many views, this just makes sure it LOADS""" + view = views.Series.as_view() + request = self.factory.get("") + request.user = self.local_user + result = view(request, self.series.id) + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + + self.assertEqual(result.status_code, 200) + + + def test_editseries_page(self): + """there are so many views, this just makes sure it LOADS""" + view = views.EditSeries.as_view() + request = self.factory.get("") + request.user = self.local_user + result = view(request, self.series.id) + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + + self.assertEqual(result.status_code, 200) + + + def test_seriesbook_page_404s(self): + """make sure it doesn't load for normal traffic""" + view = views.SeriesBook.as_view() + request = self.factory.get("") + request.user = self.local_user + + with self.assertRaises(Http404): + result = view(request, self.seriesbook.id) + diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 4211b609f8..79075a13d8 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -906,8 +906,10 @@ ), # series re_path( - r"^series/(?P\d+)(.json)?/?$", views.Series.as_view(), name="series" + rf"^series/(?P\d+)(.json)?{regex.SLUG}/?$", views.Series.as_view(), name="series" ), + re_path( + rf"^series/(?P\d+)(.json)/?$", views.Series.as_view()), # activitypub re_path( r"^series/(?P\d+)/edit/?$", views.EditSeries.as_view(), diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index e616907321..0e727de59c 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -61,11 +61,21 @@ class EditSeries(View): def get(self, request, series_id=None): """edit page for series""" - series = models.Series.objects.filter(id=series_id).first() + series = models.Series.objects.get(id=series_id) seriesbooks = models.SeriesBook.objects.filter(series=series) + books = [] + for item in seriesbooks: + edition = item.book.work.default_edition + number = item.series_number or "" + books.append({"edition": edition, "number": number, "id": item.book.work.id}) + print({"edition": edition, "number": number, "id": item.book.work.id}) + + paginated = Paginator(books, PAGE_LENGTH) + page = paginated.get_page(request.GET.get("page")) + data = { "series": series, - "books": seriesbooks, + "books": page, "form": SeriesForm(instance=series), } @@ -96,12 +106,12 @@ def post(self, request, series_id): # update seriesbooks as needed for book in series.seriesbooks.all(): - value = request.POST[f"series_number-{book.id}"] + value = request.POST[f"series_number-{book.book.id}"] book.series_number = value # save the series_number as the value book.save(update_fields=["series_number"]) - return redirect("series", series_id) + return redirect(series.local_path) class SeriesBook(View): From 1739f50d47c7b648a9538bec330dcfd1d8ea9557 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 16 Nov 2025 08:55:48 +1100 Subject: [PATCH 169/962] formatting --- bookwyrm/connectors/abstract_connector.py | 10 ++-- bookwyrm/models/book.py | 9 ++-- bookwyrm/templatetags/utilities.py | 6 ++- bookwyrm/tests/activitypub/test_series.py | 2 - .../connectors/test_abstract_connector.py | 51 +++++++++++++------ .../connectors/test_inventaire_connector.py | 4 +- bookwyrm/tests/models/test_series.py | 19 +++++-- bookwyrm/tests/views/books/test_series.py | 15 +++--- bookwyrm/urls.py | 7 ++- bookwyrm/views/books/series.py | 4 +- 10 files changed, 83 insertions(+), 44 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index c8bb4f5493..5f843d4abe 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -154,13 +154,16 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use # leave it for the user to work out if work.series: edition.series = series.name - edition.series_number = json.loads(work.series)[0].get("seriesNumber", "") + edition.series_number = json.loads(work.series)[0].get( + "seriesNumber", "" + ) edition.save() continue - activitydata_to_seriesbook(user=user, work=work, new=series, instance=instance) - + activitydata_to_seriesbook( + user=user, work=work, new=series, instance=instance + ) @abstractmethod def get_or_create_book(self, remote_id: str) -> Optional[models.Book]: @@ -247,7 +250,6 @@ def get_book_data(self, remote_id: str) -> JsonDict: # pylint: disable=no-self- """this allows connectors to override the default behavior""" return get_data(remote_id, is_activitypub=False) - def create_edition_from_data( self, work: models.Work, diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 4752d78d61..4be7175e9a 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -489,10 +489,13 @@ def to_edition_list(self, **kwargs): serialize_reverse_fields = [ ("editions", "editions", "-edition_rank"), ("file_links", "fileLinks", "-created_date"), - ("seriesbooks", "seriesBooks", "-created_date") + ("seriesbooks", "seriesBooks", "-created_date"), + ] + deserialize_reverse_fields = [ + ("editions", "editions"), + ("file_links", "fileLinks"), + ("seriesbooks", "seriesBooks"), ] - deserialize_reverse_fields = [("editions", "editions"), ("file_links", "fileLinks"), ("seriesbooks", "seriesBooks")] - # https://schema.org/BookFormatType diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index 47d6323794..0f04aed05a 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -104,7 +104,11 @@ def possible_series_hint(seriesbook): """Returns the hint string for a possible matching series""" title = seriesbook.book.title path = seriesbook.series.local_path - author = seriesbook.book.authors.first().name if seriesbook.book.authors.first() else None + author = ( + seriesbook.book.authors.first().name + if seriesbook.book.authors.first() + else None + ) # pylint: disable=line-too-long hint = f'Includes "{title}"' if author: diff --git a/bookwyrm/tests/activitypub/test_series.py b/bookwyrm/tests/activitypub/test_series.py index 4a3ab42bcb..a22abc0d27 100644 --- a/bookwyrm/tests/activitypub/test_series.py +++ b/bookwyrm/tests/activitypub/test_series.py @@ -113,7 +113,6 @@ def test_serialize_seriesbook(self): self.assertEqual(activity["book"], self.book.remote_id) self.assertEqual(activity["series"], self.series.remote_id) - @responses.activate def test_deserialize_book_with_series(self): """check that new style series are deserialised""" @@ -139,7 +138,6 @@ def test_deserialize_book_with_series(self): status=200, ) - # TODO: # set_related_field.delay is in play here, we need to mock it so the seriesbook is unfurled diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 00f61213e9..e7e3693f48 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -6,7 +6,11 @@ from bookwyrm import models from bookwyrm.connectors import abstract_connector, ConnectorException -from bookwyrm.connectors.abstract_connector import Mapping, get_data, activitydata_to_seriesbook +from bookwyrm.connectors.abstract_connector import ( + Mapping, + get_data, + activitydata_to_seriesbook, +) from bookwyrm.settings import BASE_URL, INSTANCE_ACTOR_USERNAME @@ -174,7 +178,6 @@ def test_get_data_invalid_url(self): with self.assertRaises(ConnectorException): get_data("http://127.0.0.1/image/jpg") - def test_get_or_create_seriesbook_from_data(self): """do we make a seriesbook?""" @@ -194,8 +197,12 @@ def test_get_or_create_seriesbook_from_existing_series(self): """do we get a seriesbook with existing series?""" author = models.Author.objects.create(name="Sammy") - series = models.Series.objects.create(name="Test Series 1", user=self.local_user) - models.SeriesBook.objects.create(user=self.local_user, book=self.book, series=series) + series = models.Series.objects.create( + name="Test Series 1", user=self.local_user + ) + models.SeriesBook.objects.create( + user=self.local_user, book=self.book, series=series + ) work = models.Work.objects.create(title="Test Book") work.series = json.dumps([{"name": "Test Series 1"}]) @@ -214,8 +221,12 @@ def test_get_or_create_seriesbook_with_ambiguous_series(self): """do we get series info in the book when we can't match author?""" author = models.Author.objects.create(name="Sammy") - series = models.Series.objects.create(name="Test Series 1", user=self.local_user) - models.SeriesBook.objects.create(user=self.local_user, book=self.book, series=series) + series = models.Series.objects.create( + name="Test Series 1", user=self.local_user + ) + models.SeriesBook.objects.create( + user=self.local_user, book=self.book, series=series + ) work = models.Work.objects.create(title="Test Book 2") work.series = json.dumps([{"name": "Test Series 1"}]) @@ -232,7 +243,7 @@ def test_get_or_create_seriesbook_with_ambiguous_series(self): self.assertEqual(edition.series, "Test Series 1") def test_activitydata_to_seriesbook(self): - """ do we get a seriesbook?""" + """do we get a seriesbook?""" work = models.Work.objects.create(title="Test Book 2") new = models.Series(name="Test Series A") @@ -240,36 +251,46 @@ def test_activitydata_to_seriesbook(self): self.assertEqual(models.Series.objects.count(), 0) self.assertEqual(models.SeriesBook.objects.count(), 0) - activitydata_to_seriesbook(user=self.local_user, work=work, new=new, instance=None) + activitydata_to_seriesbook( + user=self.local_user, work=work, new=new, instance=None + ) self.assertEqual(models.Series.objects.count(), 1) self.assertEqual(models.SeriesBook.objects.count(), 1) def test_activitydata_to_seriesbook_with_existing_series(self): - """ do we get a seriesbook but not a duplicate series?""" + """do we get a seriesbook but not a duplicate series?""" work = models.Work.objects.create(title="Test Book 2") - series = models.Series.objects.create(name="Test Series A", user=self.local_user) + series = models.Series.objects.create( + name="Test Series A", user=self.local_user + ) self.assertEqual(models.Series.objects.count(), 1) self.assertEqual(models.SeriesBook.objects.count(), 0) - activitydata_to_seriesbook(user=self.local_user, work=work, new=series, instance=series) + activitydata_to_seriesbook( + user=self.local_user, work=work, new=series, instance=series + ) self.assertEqual(models.Series.objects.count(), 1) self.assertEqual(models.SeriesBook.objects.count(), 1) def test_activitydata_to_seriesbook_with_existing_seriesbook(self): - """ do we reuse the existing series and seriesbook?""" + """do we reuse the existing series and seriesbook?""" work = models.Work.objects.create(title="Test Book 2") - series = models.Series.objects.create(name="Test Series A", user=self.local_user) + series = models.Series.objects.create( + name="Test Series A", user=self.local_user + ) models.SeriesBook.objects.create(user=self.local_user, book=work, series=series) self.assertEqual(models.Series.objects.count(), 1) self.assertEqual(models.SeriesBook.objects.count(), 1) - activitydata_to_seriesbook(user=self.local_user, work=work, new=series, instance=None) + activitydata_to_seriesbook( + user=self.local_user, work=work, new=series, instance=None + ) self.assertEqual(models.Series.objects.count(), 1) - self.assertEqual(models.SeriesBook.objects.count(), 1) \ No newline at end of file + self.assertEqual(models.SeriesBook.objects.count(), 1) diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index adbb1ceaf4..1ea306a1f9 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -286,14 +286,12 @@ def test_remote_id_from_model(self): "https://inventaire.io?action=by-uris&uris=123", ) - def test_format_series(self): """make an activitypub object from Inventaire JSON-LD""" pass - def test_get_or_create_seriesbook_from_data(self): """create a seriesbook from activityjson""" - pass \ No newline at end of file + pass diff --git a/bookwyrm/tests/models/test_series.py b/bookwyrm/tests/models/test_series.py index 90af8dcbcf..249dfb22e7 100644 --- a/bookwyrm/tests/models/test_series.py +++ b/bookwyrm/tests/models/test_series.py @@ -6,6 +6,7 @@ from bookwyrm import models, settings + class TestSeriesModel(TestCase): """testing series""" @@ -21,21 +22,29 @@ def setUpTestData(cls): ) cls.work = models.Work.objects.create(title="Test Book") - cls.edition = models.Edition.objects.create(title="Test Book", parent_work=cls.work) - cls.series = models.Series.objects.create(name="Test series", user=cls.instance_user) + cls.edition = models.Edition.objects.create( + title="Test Book", parent_work=cls.work + ) + cls.series = models.Series.objects.create( + name="Test series", user=cls.instance_user + ) def test_seriesbook(self): self.assertEqual(models.SeriesBook.objects.count(), 0) - models.SeriesBook.objects.create(series=self.series, book=self.work, user=self.instance_user) + models.SeriesBook.objects.create( + series=self.series, book=self.work, user=self.instance_user + ) self.assertEqual(models.SeriesBook.objects.count(), 1) def test_seriesbook_fields(self): self.assertEqual(models.SeriesBook.objects.count(), 0) - seriesbook = models.SeriesBook.objects.create(series=self.series, book=self.work, user=self.instance_user) + seriesbook = models.SeriesBook.objects.create( + series=self.series, book=self.work, user=self.instance_user + ) self.assertEqual(models.SeriesBook.objects.count(), 1) self.assertEqual(self.work.seriesbooks.first(), seriesbook) self.assertEqual(self.work.book_series()[0], self.series) - self.assertEqual(self.series.seriesbooks.first(), seriesbook) \ No newline at end of file + self.assertEqual(self.series.seriesbooks.first(), seriesbook) diff --git a/bookwyrm/tests/views/books/test_series.py b/bookwyrm/tests/views/books/test_series.py index 2c6dcf46f2..7b6ec6f3b4 100644 --- a/bookwyrm/tests/views/books/test_series.py +++ b/bookwyrm/tests/views/books/test_series.py @@ -17,14 +17,16 @@ def setUpTestData(cls): """we need basic test data and mocks""" cls.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.com", - "mouseword" + "mouse@local.com", "mouse@mouse.com", "mouseword" ) cls.book = models.Work.objects.create(title="test book") - cls.series = models.Series.objects.create(name="test series", user=cls.local_user) - cls.seriesbook = models.SeriesBook.objects.create(book=cls.book, series=cls.series, user=cls.local_user) + cls.series = models.Series.objects.create( + name="test series", user=cls.local_user + ) + cls.seriesbook = models.SeriesBook.objects.create( + book=cls.book, series=cls.series, user=cls.local_user + ) models.SiteSettings.objects.create() @@ -43,7 +45,6 @@ def test_series_page(self): self.assertEqual(result.status_code, 200) - def test_editseries_page(self): """there are so many views, this just makes sure it LOADS""" view = views.EditSeries.as_view() @@ -55,7 +56,6 @@ def test_editseries_page(self): self.assertEqual(result.status_code, 200) - def test_seriesbook_page_404s(self): """make sure it doesn't load for normal traffic""" view = views.SeriesBook.as_view() @@ -64,4 +64,3 @@ def test_seriesbook_page_404s(self): with self.assertRaises(Http404): result = view(request, self.seriesbook.id) - diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 79075a13d8..a5803c8f25 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -906,10 +906,13 @@ ), # series re_path( - rf"^series/(?P\d+)(.json)?{regex.SLUG}/?$", views.Series.as_view(), name="series" + rf"^series/(?P\d+)(.json)?{regex.SLUG}/?$", + views.Series.as_view(), + name="series", ), re_path( - rf"^series/(?P\d+)(.json)/?$", views.Series.as_view()), # activitypub + rf"^series/(?P\d+)(.json)/?$", views.Series.as_view() + ), # activitypub re_path( r"^series/(?P\d+)/edit/?$", views.EditSeries.as_view(), diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index 0e727de59c..4a5c90914b 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -67,7 +67,9 @@ def get(self, request, series_id=None): for item in seriesbooks: edition = item.book.work.default_edition number = item.series_number or "" - books.append({"edition": edition, "number": number, "id": item.book.work.id}) + books.append( + {"edition": edition, "number": number, "id": item.book.work.id} + ) print({"edition": edition, "number": number, "id": item.book.work.id}) paginated = Paginator(books, PAGE_LENGTH) From 5d350ad8c2732c7cb482c104a54f0219ffdd75fe Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Wed, 19 Nov 2025 15:34:12 +1100 Subject: [PATCH 170/962] final commit for series --- bookwyrm/activitypub/book.py | 2 +- bookwyrm/connectors/abstract_connector.py | 2 +- bookwyrm/connectors/inventaire.py | 2 +- ...ergedseries_book_book_series_seriesbook.py | 225 ------------------ .../0221_remove_book_book_series.py | 17 -- .../0222_alter_seriesbook_options.py | 17 -- bookwyrm/models/book.py | 10 +- bookwyrm/models/bookwyrm_export_job.py | 42 ++-- bookwyrm/templates/book/edit/edit_series.html | 10 +- bookwyrm/templates/book/series.html | 6 +- bookwyrm/tests/activitypub/test_series.py | 55 ++--- .../connectors/test_inventaire_connector.py | 31 ++- bookwyrm/tests/models/test_series.py | 6 +- bookwyrm/tests/views/books/test_series.py | 75 +++++- bookwyrm/urls.py | 2 +- bookwyrm/views/books/series.py | 40 +--- 16 files changed, 164 insertions(+), 378 deletions(-) delete mode 100644 bookwyrm/migrations/0220_series_mergedseries_book_book_series_seriesbook.py delete mode 100644 bookwyrm/migrations/0221_remove_book_book_series.py delete mode 100644 bookwyrm/migrations/0222_alter_seriesbook_options.py diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 8faadd7590..0f319d392e 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -113,5 +113,5 @@ class SeriesBook(ActivityObject): actor: str book: str series: str - seriesNumber: str = "" + seriesNumber: int = None type: str = "SeriesBook" diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 5f843d4abe..dfe617fb3f 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -155,7 +155,7 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use if work.series: edition.series = series.name edition.series_number = json.loads(work.series)[0].get( - "seriesNumber", "" + "series_number", "" ) edition.save() diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 2503a18296..55d17609f8 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -80,7 +80,7 @@ def get_book_data(self, remote_id: str) -> JsonDict: **data.get("claims", {}), **{ k: data.get(k) - for k in ["uri", "image", "labels", "sitelinks", "type"] + for k in ["uri", "image", "labels", "sitelinks", "type", "originalLang"] if k in data }, } diff --git a/bookwyrm/migrations/0220_series_mergedseries_book_book_series_seriesbook.py b/bookwyrm/migrations/0220_series_mergedseries_book_book_series_seriesbook.py deleted file mode 100644 index 89d3cfb43f..0000000000 --- a/bookwyrm/migrations/0220_series_mergedseries_book_book_series_seriesbook.py +++ /dev/null @@ -1,225 +0,0 @@ -# Generated by Django 5.2.3 on 2025-11-09 03:53 - -import bookwyrm.models.activitypub_mixin -import bookwyrm.models.fields -import django.contrib.postgres.search -import django.db.models.deletion -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0219_datamigration_fix_isbn10_20251017_1810"), - ] - - operations = [ - migrations.CreateModel( - name="Series", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("created_date", models.DateTimeField(auto_now_add=True)), - ("updated_date", models.DateTimeField(auto_now=True)), - ( - "remote_id", - bookwyrm.models.fields.RemoteIdField( - max_length=255, - null=True, - validators=[bookwyrm.models.fields.validate_remote_id], - ), - ), - ("origin_id", models.CharField(blank=True, max_length=255, null=True)), - ( - "openlibrary_key", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "finna_key", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "inventaire_id", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "librarything_key", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "goodreads_key", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "bnf_id", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "viaf", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "wikidata", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "asin", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "aasin", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "isfdb", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "search_vector", - django.contrib.postgres.search.SearchVectorField(null=True), - ), - ("name", bookwyrm.models.fields.TextField(max_length=255)), - ( - "alternative_names", - bookwyrm.models.fields.ArrayField( - base_field=models.CharField(max_length=255), - blank=True, - default=list, - size=None, - ), - ), - ( - "last_edited_by", - bookwyrm.models.fields.ForeignKey( - null=True, - on_delete=django.db.models.deletion.PROTECT, - to=settings.AUTH_USER_MODEL, - ), - ), - ( - "user", - bookwyrm.models.fields.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="+", - to=settings.AUTH_USER_MODEL, - ), - ), - ], - options={ - "abstract": False, - }, - bases=(bookwyrm.models.activitypub_mixin.ObjectMixin, models.Model), - ), - migrations.CreateModel( - name="MergedSeries", - fields=[ - ("deleted_id", models.IntegerField(primary_key=True, serialize=False)), - ( - "merged_into", - models.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="absorbed", - to="bookwyrm.series", - ), - ), - ], - options={ - "abstract": False, - }, - ), - migrations.AddField( - model_name="book", - name="book_series", - field=bookwyrm.models.fields.ManyToManyField( - related_name="books", to="bookwyrm.series" - ), - ), - migrations.CreateModel( - name="SeriesBook", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("created_date", models.DateTimeField(auto_now_add=True)), - ("updated_date", models.DateTimeField(auto_now=True)), - ( - "remote_id", - bookwyrm.models.fields.RemoteIdField( - max_length=255, - null=True, - validators=[bookwyrm.models.fields.validate_remote_id], - ), - ), - ( - "series_number", - bookwyrm.models.fields.CharField( - blank=True, max_length=255, null=True - ), - ), - ( - "book", - bookwyrm.models.fields.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="seriesbooks", - to="bookwyrm.book", - ), - ), - ( - "series", - bookwyrm.models.fields.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="seriesbooks", - to="bookwyrm.series", - ), - ), - ( - "user", - bookwyrm.models.fields.ForeignKey( - on_delete=django.db.models.deletion.PROTECT, - related_name="+", - to=settings.AUTH_USER_MODEL, - ), - ), - ], - options={ - "ordering": ("-series_number", "-created_date", "-updated_date"), - }, - bases=(bookwyrm.models.activitypub_mixin.ObjectMixin, models.Model), - ), - ] diff --git a/bookwyrm/migrations/0221_remove_book_book_series.py b/bookwyrm/migrations/0221_remove_book_book_series.py deleted file mode 100644 index d1fcef421a..0000000000 --- a/bookwyrm/migrations/0221_remove_book_book_series.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 5.2.3 on 2025-11-14 23:53 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0220_series_mergedseries_book_book_series_seriesbook"), - ] - - operations = [ - migrations.RemoveField( - model_name="book", - name="book_series", - ), - ] diff --git a/bookwyrm/migrations/0222_alter_seriesbook_options.py b/bookwyrm/migrations/0222_alter_seriesbook_options.py deleted file mode 100644 index c97c636d7f..0000000000 --- a/bookwyrm/migrations/0222_alter_seriesbook_options.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 5.2.3 on 2025-11-15 02:52 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0221_remove_book_book_series"), - ] - - operations = [ - migrations.AlterModelOptions( - name="seriesbook", - options={}, - ), - ] diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 4be7175e9a..889ad49b1b 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -638,8 +638,14 @@ class Edition(Book): activity_serializer = activitypub.Edition name_field = "title" - serialize_reverse_fields = [("file_links", "fileLinks", "-created_date")] - deserialize_reverse_fields = [("file_links", "fileLinks")] + serialize_reverse_fields = [ + ("file_links", "fileLinks", "-created_date"), + ("seriesbooks", "seriesBooks", "-created_date"), + ] + deserialize_reverse_fields = [ + ("file_links", "fileLinks"), + ("seriesbooks", "seriesBooks"), + ] @property def hyphenated_isbn13(self): diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 8fbb659ad0..3a9c16d090 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -6,6 +6,7 @@ from boto3.session import Session as BotoSession from s3_tar import S3Tar +from django.db import transaction from django.db.models import FileField, JSONField from django.core.serializers.json import DjangoJSONEncoder from django.core.files.base import ContentFile @@ -59,26 +60,27 @@ def create_export_json_task(**kwargs): if job.status == "stopped": return - try: - # generate JSON - data = export_user(job.user) - data["settings"] = export_settings(job.user) - data["goals"] = export_goals(job.user) - data["books"] = export_books(job.user) - data["saved_lists"] = export_saved_lists(job.user) - data["follows"] = export_follows(job.user) - data["blocks"] = export_blocks(job.user) - job.export_json = data - job.save(update_fields=["export_json"]) - - # trigger task to create tar file - create_archive_task.delay(job_id=job.id) - - except Exception as err: # pylint: disable=broad-except - logger.exception( - "create_export_json_task for job %s failed with error: %s", job.id, err - ) - job.set_status("failed") + with transaction.atomic(): + try: + # generate JSON + data = export_user(job.user) + data["settings"] = export_settings(job.user) + data["goals"] = export_goals(job.user) + data["books"] = export_books(job.user) + data["saved_lists"] = export_saved_lists(job.user) + data["follows"] = export_follows(job.user) + data["blocks"] = export_blocks(job.user) + job.export_json = data + job.save(update_fields=["export_json"]) + + # trigger task to create tar file + create_archive_task.delay(job_id=job.id) + + except Exception as err: # pylint: disable=broad-except + logger.exception( + "create_export_json_task for job %s failed with error: %s", job.id, err + ) + job.set_status("failed") def archive_file_location(file, directory="") -> str: diff --git a/bookwyrm/templates/book/edit/edit_series.html b/bookwyrm/templates/book/edit/edit_series.html index 19f08e5ef6..b0d44016a4 100644 --- a/bookwyrm/templates/book/edit/edit_series.html +++ b/bookwyrm/templates/book/edit/edit_series.html @@ -60,19 +60,17 @@

    {% blocktrans with name=series.name %}Edit "{{ name }}"{% endb
    - {% for book in books %} + {% for seriesbook in series.seriesbooks.all %}
    - + - {% include 'landing/small-book.html' with book=book.edition %} + {% include 'landing/small-book.html' with book=seriesbook.book.work.default_edition %}
    - {% with book=book %} - - {% endwith %} +
    {% endfor %} diff --git a/bookwyrm/templates/book/series.html b/bookwyrm/templates/book/series.html index 76cfd461e5..9d4d1bd62e 100644 --- a/bookwyrm/templates/book/series.html +++ b/bookwyrm/templates/book/series.html @@ -67,13 +67,13 @@

    {% trans "Identifiers" %}

    - {% for book in books %} + {% for seriesbook in series.seriesbooks.all %}
    - {% if book.series_number %}{% blocktrans with series_number=book.series_number %}Book #{{ series_number }}{% endblocktrans %}{% endif %} - {% include 'landing/small-book.html' with book=book.book %} + {% if seriesbook.series_number %}{% blocktrans with series_number=seriesbook.series_number %}Book #{{ series_number }}{% endblocktrans %}{% endif %} + {% include 'landing/small-book.html' with book=seriesbook.book.work.default_edition %}
    {% endfor %} diff --git a/bookwyrm/tests/activitypub/test_series.py b/bookwyrm/tests/activitypub/test_series.py index a22abc0d27..aad78a8cdd 100644 --- a/bookwyrm/tests/activitypub/test_series.py +++ b/bookwyrm/tests/activitypub/test_series.py @@ -52,7 +52,7 @@ def setUpTestData(cls): "languages": [], "series": "", "seriesNumber": "", - "bookSeries": ["https://example.com/series/2"], + "seriesBooks": ["https://example.com/seriesbook/2"], "subjects": [], "subjectPlaces": [], "authors": [], @@ -138,46 +138,30 @@ def test_deserialize_book_with_series(self): status=200, ) - # TODO: - # set_related_field.delay is in play here, we need to mock it so the seriesbook is unfurled + self.assertFalse(models.Work.objects.filter(title="Example Book 2").exists()) + self.assertFalse(models.Series.objects.filter(name="Example Series 2").exists()) + self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.Book.objects.count(), 1) book_data = activitypub.Work(**self.book_data) book = book_data.to_model() + with patch( + "bookwyrm.activitypub.base_activity.set_related_field.delay", + new_callable=set_related_field( + "SeriesBook", + "Work", + "book", + "https://example.com/book/2", + book_data.seriesBooks[0], + ), + ) as mocked: + book_data.to_model() # run it again to trigger the mock + mocked.assert_called() self.assertEqual(book.title, "Example Book 2") self.assertTrue(models.Series.objects.filter(name="Example Series 2").exists()) self.assertEqual(models.Series.objects.count(), 2) - - @responses.activate - def test_deserialize_book_series_no_duplicate(self): - """check that new-style series don't duplicate""" - - pass - # responses.add( - # responses.GET, - # "https://example.com/series/2", - # json=self.series_data, - # status=200, - # ) - - # responses.add( - # responses.GET, - # "https://example.com/seriesbook/2", - # json=self.seriesbook_data, - # status=200, - # ) - - # responses.add( - # responses.GET, - # "https://example.com/user/instance", - # json=self.user.to_activity(), - # status=200, - # ) - - # self.assertEqual(models.Series.objects.count(), 1) - # book_data = activitypub.Work(**self.book_data) - # book_data.to_model() - # self.assertEqual(models.Series.objects.count(), 1) + self.assertEqual(models.Book.objects.count(), 2) @responses.activate def test_deserialize_series(self): @@ -212,9 +196,6 @@ def test_deserialize_series(self): series_data = activitypub.Series(**self.series_data) s = series_data.to_model() - # related field seriesbook is created via a task - # so we have to mock it to be sure it's called - # and that when called it works properly with patch( "bookwyrm.activitypub.base_activity.set_related_field.delay", new_callable=set_related_field( diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index 1ea306a1f9..b5558dbb21 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -286,12 +286,33 @@ def test_remote_id_from_model(self): "https://inventaire.io?action=by-uris&uris=123", ) + @responses.activate def test_format_series(self): - """make an activitypub object from Inventaire JSON-LD""" + """make an activitypub series object from Inventaire JSON-LD""" + + ent = { + "uri": "wd:Q1234", + "originalLang": "fr", + "labels": {"fr": "Série de Tests", "en": "Test Series"}, + "claims": { + "wdt:P6947": ["grk123"], + "wdt:P1235": ["isfdb123"], + "wdt:P8513": ["ltk123"], + }, + } - pass + responses.add( + responses.GET, + "https://inventaire.io/?action=by-uris&uris=wd:999", + json={"entities": {"wd:999": ent}}, + ) - def test_get_or_create_seriesbook_from_data(self): - """create a seriesbook from activityjson""" + formatted = self.connector.format_series(["wd:999"]) + data = json.loads(formatted[0]) - pass + self.assertEqual(data["name"], "Série de Tests") + self.assertIsInstance(data["alternativeNames"], list) + self.assertEqual(data["wikidata"], "999") + self.assertEqual(data["goodreadsKey"], "grk123") + self.assertEqual(data["isfdb"], "isfdb123") + self.assertEqual(data["librarythingKey"], "ltk123") diff --git a/bookwyrm/tests/models/test_series.py b/bookwyrm/tests/models/test_series.py index 249dfb22e7..8d811c7c0a 100644 --- a/bookwyrm/tests/models/test_series.py +++ b/bookwyrm/tests/models/test_series.py @@ -1,7 +1,5 @@ """ testing series models """ -import json -from unittest.mock import patch -from django.db import IntegrityError + from django.test import TestCase from bookwyrm import models, settings @@ -30,6 +28,7 @@ def setUpTestData(cls): ) def test_seriesbook(self): + """making a seriesbook""" self.assertEqual(models.SeriesBook.objects.count(), 0) models.SeriesBook.objects.create( @@ -38,6 +37,7 @@ def test_seriesbook(self): self.assertEqual(models.SeriesBook.objects.count(), 1) def test_seriesbook_fields(self): + """do reverse fields work for seriesbook?""" self.assertEqual(models.SeriesBook.objects.count(), 0) seriesbook = models.SeriesBook.objects.create( diff --git a/bookwyrm/tests/views/books/test_series.py b/bookwyrm/tests/views/books/test_series.py index 7b6ec6f3b4..d4a8b4d674 100644 --- a/bookwyrm/tests/views/books/test_series.py +++ b/bookwyrm/tests/views/books/test_series.py @@ -1,11 +1,13 @@ """ test for app action functionality """ from unittest.mock import patch - +from django.contrib.auth.models import Group, Permission +from django.contrib.contenttypes.models import ContentType from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory from django.http.response import Http404 -from bookwyrm import models, views +from bookwyrm import models, views, forms +from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.tests.validate_html import validate_html @@ -16,16 +18,32 @@ class SeriesViews(TestCase): def setUpTestData(cls): """we need basic test data and mocks""" - cls.local_user = models.User.objects.create_user( - "mouse@local.com", "mouse@mouse.com", "mouseword" + cls.user = models.User.objects.create_user( + "instance", + "instance@example.example", + "pass", + local=True, + localname="instance", + ) + + cls.group = Group.objects.create(name="editor") + cls.group.permissions.add( + Permission.objects.create( + name="edit_book", + codename="edit_book", + content_type=ContentType.objects.get_for_model(models.User), + ).id ) cls.book = models.Work.objects.create(title="test book") cls.series = models.Series.objects.create( - name="test series", user=cls.local_user + name="test series", user=cls.user, remote_id="https://example.com/series/1" ) cls.seriesbook = models.SeriesBook.objects.create( - book=cls.book, series=cls.series, user=cls.local_user + book=cls.book, + series=cls.series, + user=cls.user, + remote_id="https://example.com/seriesbook/1", ) models.SiteSettings.objects.create() @@ -38,7 +56,7 @@ def test_series_page(self): """there are so many views, this just makes sure it LOADS""" view = views.Series.as_view() request = self.factory.get("") - request.user = self.local_user + request.user = self.user result = view(request, self.series.id) self.assertIsInstance(result, TemplateResponse) validate_html(result.render()) @@ -49,18 +67,57 @@ def test_editseries_page(self): """there are so many views, this just makes sure it LOADS""" view = views.EditSeries.as_view() request = self.factory.get("") - request.user = self.local_user + request.user = self.user result = view(request, self.series.id) self.assertIsInstance(result, TemplateResponse) validate_html(result.render()) self.assertEqual(result.status_code, 200) + def test_post_editseries_page(self): + """posting edit data""" + + self.assertEqual(self.seriesbook.series_number, None) + self.assertEqual(len(self.series.alternative_names), 0) + + view = views.EditSeries.as_view() + form = forms.SeriesForm(instance=self.series) + form.data["user"] = self.user.id + form.data["name"] = "New Series Name" + form.data["alternative_names"] = ["beep", "boop"] + form.data[f"series_number-{self.book.id}"] = "99" + request = self.factory.post("", form.data) + + self.user.groups.add(self.group) + request.user = self.user + + view(request, self.series.id) + self.series.refresh_from_db() + self.seriesbook.refresh_from_db() + + self.assertEqual(self.series.name, "New Series Name") + self.assertEqual(len(self.series.alternative_names), 2) + self.assertEqual(self.series.alternative_names[0], "beep") + self.assertEqual(self.series.alternative_names[1], "boop") + self.assertEqual(self.seriesbook.series_number, "99") + def test_seriesbook_page_404s(self): """make sure it doesn't load for normal traffic""" view = views.SeriesBook.as_view() request = self.factory.get("") - request.user = self.local_user + request.user = self.user with self.assertRaises(Http404): + view(request, self.seriesbook.id) + + def test_seriesbook_api(self): + """there are so many views, this just makes sure it LOADS""" + view = views.SeriesBook.as_view() + request = self.factory.get("") + request.user = self.user + + with patch("bookwyrm.views.books.series.is_api_request") as is_api: + is_api.return_value = True result = view(request, self.seriesbook.id) + self.assertIsInstance(result, ActivitypubResponse) + self.assertEqual(result.status_code, 200) diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index a5803c8f25..b6c76ec83f 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -911,7 +911,7 @@ name="series", ), re_path( - rf"^series/(?P\d+)(.json)/?$", views.Series.as_view() + r"^series/(?P\d+)(.json)/?$", views.Series.as_view() ), # activitypub re_path( r"^series/(?P\d+)/edit/?$", diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index 4a5c90914b..f900dc08c2 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -62,24 +62,7 @@ def get(self, request, series_id=None): """edit page for series""" series = models.Series.objects.get(id=series_id) - seriesbooks = models.SeriesBook.objects.filter(series=series) - books = [] - for item in seriesbooks: - edition = item.book.work.default_edition - number = item.series_number or "" - books.append( - {"edition": edition, "number": number, "id": item.book.work.id} - ) - print({"edition": edition, "number": number, "id": item.book.work.id}) - - paginated = Paginator(books, PAGE_LENGTH) - page = paginated.get_page(request.GET.get("page")) - - data = { - "series": series, - "books": page, - "form": SeriesForm(instance=series), - } + data = {"series": series, "form": SeriesForm(instance=series)} return TemplateResponse(request, "book/edit/edit_series.html", data) @@ -87,23 +70,19 @@ def get(self, request, series_id=None): def post(self, request, series_id): """submit the series edit form""" - form = SeriesForm(request.POST) - data = {"form": form} + series = get_mergeable_object_or_404(models.Series, id=series_id) + form = SeriesForm(request.POST, instance=series) + data = {"series": series, "form": form} if not form.is_valid(): - # TODO do we need to persist seriesbook data also? - print("not valid") - print(form.errors) return TemplateResponse(request, "book/edit/edit_series.html", data) - instance = models.Series.objects.get(id=series_id) - form = SeriesForm(request.POST, instance=instance) series = form.save(request) - alt_titles = [] - for title in request.POST.getlist("alternative_names"): - if title != "": - alt_titles.append(title) - series.alternative_names = alt_titles + alt_names = [] + for a_name in request.POST.getlist("alternative_names"): + if a_name != "": + alt_names.append(a_name) + series.alternative_names = alt_names series.save(update_fields=["alternative_names"]) # update seriesbooks as needed @@ -123,6 +102,7 @@ class SeriesBook(View): @vary_on_headers("Accept") def get(self, request, seriesbook_id): """we just need this for resolving AP requests""" + seriesbook = get_mergeable_object_or_404(models.SeriesBook, id=seriesbook_id) if is_api_request(request): From 486a8aee283bcbfce313cb31f0c5f01fdf441f92 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Wed, 19 Nov 2025 15:37:58 +1100 Subject: [PATCH 171/962] add migration --- .../0224_series_mergedseries_seriesbook.py | 218 ++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 bookwyrm/migrations/0224_series_mergedseries_seriesbook.py diff --git a/bookwyrm/migrations/0224_series_mergedseries_seriesbook.py b/bookwyrm/migrations/0224_series_mergedseries_seriesbook.py new file mode 100644 index 0000000000..c0ad1cccd0 --- /dev/null +++ b/bookwyrm/migrations/0224_series_mergedseries_seriesbook.py @@ -0,0 +1,218 @@ +# Generated by Django 5.2.3 on 2025-11-19 04:37 + +import bookwyrm.models.activitypub_mixin +import bookwyrm.models.fields +import django.contrib.postgres.search +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0223_sitesettings_disable_federation"), + ] + + operations = [ + migrations.CreateModel( + name="Series", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("created_date", models.DateTimeField(auto_now_add=True)), + ("updated_date", models.DateTimeField(auto_now=True)), + ( + "remote_id", + bookwyrm.models.fields.RemoteIdField( + max_length=255, + null=True, + validators=[bookwyrm.models.fields.validate_remote_id], + ), + ), + ("origin_id", models.CharField(blank=True, max_length=255, null=True)), + ( + "openlibrary_key", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "finna_key", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "inventaire_id", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "librarything_key", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "goodreads_key", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "bnf_id", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "viaf", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "wikidata", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "asin", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "aasin", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "isfdb", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "search_vector", + django.contrib.postgres.search.SearchVectorField(null=True), + ), + ("name", bookwyrm.models.fields.TextField(max_length=255)), + ( + "alternative_names", + bookwyrm.models.fields.ArrayField( + base_field=models.CharField(max_length=255), + blank=True, + default=list, + size=None, + ), + ), + ( + "last_edited_by", + bookwyrm.models.fields.ForeignKey( + null=True, + on_delete=django.db.models.deletion.PROTECT, + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "user", + bookwyrm.models.fields.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="+", + to=settings.AUTH_USER_MODEL, + ), + ), + ], + options={ + "abstract": False, + }, + bases=(bookwyrm.models.activitypub_mixin.ObjectMixin, models.Model), + ), + migrations.CreateModel( + name="MergedSeries", + fields=[ + ("deleted_id", models.IntegerField(primary_key=True, serialize=False)), + ( + "merged_into", + models.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="absorbed", + to="bookwyrm.series", + ), + ), + ], + options={ + "abstract": False, + }, + ), + migrations.CreateModel( + name="SeriesBook", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("created_date", models.DateTimeField(auto_now_add=True)), + ("updated_date", models.DateTimeField(auto_now=True)), + ( + "remote_id", + bookwyrm.models.fields.RemoteIdField( + max_length=255, + null=True, + validators=[bookwyrm.models.fields.validate_remote_id], + ), + ), + ( + "series_number", + bookwyrm.models.fields.CharField( + blank=True, max_length=255, null=True + ), + ), + ( + "book", + bookwyrm.models.fields.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="seriesbooks", + to="bookwyrm.book", + ), + ), + ( + "series", + bookwyrm.models.fields.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="seriesbooks", + to="bookwyrm.series", + ), + ), + ( + "user", + bookwyrm.models.fields.ForeignKey( + on_delete=django.db.models.deletion.PROTECT, + related_name="+", + to=settings.AUTH_USER_MODEL, + ), + ), + ], + options={ + "abstract": False, + }, + bases=(bookwyrm.models.activitypub_mixin.ObjectMixin, models.Model), + ), + ] From 77d67e2eeefd21bf434a62020b3c39633ac97d9f Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Thu, 20 Nov 2025 11:25:58 +1100 Subject: [PATCH 172/962] use SearchVector in connectors - match to existing series using a search vector instead of exact matching - add series listing to author pages - clean up a few other details --- bookwyrm/connectors/abstract_connector.py | 56 ++++++++++++------- bookwyrm/connectors/inventaire.py | 10 ++-- bookwyrm/templates/author/author.html | 14 ++++- bookwyrm/templates/book/edit/edit_series.html | 4 ++ .../connectors/test_abstract_connector.py | 6 +- .../connectors/test_inventaire_connector.py | 8 +-- bookwyrm/views/author.py | 7 +++ bookwyrm/views/books/edit_book.py | 2 +- 8 files changed, 72 insertions(+), 35 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index dfe617fb3f..c6ecf646da 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -13,9 +13,10 @@ from requests.exceptions import RequestException import aiohttp +from django.contrib.postgres.search import SearchRank, SearchVector from django.core.files.base import ContentFile from django.db import transaction -from django.db.models import Q +from django.db.models import Q, Subquery from bookwyrm import activitypub, models, settings from bookwyrm.settings import USER_AGENT, INSTANCE_ACTOR_USERNAME @@ -123,44 +124,57 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use authors = work.authors.all().union(edition.authors.all()) # Inventaire series will be a list of activity strings - if work.series: - for data in json.loads(work.series): + if work.series and type(work.series) == list: + for data in work.series: series_data = models.Series(**data) series_to_process.append(series_data) - elif edition.series: + else: # otherwise it's just a a name - series_to_process.append(models.Series(name=edition.series)) - work.series_number = edition.series_number + name = work.series or edition.series + series_to_process.append(models.Series(name=name)) + work.series_number = work.series_number or edition.series_number for series in series_to_process: instance = None - possible_series = models.SeriesBook.objects.filter( - Q(series__name__iexact=series.name) - | Q(series__alternative_names__icontains=series.name) - | Q(series__alternative_names__in=series.alternative_names) + + vector = SearchVector("name", weight="A") + SearchVector( + "alternative_names", weight="B" + ) + possible_series = ( + models.Series.objects.annotate(search=vector) + .annotate(rank=SearchRank(vector, series.name, normalization=32)) + .filter( + rank__gt=0.19 + ) # short alias names like XY get rank around 0.1956 + # .prefetch_related("seriesbooks") + .order_by("-rank")[:5] ) if possible_series.exists(): - # there is probably a more efficient way to do this... - for seriesbook in possible_series.all(): - for author in seriesbook.book.authors.all(): - if author in authors.all(): - # we already have a series with same name - # and author, let's feel lucky - instance = seriesbook.series - break + for series in possible_series.all(): + books = models.Book.objects.filter( + authors__in=Subquery(authors.values("pk")) + ) + if models.SeriesBook.objects.filter(book__in=books).filter( + series=series + ): + # we already have a series name with matching author, let's feel lucky + instance = series + break if not instance: # leave it for the user to work out if work.series: edition.series = series.name - edition.series_number = json.loads(work.series)[0].get( - "series_number", "" - ) + edition.series_number = work.series_number edition.save() continue + edition.series = None + edition.series_number = None + edition.save() + activitydata_to_seriesbook( user=user, work=work, new=series, instance=instance ) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 55d17609f8..1f63cf3df5 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -267,16 +267,16 @@ def format_series(self, keys: Iterable[str]) -> list[dict]: else: alternative_names.add(v) - series["alternativeNames"] = list(alternative_names) - series["inventaireId"] = uri + series["alternative_names"] = list(alternative_names) + series["inventaire_id"] = uri series["wikidata"] = uri.split("wd:")[1] if series_data.get("wdt:P6947"): - series["goodreadsKey"] = series_data["wdt:P6947"][0] + series["goodreads_key"] = series_data["wdt:P6947"][0] if series_data.get("wdt:P1235"): series["isfdb"] = series_data["wdt:P1235"][0] if series_data.get("wdt:P8513"): - series["librarythingKey"] = series_data["wdt:P8513"][0] - series_list.append(json.dumps(series)) + series["librarything_key"] = series_data["wdt:P8513"][0] + series_list.append(series) return series_list diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index 043f3fa54d..cf8a970984 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -57,6 +57,18 @@

    {% trans "Author details" %}

    {{ author.died|naturalday }}
    {% endif %} + + {% if series %} +
    +
    {% trans "Series:" %}
    +
    + {% for s in series %} + {{ s.name }}{% if not forloop.last%},{% endif %} + {% endfor %} +
    +
    + + {% endif %} {% endif %} @@ -79,7 +91,7 @@

    {% trans "External links" %}

    {% trans "View on Wikidata" %} - {% endif %} + {% endif %} {% if author.website %}
    diff --git a/bookwyrm/templates/book/edit/edit_series.html b/bookwyrm/templates/book/edit/edit_series.html index b0d44016a4..f560cfd08c 100644 --- a/bookwyrm/templates/book/edit/edit_series.html +++ b/bookwyrm/templates/book/edit/edit_series.html @@ -19,6 +19,10 @@

    {% blocktrans with name=series.name %}Edit "{{ name }}"{% endblocktrans %}

    +{% for match in matches.all %} + {{match.name}} +{% endfor %} + {% csrf_token %} diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index e7e3693f48..a14b8c9cbe 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -182,7 +182,7 @@ def test_get_or_create_seriesbook_from_data(self): """do we make a seriesbook?""" work = models.Work.objects.create(title="Test Book") - work.series = json.dumps([{"name": "Test Series 1"}]) + work.series = [{"name": "Test Series 1"}] edition = self.book self.assertEqual(models.Series.objects.count(), 0) @@ -205,7 +205,7 @@ def test_get_or_create_seriesbook_from_existing_series(self): ) work = models.Work.objects.create(title="Test Book") - work.series = json.dumps([{"name": "Test Series 1"}]) + work.series = [{"name": "Test Series 1"}] edition = self.book edition.authors.add(author) @@ -229,7 +229,7 @@ def test_get_or_create_seriesbook_with_ambiguous_series(self): ) work = models.Work.objects.create(title="Test Book 2") - work.series = json.dumps([{"name": "Test Series 1"}]) + work.series = [{"name": "Test Series 1"}] edition = models.Edition.objects.create(title="Test Book 2") edition.authors.add(author) diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index b5558dbb21..278f93e42f 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -308,11 +308,11 @@ def test_format_series(self): ) formatted = self.connector.format_series(["wd:999"]) - data = json.loads(formatted[0]) + data = formatted[0] self.assertEqual(data["name"], "Série de Tests") - self.assertIsInstance(data["alternativeNames"], list) + self.assertIsInstance(data["alternative_names"], list) self.assertEqual(data["wikidata"], "999") - self.assertEqual(data["goodreadsKey"], "grk123") + self.assertEqual(data["goodreads_key"], "grk123") self.assertEqual(data["isfdb"], "isfdb123") - self.assertEqual(data["librarythingKey"], "ltk123") + self.assertEqual(data["librarything_key"], "ltk123") diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index 5ab9ff9f40..5f002cf484 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -42,10 +42,17 @@ def get(self, request, author_id, slug=None): .distinct() ) + series = ( + models.Series.objects.filter(seriesbooks__book__authors=author) + .order_by("created_date") + .distinct() + ) + paginated = Paginator(books, PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) data = { "author": author, + "series": series, "books": page, "page_range": paginated.get_elided_page_range( page.number, on_each_side=2, on_ends=1 diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index ab65e0841b..3851c17b1c 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -252,7 +252,7 @@ def add_series(request, data): matches = ( models.Series.objects.annotate(search=vector) .annotate(rank=SearchRank(vector, series, normalization=32)) - .filter(rank__gt=0.015) + .filter(rank__gt=0.019) .order_by("-rank")[:5] ) From dd189404b0f8536c4a4a5ce462605e124e3b23ee Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Thu, 20 Nov 2025 18:24:28 +1100 Subject: [PATCH 173/962] add management command and improve connector series matching --- bookwyrm/connectors/abstract_connector.py | 26 +++---- bookwyrm/connectors/inventaire.py | 1 - .../management/commands/upgrade_series.py | 77 +++++++++++++++++++ .../connectors/test_abstract_connector.py | 9 ++- 4 files changed, 94 insertions(+), 19 deletions(-) create mode 100644 bookwyrm/management/commands/upgrade_series.py diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index c6ecf646da..5385bef8e8 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -4,7 +4,6 @@ from typing import Optional, TypedDict, Any, Callable, Union, Iterator from urllib.parse import quote_plus -import json import logging import re import asyncio @@ -16,7 +15,7 @@ from django.contrib.postgres.search import SearchRank, SearchVector from django.core.files.base import ContentFile from django.db import transaction -from django.db.models import Q, Subquery +from django.db.models import Subquery from bookwyrm import activitypub, models, settings from bookwyrm.settings import USER_AGENT, INSTANCE_ACTOR_USERNAME @@ -124,7 +123,7 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use authors = work.authors.all().union(edition.authors.all()) # Inventaire series will be a list of activity strings - if work.series and type(work.series) == list: + if work.series and isinstance(work.series, list): for data in work.series: series_data = models.Series(**data) series_to_process.append(series_data) @@ -146,21 +145,20 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use .filter( rank__gt=0.19 ) # short alias names like XY get rank around 0.1956 - # .prefetch_related("seriesbooks") .order_by("-rank")[:5] ) if possible_series.exists(): - for series in possible_series.all(): - books = models.Book.objects.filter( - authors__in=Subquery(authors.values("pk")) - ) - if models.SeriesBook.objects.filter(book__in=books).filter( - series=series - ): - # we already have a series name with matching author, let's feel lucky - instance = series - break + books = models.Book.objects.filter( + authors__in=Subquery(authors.values("pk")) + ) + + if same_author_sb := models.SeriesBook.objects.filter( + book__in=books + ).filter(series__in=Subquery(possible_series.values("pk"))): + # there is already a series with a seriesbook by a matching author + # let's feel lucky + instance = same_author_sb.first().series if not instance: # leave it for the user to work out diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 1f63cf3df5..edd7807f23 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -1,5 +1,4 @@ """ inventaire data connector """ -import json import re from typing import Any, Union, Optional, Iterator, Iterable diff --git a/bookwyrm/management/commands/upgrade_series.py b/bookwyrm/management/commands/upgrade_series.py new file mode 100644 index 0000000000..e952317328 --- /dev/null +++ b/bookwyrm/management/commands/upgrade_series.py @@ -0,0 +1,77 @@ +"""fix legacy series""" + +from django.core.management.base import BaseCommand +from django.contrib.postgres.search import SearchRank, SearchVector +from django.db.models.functions import Length +from bookwyrm import activitypub +from bookwyrm.models import Book, Edition, Series, SeriesBook, User + + +def upgrade_series_data(): + """turn strings into things""" + + user = activitypub.get_representative() + series_count = Series.objects.count() + seriesbook_count = SeriesBook.objects.count() + + for book in ( + Edition.objects.filter(parent_work__seriesbooks=None).exclude(series=None).all() + ): + + vector = SearchVector("name", weight="A") + SearchVector( + "alternative_names", weight="B" + ) + possible_series = ( + Series.objects.annotate(search=vector) + .annotate(rank=SearchRank(vector, book.series, normalization=32)) + .filter(rank__gt=0.19) + .order_by("-rank")[:5] + ) + + if possible_series.exists(): + + books = Book.objects.filter(authors__in=Subquery(book.authors.values("pk"))) + + if same_author_sb := SeriesBook.objects.filter(book__in=books).filter( + series__in=Subquery(possible_series.values("pk")) + ): + # there is a series with a seriesbook by a matching author + # let's feel lucky + series = same_author_sb.first().series + + else: + # there might be a matching series but we don't know + # leave it for a user to work out manually + continue + else: + series = Series.objects.create(name=book.series, user=user) + + SeriesBook.objects.create( + series=series, + book=book.parent_work, + series_number=book.series_number, + user=user, + ) + + book.series = None + book.series_number = None + + # print how many things we created + new_series_count = Series.objects.count() + new_seriesbook_count = SeriesBook.objects.count() + net_series = new_series_count - series_count + net_books = new_seriesbook_count - seriesbook_count + + print("-------") + print(f"Created {net_series} new Series and {net_books} new SeriesBooks") + + +class Command(BaseCommand): + """Turn legacy series data into Series and SeriesBook objects""" + + help = "Turn legacy series data into Series and SeriesBook objects" + + # pylint: disable=no-self-use,unused-argument + def handle(self, *args, **options): + """run data migration""" + upgrade_series_data() diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index a14b8c9cbe..32b72de2e8 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -1,5 +1,5 @@ """ testing book data connectors """ -import json + from unittest.mock import patch from django.test import TestCase import responses @@ -206,8 +206,11 @@ def test_get_or_create_seriesbook_from_existing_series(self): work = models.Work.objects.create(title="Test Book") work.series = [{"name": "Test Series 1"}] - edition = self.book + edition = models.Edition.objects.create(title="Test Book 2") edition.authors.add(author) + self.book.authors.add(author) + edition.save() + self.book.save() self.assertEqual(models.Series.objects.count(), 1) self.assertEqual(models.SeriesBook.objects.count(), 1) @@ -220,7 +223,6 @@ def test_get_or_create_seriesbook_from_existing_series(self): def test_get_or_create_seriesbook_with_ambiguous_series(self): """do we get series info in the book when we can't match author?""" - author = models.Author.objects.create(name="Sammy") series = models.Series.objects.create( name="Test Series 1", user=self.local_user ) @@ -231,7 +233,6 @@ def test_get_or_create_seriesbook_with_ambiguous_series(self): work = models.Work.objects.create(title="Test Book 2") work.series = [{"name": "Test Series 1"}] edition = models.Edition.objects.create(title="Test Book 2") - edition.authors.add(author) self.assertEqual(models.Series.objects.count(), 1) self.assertEqual(models.SeriesBook.objects.count(), 1) From bfc8304bb6e023a0e9532c609086c17c29c73ddb Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Thu, 20 Nov 2025 18:43:38 +1100 Subject: [PATCH 174/962] fix upgrade_series admin command --- bookwyrm/management/commands/upgrade_series.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookwyrm/management/commands/upgrade_series.py b/bookwyrm/management/commands/upgrade_series.py index e952317328..102340915e 100644 --- a/bookwyrm/management/commands/upgrade_series.py +++ b/bookwyrm/management/commands/upgrade_series.py @@ -2,6 +2,7 @@ from django.core.management.base import BaseCommand from django.contrib.postgres.search import SearchRank, SearchVector +from django.db.models import Subquery from django.db.models.functions import Length from bookwyrm import activitypub from bookwyrm.models import Book, Edition, Series, SeriesBook, User @@ -55,6 +56,7 @@ def upgrade_series_data(): book.series = None book.series_number = None + book.save(broadcast=False) # print how many things we created new_series_count = Series.objects.count() From 57b70fdac90fa79f01f838df30199bde8ba261e7 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Fri, 21 Nov 2025 07:57:53 +1100 Subject: [PATCH 175/962] fix linters hopefully --- bookwyrm/connectors/abstract_connector.py | 10 +++++----- bookwyrm/connectors/inventaire.py | 2 +- bookwyrm/templates/book/series.html | 6 ++---- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 5385bef8e8..e885a9a261 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -125,12 +125,12 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use # Inventaire series will be a list of activity strings if work.series and isinstance(work.series, list): for data in work.series: - series_data = models.Series(**data) + series_data = models.Series(**data) # type: ignore series_to_process.append(series_data) else: # otherwise it's just a a name name = work.series or edition.series - series_to_process.append(models.Series(name=name)) + series_to_process.append(models.Series(name=name)) # type: ignore work.series_number = work.series_number or edition.series_number for series in series_to_process: @@ -158,9 +158,9 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use ).filter(series__in=Subquery(possible_series.values("pk"))): # there is already a series with a seriesbook by a matching author # let's feel lucky - instance = same_author_sb.first().series + instance = same_author_sb.first().series # type: ignore - if not instance: + else: # leave it for the user to work out if work.series: edition.series = series.name @@ -174,7 +174,7 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use edition.save() activitydata_to_seriesbook( - user=user, work=work, new=series, instance=instance + user=user, work=work, new=series, instance=instance # type: ignore ) @abstractmethod diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index edd7807f23..ed3e536e70 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -242,7 +242,7 @@ def get_remote_id_from_model(self, obj: models.BookDataModel) -> str: remote_id_value = obj.inventaire_id return self.get_remote_id(remote_id_value) - def format_series(self, keys: Iterable[str]) -> list[dict]: + def format_series(self, keys: Iterable[str]) -> list[dict[str, str]]: """resolve series data into activitypub data""" series_list = [] diff --git a/bookwyrm/templates/book/series.html b/bookwyrm/templates/book/series.html index 9d4d1bd62e..968bdbf28c 100644 --- a/bookwyrm/templates/book/series.html +++ b/bookwyrm/templates/book/series.html @@ -4,8 +4,6 @@ {% block title %}{{ series.name }}{% endblock %} {% block content %} - -
    {% with user_authenticated=request.user.is_authenticated can_edit_book=perms.bookwyrm.edit_book %} {% if user_authenticated and can_edit_book %} @@ -24,7 +22,6 @@

    {{ series.name }}

    {% include 'snippets/authors.html' with book=series_authors limit=5 %}

    {% endif %} - {% endwith %}
    {% if series.alternative_names%} @@ -64,7 +61,7 @@

    {% trans "Identifiers" %}

    {% endif %}
    -
    +
    {% for seriesbook in series.seriesbooks.all %} @@ -78,5 +75,6 @@

    {% trans "Identifiers" %}

    {% endfor %} + {% endwith %} {% endblock %} From ece395fbc5db57160f6701d64fea89cd948aae3c Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Fri, 21 Nov 2025 10:53:13 +1100 Subject: [PATCH 176/962] fix is_api_request This addresses a CodeQL error about unsafe regex. '.*' matches anything, which leaves us open to DDoS attacks. This fix matches anything that isn't whitespace, up to 100 characters. As we're only matching the path after the domain, this should be plenty. --- bookwyrm/views/helpers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index aa8c254299..33a492e8b1 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -49,7 +49,7 @@ def get_user_from_username(viewer, username): def is_api_request(request): """check whether a request is asking for html or data""" is_api = "json" in request.headers.get("Accept", "") or re.match( - r".*\.json/?$", request.path + r"\S{1,100}\.json/?$", request.path ) if is_api: From 304d71f416027cba5ec77c00245abc08fc5c6321 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 20 Nov 2025 21:52:59 -0800 Subject: [PATCH 177/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index dc0fec796c..90afbfa503 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-16 19:34\n" +"PO-Revision-Date: 2025-11-21 05:52\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -79,7 +79,7 @@ msgstr "Vartotojas su šiuo el. pašto adresu jau yra." #: bookwyrm/forms/landing.py:69 msgid "This email address cannot be registered." -msgstr "" +msgstr "Šiuo el. pašto adresu negalima registruotis." #: bookwyrm/forms/landing.py:114 msgid "Password cannot be the same as your current password" From 829f872c2ebf916aff9e266028eaf29d002b9f4e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 20 Nov 2025 22:53:06 -0800 Subject: [PATCH 178/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 106 ++++++++++++++--------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 90afbfa503..ff54f09767 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-21 05:52\n" +"PO-Revision-Date: 2025-11-21 06:53\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -75,7 +75,7 @@ msgstr "Toks naudotojo vardas jau egzistuoja" #: bookwyrm/forms/landing.py:65 msgid "A user with this email already exists." -msgstr "Vartotojas su šiuo el. pašto adresu jau yra." +msgstr "Naudotojas su šiuo el. pašto adresu jau yra." #: bookwyrm/forms/landing.py:69 msgid "This email address cannot be registered." @@ -83,7 +83,7 @@ msgstr "Šiuo el. pašto adresu negalima registruotis." #: bookwyrm/forms/landing.py:114 msgid "Password cannot be the same as your current password" -msgstr "" +msgstr "Naujasis slaptažodis turi skirtis nuo esamojo" #: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" @@ -201,12 +201,12 @@ msgstr "Knyga minkštais viršeliais" #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 #, python-format msgid "%(value)s doesn't look like an ISBN" -msgstr "" +msgstr "„%(value)s“ neatrodo kaip ISBN kodas" #: bookwyrm/models/book.py:515 bookwyrm/models/book.py:555 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" -msgstr "" +msgstr "Kode „%(value)s“ ISBN kontrolinis skaitmuo klaidingas – tikėtasi „%(check_version)s“" #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:84 #: bookwyrm/templates/settings/reports/report.html:115 @@ -239,28 +239,28 @@ msgstr "Blokuoti" #: bookwyrm/models/bookwyrm_import_job.py:398 msgid "Unknown error importing book" -msgstr "" +msgstr "Netikėta klaida importuojant knygą" #: bookwyrm/models/bookwyrm_import_job.py:496 msgid "unauthorized" -msgstr "" +msgstr "neleista" #: bookwyrm/models/bookwyrm_import_job.py:502 msgid "Unknown error importing book status" -msgstr "" +msgstr "Netikėta klaida importuojant knygos būseną" #: bookwyrm/models/bookwyrm_import_job.py:696 #: bookwyrm/models/bookwyrm_import_job.py:722 msgid "connection_error" -msgstr "" +msgstr "ryšio_klaida" #: bookwyrm/models/bookwyrm_import_job.py:732 msgid "invalid_relationship" -msgstr "" +msgstr "netinkamas_sąryšis" #: bookwyrm/models/bookwyrm_import_job.py:740 msgid "Unkown error importing relationship" -msgstr "" +msgstr "Netikėta klaida importuojant sąryšį" #: bookwyrm/models/federated_server.py:11 #: bookwyrm/templates/settings/federation/edit_instance.html:55 @@ -331,11 +331,11 @@ msgstr "Privatu" #: bookwyrm/models/housekeeping.py:116 msgid "Missing" -msgstr "" +msgstr "Nerasta" #: bookwyrm/models/housekeeping.py:117 msgid "Wrong Path" -msgstr "" +msgstr "Blogas kelias" #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 @@ -379,7 +379,7 @@ msgstr "Nepavyko rasti tokios knygos" #: bookwyrm/models/job.py:22 #: bookwyrm/templates/import/user_import_status.html:69 msgid "Failed" -msgstr "" +msgstr "Nepavyko" #: bookwyrm/models/link.py:55 msgid "Free" @@ -396,75 +396,75 @@ msgstr "Galima pasiskolinti" #: bookwyrm/models/link.py:74 #: bookwyrm/templates/settings/link_domains/link_domains.html:23 msgid "Approved" -msgstr "Patvirtinti puslapiai" +msgstr "Patvirtinti" #: bookwyrm/models/report.py:85 msgid "Resolved report" -msgstr "" +msgstr "Pranešimas išspręstas" #: bookwyrm/models/report.py:86 msgid "Re-opened report" -msgstr "" +msgstr "Pranešimas atidarytas pakartotinai" #: bookwyrm/models/report.py:87 msgid "Messaged reporter" -msgstr "" +msgstr "Žinutė pranešėjui" #: bookwyrm/models/report.py:88 msgid "Messaged reported user" -msgstr "" +msgstr "Žinutė naudotojui, apie kurį pranešta" #: bookwyrm/models/report.py:89 msgid "Suspended user" -msgstr "" +msgstr "Naudotojas laikinai užblokuotas" #: bookwyrm/models/report.py:90 msgid "Un-suspended user" -msgstr "" +msgstr "Naudotojas atblokuotas" #: bookwyrm/models/report.py:91 msgid "Changed user permission level" -msgstr "" +msgstr "Pakeistos naudotojo teisių lygmuo" #: bookwyrm/models/report.py:92 msgid "Deleted user account" -msgstr "" +msgstr "Pašalinta naudotojo paskyra" #: bookwyrm/models/report.py:93 msgid "Blocked domain" -msgstr "" +msgstr "Domenas užblokuotas" #: bookwyrm/models/report.py:94 msgid "Approved domain" -msgstr "" +msgstr "Domenas patvirtintas" #: bookwyrm/models/report.py:95 msgid "Deleted item" -msgstr "" +msgstr "Elementas pašalintas" #: bookwyrm/models/session.py:42 msgid "Unknown" -msgstr "" +msgstr "Nežinomas" #: bookwyrm/models/status.py:192 #, python-format msgid "%(display_name)s's status" -msgstr "" +msgstr "%(display_name)s – būsena" #: bookwyrm/models/status.py:367 #, python-format msgid "%(display_name)s's comment on %(book_title)s" -msgstr "" +msgstr "%(display_name)s – knygos „%(book_title)s“ komentaras" #: bookwyrm/models/status.py:418 #, python-format msgid "%(display_name)s's quote from %(book_title)s" -msgstr "" +msgstr "%(display_name)s – knygos „%(book_title)s“ citata" #: bookwyrm/models/status.py:454 #, python-format msgid "%(display_name)s's review of %(book_title)s" -msgstr "" +msgstr "%(display_name)s – knygos „%(book_title)s“ recenzija" #: bookwyrm/models/status.py:486 #, python-format @@ -473,7 +473,7 @@ msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" msgstr[2] "" -msgstr[3] "" +msgstr[3] "%(display_name)s įvertino knygą „%(book_title)s“ %(display_rating).1f žvaigždučių" #: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" @@ -546,7 +546,7 @@ msgstr "Italų (Italian)" #: bookwyrm/settings.py:324 msgid "한국어 (Korean)" -msgstr "" +msgstr "한국어 (korėjiečių)" #: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" @@ -562,7 +562,7 @@ msgstr "Lietuvių" #: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" -msgstr "" +msgstr "Nederlands (Olandų)" #: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" @@ -590,7 +590,7 @@ msgstr "Svenska (Švedų)" #: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" -msgstr "" +msgstr "Українська (Ukrainiečių)" #: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" @@ -602,7 +602,7 @@ msgstr "繁體中文 (Tradicinė kinų)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "O, ne!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" @@ -611,11 +611,11 @@ msgstr "Prieiga draudžiama" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Jums nesuteiktos teisės matyti šį tinklalapį ar atlikti veiksmą. Jūsų naudotojo teisių lygmuo yra %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Jei manote, kad prieigą turėti turėtumėte, susisiekite su savo „BookWyrm“ serverio administratoriumi." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" @@ -627,11 +627,11 @@ msgstr "Jūsų ieškomas puslapis neegzistuoja." #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Failas per didelis" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "Mėginamas įkelit failas yra per didelis." #: bookwyrm/templates/413.html:11 msgid "You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting." @@ -724,7 +724,7 @@ msgstr "Rekvizitai" #: bookwyrm/templates/about/layout.html:11 msgid "Active users:" -msgstr "Aktyvūs vartotojai:" +msgstr "Aktyvūs naudotojai:" #: bookwyrm/templates/about/layout.html:15 msgid "Statuses posted:" @@ -1682,7 +1682,7 @@ msgstr "Veiksmai" #: bookwyrm/templates/book/file_links/edit_links.html:48 #: bookwyrm/templates/settings/link_domains/link_table.html:21 msgid "Unknown user" -msgstr "Nežinomas vartotojas" +msgstr "Nežinomas naudotojas" #: bookwyrm/templates/book/file_links/edit_links.html:57 #: bookwyrm/templates/book/file_links/verification_modal.html:22 @@ -2202,7 +2202,7 @@ msgstr "Ką sekti" #: bookwyrm/templates/feed/suggested_users.html:9 msgid "Don't show suggested users" -msgstr "Nerodyti siūlomų vartotojų" +msgstr "Nerodyti siūlomų naudotojų" #: bookwyrm/templates/feed/suggested_users.html:14 msgid "View directory" @@ -2373,7 +2373,7 @@ msgstr "Jūsų paskyra atsiras kataloge ir gali būti rekomenduota kitiems „Bo #: bookwyrm/templates/get_started/users.html:8 msgid "You can follow users on other BookWyrm instances and federated services like Mastodon." -msgstr "Galite sekti vartotojus iš kitų BookWyrm serverių ar federacijos programų, tokių kaip Mastodon." +msgstr "Galite sekti naudotojus iš kitų „BookWyrm“ serverių ir federuotų tarnybų, kaip antai „Mastodon“." #: bookwyrm/templates/get_started/users.html:11 msgid "Search for a user" @@ -4563,7 +4563,7 @@ msgstr "Paskyra taps paslėpta, tačiau prisijungus prie saito bus galima aktyvu #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Deactivate Account" -msgstr "Išjungti vartotojo vardą" +msgstr "Išjungti paskyrą" #: bookwyrm/templates/preferences/delete_user.html:26 msgid "Permanently delete account" @@ -4589,7 +4589,7 @@ msgstr "Išjungti dviejų lygių autentifikavimą" #: bookwyrm/templates/preferences/disable-2fa.html:14 msgid "Disabling 2FA will allow anyone with your username and password to log in to your account." -msgstr "Išjungus 2FA bet kas, žinantis vartotojo vardą ir slaptažodį, galės prisijungti prie paskyros." +msgstr "Išjungus 2FA bet kas, žinantis naudotojo vardą ir slaptažodį, galės prisijungti prie paskyros." #: bookwyrm/templates/preferences/disable-2fa.html:20 msgid "Turn off 2FA" @@ -6014,7 +6014,7 @@ msgstr "Apriboti importo skaičių" #: bookwyrm/templates/settings/imports/imports.html:75 msgid "Some users might try to import a large number of books, which you want to limit." -msgstr "Kai kurie vartotojai gali pabandyti importuoti daug knygų, ko galbūt nenorima." +msgstr "Kai kurie naudotojai gali bandyti importuoti daug knygų, ko galbūt nenorima." #: bookwyrm/templates/settings/imports/imports.html:76 #: bookwyrm/templates/settings/imports/imports.html:135 @@ -6092,7 +6092,7 @@ msgstr "" #: bookwyrm/templates/settings/imports/imports.html:198 #: bookwyrm/templates/settings/imports/imports.html:288 msgid "User" -msgstr "Vartotojas" +msgstr "Naudotojas" #: bookwyrm/templates/settings/imports/imports.html:207 #: bookwyrm/templates/settings/imports/imports.html:297 @@ -6734,7 +6734,7 @@ msgstr "" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 msgid "Permanently delete user" -msgstr "Visam laikui ištrinti vartotoją" +msgstr "Visam laikui pašalinti naudotoją" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format @@ -6780,7 +6780,7 @@ msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format msgid "Users: %(instance_name)s" -msgstr "Vartotojai: %(instance_name)s" +msgstr "Naudotojai: %(instance_name)s" #: bookwyrm/templates/settings/users/user_admin.html:29 msgid "Deleted users" @@ -6789,7 +6789,7 @@ msgstr "Ištrinti naudotojus" #: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" -msgstr "Vartotojo vardas" +msgstr "Naudotojo vardas" #: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" @@ -6830,7 +6830,7 @@ msgstr "Nutolęs" #: bookwyrm/templates/settings/users/user_info.html:51 msgid "User details" -msgstr "Vartotojo duomenys" +msgstr "Naudotojo duomenys" #: bookwyrm/templates/settings/users/user_info.html:55 msgid "Email:" @@ -6890,7 +6890,7 @@ msgstr "" #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" -msgstr "Įjungti vartotoją" +msgstr "Įjungti naudotoją" #: bookwyrm/templates/settings/users/user_moderation_actions.html:41 msgid "Suspend user" From 2e86dd775031a6d24e3baea5716870b5dc2f90ff Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 21 Nov 2025 00:29:30 -0800 Subject: [PATCH 179/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index ff54f09767..701944bc5c 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-21 06:53\n" +"PO-Revision-Date: 2025-11-21 08:29\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -635,7 +635,7 @@ msgstr "Mėginamas įkelit failas yra per didelis." #: bookwyrm/templates/413.html:11 msgid "You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting." -msgstr "" +msgstr "Pamėginkite įkelti mažesnį failą arba susisiekite su savo „BookWyrm“ administratoriumi, kad šis padidintų DATA_UPLOAD_MAX_MEMORY_SIZE parametro reikšmę." #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -930,7 +930,7 @@ msgstr "Wikipedia" #: bookwyrm/templates/author/author.html:79 msgid "View on Wikidata" -msgstr "" +msgstr "Žiūrėti „Wikidata“ įrašą" #: bookwyrm/templates/author/author.html:87 msgid "Website" @@ -1022,7 +1022,7 @@ msgstr "Nuoroda į wikipediją:" #: bookwyrm/templates/author/edit_author.html:58 msgid "Wikidata:" -msgstr "" +msgstr "Wikidata:" #: bookwyrm/templates/author/edit_author.html:62 msgid "Website:" @@ -1156,7 +1156,7 @@ msgstr "Spustelėkite padidinti" #: bookwyrm/templates/book/book.html:190 msgid "View on Finna" -msgstr "" +msgstr "Žiūrėti „Finna“ įrašą" #: bookwyrm/templates/book/book.html:222 #, python-format @@ -1263,11 +1263,11 @@ msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:12 #: bookwyrm/templates/book/book_identifiers.html:13 msgid "Copy ISBN" -msgstr "" +msgstr "Kopijuoti ISBN kodą" #: bookwyrm/templates/book/book_identifiers.html:16 msgid "Copied ISBN!" -msgstr "" +msgstr "ISBN kodas nukopijuotas!" #: bookwyrm/templates/book/book_identifiers.html:23 #: bookwyrm/templates/book/edit/edit_book_form.html:354 @@ -1301,7 +1301,7 @@ msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 #: bookwyrm/templates/book/edit/edit_book_form.html:390 msgid "Finna ID:" -msgstr "" +msgstr "Finna ID:" #: bookwyrm/templates/book/cover_add_modal.html:5 msgid "Add cover" @@ -1315,7 +1315,7 @@ msgstr "Įkelti viršelį:" #: bookwyrm/templates/book/cover_add_modal.html:23 #: bookwyrm/templates/book/edit/edit_book_form.html:252 msgid "Load cover from URL:" -msgstr "" +msgstr "Įkelti viršelį iš URL:" #: bookwyrm/templates/book/cover_show_modal.html:6 msgid "Book cover preview" @@ -1574,7 +1574,7 @@ msgstr "Knygos %(book_title)s leidimai" #: bookwyrm/templates/book/editions/editions.html:8 #, python-format msgid "Editions of %(work_title)s" -msgstr "" +msgstr "„%(work_title)s“ leidimai" #: bookwyrm/templates/book/editions/editions.html:55 msgid "Can't find the edition you're looking for?" @@ -1778,15 +1778,15 @@ msgstr "Duomenų įkėlimas prisijungs prie %(source_name)s ir #: bookwyrm/templates/compose.html:7 bookwyrm/templates/compose.html:21 msgid "Edit review" -msgstr "" +msgstr "Redaguoti recenziją" #: bookwyrm/templates/compose.html:9 bookwyrm/templates/compose.html:23 msgid "Edit quote" -msgstr "" +msgstr "Redaguoti citatą" #: bookwyrm/templates/compose.html:11 bookwyrm/templates/compose.html:25 msgid "Edit comment" -msgstr "" +msgstr "Redaguoti komentarą" #: bookwyrm/templates/compose.html:13 bookwyrm/templates/compose.html:27 msgid "Edit status" @@ -2047,7 +2047,7 @@ msgstr "Prisijungti dabar" #: bookwyrm/templates/email/invite/html_content.html:15 #, python-format msgid "Learn more about %(site_name)s." -msgstr "" +msgstr "Sužinokite apie „%(site_name)s“ daugiau." #: bookwyrm/templates/email/invite/text_content.html:4 #, python-format @@ -2503,7 +2503,7 @@ msgstr "Vadovas" #: bookwyrm/templates/groups/user_groups.html:35 msgid "No groups found." -msgstr "" +msgstr "Jokių grupių nerasta." #: bookwyrm/templates/guided_tour/book.html:10 msgid "This is home page of a book. Let's see what you can do while you're here!" From 1a1a56488cbcbb699d04d43a7ed040b26836fb85 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 22 Nov 2025 00:50:34 -0800 Subject: [PATCH 180/962] New translations django.po (Catalan) --- locale/ca_ES/LC_MESSAGES/django.po | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/locale/ca_ES/LC_MESSAGES/django.po b/locale/ca_ES/LC_MESSAGES/django.po index bafb7262b9..b12af13c7a 100644 --- a/locale/ca_ES/LC_MESSAGES/django.po +++ b/locale/ca_ES/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-17 21:31\n" +"PO-Revision-Date: 2025-11-22 08:50\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -5903,19 +5903,19 @@ msgstr "Corregeix les rutes de fitxer trencades dels fitxers d'imatges de cobert #: bookwyrm/templates/settings/files.html:299 msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." -msgstr "" +msgstr "Si heu perdut els fitxers d'imatge de portada (per ex. a causa d'una fallada en la migració del servidor), la tasca programada anterior no els reemplaçarà. Executeu aquesta tasca en lloc d'intentar trobar les portades per als llibres, on la ruta cap al fitxer de portada actual no condueix cap al fitxer." #: bookwyrm/templates/settings/files.html:306 msgid "This job cannot be scheduled to run regularly" -msgstr "" +msgstr "Aquesta tasca no pot ser programada per activar-se regularment" #: bookwyrm/templates/settings/files.html:320 msgid "Editions checked" -msgstr "" +msgstr "Edicions comprovades" #: bookwyrm/templates/settings/files.html:321 msgid "Covers fixed" -msgstr "" +msgstr "Cobertes arreglades" #: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" @@ -6219,7 +6219,7 @@ msgstr "Gestiona usuaris" #: bookwyrm/templates/settings/users/force_password_reset.html:7 #: bookwyrm/templates/settings/users/force_password_reset.html:11 msgid "Force Password Reset" -msgstr "" +msgstr "Força el restabliment de la contrasenya" #: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" @@ -6689,43 +6689,43 @@ msgstr "Suprimeix l'usuari de manera permanent" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." -msgstr "" +msgstr "Estàs segur de voler esborrar el compte %(username)s? Això no pot desfer-se." #: bookwyrm/templates/settings/users/delete_user_form.html:18 msgid "I understand that this is a permanent action:" -msgstr "" +msgstr "Entenc que aquesta acció és permanent:" #: bookwyrm/templates/settings/users/force_password_reset.html:17 msgid "All users in the selected category will be logged out and required to set a new password to log back in." -msgstr "" +msgstr "Tots els usuaris de la categoria seleccionada hauran de tancar la sessió i establir una nova contrasenya per tornar a iniciar la sessió." #: bookwyrm/templates/settings/users/force_password_reset.html:18 msgid "If your account is in the group, you will be logged out out after submitting." -msgstr "" +msgstr "Si el vostre compte és al grup, se us tancarà la sessió després de l'enviament." #: bookwyrm/templates/settings/users/force_password_reset.html:22 msgid "Users given password resets:" -msgstr "" +msgstr "S'ha reinicialitzat la contrasenya pels usuaris:" #: bookwyrm/templates/settings/users/force_password_reset.html:35 msgid "All users" -msgstr "" +msgstr "Tots els usuaris" #: bookwyrm/templates/settings/users/force_password_reset.html:39 msgid "users" -msgstr "" +msgstr "usuaris" #: bookwyrm/templates/settings/users/force_password_reset.html:43 msgid "Force password reset" -msgstr "" +msgstr "Força el restabliment de contrasenya" #: bookwyrm/templates/settings/users/force_password_reset.html:48 msgid "Number of users that will be effected:" -msgstr "" +msgstr "Quantitat d'usuaris que en seran afectats:" #: bookwyrm/templates/settings/users/force_password_reset.html:53 msgid "Are you sure you want to force password reset for these users:" -msgstr "" +msgstr "Estàs segur que vols forçar el restabliment de la contrasenya per aquests usuaris:" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format From dc127348de21473f5cee7645cb42f610a415d672 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 23 Nov 2025 04:32:07 -0800 Subject: [PATCH 181/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 701944bc5c..0484f0267e 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-21 08:29\n" +"PO-Revision-Date: 2025-11-23 12:32\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -2750,7 +2750,7 @@ msgstr "Brūkšninio kodo skaitytuvas" #: bookwyrm/templates/guided_tour/home.html:102 msgid "Use the Lists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" -msgstr "" +msgstr "Naudokitės nuorodomis Sąrašai, Atraskite ir Mano knygos skaitinių pasiūlymams ir naujausiems įrašams šiame serveryje atrasti bei knygų katalogui apžvelgti!" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" @@ -2782,7 +2782,7 @@ msgstr "Pranešimai" #: bookwyrm/templates/guided_tour/home.html:200 msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." -msgstr "" +msgstr "Savo profilį, asmeninį sąrašą, tiesiogines žinutes ir nuostatas galite pasiekti, spustelėdami savo vardą šiame meniu." #: bookwyrm/templates/guided_tour/home.html:200 msgid "Try selecting Profile from the drop down menu to continue the tour." @@ -3033,7 +3033,7 @@ msgstr "Šioje grotžymėje nėra aktyvumo!" #: bookwyrm/templates/import/import.html:6 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" -msgstr "" +msgstr "Importuoti knygų sąrašą" #: bookwyrm/templates/import/import.html:12 msgid "Not a valid CSV file" @@ -3046,7 +3046,7 @@ msgid_plural "Currently, you are allowed to import %(display_size)s books every msgstr[0] "" msgstr[1] "" msgstr[2] "" -msgstr[3] "" +msgstr[3] "Šiuo metu jums leidžiama importuoti po %(display_size)s knygų kas %(import_limit_reset)s d." #: bookwyrm/templates/import/import.html:26 #, python-format From 563a568d8c6d60c58569f83f2e481732a82eedc0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 23 Nov 2025 05:27:30 -0800 Subject: [PATCH 182/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 0484f0267e..9e5827f3d6 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-23 12:32\n" +"PO-Revision-Date: 2025-11-23 13:27\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -464,7 +464,7 @@ msgstr "%(display_name)s – knygos „%(book_title)s“ citata" #: bookwyrm/models/status.py:454 #, python-format msgid "%(display_name)s's review of %(book_title)s" -msgstr "%(display_name)s – knygos „%(book_title)s“ recenzija" +msgstr "%(display_name)s – knygos „%(book_title)s“ apžvalga" #: bookwyrm/models/status.py:486 #, python-format @@ -1778,7 +1778,7 @@ msgstr "Duomenų įkėlimas prisijungs prie %(source_name)s ir #: bookwyrm/templates/compose.html:7 bookwyrm/templates/compose.html:21 msgid "Edit review" -msgstr "Redaguoti recenziją" +msgstr "Redaguoti apžvalgą" #: bookwyrm/templates/compose.html:9 bookwyrm/templates/compose.html:23 msgid "Edit quote" @@ -3051,7 +3051,7 @@ msgstr[3] "Šiuo metu jums leidžiama importuoti po %(display_size)s knygų kas #: bookwyrm/templates/import/import.html:26 #, python-format msgid "You have %(display_left)s left." -msgstr "" +msgstr "Jūsų neišnaudotas likutis – %(display_left)s." #: bookwyrm/templates/import/import.html:33 #: bookwyrm/templates/import/import_user.html:40 @@ -3087,7 +3087,7 @@ msgstr "OpenLibrary (CSV)" #: bookwyrm/templates/import/import.html:70 msgid "OpenReads (CSV)" -msgstr "" +msgstr "„OpenReads“ (CSV)" #: bookwyrm/templates/import/import.html:73 msgid "Calibre (CSV)" @@ -3095,7 +3095,7 @@ msgstr "Calibre (CSV)" #: bookwyrm/templates/import/import.html:76 msgid "BookWyrm (CSV)" -msgstr "" +msgstr "„BookWyrm“ (CSV)" #: bookwyrm/templates/import/import.html:82 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." @@ -3112,11 +3112,11 @@ msgstr "Įtraukti atsiliepimus" #: bookwyrm/templates/import/import.html:104 msgid "Create new shelves if they do not exist" -msgstr "" +msgstr "Jeigu tinkamos lentynos nėra, galite sukurti naują" #: bookwyrm/templates/import/import.html:109 msgid "Privacy setting for imported reviews and shelves:" -msgstr "" +msgstr "Importuojamų apžvalgų ir lentynų privatumas:" #: bookwyrm/templates/import/import.html:116 #: bookwyrm/templates/import/import.html:118 @@ -3309,41 +3309,41 @@ msgstr "Atnaujinti importą" #: bookwyrm/templates/import/import_user.html:6 #: bookwyrm/templates/preferences/layout.html:51 msgid "Import BookWyrm Account" -msgstr "" +msgstr "Importuoti „BookWyrm“ paskyrą" #: bookwyrm/templates/import/import_user.html:13 msgid "Not a valid import file" -msgstr "" +msgstr "Šis failas netinkamas importui" #: bookwyrm/templates/import/import_user.html:18 msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." -msgstr "" +msgstr "Jei norite numigruoti įrašus (komentarus, apžvalgas ar citatas), pirma turite arba nurodyti šią paskyrą kaip paskyros, iš kurios migruojate, pseudonimą, arba perkelti paskyrą į šią, prieš importuodami naudotojo duomenis." #: bookwyrm/templates/import/import_user.html:32 #, python-format msgid "Currently you are allowed to import one user every %(hours)s hours." -msgstr "" +msgstr "Šiuo metu jums leidžiama importuoti vieną paskyrą kas %(hours)s val." #: bookwyrm/templates/import/import_user.html:33 #, python-format msgid "You will next be able to import a user file at %(next_time)s" -msgstr "" +msgstr "Kitąkart paskyrą galėsite importuoti %(next_time)s" #: bookwyrm/templates/import/import_user.html:56 msgid "Step 1:" -msgstr "" +msgstr "Pirmas žingsnis:" #: bookwyrm/templates/import/import_user.html:58 msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." -msgstr "" +msgstr "Parinkite eksporto failą, sugeneruotą naudojantis kita „BookWyrm“ paskyra. Failo prievardis turėtų būti .tar.gz." #: bookwyrm/templates/import/import_user.html:73 msgid "Step 2:" -msgstr "" +msgstr "Antras žingnis:" #: bookwyrm/templates/import/import_user.html:75 msgid "Deselect any checkboxes for data you do not wish to include in your import." -msgstr "" +msgstr "Nuimkite žymėjimą nuo varnelių ties tais duomenimis, kurių nenorite importuoti." #: bookwyrm/templates/import/import_user.html:86 #: bookwyrm/templates/preferences/export-user.html:21 @@ -3355,11 +3355,11 @@ msgstr "Nario paskyra" #: bookwyrm/templates/import/import_user.html:89 msgid "Overwrites display name, summary, and avatar" -msgstr "" +msgstr "Bus perrašytas rodomas vardas, prisistatymas ir avataras" #: bookwyrm/templates/import/import_user.html:95 msgid "User settings" -msgstr "" +msgstr "Naudotojo nustatymai" #: bookwyrm/templates/import/import_user.html:98 msgid "Overwrites:" From 3b12c2c49fe67ddc0718622412b18e58955c86a5 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 23 Nov 2025 06:35:16 -0800 Subject: [PATCH 183/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 108 ++++++++++++++--------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 9e5827f3d6..53da2377f3 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-23 13:27\n" +"PO-Revision-Date: 2025-11-23 14:35\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -1442,7 +1442,7 @@ msgstr "Pavadinimas:" #: bookwyrm/templates/book/edit/edit_book_form.html:36 msgid "Sort Title:" -msgstr "" +msgstr "Pavadinimas rikiavimo tikslais:" #: bookwyrm/templates/book/edit/edit_book_form.html:46 msgid "Subtitle:" @@ -2028,7 +2028,7 @@ msgstr "Labas!" #: bookwyrm/templates/email/html_layout.html:21 #, python-format msgid "BookWyrm hosted on %(site_name)s" -msgstr "" +msgstr "Svetainė „%(site_name)s“, veikianti „BookWyrm“ pagrindu" #: bookwyrm/templates/email/html_layout.html:23 msgid "Email preference" @@ -3043,9 +3043,9 @@ msgstr "Netinkamas CSV failas" #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Šiuo metu jums leidžiama importuoti po %(display_size)s knygą kas %(import_limit_reset)s d." +msgstr[1] "Šiuo metu jums leidžiama importuoti po %(display_size)s knygas kas %(import_limit_reset)s d." +msgstr[2] "Šiuo metu jums leidžiama importuoti po %(display_size)s knygų kas %(import_limit_reset)s d." msgstr[3] "Šiuo metu jums leidžiama importuoti po %(display_size)s knygų kas %(import_limit_reset)s d." #: bookwyrm/templates/import/import.html:26 @@ -3355,7 +3355,7 @@ msgstr "Nario paskyra" #: bookwyrm/templates/import/import_user.html:89 msgid "Overwrites display name, summary, and avatar" -msgstr "Bus perrašytas rodomas vardas, prisistatymas ir avataras" +msgstr "Perrašyti rodomą vardą, prisistatymą ir avatarą" #: bookwyrm/templates/import/import_user.html:95 msgid "User settings" @@ -3363,79 +3363,79 @@ msgstr "Naudotojo nustatymai" #: bookwyrm/templates/import/import_user.html:98 msgid "Overwrites:" -msgstr "" +msgstr "Perrašyti šias parinktis:" #: bookwyrm/templates/import/import_user.html:101 msgid "Whether manual approval is required for other users to follow your account" -msgstr "" +msgstr "Ar, norint sekti jūsų paskyrą, būtina iš jūsų gauti patvirtinimą" #: bookwyrm/templates/import/import_user.html:104 msgid "Whether following/followers are shown on your profile" -msgstr "" +msgstr "Ar jūsų profilyje rodomi sekamų narių ir sekėjų skaičiai" #: bookwyrm/templates/import/import_user.html:107 msgid "Whether your reading goal is shown on your profile" -msgstr "" +msgstr "Ar jūsų profilyje rodomas jūsų skaitymo tikslas" #: bookwyrm/templates/import/import_user.html:110 msgid "Whether you see user follow suggestions" -msgstr "" +msgstr "Ar jums rodomi pasiūlymai ką sekti" #: bookwyrm/templates/import/import_user.html:113 msgid "Whether your account is suggested to others" -msgstr "" +msgstr "Ar jūsų paskyra siūloma sekti kitiems" #: bookwyrm/templates/import/import_user.html:116 msgid "Your timezone" -msgstr "" +msgstr "Jūsų laiko juosta" #: bookwyrm/templates/import/import_user.html:119 msgid "Your default post privacy setting" -msgstr "" +msgstr "Jūsų įrašų numatytasis privatumas" #: bookwyrm/templates/import/import_user.html:127 msgid "Followers and following" -msgstr "" +msgstr "Sekėjai ir sekamieji" #: bookwyrm/templates/import/import_user.html:131 msgid "User blocks" -msgstr "" +msgstr "Blokuojami naudotojai" #: bookwyrm/templates/import/import_user.html:138 #: bookwyrm/templates/preferences/export-user.html:23 msgid "Reading goals" -msgstr "" +msgstr "Skaitymo tikslai" #: bookwyrm/templates/import/import_user.html:141 msgid "Overwrites reading goals for all years listed in the import file" -msgstr "" +msgstr "Perrašyti skaitymo tikslus visiems metams, nurodytiems importuojamame faile" #: bookwyrm/templates/import/import_user.html:145 #: bookwyrm/templates/preferences/export-user.html:24 msgid "Shelves" -msgstr "" +msgstr "Lentynos" #: bookwyrm/templates/import/import_user.html:148 #: bookwyrm/templates/preferences/export-user.html:25 msgid "Reading history" -msgstr "" +msgstr "Skaitymo žurnalas" #: bookwyrm/templates/import/import_user.html:151 #: bookwyrm/templates/preferences/export-user.html:26 msgid "Book reviews" -msgstr "" +msgstr "Knygų apžvalgos" #: bookwyrm/templates/import/import_user.html:157 msgid "Comments about books" -msgstr "" +msgstr "Knygų komentarai" #: bookwyrm/templates/import/import_user.html:160 msgid "Book lists" -msgstr "" +msgstr "Knygų sąrašai" #: bookwyrm/templates/import/import_user.html:163 msgid "Saved lists" -msgstr "" +msgstr "Įsiminti sąrašai" #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 @@ -3495,16 +3495,16 @@ msgstr "Jei matote netikėtų nesklandumų, susisiekite su administratoriumi arb #: bookwyrm/templates/import/user_import_status.html:15 #: bookwyrm/templates/import/user_import_status.html:26 msgid "User Import Status" -msgstr "" +msgstr "Naudotojo importo būsena" #: bookwyrm/templates/import/user_import_status.html:13 msgid "User Import Retry Status" -msgstr "" +msgstr "Pakartotinio naudotojo importo būsena" #: bookwyrm/templates/import/user_import_status.html:22 #: bookwyrm/templates/settings/imports/imports.html:264 msgid "User Imports" -msgstr "" +msgstr "Importuojami naudotojai" #: bookwyrm/templates/import/user_import_status.html:70 #: bookwyrm/templates/settings/dashboard/user_chart.html:11 @@ -3519,41 +3519,41 @@ msgstr "Būsenos" #: bookwyrm/templates/import/user_import_status.html:85 msgid "Follows & Blocks" -msgstr "" +msgstr "Sekimai ir blokavimai" #: bookwyrm/templates/import/user_import_status.html:144 msgid "Imported books" -msgstr "" +msgstr "Importuotos knygos" #: bookwyrm/templates/import/user_troubleshoot.html:5 msgid "User Import Troubleshooting" -msgstr "" +msgstr "Naudotojo importo trikčių sprendimas" #: bookwyrm/templates/import/user_troubleshoot.html:26 msgid "Your account was not set as an alias of the original user account" -msgstr "" +msgstr "Jūsų paskyra nesukonfigūruota kaip pirminės paskyros pseudonimas" #: bookwyrm/templates/import/user_troubleshoot.html:31 msgid "Re-trying an import will not work in cases such as:" -msgstr "" +msgstr "Pakartotinis importas neveiks tokiais atvejais, kaip antai:" #: bookwyrm/templates/import/user_troubleshoot.html:34 msgid "A user, status, or BookWyrm server was deleted after your import file was created" -msgstr "" +msgstr "Jei naudotojo paskyra, įrašai ar „BookWyrm“ serveris pašalinti sukūrus importo failą" #: bookwyrm/templates/import/user_troubleshoot.html:35 msgid "Importing statuses when your old account has been deleted" -msgstr "" +msgstr "Įrašų importas, kai senoji paskyra panaikinta" #: bookwyrm/templates/import/user_troubleshoot.html:43 #, python-format msgid "Currently you are allowed to import or retry one user every %(hours)s hours." -msgstr "" +msgstr "Šiuo metu jums leidžiama importuoti ar pakartotinai importuoti vieną naudotojo paskyrą kas %(hours)s val." #: bookwyrm/templates/import/user_troubleshoot.html:44 #, python-format msgid "You will be able to retry this import at %(next_time)s" -msgstr "" +msgstr "Šį importą galėsite kartoti %(next_time)s" #: bookwyrm/templates/import/user_troubleshoot.html:65 msgid "Relationship" @@ -3565,7 +3565,7 @@ msgstr "Priežastis" #: bookwyrm/templates/landing/force_password_reset.html:30 msgid "You must set a new password before logging in." -msgstr "" +msgstr "Prieš prisijungdami, turite susikurti naują slaptažodį." #: bookwyrm/templates/landing/force_password_reset.html:50 #: bookwyrm/templates/preferences/change_password.html:22 @@ -3701,7 +3701,7 @@ msgstr "%(site_name)s paieška" #: bookwyrm/templates/layout.html:39 msgid "Search for a book, author, user, or list" -msgstr "" +msgstr "Ieškoti knygos, autoriaus, naudotojo ar sąrašo" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 msgid "Scan Barcode" @@ -3717,7 +3717,7 @@ msgstr "slaptažodis" #: bookwyrm/templates/layout.html:136 msgid "Show/Hide password" -msgstr "" +msgstr "Rodyti/slėpti slaptažodį" #: bookwyrm/templates/layout.html:150 msgid "Join" @@ -3975,7 +3975,7 @@ msgstr "Išsaugota" #: bookwyrm/templates/lists/list_items.html:50 msgid "No lists found." -msgstr "" +msgstr "Sąrašų nerasta." #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:14 msgid "Your Lists" @@ -3992,15 +3992,15 @@ msgstr "Išsaugoti sąrašai" #: bookwyrm/templates/moved.html:27 #, python-format msgid "You have moved your account to %(username)s" -msgstr "" +msgstr "Jūs perkėlėte savo paskyrą į %(username)s" #: bookwyrm/templates/moved.html:32 msgid "You can undo the move to restore full functionality, but some followers may have already unfollowed this account." -msgstr "" +msgstr "Jūs galite atšaukti perkėlimą ir sugrąžinti visą funkcionalumą šiai paskyrai, tačiau gali būti, kad kai kurie sekėjai ją jau bus nustoję sekti." #: bookwyrm/templates/moved.html:42 msgid "Undo move" -msgstr "" +msgstr "Atšaukti perkėlimą" #: bookwyrm/templates/moved.html:46 bookwyrm/templates/user_menu.html:77 msgid "Log out" @@ -4219,9 +4219,9 @@ msgstr "%(related_user)s pakvietė jus pri msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[1] "Atsakymo laukia %(display_count)s naujos pakvietimo užklausos" +msgstr[2] "Atsakymo laukia %(display_count)s naujų pakvietimo užklausų" +msgstr[3] "Atsakymo laukia %(display_count)s naujų pakvietimo užklausų" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -4275,12 +4275,12 @@ msgstr "%(related_user)s paminėjo jus %(username)s" -msgstr "" +msgstr "%(related_user)s perkėlė paskyrą į %(username)s" #: bookwyrm/templates/notifications/items/move_user.html:25 #, python-format msgid "%(related_user)s has undone their move" -msgstr "" +msgstr "%(related_user)s atšaukė savo paskyros perkėlimą" #: bookwyrm/templates/notifications/items/remove.html:17 #, python-format @@ -4344,12 +4344,12 @@ msgstr "pakeitė %(group_name)s aprašymą" #: bookwyrm/templates/notifications/items/user_export.html:14 #, python-format msgid "Your user export is ready." -msgstr "" +msgstr "Jūsų eksportuoti naudotojo duomenys parengti." #: bookwyrm/templates/notifications/items/user_import.html:14 #, python-format msgid "Your user import is complete." -msgstr "" +msgstr "Jūsų naudotojo duomenų importas užbaigtas." #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" @@ -4487,16 +4487,16 @@ msgstr "Dabar sekate %(display_name)s!" #: bookwyrm/templates/preferences/move_user.html:7 #: bookwyrm/templates/preferences/move_user.html:39 msgid "Move Account" -msgstr "" +msgstr "Perkelti paskyrą" #: bookwyrm/templates/preferences/alias_user.html:7 #: bookwyrm/templates/preferences/alias_user.html:34 msgid "Create Alias" -msgstr "" +msgstr "Pridėti pseudonimą" #: bookwyrm/templates/preferences/alias_user.html:12 msgid "Add another account as an alias" -msgstr "" +msgstr "Pridėti kitą paskyrą kaip šios pseudonimą" #: bookwyrm/templates/preferences/alias_user.html:16 msgid "Marking another account as an alias is required if you want to move that account to this one." From 57ef4c0d66843f61dc1da1c33496d563c0fb6e00 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 23 Nov 2025 07:32:19 -0800 Subject: [PATCH 184/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 66 +++++++++++++++--------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 53da2377f3..465bca314f 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-23 14:35\n" +"PO-Revision-Date: 2025-11-23 15:32\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -3987,7 +3987,7 @@ msgstr "Visi sąrašai" #: bookwyrm/templates/lists/lists.html:40 msgid "Saved Lists" -msgstr "Išsaugoti sąrašai" +msgstr "Įsiminti sąrašai" #: bookwyrm/templates/moved.html:27 #, python-format @@ -4500,29 +4500,29 @@ msgstr "Pridėti kitą paskyrą kaip šios pseudonimą" #: bookwyrm/templates/preferences/alias_user.html:16 msgid "Marking another account as an alias is required if you want to move that account to this one." -msgstr "" +msgstr "Jei norite kitą paskyrą perkelti į šią, turite ją pažymėti kaip šios pseudonimą." #: bookwyrm/templates/preferences/alias_user.html:19 msgid "This is a reversable action and will not change the functionality of this account." -msgstr "" +msgstr "Šį veiksmą galima atšaukti, o šios paskyros funkcionalumo jis nepakeičia." #: bookwyrm/templates/preferences/alias_user.html:25 msgid "Enter the username for the account you want to add as an alias e.g. user@example.com :" -msgstr "" +msgstr "Įvekite paskyros, kurią norite pridėti kaip šios pseudonimą, naudotojo vardą, pvz., naudotojas@example.com:" #: bookwyrm/templates/preferences/alias_user.html:30 #: bookwyrm/templates/preferences/move_user.html:35 msgid "Confirm your password:" -msgstr "" +msgstr "Patvirtinkite savo slaptažodį:" #: bookwyrm/templates/preferences/alias_user.html:39 #: bookwyrm/templates/preferences/layout.html:28 msgid "Aliases" -msgstr "" +msgstr "Paskyros pseudonimai" #: bookwyrm/templates/preferences/alias_user.html:49 msgid "Remove alias" -msgstr "" +msgstr "Pašalinti pseudonimą" #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 @@ -4575,7 +4575,7 @@ msgstr "Nebegalėsite atstatyti ištrintos paskyros. Ateityje nebegalėsite naud #: bookwyrm/templates/preferences/delete_user.html:36 msgid "I understand that my account cannot be recovered:" -msgstr "" +msgstr "Aš suprantu, kad mano paskyros nebus įmanoma atkurti:" #: bookwyrm/templates/preferences/disable-2fa.html:4 #: bookwyrm/templates/preferences/disable-2fa.html:7 @@ -4627,7 +4627,7 @@ msgstr "Rodyti skaitymo tikslą sienoje" #: bookwyrm/templates/preferences/edit_user.html:75 msgid "Show ratings" -msgstr "" +msgstr "Rodyti įvertinimus" #: bookwyrm/templates/preferences/edit_user.html:81 msgid "Show suggested users" @@ -4671,65 +4671,65 @@ msgstr "Ieškai privačių lentynų? Gali nustatyti atskirus matomumo lygius kie #: bookwyrm/templates/preferences/export-user.html:9 #: bookwyrm/templates/preferences/layout.html:55 msgid "Export BookWyrm Account" -msgstr "" +msgstr "Eksportuoti „BookWyrm“ paskyrą" #: bookwyrm/templates/preferences/export-user.html:15 msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." -msgstr "" +msgstr "Čia galite eksportuoti savo paskyros duomenų failą Tai pravers, jei nuspręsite migruoti į kitą „BookWyrm“ paskyrą." #: bookwyrm/templates/preferences/export-user.html:19 msgid "Your file will include:" -msgstr "" +msgstr "Eksportuotas failas apims šiuos duomenis:" #: bookwyrm/templates/preferences/export-user.html:22 msgid "Most user settings" -msgstr "" +msgstr "Daugumą naudotojo nustatymų" #: bookwyrm/templates/preferences/export-user.html:28 msgid "Your own lists and saved lists" -msgstr "" +msgstr "Jūsų asmeninius sąrašus ir įsimintus sąrašus" #: bookwyrm/templates/preferences/export-user.html:29 msgid "Which users you follow and block" -msgstr "" +msgstr "Sekamų ir blokuojamų naudotojų sąrašus" #: bookwyrm/templates/preferences/export-user.html:33 msgid "Your file will not include:" -msgstr "" +msgstr "Faile nebus šių duomenų:" #: bookwyrm/templates/preferences/export-user.html:35 msgid "Direct messages" -msgstr "" +msgstr "Asmeninių žinučių" #: bookwyrm/templates/preferences/export-user.html:36 msgid "Replies to your statuses" -msgstr "" +msgstr "Atsakymų į jūsų įrašus" #: bookwyrm/templates/preferences/export-user.html:38 msgid "Favorites" -msgstr "" +msgstr "Žymelių" #: bookwyrm/templates/preferences/export-user.html:42 msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." -msgstr "" +msgstr "Naujojoje savo „BookWyrm“ paskyroje galėsite pasirinkti norimus importuoti duomenis – galėsite atlikti ir dalinį importą." #: bookwyrm/templates/preferences/export-user.html:45 msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." -msgstr "" +msgstr "Jeigu norite migruoti įrašus (komentarus, apžvalgas ar citatas), turite arba prudėti naująją paskyrą kaip šios pseudonimą, arba perkelti šią paskyrą į naująją prieš importuodami naudotojo duomenis." #: bookwyrm/templates/preferences/export-user.html:50 msgid "New user exports are currently disabled." -msgstr "" +msgstr "Šiuo metu naujai eksportuoti naudotojo duomenų neleidžiama." #: bookwyrm/templates/preferences/export-user.html:54 #, python-format msgid "User exports settings can be changed from the Imports page in the Admin dashboard." -msgstr "" +msgstr "Naudotojo eksporto nustatymus galima keisti Importuojamų naudotojų puslapyje administratoriaus skydelyje." #: bookwyrm/templates/preferences/export-user.html:61 #, python-format msgid "You will be able to create a new export file at %(next_available)s" -msgstr "" +msgstr "Naują eksporto failą galėsite susikurti %(next_available)s" #: bookwyrm/templates/preferences/export-user.html:72 #, python-format @@ -4743,31 +4743,31 @@ msgstr "Vidutiniškai naujausi eksportai užtruko %(minutes)s minutes (-čių)." #: bookwyrm/templates/preferences/export-user.html:88 msgid "Create user export file" -msgstr "" +msgstr "Kurti naudotojo eksporto failą" #: bookwyrm/templates/preferences/export-user.html:95 msgid "Recent Exports" -msgstr "" +msgstr "Paskiausiai eksportuota" #: bookwyrm/templates/preferences/export-user.html:97 msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." -msgstr "" +msgstr "Kai naudotojo eksporto failai parengiami, jie rodomi kaip „užbaigti“. Eksportas gali užtrukti. Failą parsisiųsite, spustelėję jo saitą." #: bookwyrm/templates/preferences/export-user.html:100 #, python-format msgid "Export files will be deleted after %(expiry_hours)s hour." msgid_plural "Export files will be deleted after %(expiry_hours)s hours." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Eksporto failai pašalinami po %(expiry_hours)s valandos." +msgstr[1] "Eksporto failai pašalinami po %(expiry_hours)s valandų." +msgstr[2] "Eksporto failai pašalinami po %(expiry_hours)s valandų." +msgstr[3] "Eksporto failai pašalinami po %(expiry_hours)s valandų." #: bookwyrm/templates/preferences/export-user.html:110 #: bookwyrm/templates/preferences/security.html:126 #: bookwyrm/templates/settings/files.html:136 #: bookwyrm/templates/settings/files.html:318 msgid "Date" -msgstr "" +msgstr "Data" #: bookwyrm/templates/preferences/export-user.html:116 msgid "Size" From 1010067a73576e893e85784d08c51b3513ed5bf7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 23 Nov 2025 10:54:20 -0800 Subject: [PATCH 185/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 465bca314f..8ecb881468 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-23 15:32\n" +"PO-Revision-Date: 2025-11-23 18:54\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -5907,23 +5907,23 @@ msgstr "" #: bookwyrm/templates/settings/files.html:102 msgid "Export file expiration" -msgstr "" +msgstr "Eksporto failo galiojimas" #: bookwyrm/templates/settings/files.html:109 msgid "Maximum age of export files, in hours" -msgstr "" +msgstr "Ilgiausias laikas eksportuotiems failams saugoti, valandomis" #: bookwyrm/templates/settings/files.html:122 msgid "Files older than this will be deleted." -msgstr "" +msgstr "Senesni failai bus šalinami." #: bookwyrm/templates/settings/files.html:125 msgid "Set expiry hours" -msgstr "" +msgstr "Nustatyti galiojimo trukmę valandomis" #: bookwyrm/templates/settings/files.html:138 msgid "Expired files" -msgstr "" +msgstr "Nebegaliojantys failai" #: bookwyrm/templates/settings/files.html:186 #: bookwyrm/templates/settings/imports/imports.html:184 From 3b098eb36a05b106e5f3c403cb80500571081858 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 23 Nov 2025 11:59:46 -0800 Subject: [PATCH 186/962] New translations django.po (Slovak) --- locale/sk_SK/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/sk_SK/LC_MESSAGES/django.po b/locale/sk_SK/LC_MESSAGES/django.po index 4f9d2f06bc..d37e58f1b5 100644 --- a/locale/sk_SK/LC_MESSAGES/django.po +++ b/locale/sk_SK/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-16 19:34\n" +"PO-Revision-Date: 2025-11-23 19:59\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Slovak\n" "Language: sk\n" @@ -83,7 +83,7 @@ msgstr "Táto emailová adresa nemôže byť zaregistrovaná." #: bookwyrm/forms/landing.py:114 msgid "Password cannot be the same as your current password" -msgstr "" +msgstr "Heslo nemôže byť rovnaké, ako súčasné heslo" #: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" From 1706fc41cc537c4430467b9c9c65d8cc2bbabc52 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 23 Nov 2025 11:59:47 -0800 Subject: [PATCH 187/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 8ecb881468..a8015fa518 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-23 18:54\n" +"PO-Revision-Date: 2025-11-23 19:59\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -470,9 +470,9 @@ msgstr "%(display_name)s – knygos „%(book_title)s“ apžvalga" #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(display_name)s įvertino knygą „%(book_title)s“ %(display_rating).1f žvaigždute" +msgstr[1] "%(display_name)s įvertino knygą „%(book_title)s“ %(display_rating).1f žvaigždutėmis" +msgstr[2] "%(display_name)s įvertino knygą „%(book_title)s“ %(display_rating).1f žvaigždučių" msgstr[3] "%(display_name)s įvertino knygą „%(book_title)s“ %(display_rating).1f žvaigždučių" #: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 @@ -4218,7 +4218,7 @@ msgstr "%(related_user)s pakvietė jus pri #, python-format msgid "New invite request awaiting response" msgid_plural "%(display_count)s new invite requests awaiting response" -msgstr[0] "" +msgstr[0] "Atsakymo laukia %(display_count)s naujos pakvietimo užklausos" msgstr[1] "Atsakymo laukia %(display_count)s naujos pakvietimo užklausos" msgstr[2] "Atsakymo laukia %(display_count)s naujų pakvietimo užklausų" msgstr[3] "Atsakymo laukia %(display_count)s naujų pakvietimo užklausų" @@ -4771,11 +4771,11 @@ msgstr "Data" #: bookwyrm/templates/preferences/export-user.html:116 msgid "Size" -msgstr "" +msgstr "Dydis" #: bookwyrm/templates/preferences/export-user.html:160 msgid "Download your export" -msgstr "" +msgstr "Parsisiųsti eksportuotą failą" #: bookwyrm/templates/preferences/export-user.html:164 msgid "Archive is no longer available" From 694f5c4f60594c6c427c38ecf7d75c6d3fca1cb8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 23 Nov 2025 13:11:07 -0800 Subject: [PATCH 188/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index a8015fa518..da75671ef4 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-23 19:59\n" +"PO-Revision-Date: 2025-11-23 21:11\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -4779,17 +4779,17 @@ msgstr "Parsisiųsti eksportuotą failą" #: bookwyrm/templates/preferences/export-user.html:164 msgid "Archive is no longer available" -msgstr "" +msgstr "Pakas nebeprieinamas" #: bookwyrm/templates/preferences/export.html:4 #: bookwyrm/templates/preferences/export.html:7 #: bookwyrm/templates/preferences/layout.html:47 msgid "Export Book List" -msgstr "" +msgstr "Eksportuoti knygų sąrašą" #: bookwyrm/templates/preferences/export.html:13 msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." -msgstr "" +msgstr "Į eksportuotą CSV failą bus įtrauktos visos knygos jūsų lentynose, visos apžvelgtos knygos bei skaitytos knygos.
    Šį failą galite importuoti į tokias tarnybas, kaip antai „Goodreads“." #: bookwyrm/templates/preferences/export.html:20 msgid "Download file" @@ -4801,11 +4801,11 @@ msgstr "Paskyra" #: bookwyrm/templates/preferences/layout.html:24 msgid "Security Settings" -msgstr "" +msgstr "Saugumo nustatymai" #: bookwyrm/templates/preferences/layout.html:32 msgid "Move Account" -msgstr "" +msgstr "Perkelti paskyrą" #: bookwyrm/templates/preferences/layout.html:39 msgid "Data" @@ -4817,7 +4817,7 @@ msgstr "Sąsajos" #: bookwyrm/templates/preferences/move_user.html:12 msgid "Migrate account to another server" -msgstr "" +msgstr "Migruoti paskyrą į kitą serverį" #: bookwyrm/templates/preferences/move_user.html:16 msgid "Moving your account will notify all your followers and direct them to follow the new account." From 53b5f48b6dced03703428e17227f08a1eb15dd47 Mon Sep 17 00:00:00 2001 From: kasiarog Date: Thu, 27 Nov 2025 08:33:08 +0100 Subject: [PATCH 189/962] striptags correction --- bookwyrm/templates/snippets/opengraph.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/snippets/opengraph.html b/bookwyrm/templates/snippets/opengraph.html index 7f44c52238..803f95fa99 100644 --- a/bookwyrm/templates/snippets/opengraph.html +++ b/bookwyrm/templates/snippets/opengraph.html @@ -20,5 +20,6 @@ - - \ No newline at end of file +{% firstof description|striptags site.instance_tagline|striptags as description %} + + \ No newline at end of file From ec564891875bac7cf9feb8af601caa63209341fd Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 30 Nov 2025 06:47:09 +1100 Subject: [PATCH 190/962] fix rank match value for series matches --- bookwyrm/views/books/edit_book.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index 3851c17b1c..a083d85e56 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -252,7 +252,7 @@ def add_series(request, data): matches = ( models.Series.objects.annotate(search=vector) .annotate(rank=SearchRank(vector, series, normalization=32)) - .filter(rank__gt=0.019) + .filter(rank__gt=0.19) .order_by("-rank")[:5] ) From 7e438e13f150339ae3aca945c0b21846a7ed3b56 Mon Sep 17 00:00:00 2001 From: kasiarog Date: Wed, 26 Nov 2025 21:16:42 +0100 Subject: [PATCH 191/962] first attempt in ruff migration --- .github/pull_request_template.md | 2 +- .github/workflows/python.yml | 19 +++---- README.md | 2 +- bookwyrm/activitypub/__init__.py | 3 +- bookwyrm/activitypub/base_activity.py | 9 ++-- bookwyrm/activitypub/book.py | 3 +- bookwyrm/activitypub/image.py | 3 +- bookwyrm/activitypub/note.py | 3 +- bookwyrm/activitypub/ordered_collection.py | 3 +- bookwyrm/activitypub/person.py | 3 +- bookwyrm/activitypub/response.py | 6 +-- bookwyrm/activitypub/verbs.py | 3 +- bookwyrm/activitystreams.py | 3 +- bookwyrm/admin.py | 3 +- bookwyrm/book_search.py | 11 ++-- bookwyrm/connectors/__init__.py | 3 +- bookwyrm/connectors/abstract_connector.py | 3 +- bookwyrm/connectors/bookwyrm_connector.py | 3 +- bookwyrm/connectors/connector_manager.py | 13 +++-- bookwyrm/connectors/finna.py | 3 +- bookwyrm/connectors/format_mappings.py | 3 +- bookwyrm/connectors/inventaire.py | 3 +- bookwyrm/connectors/openlibrary.py | 3 +- bookwyrm/connectors/openlibrary_languages.py | 3 +- bookwyrm/connectors/settings.py | 2 +- bookwyrm/context_processors.py | 3 +- bookwyrm/decorators.py | 3 +- bookwyrm/emailing.py | 3 +- bookwyrm/forms/__init__.py | 3 +- bookwyrm/forms/admin.py | 4 +- bookwyrm/forms/author.py | 3 +- bookwyrm/forms/books.py | 3 +- bookwyrm/forms/custom_form.py | 3 +- bookwyrm/forms/edit_user.py | 4 +- bookwyrm/forms/forms.py | 4 +- bookwyrm/forms/groups.py | 3 +- bookwyrm/forms/landing.py | 4 +- bookwyrm/forms/links.py | 2 +- bookwyrm/forms/lists.py | 3 +- bookwyrm/forms/status.py | 3 +- bookwyrm/forms/user_admin.py | 3 +- bookwyrm/forms/widgets.py | 3 +- bookwyrm/imagegenerators.py | 1 + bookwyrm/importers/__init__.py | 2 +- bookwyrm/importers/bookwyrm_import.py | 1 + bookwyrm/importers/calibre_import.py | 3 +- bookwyrm/importers/goodreads_import.py | 3 +- bookwyrm/importers/importer.py | 5 +- bookwyrm/importers/librarything_import.py | 3 +- bookwyrm/importers/openlibrary_import.py | 3 +- bookwyrm/importers/openreads_import.py | 3 +- bookwyrm/importers/storygraph_import.py | 3 +- bookwyrm/isbn/isbn.py | 3 +- bookwyrm/lists_stream.py | 3 +- .../commands/add_finna_connector.py | 6 +-- bookwyrm/management/commands/admin_code.py | 3 +- .../management/commands/compile_themes.py | 3 +- bookwyrm/management/commands/confirm_email.py | 3 +- .../commands/deduplicate_book_data.py | 4 +- .../commands/erase_deleted_user_data.py | 5 +- bookwyrm/management/commands/erase_streams.py | 4 +- .../commands/generate_preview_images.py | 3 +- bookwyrm/management/commands/initdb.py | 3 +- bookwyrm/management/commands/merge_authors.py | 5 +- .../management/commands/merge_editions.py | 5 +- bookwyrm/management/commands/merge_works.py | 5 +- .../commands/populate_lists_streams.py | 3 +- .../management/commands/populate_streams.py | 3 +- .../commands/populate_suggestions.py | 4 +- .../management/commands/remove_editions.py | 6 ++- .../remove_remote_user_preview_images.py | 5 +- .../management/commands/repair_editions.py | 3 +- .../commands/revoke_preview_image_tasks.py | 3 +- bookwyrm/middleware/__init__.py | 3 +- bookwyrm/middleware/file_too_big.py | 1 - bookwyrm/middleware/force_logout.py | 2 +- bookwyrm/middleware/ip_middleware.py | 3 +- bookwyrm/middleware/timezone_middleware.py | 3 +- bookwyrm/models/__init__.py | 3 +- bookwyrm/models/activitypub_mixin.py | 3 +- bookwyrm/models/announcement.py | 3 +- bookwyrm/models/annual_goal.py | 5 +- bookwyrm/models/antispam.py | 3 +- bookwyrm/models/attachment.py | 3 +- bookwyrm/models/author.py | 2 +- bookwyrm/models/base_model.py | 6 +-- bookwyrm/models/book.py | 4 +- bookwyrm/models/bookwyrm_export_job.py | 8 +-- bookwyrm/models/bookwyrm_import_job.py | 18 ++----- bookwyrm/models/connector.py | 3 +- bookwyrm/models/favorite.py | 3 +- bookwyrm/models/federated_server.py | 3 +- bookwyrm/models/fields.py | 3 +- bookwyrm/models/group.py | 3 +- bookwyrm/models/hashtag.py | 3 +- bookwyrm/models/housekeeping.py | 4 +- bookwyrm/models/import_job.py | 5 +- bookwyrm/models/job.py | 16 ++---- bookwyrm/models/link.py | 3 +- bookwyrm/models/list.py | 3 +- bookwyrm/models/move.py | 3 +- bookwyrm/models/notification.py | 3 +- bookwyrm/models/readthrough.py | 3 +- bookwyrm/models/relationship.py | 3 +- bookwyrm/models/report.py | 3 +- bookwyrm/models/session.py | 3 +- bookwyrm/models/shelf.py | 3 +- bookwyrm/models/site.py | 3 +- bookwyrm/models/status.py | 10 ++-- bookwyrm/models/user.py | 3 +- bookwyrm/preview_images.py | 2 +- bookwyrm/redis_store.py | 3 +- bookwyrm/signatures.py | 3 +- bookwyrm/status.py | 3 +- bookwyrm/suggested_users.py | 5 +- bookwyrm/tasks.py | 3 +- bookwyrm/templatetags/book_display_tags.py | 3 +- bookwyrm/templatetags/celery_tags.py | 3 +- bookwyrm/templatetags/date_ext.py | 3 +- bookwyrm/templatetags/feed_page_tags.py | 3 +- bookwyrm/templatetags/group_tags.py | 3 +- bookwyrm/templatetags/interaction.py | 3 +- bookwyrm/templatetags/landing_page_tags.py | 3 +- bookwyrm/templatetags/layout.py | 3 +- bookwyrm/templatetags/list_page_tags.py | 3 +- bookwyrm/templatetags/markdown.py | 3 +- .../templatetags/notification_page_tags.py | 3 +- bookwyrm/templatetags/rating_tags.py | 3 +- bookwyrm/templatetags/shelf_tags.py | 3 +- bookwyrm/templatetags/stars.py | 3 +- bookwyrm/templatetags/status_display.py | 3 +- bookwyrm/templatetags/user_page_tags.py | 3 +- bookwyrm/templatetags/utilities.py | 9 ++-- bookwyrm/tests/__init__.py | 3 +- bookwyrm/tests/activitypub/test_author.py | 1 + .../tests/activitypub/test_base_activity.py | 3 +- bookwyrm/tests/activitypub/test_note.py | 3 +- bookwyrm/tests/activitypub/test_quotation.py | 3 +- .../activitystreams/test_abstractstream.py | 3 +- .../tests/activitystreams/test_booksstream.py | 3 +- .../tests/activitystreams/test_homestream.py | 3 +- .../tests/activitystreams/test_localstream.py | 3 +- .../tests/activitystreams/test_signals.py | 3 +- bookwyrm/tests/activitystreams/test_tasks.py | 3 +- .../connectors/test_abstract_connector.py | 3 +- .../test_abstract_minimal_connector.py | 3 +- .../connectors/test_bookwyrm_connector.py | 3 +- .../connectors/test_connector_manager.py | 3 +- .../tests/connectors/test_finna_connector.py | 5 +- .../connectors/test_inventaire_connector.py | 3 +- .../connectors/test_openlibrary_connector.py | 3 +- .../tests/importers/test_bookwyrm_import.py | 3 +- .../importers/test_bookwyrm_user_import.py | 3 +- .../tests/importers/test_calibre_import.py | 3 +- .../tests/importers/test_goodreads_import.py | 3 +- bookwyrm/tests/importers/test_importer.py | 3 +- .../importers/test_librarything_import.py | 3 +- .../importers/test_openlibrary_import.py | 3 +- .../tests/importers/test_openreads_import.py | 3 +- .../tests/importers/test_storygraph_import.py | 3 +- bookwyrm/tests/lists_stream/test_signals.py | 3 +- bookwyrm/tests/lists_stream/test_stream.py | 3 +- bookwyrm/tests/lists_stream/test_tasks.py | 3 +- .../management/test_add_finna_connector.py | 3 +- bookwyrm/tests/management/test_initdb.py | 3 +- .../management/test_populate_lists_streams.py | 3 +- .../tests/management/test_populate_streams.py | 3 +- .../tests/models/test_activitypub_mixin.py | 7 ++- bookwyrm/tests/models/test_automod.py | 3 +- bookwyrm/tests/models/test_base_model.py | 3 +- bookwyrm/tests/models/test_book_model.py | 5 +- .../tests/models/test_bookwyrm_export_job.py | 2 +- .../tests/models/test_bookwyrm_import_job.py | 5 +- bookwyrm/tests/models/test_connector.py | 2 +- .../tests/models/test_federated_server.py | 3 +- bookwyrm/tests/models/test_fields.py | 4 +- bookwyrm/tests/models/test_group.py | 3 +- bookwyrm/tests/models/test_housekeeping.py | 26 +++++----- bookwyrm/tests/models/test_import_model.py | 3 +- bookwyrm/tests/models/test_job.py | 3 +- bookwyrm/tests/models/test_link.py | 3 +- bookwyrm/tests/models/test_list.py | 3 +- bookwyrm/tests/models/test_move.py | 3 +- bookwyrm/tests/models/test_notification.py | 3 +- .../tests/models/test_readthrough_model.py | 3 +- .../tests/models/test_relationship_models.py | 3 +- bookwyrm/tests/models/test_session.py | 3 +- bookwyrm/tests/models/test_shelf_model.py | 3 +- bookwyrm/tests/models/test_site.py | 3 +- bookwyrm/tests/models/test_status_model.py | 3 +- bookwyrm/tests/models/test_unicode_slugs.py | 3 +- bookwyrm/tests/models/test_user_model.py | 3 +- .../templatetags/test_book_display_tags.py | 3 +- bookwyrm/tests/templatetags/test_date_ext.py | 1 + .../tests/templatetags/test_feed_page_tags.py | 3 +- .../tests/templatetags/test_interaction.py | 3 +- bookwyrm/tests/templatetags/test_markdown.py | 3 +- .../test_notification_page_tags.py | 3 +- .../tests/templatetags/test_rating_tags.py | 3 +- .../tests/templatetags/test_shelf_tags.py | 3 +- .../tests/templatetags/test_status_display.py | 3 +- bookwyrm/tests/templatetags/test_utilities.py | 3 +- bookwyrm/tests/test_author_search.py | 3 +- bookwyrm/tests/test_book_search.py | 3 +- bookwyrm/tests/test_context_processors.py | 3 +- bookwyrm/tests/test_emailing.py | 3 +- bookwyrm/tests/test_isbn.py | 3 +- bookwyrm/tests/test_partial_date.py | 2 +- bookwyrm/tests/test_preview_images.py | 3 +- bookwyrm/tests/test_sanitize_html.py | 3 +- bookwyrm/tests/test_signing.py | 3 +- bookwyrm/tests/test_suggested_users.py | 3 +- bookwyrm/tests/test_utils.py | 3 +- bookwyrm/tests/validate_html.py | 3 +- .../tests/views/admin/test_announcements.py | 3 +- bookwyrm/tests/views/admin/test_automod.py | 3 +- bookwyrm/tests/views/admin/test_celery.py | 3 +- bookwyrm/tests/views/admin/test_connectors.py | 3 +- bookwyrm/tests/views/admin/test_dashboard.py | 3 +- .../tests/views/admin/test_email_blocks.py | 3 +- .../tests/views/admin/test_email_config.py | 3 +- bookwyrm/tests/views/admin/test_federation.py | 3 +- .../views/admin/test_files_maintenance.py | 3 +- bookwyrm/tests/views/admin/test_imports.py | 3 +- .../tests/views/admin/test_ip_blocklist.py | 3 +- .../tests/views/admin/test_link_domains.py | 3 +- bookwyrm/tests/views/admin/test_reports.py | 3 +- bookwyrm/tests/views/admin/test_site.py | 3 +- bookwyrm/tests/views/admin/test_themes.py | 3 +- bookwyrm/tests/views/admin/test_user_admin.py | 3 +- bookwyrm/tests/views/books/test_book.py | 3 +- bookwyrm/tests/views/books/test_edit_book.py | 3 +- bookwyrm/tests/views/books/test_editions.py | 3 +- bookwyrm/tests/views/books/test_links.py | 3 +- bookwyrm/tests/views/imports/test_import.py | 3 +- .../tests/views/imports/test_import_review.py | 3 +- .../views/imports/test_import_troubleshoot.py | 3 +- .../tests/views/imports/test_user_import.py | 3 +- bookwyrm/tests/views/inbox/test_inbox.py | 3 +- bookwyrm/tests/views/inbox/test_inbox_add.py | 3 +- .../tests/views/inbox/test_inbox_announce.py | 3 +- .../tests/views/inbox/test_inbox_block.py | 3 +- .../tests/views/inbox/test_inbox_create.py | 3 +- .../tests/views/inbox/test_inbox_delete.py | 1 + .../tests/views/inbox/test_inbox_follow.py | 3 +- bookwyrm/tests/views/inbox/test_inbox_like.py | 3 +- .../tests/views/inbox/test_inbox_remove.py | 3 +- .../tests/views/inbox/test_inbox_update.py | 3 +- bookwyrm/tests/views/landing/test_invite.py | 3 +- bookwyrm/tests/views/landing/test_landing.py | 3 +- bookwyrm/tests/views/landing/test_login.py | 3 +- bookwyrm/tests/views/landing/test_password.py | 3 +- bookwyrm/tests/views/landing/test_register.py | 3 +- bookwyrm/tests/views/lists/test_curate.py | 3 +- bookwyrm/tests/views/lists/test_embed.py | 3 +- bookwyrm/tests/views/lists/test_list.py | 5 +- bookwyrm/tests/views/lists/test_list_item.py | 3 +- bookwyrm/tests/views/lists/test_lists.py | 3 +- .../tests/views/preferences/test_block.py | 3 +- .../views/preferences/test_change_password.py | 3 +- .../views/preferences/test_delete_user.py | 3 +- .../tests/views/preferences/test_edit_user.py | 3 +- .../tests/views/preferences/test_export.py | 3 +- .../views/preferences/test_export_user.py | 3 +- bookwyrm/tests/views/preferences/test_move.py | 3 +- .../tests/views/preferences/test_security.py | 3 +- bookwyrm/tests/views/shelf/test_shelf.py | 3 +- .../tests/views/shelf/test_shelf_actions.py | 3 +- bookwyrm/tests/views/test_annual_summary.py | 1 + bookwyrm/tests/views/test_author.py | 3 +- bookwyrm/tests/views/test_directory.py | 3 +- bookwyrm/tests/views/test_discover.py | 3 +- bookwyrm/tests/views/test_feed.py | 3 +- bookwyrm/tests/views/test_follow.py | 3 +- bookwyrm/tests/views/test_get_started.py | 3 +- bookwyrm/tests/views/test_goal.py | 3 +- bookwyrm/tests/views/test_group.py | 4 +- bookwyrm/tests/views/test_hashtag.py | 3 +- bookwyrm/tests/views/test_helpers.py | 3 +- bookwyrm/tests/views/test_interaction.py | 3 +- bookwyrm/tests/views/test_isbn.py | 3 +- bookwyrm/tests/views/test_notifications.py | 3 +- bookwyrm/tests/views/test_outbox.py | 3 +- bookwyrm/tests/views/test_reading.py | 3 +- bookwyrm/tests/views/test_readthrough.py | 3 +- bookwyrm/tests/views/test_report.py | 3 +- bookwyrm/tests/views/test_rss_feed.py | 10 ++-- bookwyrm/tests/views/test_search.py | 3 +- bookwyrm/tests/views/test_setup.py | 3 +- bookwyrm/tests/views/test_status.py | 3 +- bookwyrm/tests/views/test_updates.py | 29 +++++++---- bookwyrm/tests/views/test_user.py | 3 +- bookwyrm/tests/views/test_wellknown.py | 3 +- bookwyrm/urls.py | 3 +- bookwyrm/utils/__init__.py | 3 +- bookwyrm/utils/cache.py | 5 +- bookwyrm/utils/db.py | 2 +- bookwyrm/utils/images.py | 2 +- bookwyrm/utils/isni.py | 3 +- bookwyrm/utils/log.py | 3 +- bookwyrm/utils/regex.py | 2 +- bookwyrm/utils/sanitizer.py | 1 + bookwyrm/utils/tar.py | 1 + bookwyrm/utils/validate.py | 1 + bookwyrm/views/__init__.py | 3 +- bookwyrm/views/admin/announcements.py | 3 +- bookwyrm/views/admin/automod.py | 3 +- bookwyrm/views/admin/celery_status.py | 4 +- bookwyrm/views/admin/connectors.py | 3 +- bookwyrm/views/admin/dashboard.py | 11 ++-- bookwyrm/views/admin/email_blocklist.py | 4 +- bookwyrm/views/admin/email_config.py | 4 +- bookwyrm/views/admin/federation.py | 5 +- bookwyrm/views/admin/federation_settings.py | 3 +- bookwyrm/views/admin/files_maintenance.py | 4 +- bookwyrm/views/admin/imports.py | 3 +- bookwyrm/views/admin/invite.py | 5 +- bookwyrm/views/admin/ip_blocklist.py | 4 +- bookwyrm/views/admin/link_domains.py | 4 +- bookwyrm/views/admin/reports.py | 3 +- bookwyrm/views/admin/schedule.py | 3 +- bookwyrm/views/admin/site.py | 3 +- bookwyrm/views/admin/themes.py | 3 +- bookwyrm/views/admin/user_admin.py | 3 +- bookwyrm/views/annual_summary.py | 1 + bookwyrm/views/author.py | 2 +- bookwyrm/views/books/books.py | 6 ++- bookwyrm/views/books/edit_book.py | 4 +- bookwyrm/views/books/editions.py | 2 +- bookwyrm/views/books/links.py | 2 +- bookwyrm/views/books/series.py | 2 +- bookwyrm/views/directory.py | 4 +- bookwyrm/views/discover.py | 3 +- bookwyrm/views/feed.py | 3 +- bookwyrm/views/follow.py | 4 +- bookwyrm/views/get_started.py | 2 +- bookwyrm/views/goal.py | 3 +- bookwyrm/views/group.py | 1 + bookwyrm/views/hashtag.py | 3 +- bookwyrm/views/helpers.py | 3 +- bookwyrm/views/imports/import_data.py | 4 +- bookwyrm/views/imports/import_status.py | 4 +- bookwyrm/views/imports/manually_review.py | 4 +- bookwyrm/views/imports/troubleshoot.py | 4 +- bookwyrm/views/imports/user_troubleshoot.py | 4 +- bookwyrm/views/inbox.py | 9 ++-- bookwyrm/views/interaction.py | 3 +- bookwyrm/views/isbn.py | 4 +- bookwyrm/views/landing/about.py | 3 +- bookwyrm/views/landing/landing.py | 3 +- bookwyrm/views/landing/login.py | 3 +- bookwyrm/views/landing/password.py | 3 +- bookwyrm/views/landing/register.py | 3 +- bookwyrm/views/list/curate.py | 3 +- bookwyrm/views/list/embed.py | 3 +- bookwyrm/views/list/list.py | 14 ++++-- bookwyrm/views/list/list_item.py | 3 +- bookwyrm/views/list/lists.py | 4 +- bookwyrm/views/notifications.py | 3 +- bookwyrm/views/outbox.py | 5 +- bookwyrm/views/preferences/block.py | 4 +- bookwyrm/views/preferences/change_password.py | 3 +- bookwyrm/views/preferences/delete_user.py | 3 +- bookwyrm/views/preferences/edit_user.py | 3 +- bookwyrm/views/preferences/export.py | 4 +- bookwyrm/views/preferences/move_user.py | 2 +- bookwyrm/views/preferences/security.py | 4 +- bookwyrm/views/reading.py | 2 +- bookwyrm/views/relationships.py | 3 +- bookwyrm/views/report.py | 3 +- bookwyrm/views/rss_feed.py | 7 ++- bookwyrm/views/search.py | 4 +- bookwyrm/views/server_error.py | 1 + bookwyrm/views/setup.py | 3 +- bookwyrm/views/shelf/shelf.py | 3 +- bookwyrm/views/shelf/shelf_actions.py | 2 +- bookwyrm/views/status.py | 2 +- bookwyrm/views/updates.py | 3 +- bookwyrm/views/user.py | 3 +- bookwyrm/views/wellknown.py | 2 +- bw-dev | 30 ++++++++--- celerywyrm/__init__.py | 3 +- celerywyrm/celery.py | 3 +- celerywyrm/settings.py | 3 +- celerywyrm/urls.py | 1 + complete_bwdev.fish | 10 +++- complete_bwdev.sh | 5 +- complete_bwdev.zsh | 5 +- dev-tools/requirements.txt | 2 +- pyproject.toml | 50 ++++++++++++++++++- requirements.txt | 3 +- 391 files changed, 931 insertions(+), 529 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 570174248a..d564973661 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -56,7 +56,7 @@ Our documentation is maintained in a separate repository at https://github.com/b - [ ] I intend to create a matching pull request in the Documentation repository after this PR is merged ### Tests diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index baa4f3a22b..5946b09675 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -52,8 +52,8 @@ jobs: - name: Run Tests run: pytest -n 3 - pylint: - name: Linting (pylint) + ruff: + name: Linting & Formatting (ruff) runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -66,8 +66,10 @@ jobs: run: | python -m pip install --upgrade pip pip install -r requirements.txt - - name: Analyse code with pylint - run: pylint bookwyrm/ + - name: Check code formatting with ruff + run: ruff format --check bookwyrm/ celerywyrm/ + - name: Lint code with ruff + run: ruff check bookwyrm/ celerywyrm/ mypy: name: Typing (mypy) @@ -88,12 +90,3 @@ jobs: - name: Analyse code with mypy run: mypy bookwyrm celerywyrm - black: - name: Formatting (black; run ./bw-dev black to fix) - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - - uses: psf/black@stable - with: - version: "22.*" diff --git a/README.md b/README.md index 0322308821..5afc0cdaf0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![](https://img.shields.io/github/release/bookwyrm-social/bookwyrm.svg?colorB=58839b)](https://github.com/bookwyrm-social/bookwyrm/releases) [![Run Python Tests](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/django-tests.yml/badge.svg)](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/django-tests.yml) -[![Pylint](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/pylint.yml/badge.svg)](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/pylint.yml) +[![Ruff](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/python.yml/badge.svg?job=ruff)](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/python.yml) BookWyrm is a social network for tracking your reading, talking about books, writing reviews, and discovering what to read next. Federation allows BookWyrm users to join small, trusted communities that can connect with one another, and with other ActivityPub services like [Mastodon](https://joinmastodon.org/) and [Pleroma](http://pleroma.social/). diff --git a/bookwyrm/activitypub/__init__.py b/bookwyrm/activitypub/__init__.py index 41decd68af..70f1097420 100644 --- a/bookwyrm/activitypub/__init__.py +++ b/bookwyrm/activitypub/__init__.py @@ -1,4 +1,5 @@ -""" bring activitypub functions into the namespace """ +"""bring activitypub functions into the namespace""" + import inspect import sys diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py index 2a52d99f03..5560fafb78 100644 --- a/bookwyrm/activitypub/base_activity.py +++ b/bookwyrm/activitypub/base_activity.py @@ -1,4 +1,5 @@ -""" basics for an activitypub serializer """ +"""basics for an activitypub serializer""" + from __future__ import annotations from dataclasses import dataclass, fields, MISSING from json import JSONEncoder @@ -326,8 +327,7 @@ def resolve_remote_id( save: bool = True, get_activity: bool = False, allow_external_connections: bool = True, -) -> TBookWyrmModel: - ... +) -> TBookWyrmModel: ... # pylint: disable=too-many-arguments @@ -339,8 +339,7 @@ def resolve_remote_id( save: bool = True, get_activity: bool = False, allow_external_connections: bool = True, -) -> base_model.BookWyrmModel: - ... +) -> base_model.BookWyrmModel: ... # pylint: disable=too-many-arguments diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index 33c327d0fe..dd1bb22dfe 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -1,4 +1,5 @@ -""" book and author data """ +"""book and author data""" + from dataclasses import dataclass, field from typing import Optional diff --git a/bookwyrm/activitypub/image.py b/bookwyrm/activitypub/image.py index 7950faaf89..e92ea5c495 100644 --- a/bookwyrm/activitypub/image.py +++ b/bookwyrm/activitypub/image.py @@ -1,4 +1,5 @@ -""" an image, nothing fancy """ +"""an image, nothing fancy""" + from dataclasses import dataclass from .base_activity import ActivityObject diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py index 376560f6e8..9139889d25 100644 --- a/bookwyrm/activitypub/note.py +++ b/bookwyrm/activitypub/note.py @@ -1,4 +1,5 @@ -""" note serializer and children thereof """ +"""note serializer and children thereof""" + from dataclasses import dataclass, field from typing import Dict, List import re diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py index 250490041d..65e386a6a2 100644 --- a/bookwyrm/activitypub/ordered_collection.py +++ b/bookwyrm/activitypub/ordered_collection.py @@ -1,4 +1,5 @@ -""" defines activitypub collections (lists) """ +"""defines activitypub collections (lists)""" + from dataclasses import dataclass, field from typing import List diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py index dfec92e4cf..1f978f3c32 100644 --- a/bookwyrm/activitypub/person.py +++ b/bookwyrm/activitypub/person.py @@ -1,4 +1,5 @@ -""" actor serializer """ +"""actor serializer""" + from dataclasses import dataclass from typing import Dict diff --git a/bookwyrm/activitypub/response.py b/bookwyrm/activitypub/response.py index e480b85dfa..dcc6767f48 100644 --- a/bookwyrm/activitypub/response.py +++ b/bookwyrm/activitypub/response.py @@ -1,4 +1,5 @@ -""" ActivityPub-specific json response wrapper """ +"""ActivityPub-specific json response wrapper""" + from django.http import JsonResponse from .base_activity import ActivityEncoder @@ -18,9 +19,8 @@ def __init__( encoder=ActivityEncoder, safe=False, json_dumps_params=None, - **kwargs + **kwargs, ): - if "content_type" not in kwargs: kwargs["content_type"] = "application/activity+json" diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py index 549f14c9c0..4e3f3ed07b 100644 --- a/bookwyrm/activitypub/verbs.py +++ b/bookwyrm/activitypub/verbs.py @@ -1,4 +1,5 @@ -""" activities that do things """ +"""activities that do things""" + from dataclasses import dataclass, field from typing import List from django.apps import apps diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 08fb757d5a..ef02c8ca23 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -1,4 +1,5 @@ -""" access the activity streams stored in redis """ +"""access the activity streams stored in redis""" + from datetime import timedelta from django.dispatch import receiver from django.db import transaction diff --git a/bookwyrm/admin.py b/bookwyrm/admin.py index f028dea083..0611060280 100644 --- a/bookwyrm/admin.py +++ b/bookwyrm/admin.py @@ -1,4 +1,5 @@ -""" models that will show up in django admin for superuser """ +"""models that will show up in django admin for superuser""" + from django.contrib import admin from bookwyrm import models diff --git a/bookwyrm/book_search.py b/bookwyrm/book_search.py index 106c68a83a..8a472127e3 100644 --- a/bookwyrm/book_search.py +++ b/bookwyrm/book_search.py @@ -1,4 +1,5 @@ -""" using a bookwyrm instance as a source of book data """ +"""using a bookwyrm instance as a source of book data""" + from __future__ import annotations from dataclasses import asdict, dataclass from functools import reduce @@ -21,8 +22,7 @@ def search( min_confidence: float = 0, filters: Optional[list[Any]] = None, return_first: Literal[False], -) -> QuerySet[models.Edition]: - ... +) -> QuerySet[models.Edition]: ... @overload @@ -32,8 +32,7 @@ def search( min_confidence: float = 0, filters: Optional[list[Any]] = None, return_first: Literal[True], -) -> Optional[models.Edition]: - ... +) -> Optional[models.Edition]: ... def search( @@ -53,7 +52,7 @@ def search( results = None # first, try searching unique identifiers # unique identifiers never have spaces, title/author usually do - if not " " in query: + if " " not in query: results = search_identifiers( query, *filters, return_first=return_first, books=books ) diff --git a/bookwyrm/connectors/__init__.py b/bookwyrm/connectors/__init__.py index ada2a78261..83d1da2b67 100644 --- a/bookwyrm/connectors/__init__.py +++ b/bookwyrm/connectors/__init__.py @@ -1,4 +1,5 @@ -""" bring connectors into the namespace """ +"""bring connectors into the namespace""" + from .settings import CONNECTORS from .abstract_connector import ConnectorException from .abstract_connector import get_data, get_image, maybe_isbn diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 6bd9f54eb4..6e71eb39db 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -1,4 +1,5 @@ -""" functionality outline for a book data connector """ +"""functionality outline for a book data connector""" + from __future__ import annotations from abc import ABC, abstractmethod from typing import Optional, TypedDict, Any, Callable, Union, Iterator diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py index 9aaa562648..477dd9c20d 100644 --- a/bookwyrm/connectors/bookwyrm_connector.py +++ b/bookwyrm/connectors/bookwyrm_connector.py @@ -1,4 +1,5 @@ -""" using another bookwyrm instance as a source of book data """ +"""using another bookwyrm instance as a source of book data""" + from __future__ import annotations from typing import Any, Iterator diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py index a0ff1d4bb1..a24dc8b357 100644 --- a/bookwyrm/connectors/connector_manager.py +++ b/bookwyrm/connectors/connector_manager.py @@ -1,4 +1,5 @@ -""" interface with whatever connectors the app has """ +"""interface with whatever connectors the app has""" + from __future__ import annotations import asyncio import importlib @@ -50,15 +51,13 @@ async def async_connector_search( @overload def search( query: str, *, min_confidence: float = 0.1, return_first: Literal[False] -) -> list[abstract_connector.ConnectorResults]: - ... +) -> list[abstract_connector.ConnectorResults]: ... @overload def search( query: str, *, min_confidence: float = 0.1, return_first: Literal[True] -) -> Optional[SearchResult]: - ... +) -> Optional[SearchResult]: ... def search( @@ -195,7 +194,7 @@ def create_connector( def raise_not_valid_url(url: str) -> None: """do some basic reality checks on the url""" parsed = urlparse(url) - if not parsed.scheme in ["http", "https"]: + if parsed.scheme not in ["http", "https"]: raise ConnectorException("Invalid scheme: ", url) if not parsed.hostname: @@ -220,7 +219,7 @@ def create_finna_connector() -> None: name="Finna API", connector_file="finna", base_url="https://www.finna.fi", - books_url="https://api.finna.fi/api/v1/record" "?id=", + books_url="https://api.finna.fi/api/v1/record?id=", covers_url="https://api.finna.fi", search_url="https://api.finna.fi/api/v1/search?limit=20" "&filter[]=format%3a%220%2fBook%2f%22" diff --git a/bookwyrm/connectors/finna.py b/bookwyrm/connectors/finna.py index 59eedfbdcd..b54f92fd53 100644 --- a/bookwyrm/connectors/finna.py +++ b/bookwyrm/connectors/finna.py @@ -88,7 +88,8 @@ def get_book_data(self, remote_id: str) -> JsonDict: ] } data = get_data( - url=remote_id, params=request_parameters # type:ignore[arg-type] + url=remote_id, + params=request_parameters, # type:ignore[arg-type] ) extracted = data.get("records", []) try: diff --git a/bookwyrm/connectors/format_mappings.py b/bookwyrm/connectors/format_mappings.py index 61f61efaad..f998a23787 100644 --- a/bookwyrm/connectors/format_mappings.py +++ b/bookwyrm/connectors/format_mappings.py @@ -1,4 +1,5 @@ -""" comparing a free text format to the standardized one """ +"""comparing a free text format to the standardized one""" + format_mappings = { "paperback": "Paperback", "soft": "Paperback", diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 3f4c179e8c..1cacd44bf6 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -1,4 +1,5 @@ -""" inventaire data connector """ +"""inventaire data connector""" + import re from typing import Any, Union, Optional, Iterator, Iterable diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index 4778a32332..032a86f580 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -1,4 +1,5 @@ -""" openlibrary data connector """ +"""openlibrary data connector""" + import re from typing import Any, Optional, Union, Iterator, Iterable diff --git a/bookwyrm/connectors/openlibrary_languages.py b/bookwyrm/connectors/openlibrary_languages.py index 2520d1ea15..3a6276e74a 100644 --- a/bookwyrm/connectors/openlibrary_languages.py +++ b/bookwyrm/connectors/openlibrary_languages.py @@ -1,4 +1,5 @@ -""" key lookups for openlibrary languages """ +"""key lookups for openlibrary languages""" + languages = { "/languages/eng": "English", "/languages/fre": "French", diff --git a/bookwyrm/connectors/settings.py b/bookwyrm/connectors/settings.py index 4ef149a21d..85aff80f17 100644 --- a/bookwyrm/connectors/settings.py +++ b/bookwyrm/connectors/settings.py @@ -1,4 +1,4 @@ -""" settings book data connectors """ +"""settings book data connectors""" CONNECTORS = [ "openlibrary", diff --git a/bookwyrm/context_processors.py b/bookwyrm/context_processors.py index 1dac54997d..1406a84a18 100644 --- a/bookwyrm/context_processors.py +++ b/bookwyrm/context_processors.py @@ -1,4 +1,5 @@ -""" customize the info available in context for rendering templates """ +"""customize the info available in context for rendering templates""" + from bookwyrm import models, settings diff --git a/bookwyrm/decorators.py b/bookwyrm/decorators.py index b8285cfb85..ba9526bf9e 100644 --- a/bookwyrm/decorators.py +++ b/bookwyrm/decorators.py @@ -1,4 +1,5 @@ -""" Custom view decorators """ +"""Custom view decorators""" + from functools import wraps from bookwyrm.models.site import SiteSettings diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py index 4a0ae7423e..1662bd4c65 100644 --- a/bookwyrm/emailing.py +++ b/bookwyrm/emailing.py @@ -1,4 +1,5 @@ -""" send emails """ +"""send emails""" + from django.core.mail import EmailMultiAlternatives from django.template.loader import get_template diff --git a/bookwyrm/forms/__init__.py b/bookwyrm/forms/__init__.py index a37d126ac9..00709a7c77 100644 --- a/bookwyrm/forms/__init__.py +++ b/bookwyrm/forms/__init__.py @@ -1,4 +1,5 @@ -""" make forms available to the app """ +"""make forms available to the app""" + # site admin from .admin import * from .author import * diff --git a/bookwyrm/forms/admin.py b/bookwyrm/forms/admin.py index e3586cd342..2bae65a030 100644 --- a/bookwyrm/forms/admin.py +++ b/bookwyrm/forms/admin.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + import datetime from django import forms @@ -216,5 +217,4 @@ def save(self, request, *args, **kwargs): class ExportFileExpiryForm(forms.Form): - hours = forms.IntegerField(min_value=1) diff --git a/bookwyrm/forms/author.py b/bookwyrm/forms/author.py index a3a759af7c..2364b488b2 100644 --- a/bookwyrm/forms/author.py +++ b/bookwyrm/forms/author.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + from django import forms from bookwyrm import models diff --git a/bookwyrm/forms/books.py b/bookwyrm/forms/books.py index f9a110efc9..e2206d9e7b 100644 --- a/bookwyrm/forms/books.py +++ b/bookwyrm/forms/books.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + from django import forms from file_resubmit.widgets import ResubmitImageWidget diff --git a/bookwyrm/forms/custom_form.py b/bookwyrm/forms/custom_form.py index 6b425d216a..98a77aa93d 100644 --- a/bookwyrm/forms/custom_form.py +++ b/bookwyrm/forms/custom_form.py @@ -1,4 +1,5 @@ -""" Overrides django's default form class """ +"""Overrides django's default form class""" + from collections import defaultdict from django.forms import ModelForm from django.forms.widgets import Textarea diff --git a/bookwyrm/forms/edit_user.py b/bookwyrm/forms/edit_user.py index da69243e11..1fe794045f 100644 --- a/bookwyrm/forms/edit_user.py +++ b/bookwyrm/forms/edit_user.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + from django import forms from django.contrib.auth.password_validation import validate_password from django.core.exceptions import ValidationError @@ -8,6 +9,7 @@ from bookwyrm.models.fields import ClearableFileInputWithWarning from .custom_form import CustomForm + # pylint: disable=missing-class-docstring class EditUserForm(CustomForm): class Meta: diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py index 0ecf3e3018..52d327a22f 100644 --- a/bookwyrm/forms/forms.py +++ b/bookwyrm/forms/forms.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + import datetime from django import forms from django.forms import widgets @@ -9,6 +10,7 @@ from bookwyrm.models.fields import ClearableFileInputWithWarning from .custom_form import CustomForm + # pylint: disable=missing-class-docstring class FeedStatusTypesForm(CustomForm): class Meta: diff --git a/bookwyrm/forms/groups.py b/bookwyrm/forms/groups.py index 90aace3baf..3138d3f7a2 100644 --- a/bookwyrm/forms/groups.py +++ b/bookwyrm/forms/groups.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + from bookwyrm import models from .custom_form import CustomForm diff --git a/bookwyrm/forms/landing.py b/bookwyrm/forms/landing.py index 6e43dbad49..c14b1d4722 100644 --- a/bookwyrm/forms/landing.py +++ b/bookwyrm/forms/landing.py @@ -1,4 +1,5 @@ -""" Forms for the landing pages """ +"""Forms for the landing pages""" + from django import forms from django.contrib.auth.password_validation import validate_password from django.core.exceptions import ValidationError @@ -131,7 +132,6 @@ def clean_otp(self): totp = pyotp.TOTP(self.instance.otp_secret) if not totp.verify(otp, valid_window=TWO_FACTOR_LOGIN_VALIDITY_WINDOW): - if self.instance.hotp_secret: # maybe it's a backup code? hotp = pyotp.HOTP(self.instance.hotp_secret) diff --git a/bookwyrm/forms/links.py b/bookwyrm/forms/links.py index 06de9a304d..eda5b675c1 100644 --- a/bookwyrm/forms/links.py +++ b/bookwyrm/forms/links.py @@ -1,4 +1,4 @@ -""" using django model forms """ +"""using django model forms""" from urllib.parse import urlparse diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py index f5008baa3c..5a5392ca70 100644 --- a/bookwyrm/forms/lists.py +++ b/bookwyrm/forms/lists.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + from django import forms from django.forms import ChoiceField from django.utils.translation import gettext_lazy as _ diff --git a/bookwyrm/forms/status.py b/bookwyrm/forms/status.py index b562595eeb..f026780746 100644 --- a/bookwyrm/forms/status.py +++ b/bookwyrm/forms/status.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + from bookwyrm import models from .custom_form import CustomForm diff --git a/bookwyrm/forms/user_admin.py b/bookwyrm/forms/user_admin.py index a3bf6fa8ec..1efd366a40 100644 --- a/bookwyrm/forms/user_admin.py +++ b/bookwyrm/forms/user_admin.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + from bookwyrm import models from .custom_form import CustomForm diff --git a/bookwyrm/forms/widgets.py b/bookwyrm/forms/widgets.py index 001fdbec40..97088cf826 100644 --- a/bookwyrm/forms/widgets.py +++ b/bookwyrm/forms/widgets.py @@ -1,4 +1,5 @@ -""" using django model forms """ +"""using django model forms""" + from django import forms diff --git a/bookwyrm/imagegenerators.py b/bookwyrm/imagegenerators.py index 1d065192e8..dc51683d06 100644 --- a/bookwyrm/imagegenerators.py +++ b/bookwyrm/imagegenerators.py @@ -1,4 +1,5 @@ """Generators for all the different thumbnail sizes""" + from imagekit import ImageSpec, register from imagekit.processors import ResizeToFit diff --git a/bookwyrm/importers/__init__.py b/bookwyrm/importers/__init__.py index 497eebcf69..3c8bab23f0 100644 --- a/bookwyrm/importers/__init__.py +++ b/bookwyrm/importers/__init__.py @@ -1,4 +1,4 @@ -""" import classes """ +"""import classes""" from .importer import Importer from .bookwyrm_import import BookwyrmImporter, BookwyrmBooksImporter diff --git a/bookwyrm/importers/bookwyrm_import.py b/bookwyrm/importers/bookwyrm_import.py index d4fedb4f79..a1cdec811d 100644 --- a/bookwyrm/importers/bookwyrm_import.py +++ b/bookwyrm/importers/bookwyrm_import.py @@ -1,4 +1,5 @@ """Import data from Bookwyrm export files""" + from django.http import QueryDict from bookwyrm.models import User diff --git a/bookwyrm/importers/calibre_import.py b/bookwyrm/importers/calibre_import.py index 542175dd7a..76b7ae63fa 100644 --- a/bookwyrm/importers/calibre_import.py +++ b/bookwyrm/importers/calibre_import.py @@ -1,4 +1,5 @@ -""" handle reading a csv from calibre """ +"""handle reading a csv from calibre""" + from typing import Any, Optional from bookwyrm.models import Shelf diff --git a/bookwyrm/importers/goodreads_import.py b/bookwyrm/importers/goodreads_import.py index 8b3e94cbc7..e7c5b6aaf4 100644 --- a/bookwyrm/importers/goodreads_import.py +++ b/bookwyrm/importers/goodreads_import.py @@ -1,4 +1,5 @@ -""" handle reading a csv from goodreads """ +"""handle reading a csv from goodreads""" + from typing import Optional from . import Importer diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index e321303f1f..926fa4a726 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -1,4 +1,5 @@ -""" handle reading a csv from an external service, defaults are from Goodreads """ +"""handle reading a csv from an external service, defaults are from Goodreads""" + import csv from datetime import timedelta from typing import Iterable, Optional @@ -106,7 +107,7 @@ def update_legacy_job(self, job: ImportJob) -> None: def create_row_mappings(self, headers: list[str]) -> dict[str, Optional[str]]: """guess what the headers mean""" mappings = {} - for (key, guesses) in self.row_mappings_guesses: + for key, guesses in self.row_mappings_guesses: values = [h for h in headers if h.lower() in guesses] value = values[0] if len(values) else None if value: diff --git a/bookwyrm/importers/librarything_import.py b/bookwyrm/importers/librarything_import.py index 24a2626bf6..f118d7ea20 100644 --- a/bookwyrm/importers/librarything_import.py +++ b/bookwyrm/importers/librarything_import.py @@ -1,4 +1,5 @@ -""" handle reading a tsv from librarything """ +"""handle reading a tsv from librarything""" + import re from typing import Optional diff --git a/bookwyrm/importers/openlibrary_import.py b/bookwyrm/importers/openlibrary_import.py index 6a954ed3c7..6cb7c615b9 100644 --- a/bookwyrm/importers/openlibrary_import.py +++ b/bookwyrm/importers/openlibrary_import.py @@ -1,4 +1,5 @@ -""" handle reading a csv from openlibrary""" +"""handle reading a csv from openlibrary""" + from typing import Any from . import Importer diff --git a/bookwyrm/importers/openreads_import.py b/bookwyrm/importers/openreads_import.py index e6e12c2ef1..f17ce8425a 100644 --- a/bookwyrm/importers/openreads_import.py +++ b/bookwyrm/importers/openreads_import.py @@ -1,4 +1,5 @@ -""" handle reading a csv from openreads""" +"""handle reading a csv from openreads""" + from typing import Any, Optional from datetime import datetime from bookwyrm.models import Shelf diff --git a/bookwyrm/importers/storygraph_import.py b/bookwyrm/importers/storygraph_import.py index 67cbaa663c..b5954ea345 100644 --- a/bookwyrm/importers/storygraph_import.py +++ b/bookwyrm/importers/storygraph_import.py @@ -1,4 +1,5 @@ -""" handle reading a csv from storygraph""" +"""handle reading a csv from storygraph""" + from . import Importer diff --git a/bookwyrm/isbn/isbn.py b/bookwyrm/isbn/isbn.py index d14dc26196..db67060f58 100644 --- a/bookwyrm/isbn/isbn.py +++ b/bookwyrm/isbn/isbn.py @@ -1,4 +1,5 @@ -""" Use the range message from isbn-international to hyphenate ISBNs """ +"""Use the range message from isbn-international to hyphenate ISBNs""" + import os from typing import Optional from xml.etree import ElementTree diff --git a/bookwyrm/lists_stream.py b/bookwyrm/lists_stream.py index 479eacb193..1030b3834d 100644 --- a/bookwyrm/lists_stream.py +++ b/bookwyrm/lists_stream.py @@ -1,4 +1,5 @@ -""" access the list streams stored in redis """ +"""access the list streams stored in redis""" + from django.dispatch import receiver from django.db import transaction from django.db.models import signals, Count, Q diff --git a/bookwyrm/management/commands/add_finna_connector.py b/bookwyrm/management/commands/add_finna_connector.py index 6da28570a3..94250d8d06 100644 --- a/bookwyrm/management/commands/add_finna_connector.py +++ b/bookwyrm/management/commands/add_finna_connector.py @@ -1,17 +1,17 @@ -""" Add finna connector to connectors """ +"""Add finna connector to connectors""" + from django.core.management.base import BaseCommand from bookwyrm import models def enable_finna_connector(): - models.Connector.objects.create( identifier="api.finna.fi", name="Finna API", connector_file="finna", base_url="https://www.finna.fi", - books_url="https://api.finna.fi/api/v1/record" "?id=", + books_url="https://api.finna.fi/api/v1/record?id=", covers_url="https://api.finna.fi", search_url="https://api.finna.fi/api/v1/search?limit=20" "&filter[]=format%3a%220%2fBook%2f%22" diff --git a/bookwyrm/management/commands/admin_code.py b/bookwyrm/management/commands/admin_code.py index 75322163f5..90da08f28a 100644 --- a/bookwyrm/management/commands/admin_code.py +++ b/bookwyrm/management/commands/admin_code.py @@ -1,4 +1,5 @@ -""" Get your admin code to allow install """ +"""Get your admin code to allow install""" + from django.core.management.base import BaseCommand from bookwyrm import models diff --git a/bookwyrm/management/commands/compile_themes.py b/bookwyrm/management/commands/compile_themes.py index 95c6699ba5..c120f977e2 100644 --- a/bookwyrm/management/commands/compile_themes.py +++ b/bookwyrm/management/commands/compile_themes.py @@ -1,4 +1,5 @@ -""" Our own command to all scss themes """ +"""Our own command to all scss themes""" + import glob import os diff --git a/bookwyrm/management/commands/confirm_email.py b/bookwyrm/management/commands/confirm_email.py index 450da7eecf..38f4c34321 100644 --- a/bookwyrm/management/commands/confirm_email.py +++ b/bookwyrm/management/commands/confirm_email.py @@ -1,4 +1,5 @@ -""" manually confirm e-mail of user """ +"""manually confirm e-mail of user""" + from django.core.management.base import BaseCommand from bookwyrm import models diff --git a/bookwyrm/management/commands/deduplicate_book_data.py b/bookwyrm/management/commands/deduplicate_book_data.py index c2d897ce33..2637079ccf 100644 --- a/bookwyrm/management/commands/deduplicate_book_data.py +++ b/bookwyrm/management/commands/deduplicate_book_data.py @@ -1,5 +1,5 @@ -""" PROCEED WITH CAUTION: uses deduplication fields to permanently -merge book data objects """ +"""PROCEED WITH CAUTION: uses deduplication fields to permanently +merge book data objects""" from django.core.management.base import BaseCommand from django.db.models import Count diff --git a/bookwyrm/management/commands/erase_deleted_user_data.py b/bookwyrm/management/commands/erase_deleted_user_data.py index 40c3f042b3..d907327d22 100644 --- a/bookwyrm/management/commands/erase_deleted_user_data.py +++ b/bookwyrm/management/commands/erase_deleted_user_data.py @@ -1,9 +1,11 @@ -""" Erase any data stored about deleted users """ +"""Erase any data stored about deleted users""" + import sys from django.core.management.base import BaseCommand, CommandError from bookwyrm import models from bookwyrm.models.user import erase_user_data + # pylint: disable=missing-function-docstring class Command(BaseCommand): """command-line options""" @@ -18,7 +20,6 @@ def add_arguments(self, parser): # pylint: disable=no-self-use ) def handle(self, *args, **options): # pylint: disable=unused-argument - # Check for anything fishy bad_state = models.User.objects.filter(is_deleted=True, is_active=True) if bad_state.exists(): diff --git a/bookwyrm/management/commands/erase_streams.py b/bookwyrm/management/commands/erase_streams.py index ecd36006cc..4c2964e673 100644 --- a/bookwyrm/management/commands/erase_streams.py +++ b/bookwyrm/management/commands/erase_streams.py @@ -1,4 +1,5 @@ -""" Delete user streams """ +"""Delete user streams""" + from django.core.management.base import BaseCommand import redis @@ -16,6 +17,7 @@ class Command(BaseCommand): """delete activity streams for all users""" help = "Delete all the user streams" + # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """flush all, baby""" diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index 9ff16c26ae..6adf265354 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -1,4 +1,5 @@ -""" Generate preview images """ +"""Generate preview images""" + from django.core.management.base import BaseCommand from bookwyrm import models, preview_images diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py index 88941a653e..9192f0173f 100644 --- a/bookwyrm/management/commands/initdb.py +++ b/bookwyrm/management/commands/initdb.py @@ -1,4 +1,5 @@ -""" What you need in the database to make it work """ +"""What you need in the database to make it work""" + from django.core.management.base import BaseCommand from django.contrib.auth.models import Group, Permission from django.contrib.contenttypes.models import ContentType diff --git a/bookwyrm/management/commands/merge_authors.py b/bookwyrm/management/commands/merge_authors.py index 7465df1479..a05029e9eb 100644 --- a/bookwyrm/management/commands/merge_authors.py +++ b/bookwyrm/management/commands/merge_authors.py @@ -1,5 +1,6 @@ -""" PROCEED WITH CAUTION: uses deduplication fields to permanently -merge author data objects """ +"""PROCEED WITH CAUTION: uses deduplication fields to permanently +merge author data objects""" + from bookwyrm import models from bookwyrm.management.merge_command import MergeCommand diff --git a/bookwyrm/management/commands/merge_editions.py b/bookwyrm/management/commands/merge_editions.py index 9ed6962019..4b7f367809 100644 --- a/bookwyrm/management/commands/merge_editions.py +++ b/bookwyrm/management/commands/merge_editions.py @@ -1,5 +1,6 @@ -""" PROCEED WITH CAUTION: uses deduplication fields to permanently -merge edition data objects """ +"""PROCEED WITH CAUTION: uses deduplication fields to permanently +merge edition data objects""" + from bookwyrm import models from bookwyrm.management.merge_command import MergeCommand diff --git a/bookwyrm/management/commands/merge_works.py b/bookwyrm/management/commands/merge_works.py index 619d0509ac..e8c5e08319 100644 --- a/bookwyrm/management/commands/merge_works.py +++ b/bookwyrm/management/commands/merge_works.py @@ -1,5 +1,6 @@ -""" PROCEED WITH CAUTION: uses deduplication fields to permanently -merge work data objects """ +"""PROCEED WITH CAUTION: uses deduplication fields to permanently +merge work data objects""" + from bookwyrm import models from bookwyrm.management.merge_command import MergeCommand diff --git a/bookwyrm/management/commands/populate_lists_streams.py b/bookwyrm/management/commands/populate_lists_streams.py index 0a057401cc..313502e5c3 100644 --- a/bookwyrm/management/commands/populate_lists_streams.py +++ b/bookwyrm/management/commands/populate_lists_streams.py @@ -1,4 +1,5 @@ -""" Re-create list streams """ +"""Re-create list streams""" + from django.core.management.base import BaseCommand from bookwyrm import lists_stream, models diff --git a/bookwyrm/management/commands/populate_streams.py b/bookwyrm/management/commands/populate_streams.py index 5f83670c20..2aa769699a 100644 --- a/bookwyrm/management/commands/populate_streams.py +++ b/bookwyrm/management/commands/populate_streams.py @@ -1,4 +1,5 @@ -""" Re-create user streams """ +"""Re-create user streams""" + from django.core.management.base import BaseCommand from bookwyrm import activitystreams, lists_stream, models diff --git a/bookwyrm/management/commands/populate_suggestions.py b/bookwyrm/management/commands/populate_suggestions.py index 32495497e4..fd195d4ac8 100644 --- a/bookwyrm/management/commands/populate_suggestions.py +++ b/bookwyrm/management/commands/populate_suggestions.py @@ -1,4 +1,5 @@ -""" Populate suggested users """ +"""Populate suggested users""" + from django.core.management.base import BaseCommand from bookwyrm import models @@ -19,6 +20,7 @@ class Command(BaseCommand): """start all over with user suggestions""" help = "Populate suggested users for all users" + # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run builder""" diff --git a/bookwyrm/management/commands/remove_editions.py b/bookwyrm/management/commands/remove_editions.py index 5cb430a93b..f07d075ac4 100644 --- a/bookwyrm/management/commands/remove_editions.py +++ b/bookwyrm/management/commands/remove_editions.py @@ -1,4 +1,5 @@ -""" PROCEED WITH CAUTION: this permanently deletes book data """ +"""PROCEED WITH CAUTION: this permanently deletes book data""" + from django.core.management.base import BaseCommand from django.db.models import Count, Q from bookwyrm import models @@ -20,7 +21,7 @@ def remove_editions(): models.Edition.objects.filter( Q(languages=[]) | Q(languages__contains=["English"]), **filters, - **null_fields + **null_fields, ) .annotate(Count("parent_work__editions")) .filter( @@ -36,6 +37,7 @@ class Command(BaseCommand): """deduplicate allllll the book data models""" help = "merges duplicate book data" + # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run deduplications""" diff --git a/bookwyrm/management/commands/remove_remote_user_preview_images.py b/bookwyrm/management/commands/remove_remote_user_preview_images.py index d4dc131d82..d7d816e6d6 100644 --- a/bookwyrm/management/commands/remove_remote_user_preview_images.py +++ b/bookwyrm/management/commands/remove_remote_user_preview_images.py @@ -1,4 +1,5 @@ -""" Remove preview images for remote users """ +"""Remove preview images for remote users""" + from django.core.management.base import BaseCommand from django.db.models import Q @@ -35,6 +36,6 @@ def handle(self, *args, **options): self.stdout.write(".", ending="") self.stdout.write(" OK 🖼") else: - self.stdout.write(f" | There was no remote users with preview images.") + self.stdout.write(" | There was no remote users with preview images.") self.stdout.write("🧑‍🚒 ⎨ I’m all done! ✧ Enjoy ✧") diff --git a/bookwyrm/management/commands/repair_editions.py b/bookwyrm/management/commands/repair_editions.py index 304cd5e51f..56ffd93591 100644 --- a/bookwyrm/management/commands/repair_editions.py +++ b/bookwyrm/management/commands/repair_editions.py @@ -1,4 +1,5 @@ -""" Repair editions with missing works """ +"""Repair editions with missing works""" + from django.core.management.base import BaseCommand from bookwyrm import models diff --git a/bookwyrm/management/commands/revoke_preview_image_tasks.py b/bookwyrm/management/commands/revoke_preview_image_tasks.py index 7b0947b12c..311811017c 100644 --- a/bookwyrm/management/commands/revoke_preview_image_tasks.py +++ b/bookwyrm/management/commands/revoke_preview_image_tasks.py @@ -1,4 +1,5 @@ -""" Actually let's not generate those preview images """ +"""Actually let's not generate those preview images""" + import json from django.core.management.base import BaseCommand from bookwyrm.tasks import app diff --git a/bookwyrm/middleware/__init__.py b/bookwyrm/middleware/__init__.py index 5b9c658832..2656a29f12 100644 --- a/bookwyrm/middleware/__init__.py +++ b/bookwyrm/middleware/__init__.py @@ -1,4 +1,5 @@ -""" look at all this nice middleware! """ +"""look at all this nice middleware!""" + from .timezone_middleware import TimezoneMiddleware from .ip_middleware import IPBlocklistMiddleware from .file_too_big import FileTooBig diff --git a/bookwyrm/middleware/file_too_big.py b/bookwyrm/middleware/file_too_big.py index de1349d96a..0949821cfb 100644 --- a/bookwyrm/middleware/file_too_big.py +++ b/bookwyrm/middleware/file_too_big.py @@ -21,7 +21,6 @@ def __call__(self, request): body = request.body # pylint: disable=unused-variable except RequestDataTooBig: - rendered = render(request, "413.html") response = HttpResponse(rendered) return response diff --git a/bookwyrm/middleware/force_logout.py b/bookwyrm/middleware/force_logout.py index 02cd28a31e..d901e1a2e8 100644 --- a/bookwyrm/middleware/force_logout.py +++ b/bookwyrm/middleware/force_logout.py @@ -1,4 +1,4 @@ -""" Check if user needs to reset their password and log them out """ +"""Check if user needs to reset their password and log them out""" from django.contrib.auth import logout diff --git a/bookwyrm/middleware/ip_middleware.py b/bookwyrm/middleware/ip_middleware.py index 8063dd1f60..4d9f2bbf63 100644 --- a/bookwyrm/middleware/ip_middleware.py +++ b/bookwyrm/middleware/ip_middleware.py @@ -1,4 +1,5 @@ -""" Block IP addresses """ +"""Block IP addresses""" + from django.http import Http404 from bookwyrm import models diff --git a/bookwyrm/middleware/timezone_middleware.py b/bookwyrm/middleware/timezone_middleware.py index 3cf084154c..4337d04193 100644 --- a/bookwyrm/middleware/timezone_middleware.py +++ b/bookwyrm/middleware/timezone_middleware.py @@ -1,4 +1,5 @@ -""" Makes the app aware of the users timezone """ +"""Makes the app aware of the users timezone""" + import zoneinfo from django.utils import timezone diff --git a/bookwyrm/models/__init__.py b/bookwyrm/models/__init__.py index 9c93d3b1ac..a21f847623 100644 --- a/bookwyrm/models/__init__.py +++ b/bookwyrm/models/__init__.py @@ -1,4 +1,5 @@ -""" bring all the models into the app namespace """ +"""bring all the models into the app namespace""" + import inspect import sys diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index dfce4d5af9..1e8ab6c4b8 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -1,4 +1,5 @@ -""" activitypub model functionality """ +"""activitypub model functionality""" + import asyncio from base64 import b64encode from collections import namedtuple diff --git a/bookwyrm/models/announcement.py b/bookwyrm/models/announcement.py index 4581dbdae2..a1a25fb418 100644 --- a/bookwyrm/models/announcement.py +++ b/bookwyrm/models/announcement.py @@ -1,4 +1,5 @@ -""" admin announcements """ +"""admin announcements""" + from django.db import models from django.db.models import Q from django.utils import timezone diff --git a/bookwyrm/models/annual_goal.py b/bookwyrm/models/annual_goal.py index d36b822df2..7cce07115f 100644 --- a/bookwyrm/models/annual_goal.py +++ b/bookwyrm/models/annual_goal.py @@ -1,11 +1,12 @@ -""" How many books do you want to read this year """ +"""How many books do you want to read this year""" + from django.core.validators import MinValueValidator from django.db import models from django.utils import timezone from bookwyrm.models.status import Review from .base_model import BookWyrmModel -from . import fields, Review +from . import fields def get_current_year(): diff --git a/bookwyrm/models/antispam.py b/bookwyrm/models/antispam.py index 1067cbf1d7..da09014582 100644 --- a/bookwyrm/models/antispam.py +++ b/bookwyrm/models/antispam.py @@ -1,4 +1,5 @@ -""" Lets try NOT to sell viagra """ +"""Lets try NOT to sell viagra""" + from functools import reduce import operator diff --git a/bookwyrm/models/attachment.py b/bookwyrm/models/attachment.py index c8b2e51c2d..ae3fad950a 100644 --- a/bookwyrm/models/attachment.py +++ b/bookwyrm/models/attachment.py @@ -1,4 +1,5 @@ -""" media that is posted in the app """ +"""media that is posted in the app""" + from django.db import models from bookwyrm import activitypub diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 20c4e9e005..29e2954f92 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -1,4 +1,4 @@ -""" database schema for info about authors """ +"""database schema for info about authors""" import re from typing import Any diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index 814e59a733..837c18ecb9 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -1,4 +1,5 @@ -""" base model with default fields """ +"""base model with default fields""" + import base64 from Crypto import Random @@ -93,7 +94,6 @@ def raise_visible_to_user(self, viewer): self.privacy in ["direct", "followers"] and self.mention_users.filter(id=viewer.id).first() ): - return # you can see groups of which you are a member @@ -149,7 +149,7 @@ def privacy_filter(cls, viewer, privacy_levels=None): # you can't see followers only or direct messages if you're not logged in if viewer.is_anonymous: privacy_levels = [ - p for p in privacy_levels if not p in ["followers", "direct"] + p for p in privacy_levels if p not in ["followers", "direct"] ] else: # exclude blocks from both directions diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 5f71221ea8..a16b0a7f40 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -1,4 +1,4 @@ -""" database schema for books and shelves """ +"""database schema for books and shelves""" from itertools import chain import re @@ -371,7 +371,7 @@ def guess_sort_title(self, user=None): *(LANGUAGE_ARTICLES[language].get("articles") for language in lang_codes) ) - return re.sub(f'^{" |^".join(articles)} ', "", str(self.title).lower()) + return re.sub(f"^{' |^'.join(articles)} ", "", str(self.title).lower()) def __repr__(self): # pylint: disable=consider-using-f-string diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 8fbb659ad0..25eea2b862 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -193,7 +193,7 @@ def export_settings(user: User): def export_saved_lists(user: User): """add user saved lists to export JSON""" - return [l.remote_id for l in user.saved_lists.all()] + return [saved_list.remote_id for saved_list in user.saved_lists.all()] def export_follows(user: User): @@ -256,9 +256,9 @@ def export_book(user: User, edition: Edition): data["lists"] = [] for item in list_items: list_info = item.book_list.to_activity() - list_info[ - "privacy" - ] = item.book_list.privacy # this isn't serialized so we add it + list_info["privacy"] = ( + item.book_list.privacy + ) # this isn't serialized so we add it list_info["list_item"] = item.to_activity() data["lists"].append(list_info) diff --git a/bookwyrm/models/bookwyrm_import_job.py b/bookwyrm/models/bookwyrm_import_job.py index d679be2928..9e545e025b 100644 --- a/bookwyrm/models/bookwyrm_import_job.py +++ b/bookwyrm/models/bookwyrm_import_job.py @@ -217,7 +217,7 @@ class UserImportSubTask(SubTask): def before_start(self, task_id, args, kwargs): """Handler called before the task starts.""" - model = apps.get_model(f'bookwyrm.{kwargs["job_type"]}', require_ready=True) + model = apps.get_model(f"bookwyrm.{kwargs['job_type']}", require_ready=True) child_job = model.objects.get(id=kwargs["child_id"]) child_job.task_id = task_id child_job.save(update_fields=["task_id"]) @@ -227,7 +227,7 @@ def on_success(self, retval, task_id, args, kwargs): """Run by the worker if the task executes successfully""" # we want to complete our own UserImportBook job, not ChildJob - model = apps.get_model(f'bookwyrm.{kwargs["job_type"]}', require_ready=True) + model = apps.get_model(f"bookwyrm.{kwargs['job_type']}", require_ready=True) subtask = model.objects.get(id=kwargs["child_id"]) subtask.complete_job() @@ -297,7 +297,6 @@ def start_import_task(**kwargs): requests.exceptions.ConnectionError, ConnectionRefusedError, ): - origin_is_ok = False for data in job.import_data.get("books"): @@ -364,7 +363,6 @@ def import_book_task(**kwargs): # pylint: disable=too-many-branches edition = book_data.get("edition") book = models.Edition.find_existing(edition) if not book: - if kwargs["origin_is_ok"]: # try importing from the instance the user is coming from remote_id = edition.get("id") @@ -461,15 +459,12 @@ def upsert_status_task(**kwargs): status["cc"] = update_followers_address(user, status["cc"]) status[ "replies" - ] = ( - {} - ) # this parses incorrectly but we can't set it without knowing the new id + ] = {} # this parses incorrectly but we can't set it without knowing the new id status["inReplyToBook"] = task.book.remote_id parsed = activitypub.parse(status) if not status_already_exists( user, parsed ): # don't duplicate posts on multiple import - instance = parsed.to_model( model=status_class, save=True, overwrite=True ) @@ -509,7 +504,6 @@ def upsert_readthroughs(user, book_id, data): find or create the instances in the database""" for read_through in data: - obj = {} keys = [ "progress_mode", @@ -547,7 +541,6 @@ def upsert_lists( for blist in lists: booklist = models.List.objects.filter(name=blist["name"], user=user).first() if not booklist: - blist["owner"] = user.remote_id parsed = activitypub.parse(blist) booklist = parsed.to_model(model=models.List, save=True, overwrite=True) @@ -575,7 +568,6 @@ def upsert_shelves(user, book, shelves): DB entries if they don't already exist""" for shelf in shelves: - book_shelf = models.Shelf.objects.filter(name=shelf["name"], user=user).first() if not book_shelf: @@ -617,7 +609,7 @@ def update_user_settings(user, data): ("discoverable", "discoverable"), ] - for (ap_field, bw_field) in ap_fields: + for ap_field, bw_field in ap_fields: setattr(user, bw_field, data[ap_field]) bw_fields = [ @@ -669,7 +661,6 @@ def import_user_relationship_task(**kwargs): try: if task.relationship == "follow": - followee = activitypub.resolve_remote_id(task.remote_id, models.User) if followee: ( @@ -698,7 +689,6 @@ def import_user_relationship_task(**kwargs): task.set_status("failed") elif task.relationship == "block": - user_object = activitypub.resolve_remote_id(task.remote_id, models.User) if user_object: exists = models.UserBlocks.objects.filter( diff --git a/bookwyrm/models/connector.py b/bookwyrm/models/connector.py index d62f97f02e..f573720926 100644 --- a/bookwyrm/models/connector.py +++ b/bookwyrm/models/connector.py @@ -1,4 +1,5 @@ -""" manages interfaces with external sources of book data """ +"""manages interfaces with external sources of book data""" + from typing import Optional from django.db import models diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py index 98fbce550d..5df23bac9a 100644 --- a/bookwyrm/models/favorite.py +++ b/bookwyrm/models/favorite.py @@ -1,4 +1,5 @@ -""" like/fav/star a status """ +"""like/fav/star a status""" + from django.db import models from bookwyrm import activitypub diff --git a/bookwyrm/models/federated_server.py b/bookwyrm/models/federated_server.py index 5e08fc11d6..599701efc4 100644 --- a/bookwyrm/models/federated_server.py +++ b/bookwyrm/models/federated_server.py @@ -1,4 +1,5 @@ -""" connections to external ActivityPub servers """ +"""connections to external ActivityPub servers""" + from urllib.parse import urlparse from django.apps import apps diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 3cf455603e..317293cb40 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -1,4 +1,5 @@ -""" activitypub-aware django model fields """ +"""activitypub-aware django model fields""" + from dataclasses import MISSING from datetime import datetime import re diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py index 40a32b5dcf..9314cf569f 100644 --- a/bookwyrm/models/group.py +++ b/bookwyrm/models/group.py @@ -1,4 +1,5 @@ -""" do book related things with other users """ +"""do book related things with other users""" + from django.db import models, IntegrityError, transaction from django.db.models import Q from bookwyrm.settings import BASE_URL diff --git a/bookwyrm/models/hashtag.py b/bookwyrm/models/hashtag.py index 5126f012db..1a955e98a0 100644 --- a/bookwyrm/models/hashtag.py +++ b/bookwyrm/models/hashtag.py @@ -1,4 +1,5 @@ -""" model for tags """ +"""model for tags""" + from bookwyrm import activitypub from .activitypub_mixin import ActivitypubMixin from .base_model import BookWyrmModel diff --git a/bookwyrm/models/housekeeping.py b/bookwyrm/models/housekeeping.py index e8f8ae45dd..f9525dee05 100644 --- a/bookwyrm/models/housekeeping.py +++ b/bookwyrm/models/housekeeping.py @@ -1,4 +1,5 @@ -""" cleanup tasks """ +"""cleanup tasks""" + import math from datetime import datetime, timedelta, timezone @@ -139,7 +140,6 @@ def start_job(self): get_missing_cover_task.delay(job_id=self.id, edition_id=edition.id) if self.editions.count() == 0: - self.complete_job() diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index 25cab635d3..2b0ed9edb6 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -1,4 +1,5 @@ -""" track progress of goodreads imports """ +"""track progress of goodreads imports""" + from datetime import datetime import math import re @@ -419,7 +420,6 @@ def handle_imported_book(item): # pylint: disable=too-many-branches try: shelf = Shelf.objects.get(identifier=item.shelf, user=user) except ObjectDoesNotExist: - shelf = Shelf.objects.create( user=user, identifier=item.shelf, @@ -455,7 +455,6 @@ def handle_imported_book(item): # pylint: disable=too-many-branches item.date_reviewed or item.date_read or item.date_added or timezone.now() ) if item.review: - # pylint: disable=consider-using-f-string review_title = "Review of {!r} on {!r}".format( item.book.title, diff --git a/bookwyrm/models/job.py b/bookwyrm/models/job.py index ff4895dc60..1c7c2e6f09 100644 --- a/bookwyrm/models/job.py +++ b/bookwyrm/models/job.py @@ -186,9 +186,7 @@ class ParentTask(app.Task): Usage e.g. @app.task(base=ParentTask) """ - def before_start( - self, task_id, args, kwargs - ): # pylint: disable=no-self-use, unused-argument + def before_start(self, task_id, args, kwargs): # pylint: disable=no-self-use, unused-argument """Handler called before the task starts. Override. Prepare ParentJob before the task starts. @@ -213,9 +211,7 @@ def before_start( if kwargs.get("no_children"): job.set_status(ChildJob.Status.ACTIVE) - def on_success( - self, retval, task_id, args, kwargs - ): # pylint: disable=no-self-use, unused-argument + def on_success(self, retval, task_id, args, kwargs): # pylint: disable=no-self-use, unused-argument """Run by the worker if the task executes successfully. Override. Update ParentJob on Task complete. @@ -248,9 +244,7 @@ class SubTask(app.Task): Usage e.g. @app.task(base=SubTask) """ - def before_start( - self, task_id, args, kwargs - ): # pylint: disable=no-self-use, unused-argument + def before_start(self, task_id, args, kwargs): # pylint: disable=no-self-use, unused-argument """Handler called before the task starts. Override. Prepare ChildJob before the task starts. @@ -272,9 +266,7 @@ def before_start( child_job.save(update_fields=["task_id"]) child_job.set_status(ChildJob.Status.ACTIVE) - def on_success( - self, retval, task_id, args, kwargs - ): # pylint: disable=no-self-use, unused-argument + def on_success(self, retval, task_id, args, kwargs): # pylint: disable=no-self-use, unused-argument """Run by the worker if the task executes successfully. Override. Notify ChildJob of task completion. diff --git a/bookwyrm/models/link.py b/bookwyrm/models/link.py index 4519f0c81e..7d58423b8f 100644 --- a/bookwyrm/models/link.py +++ b/bookwyrm/models/link.py @@ -1,4 +1,5 @@ -""" outlink data """ +"""outlink data""" + from typing import Optional, Iterable from urllib.parse import urlparse diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index df7e8162c2..0f725d1643 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -1,4 +1,5 @@ -""" make a list of books!! """ +"""make a list of books!!""" + from typing import Optional, Iterable import uuid diff --git a/bookwyrm/models/move.py b/bookwyrm/models/move.py index 5038058b78..f7c891cef9 100644 --- a/bookwyrm/models/move.py +++ b/bookwyrm/models/move.py @@ -1,4 +1,5 @@ -""" move an object including migrating a user account """ +"""move an object including migrating a user account""" + from django.core.exceptions import PermissionDenied from django.db import models diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py index ca1e2aeb05..fefc8dd807 100644 --- a/bookwyrm/models/notification.py +++ b/bookwyrm/models/notification.py @@ -1,4 +1,5 @@ -""" alert a user to activity """ +"""alert a user to activity""" + from django.db import models, transaction from django.dispatch import receiver from bookwyrm.models.bookwyrm_export_job import BookwyrmExportJob diff --git a/bookwyrm/models/readthrough.py b/bookwyrm/models/readthrough.py index 670b35821f..46feaafaa9 100644 --- a/bookwyrm/models/readthrough.py +++ b/bookwyrm/models/readthrough.py @@ -1,4 +1,5 @@ -""" progress in a book """ +"""progress in a book""" + from typing import Optional, Iterable from django.core import validators diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py index c4344d812c..5117bef084 100644 --- a/bookwyrm/models/relationship.py +++ b/bookwyrm/models/relationship.py @@ -1,4 +1,5 @@ -""" defines relationships between users """ +"""defines relationships between users""" + from django.core.cache import cache from django.db import models, transaction, IntegrityError from django.db.models import Q diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py index 64ade3a406..7f396fa700 100644 --- a/bookwyrm/models/report.py +++ b/bookwyrm/models/report.py @@ -1,4 +1,5 @@ -""" flagged for moderation """ +"""flagged for moderation""" + from django.core.exceptions import PermissionDenied from django.db import models from django.utils.translation import gettext_lazy as _ diff --git a/bookwyrm/models/session.py b/bookwyrm/models/session.py index 3de199d299..d99d03483a 100644 --- a/bookwyrm/models/session.py +++ b/bookwyrm/models/session.py @@ -1,4 +1,5 @@ -""" functions for managing user sessions """ +"""functions for managing user sessions""" + from importlib import import_module import ua_parser diff --git a/bookwyrm/models/shelf.py b/bookwyrm/models/shelf.py index 0b9ef2b09e..8815400c4d 100644 --- a/bookwyrm/models/shelf.py +++ b/bookwyrm/models/shelf.py @@ -1,4 +1,5 @@ -""" puttin' books on shelves """ +"""puttin' books on shelves""" + import re from typing import Optional, Iterable from django.core.cache import cache diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index dafa185fee..efe8fd1009 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -1,4 +1,5 @@ -""" the particulars for this instance of BookWyrm """ +"""the particulars for this instance of BookWyrm""" + from __future__ import annotations import datetime from typing import Any, Optional, Iterable diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 2b357ebd22..ed04b2ee80 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -1,4 +1,5 @@ -""" models for storing different kinds of Activities """ +"""models for storing different kinds of Activities""" + from dataclasses import MISSING from typing import Optional, Iterable import re @@ -125,9 +126,7 @@ def recipients(self): return list(mentions) @classmethod - def ignore_activity( - cls, activity, allow_external_connections=True - ): # pylint: disable=too-many-return-statements + def ignore_activity(cls, activity, allow_external_connections=True): # pylint: disable=too-many-return-statements """keep notes if they are replies to existing statuses""" if activity.type == "Announce": boosted = activitypub.resolve_remote_id( @@ -353,8 +352,7 @@ def pure_content(self): """indicate the book in question for mastodon (or w/e) users""" progress = self.progress or 0 citation = ( - f'comment on ' - f"{self.book.title}" + f'comment on {self.book.title}' ) if self.progress_mode == "PG" and progress > 0: citation += f", p. {progress}" diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index c1e6d9fb1f..bc363909a0 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -1,4 +1,5 @@ -""" database schema for user data """ +"""database schema for user data""" + import datetime from importlib import import_module import re diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 446199c397..ed0a1d5196 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -1,4 +1,4 @@ -""" Generate social media preview images for twitter/mastodon/etc """ +"""Generate social media preview images for twitter/mastodon/etc""" import math import os diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py index e188487aaa..f7520152cf 100644 --- a/bookwyrm/redis_store.py +++ b/bookwyrm/redis_store.py @@ -1,4 +1,5 @@ -""" access the activity stores stored in redis """ +"""access the activity stores stored in redis""" + from abc import ABC, abstractmethod import redis diff --git a/bookwyrm/signatures.py b/bookwyrm/signatures.py index f59367b51e..e33033d094 100644 --- a/bookwyrm/signatures.py +++ b/bookwyrm/signatures.py @@ -1,4 +1,5 @@ -""" signs activitypub activities """ +"""signs activitypub activities""" + import hashlib from urllib.parse import urlparse import datetime diff --git a/bookwyrm/status.py b/bookwyrm/status.py index de7682ee72..31141b525a 100644 --- a/bookwyrm/status.py +++ b/bookwyrm/status.py @@ -1,4 +1,5 @@ -""" Handle user activity """ +"""Handle user activity""" + from django.db import transaction from bookwyrm import models diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py index 9f31a97bf6..7efadcb6c1 100644 --- a/bookwyrm/suggested_users.py +++ b/bookwyrm/suggested_users.py @@ -1,4 +1,5 @@ -""" store recommended follows in redis """ +"""store recommended follows in redis""" + import math import logging from django.dispatch import receiver @@ -211,7 +212,7 @@ def update_user(sender, instance, created, update_fields=None, **kwargs): # we know what fields were updated and discoverability didn't change if not instance.bookwyrm_user or ( - update_fields and not "discoverable" in update_fields + update_fields and "discoverable" not in update_fields ): return diff --git a/bookwyrm/tasks.py b/bookwyrm/tasks.py index 79e1b63408..3c65dfde90 100644 --- a/bookwyrm/tasks.py +++ b/bookwyrm/tasks.py @@ -1,4 +1,5 @@ -""" background tasks """ +"""background tasks""" + import os from celery import Celery diff --git a/bookwyrm/templatetags/book_display_tags.py b/bookwyrm/templatetags/book_display_tags.py index 0a0f228d88..0fbb293f77 100644 --- a/bookwyrm/templatetags/book_display_tags.py +++ b/bookwyrm/templatetags/book_display_tags.py @@ -1,4 +1,5 @@ -""" template filters """ +"""template filters""" + from django import template from bookwyrm import models diff --git a/bookwyrm/templatetags/celery_tags.py b/bookwyrm/templatetags/celery_tags.py index 6168d048e2..d66e67a646 100644 --- a/bookwyrm/templatetags/celery_tags.py +++ b/bookwyrm/templatetags/celery_tags.py @@ -1,4 +1,5 @@ -""" template filters for really common utilities """ +"""template filters for really common utilities""" + import datetime from django import template diff --git a/bookwyrm/templatetags/date_ext.py b/bookwyrm/templatetags/date_ext.py index efe55f2d9c..c73a3a7e65 100644 --- a/bookwyrm/templatetags/date_ext.py +++ b/bookwyrm/templatetags/date_ext.py @@ -1,4 +1,5 @@ -""" additional formatting of dates """ +"""additional formatting of dates""" + from django import template from django.template import defaultfilters from django.contrib.humanize.templatetags.humanize import naturalday diff --git a/bookwyrm/templatetags/feed_page_tags.py b/bookwyrm/templatetags/feed_page_tags.py index 3d346b9a27..dc6ebefdfd 100644 --- a/bookwyrm/templatetags/feed_page_tags.py +++ b/bookwyrm/templatetags/feed_page_tags.py @@ -1,4 +1,5 @@ -""" tags used on the feed pages """ +"""tags used on the feed pages""" + from django import template from bookwyrm.views.feed import get_suggested_books diff --git a/bookwyrm/templatetags/group_tags.py b/bookwyrm/templatetags/group_tags.py index fde7997e83..e4caeba4fd 100644 --- a/bookwyrm/templatetags/group_tags.py +++ b/bookwyrm/templatetags/group_tags.py @@ -1,4 +1,5 @@ -""" template filters """ +"""template filters""" + from django import template from bookwyrm import models diff --git a/bookwyrm/templatetags/interaction.py b/bookwyrm/templatetags/interaction.py index 9c73aa1afe..894b28336b 100644 --- a/bookwyrm/templatetags/interaction.py +++ b/bookwyrm/templatetags/interaction.py @@ -1,4 +1,5 @@ -""" template filters for status interaction buttons """ +"""template filters for status interaction buttons""" + from django import template from bookwyrm import models diff --git a/bookwyrm/templatetags/landing_page_tags.py b/bookwyrm/templatetags/landing_page_tags.py index bc7594fc47..50e0471fec 100644 --- a/bookwyrm/templatetags/landing_page_tags.py +++ b/bookwyrm/templatetags/landing_page_tags.py @@ -1,4 +1,5 @@ -""" template filters """ +"""template filters""" + from django import template from django.db.models import Avg, StdDev, Count, F, Q diff --git a/bookwyrm/templatetags/layout.py b/bookwyrm/templatetags/layout.py index f42f3bda18..409e134566 100644 --- a/bookwyrm/templatetags/layout.py +++ b/bookwyrm/templatetags/layout.py @@ -1,4 +1,5 @@ -""" template filters used for creating the layout""" +"""template filters used for creating the layout""" + from django import template, utils register = template.Library() diff --git a/bookwyrm/templatetags/list_page_tags.py b/bookwyrm/templatetags/list_page_tags.py index c5445050f5..9eba4e97e2 100644 --- a/bookwyrm/templatetags/list_page_tags.py +++ b/bookwyrm/templatetags/list_page_tags.py @@ -1,4 +1,5 @@ -""" template filters for list page """ +"""template filters for list page""" + from django import template from django.utils.translation import gettext_lazy as _, ngettext diff --git a/bookwyrm/templatetags/markdown.py b/bookwyrm/templatetags/markdown.py index 370d60a1a8..6ca34a2546 100644 --- a/bookwyrm/templatetags/markdown.py +++ b/bookwyrm/templatetags/markdown.py @@ -1,4 +1,5 @@ -""" template filters """ +"""template filters""" + from django import template from bookwyrm.views.status import to_markdown diff --git a/bookwyrm/templatetags/notification_page_tags.py b/bookwyrm/templatetags/notification_page_tags.py index 7a365e689a..029b3acced 100644 --- a/bookwyrm/templatetags/notification_page_tags.py +++ b/bookwyrm/templatetags/notification_page_tags.py @@ -1,4 +1,5 @@ -""" tags used on the feed pages """ +"""tags used on the feed pages""" + from django import template from bookwyrm.templatetags.feed_page_tags import load_subclass diff --git a/bookwyrm/templatetags/rating_tags.py b/bookwyrm/templatetags/rating_tags.py index 367463a8f0..d7b7717a32 100644 --- a/bookwyrm/templatetags/rating_tags.py +++ b/bookwyrm/templatetags/rating_tags.py @@ -1,4 +1,5 @@ -""" template filters """ +"""template filters""" + from django import template from django.db.models import Avg diff --git a/bookwyrm/templatetags/shelf_tags.py b/bookwyrm/templatetags/shelf_tags.py index 36065d575b..320d508a2b 100644 --- a/bookwyrm/templatetags/shelf_tags.py +++ b/bookwyrm/templatetags/shelf_tags.py @@ -1,4 +1,5 @@ -""" Filters and tags related to shelving books """ +"""Filters and tags related to shelving books""" + from django import template from django.utils.translation import gettext_lazy as _ diff --git a/bookwyrm/templatetags/stars.py b/bookwyrm/templatetags/stars.py index d08dd8ef0f..15e662ec41 100644 --- a/bookwyrm/templatetags/stars.py +++ b/bookwyrm/templatetags/stars.py @@ -1,4 +1,5 @@ -""" template filters """ +"""template filters""" + from django import template diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py index 5d1f86caf2..3bc853962f 100644 --- a/bookwyrm/templatetags/status_display.py +++ b/bookwyrm/templatetags/status_display.py @@ -1,4 +1,5 @@ -""" template filters """ +"""template filters""" + from dateutil.relativedelta import relativedelta from django import template from django.conf import settings diff --git a/bookwyrm/templatetags/user_page_tags.py b/bookwyrm/templatetags/user_page_tags.py index b3a82597ea..9cae2fedb1 100644 --- a/bookwyrm/templatetags/user_page_tags.py +++ b/bookwyrm/templatetags/user_page_tags.py @@ -1,4 +1,5 @@ -""" template filters """ +"""template filters""" + from django import template diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index ce8b6d16f3..67d3e746c0 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -1,4 +1,5 @@ -""" template filters for really common utilities """ +"""template filters for really common utilities""" + import os import re from uuid import uuid4 @@ -145,10 +146,10 @@ def get_file_size(nbytes): if raw_size < 1024: return f"{raw_size} bytes" if raw_size < 1024**2: - return f"{raw_size/1024:.2f} KB" + return f"{raw_size / 1024:.2f} KB" if raw_size < 1024**3: - return f"{raw_size/1024**2:.2f} MB" - return f"{raw_size/1024**3:.2f} GB" + return f"{raw_size / 1024**2:.2f} MB" + return f"{raw_size / 1024**3:.2f} GB" @register.filter(name="get_user_permission") diff --git a/bookwyrm/tests/__init__.py b/bookwyrm/tests/__init__.py index 0879d4ecd5..998288ed5d 100644 --- a/bookwyrm/tests/__init__.py +++ b/bookwyrm/tests/__init__.py @@ -1,2 +1,3 @@ -""" import ALL the tests """ +"""import ALL the tests""" + from . import * # pylint: disable=import-self diff --git a/bookwyrm/tests/activitypub/test_author.py b/bookwyrm/tests/activitypub/test_author.py index 7f21e570c1..55c4f869d5 100644 --- a/bookwyrm/tests/activitypub/test_author.py +++ b/bookwyrm/tests/activitypub/test_author.py @@ -1,4 +1,5 @@ """test author serializer""" + from django.test import TestCase from bookwyrm import models diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 7321b18009..7b79c6a206 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -1,4 +1,5 @@ -""" tests the base functionality for activitypub dataclasses """ +"""tests the base functionality for activitypub dataclasses""" + import json import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/activitypub/test_note.py b/bookwyrm/tests/activitypub/test_note.py index 33fc04d911..1de9b1fd85 100644 --- a/bookwyrm/tests/activitypub/test_note.py +++ b/bookwyrm/tests/activitypub/test_note.py @@ -1,4 +1,5 @@ -""" tests functionality specifically for the Note ActivityPub dataclass""" +"""tests functionality specifically for the Note ActivityPub dataclass""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/activitypub/test_quotation.py b/bookwyrm/tests/activitypub/test_quotation.py index 50aeb58345..1f5da9a043 100644 --- a/bookwyrm/tests/activitypub/test_quotation.py +++ b/bookwyrm/tests/activitypub/test_quotation.py @@ -1,4 +1,5 @@ -""" quotation activity object serializer class """ +"""quotation activity object serializer class""" + import json import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/activitystreams/test_abstractstream.py b/bookwyrm/tests/activitystreams/test_abstractstream.py index addbd00f74..4b61ea9dec 100644 --- a/bookwyrm/tests/activitystreams/test_abstractstream.py +++ b/bookwyrm/tests/activitystreams/test_abstractstream.py @@ -1,4 +1,5 @@ -""" testing activitystreams """ +"""testing activitystreams""" + from datetime import datetime, timezone from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/activitystreams/test_booksstream.py b/bookwyrm/tests/activitystreams/test_booksstream.py index 07a4c52f4d..bf5024edf7 100644 --- a/bookwyrm/tests/activitystreams/test_booksstream.py +++ b/bookwyrm/tests/activitystreams/test_booksstream.py @@ -1,4 +1,5 @@ -""" testing activitystreams """ +"""testing activitystreams""" + import itertools from unittest.mock import patch diff --git a/bookwyrm/tests/activitystreams/test_homestream.py b/bookwyrm/tests/activitystreams/test_homestream.py index feadaab1b8..ae55388e12 100644 --- a/bookwyrm/tests/activitystreams/test_homestream.py +++ b/bookwyrm/tests/activitystreams/test_homestream.py @@ -1,4 +1,5 @@ -""" testing activitystreams """ +"""testing activitystreams""" + from unittest.mock import patch from django.test import TestCase from bookwyrm import activitystreams, models diff --git a/bookwyrm/tests/activitystreams/test_localstream.py b/bookwyrm/tests/activitystreams/test_localstream.py index 508a289b22..e58c1d45a7 100644 --- a/bookwyrm/tests/activitystreams/test_localstream.py +++ b/bookwyrm/tests/activitystreams/test_localstream.py @@ -1,4 +1,5 @@ -""" testing activitystreams """ +"""testing activitystreams""" + from unittest.mock import patch from django.test import TestCase from bookwyrm import activitystreams, models diff --git a/bookwyrm/tests/activitystreams/test_signals.py b/bookwyrm/tests/activitystreams/test_signals.py index 42bf262893..a3f694a11b 100644 --- a/bookwyrm/tests/activitystreams/test_signals.py +++ b/bookwyrm/tests/activitystreams/test_signals.py @@ -1,4 +1,5 @@ -""" testing activitystreams """ +"""testing activitystreams""" + import datetime from unittest.mock import patch diff --git a/bookwyrm/tests/activitystreams/test_tasks.py b/bookwyrm/tests/activitystreams/test_tasks.py index 28bd68bf25..3d3e8ad2e1 100644 --- a/bookwyrm/tests/activitystreams/test_tasks.py +++ b/bookwyrm/tests/activitystreams/test_tasks.py @@ -1,4 +1,5 @@ -""" testing activitystreams """ +"""testing activitystreams""" + from unittest.mock import patch from django.test import TestCase from bookwyrm import activitystreams, models diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index d849f23d7a..531b8a73b6 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -1,4 +1,5 @@ -""" testing book data connectors """ +"""testing book data connectors""" + from unittest.mock import patch from django.test import TestCase import responses diff --git a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py index cbbecf652b..5008b7ab67 100644 --- a/bookwyrm/tests/connectors/test_abstract_minimal_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_minimal_connector.py @@ -1,4 +1,5 @@ -""" testing book data connectors """ +"""testing book data connectors""" + from django.test import TestCase from bookwyrm import models diff --git a/bookwyrm/tests/connectors/test_bookwyrm_connector.py b/bookwyrm/tests/connectors/test_bookwyrm_connector.py index 9a909aa8a4..e955ccfa12 100644 --- a/bookwyrm/tests/connectors/test_bookwyrm_connector.py +++ b/bookwyrm/tests/connectors/test_bookwyrm_connector.py @@ -1,4 +1,5 @@ -""" testing book data connectors """ +"""testing book data connectors""" + import json import pathlib from django.test import TestCase diff --git a/bookwyrm/tests/connectors/test_connector_manager.py b/bookwyrm/tests/connectors/test_connector_manager.py index f40c32ac2f..25b23ca551 100644 --- a/bookwyrm/tests/connectors/test_connector_manager.py +++ b/bookwyrm/tests/connectors/test_connector_manager.py @@ -1,4 +1,5 @@ -""" interface between the app and various connectors """ +"""interface between the app and various connectors""" + from django.test import TestCase import responses diff --git a/bookwyrm/tests/connectors/test_finna_connector.py b/bookwyrm/tests/connectors/test_finna_connector.py index 74002d3cb0..2d5b2d6454 100644 --- a/bookwyrm/tests/connectors/test_finna_connector.py +++ b/bookwyrm/tests/connectors/test_finna_connector.py @@ -1,4 +1,5 @@ -""" testing book data connectors """ +"""testing book data connectors""" + import json import pathlib @@ -20,7 +21,7 @@ def setUpTestData(cls): name="Finna API", connector_file="finna", base_url="https://www.finna.fi", - books_url="https://api.finna.fi/api/v1/record" "?id=", + books_url="https://api.finna.fi/api/v1/record?id=", covers_url="https://api.finna.fi", search_url="https://api.finna.fi/api/v1/search?limit=20" "&filter[]=format%3a%220%2fBook%2f%22" diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index 1cd88195f1..cded12502f 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -1,4 +1,5 @@ -""" testing book data connectors """ +"""testing book data connectors""" + import json import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index b3157f4577..380ae2c82b 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -1,4 +1,5 @@ -""" testing book data connectors """ +"""testing book data connectors""" + import json import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/importers/test_bookwyrm_import.py b/bookwyrm/tests/importers/test_bookwyrm_import.py index 86cf08e815..5fca685f6d 100644 --- a/bookwyrm/tests/importers/test_bookwyrm_import.py +++ b/bookwyrm/tests/importers/test_bookwyrm_import.py @@ -1,4 +1,5 @@ -""" testing bookwyrm csv import """ +"""testing bookwyrm csv import""" + import pathlib from unittest.mock import patch import datetime diff --git a/bookwyrm/tests/importers/test_bookwyrm_user_import.py b/bookwyrm/tests/importers/test_bookwyrm_user_import.py index 72aafd29a4..33021550e4 100644 --- a/bookwyrm/tests/importers/test_bookwyrm_user_import.py +++ b/bookwyrm/tests/importers/test_bookwyrm_user_import.py @@ -1,4 +1,5 @@ -""" testing bookwyrm user import """ +"""testing bookwyrm user import""" + from unittest.mock import patch from django.test import TestCase from bookwyrm import models diff --git a/bookwyrm/tests/importers/test_calibre_import.py b/bookwyrm/tests/importers/test_calibre_import.py index 1d3d5fe8a4..1a1f1875e5 100644 --- a/bookwyrm/tests/importers/test_calibre_import.py +++ b/bookwyrm/tests/importers/test_calibre_import.py @@ -1,4 +1,5 @@ -""" testing import """ +"""testing import""" + import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index dedae57098..615719ff43 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -1,4 +1,5 @@ -""" testing import """ +"""testing import""" + import pathlib from unittest.mock import patch import datetime diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 5eb4487193..a051d5c082 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -1,4 +1,5 @@ -""" testing import """ +"""testing import""" + from collections import namedtuple import pathlib import io diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index 5453f2b53d..6ce41a5d78 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -1,4 +1,5 @@ -""" testing import """ +"""testing import""" + import pathlib from unittest.mock import patch import datetime diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py index aa330e2299..cbb2310fb1 100644 --- a/bookwyrm/tests/importers/test_openlibrary_import.py +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -1,4 +1,5 @@ -""" testing import """ +"""testing import""" + import pathlib from unittest.mock import patch import datetime diff --git a/bookwyrm/tests/importers/test_openreads_import.py b/bookwyrm/tests/importers/test_openreads_import.py index e7344e692f..affba3078f 100644 --- a/bookwyrm/tests/importers/test_openreads_import.py +++ b/bookwyrm/tests/importers/test_openreads_import.py @@ -1,4 +1,5 @@ -""" testing import """ +"""testing import""" + import pathlib from unittest.mock import patch import datetime diff --git a/bookwyrm/tests/importers/test_storygraph_import.py b/bookwyrm/tests/importers/test_storygraph_import.py index 182fa794ca..4ba4be2533 100644 --- a/bookwyrm/tests/importers/test_storygraph_import.py +++ b/bookwyrm/tests/importers/test_storygraph_import.py @@ -1,4 +1,5 @@ -""" testing import """ +"""testing import""" + import pathlib from unittest.mock import patch import datetime diff --git a/bookwyrm/tests/lists_stream/test_signals.py b/bookwyrm/tests/lists_stream/test_signals.py index f9e7e4d12e..d536bb58ca 100644 --- a/bookwyrm/tests/lists_stream/test_signals.py +++ b/bookwyrm/tests/lists_stream/test_signals.py @@ -1,4 +1,5 @@ -""" testing lists_stream """ +"""testing lists_stream""" + from unittest.mock import patch from django.test import TestCase from bookwyrm import lists_stream, models diff --git a/bookwyrm/tests/lists_stream/test_stream.py b/bookwyrm/tests/lists_stream/test_stream.py index 5d752dd570..62db97bc3e 100644 --- a/bookwyrm/tests/lists_stream/test_stream.py +++ b/bookwyrm/tests/lists_stream/test_stream.py @@ -1,4 +1,5 @@ -""" testing activitystreams """ +"""testing activitystreams""" + from datetime import datetime from unittest.mock import patch diff --git a/bookwyrm/tests/lists_stream/test_tasks.py b/bookwyrm/tests/lists_stream/test_tasks.py index a127d363c1..eb448c5744 100644 --- a/bookwyrm/tests/lists_stream/test_tasks.py +++ b/bookwyrm/tests/lists_stream/test_tasks.py @@ -1,4 +1,5 @@ -""" testing lists_stream """ +"""testing lists_stream""" + from unittest.mock import patch from django.test import TestCase from bookwyrm import lists_stream, models diff --git a/bookwyrm/tests/management/test_add_finna_connector.py b/bookwyrm/tests/management/test_add_finna_connector.py index 671fac0a33..78fd586e71 100644 --- a/bookwyrm/tests/management/test_add_finna_connector.py +++ b/bookwyrm/tests/management/test_add_finna_connector.py @@ -1,4 +1,5 @@ -""" test populating user streams """ +"""test populating user streams""" + from django.test import TestCase from bookwyrm.models import Connector diff --git a/bookwyrm/tests/management/test_initdb.py b/bookwyrm/tests/management/test_initdb.py index a76fac04d0..648168713a 100644 --- a/bookwyrm/tests/management/test_initdb.py +++ b/bookwyrm/tests/management/test_initdb.py @@ -1,4 +1,5 @@ -""" test populating user streams """ +"""test populating user streams""" + from django.contrib.auth.models import Group, Permission from django.test import TestCase diff --git a/bookwyrm/tests/management/test_populate_lists_streams.py b/bookwyrm/tests/management/test_populate_lists_streams.py index 011011903e..a2a765d56e 100644 --- a/bookwyrm/tests/management/test_populate_lists_streams.py +++ b/bookwyrm/tests/management/test_populate_lists_streams.py @@ -1,4 +1,5 @@ -""" test populating user streams """ +"""test populating user streams""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/management/test_populate_streams.py b/bookwyrm/tests/management/test_populate_streams.py index c5b745c08f..07e0cc7cd1 100644 --- a/bookwyrm/tests/management/test_populate_streams.py +++ b/bookwyrm/tests/management/test_populate_streams.py @@ -1,4 +1,5 @@ -""" test populating user streams """ +"""test populating user streams""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index d5967b1a38..1562cb51fb 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -1,4 +1,5 @@ -""" testing model activitypub utilities """ +"""testing model activitypub utilities""" + from unittest.mock import patch from collections import namedtuple from dataclasses import dataclass @@ -287,9 +288,7 @@ def save(self, *args, **kwargs): with patch("django.db.models.Model.save"): super().save(*args, **kwargs) - def broadcast( - self, activity, sender, **kwargs - ): # pylint: disable=arguments-differ + def broadcast(self, activity, sender, **kwargs): # pylint: disable=arguments-differ """do something""" raise Success() diff --git a/bookwyrm/tests/models/test_automod.py b/bookwyrm/tests/models/test_automod.py index 5e10eb4d07..450e99fb63 100644 --- a/bookwyrm/tests/models/test_automod.py +++ b/bookwyrm/tests/models/test_automod.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index ddde41d048..62e1b9b5ae 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from unittest.mock import patch from django.http import Http404 from django.test import TestCase diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index ac5c9f93ad..ebf01de2e2 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + import pathlib import pytest @@ -215,7 +216,7 @@ def test_thumbnail_fields(self): def test_populate_sort_title(self): """The sort title should remove the initial article on save""" books = [] - for (k, v) in settings.LANGUAGE_ARTICLES.items(): + for k, v in settings.LANGUAGE_ARTICLES.items(): lang_books = [ models.Edition.objects.create( title=f"{article} Test Edition", languages=[string] diff --git a/bookwyrm/tests/models/test_bookwyrm_export_job.py b/bookwyrm/tests/models/test_bookwyrm_export_job.py index fa971664f8..5c9d756149 100644 --- a/bookwyrm/tests/models/test_bookwyrm_export_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_export_job.py @@ -1,4 +1,5 @@ """test bookwyrm user export functions""" + import datetime import json import pathlib @@ -27,7 +28,6 @@ def setUpTestData(self): # pylint: disable=bad-classmethod-argument patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.activitystreams.add_book_statuses_task"), ): - self.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", diff --git a/bookwyrm/tests/models/test_bookwyrm_import_job.py b/bookwyrm/tests/models/test_bookwyrm_import_job.py index 63745f6748..5c5853a1f3 100644 --- a/bookwyrm/tests/models/test_bookwyrm_import_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_import_job.py @@ -1,4 +1,4 @@ -""" testing models """ +"""testing models""" import json import os @@ -146,7 +146,6 @@ def test_update_goals(self): goals = [{"goal": 12, "year": 2023, "privacy": "followers"}] with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - models.bookwyrm_import_job.update_goals(self.local_user, goals) self.local_user.refresh_from_db() @@ -226,7 +225,6 @@ def test_follow_relationship(self): patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), patch("bookwyrm.activitypub.resolve_remote_id", return_value=self.rat_user), ): - bookwyrm_import_job.import_user_relationship_task(child_id=task.id) after_follow = models.UserFollows.objects.filter( @@ -757,7 +755,6 @@ def test_is_alias(self): with patch( "bookwyrm.activitypub.resolve_remote_id", return_value=self.rat_user ): - alias = bookwyrm_import_job.is_alias( self.local_user, self.rat_user.remote_id ) diff --git a/bookwyrm/tests/models/test_connector.py b/bookwyrm/tests/models/test_connector.py index b81e9092c8..a9c452069b 100644 --- a/bookwyrm/tests/models/test_connector.py +++ b/bookwyrm/tests/models/test_connector.py @@ -1,4 +1,4 @@ -""" testing connector model """ +"""testing connector model""" import pytest from django.test import TestCase diff --git a/bookwyrm/tests/models/test_federated_server.py b/bookwyrm/tests/models/test_federated_server.py index 43724568df..b3d8a0dd2a 100644 --- a/bookwyrm/tests/models/test_federated_server.py +++ b/bookwyrm/tests/models/test_federated_server.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index 7c1dcadc97..d0ab4868e8 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from collections import namedtuple from dataclasses import dataclass import datetime @@ -24,6 +25,7 @@ from bookwyrm.models.activitypub_mixin import ActivitypubMixin from bookwyrm.settings import PROTOCOL, NETLOC + # pylint: disable=too-many-public-methods @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") diff --git a/bookwyrm/tests/models/test_group.py b/bookwyrm/tests/models/test_group.py index 2c2960ac4f..3a3adda428 100644 --- a/bookwyrm/tests/models/test_group.py +++ b/bookwyrm/tests/models/test_group.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_housekeeping.py b/bookwyrm/tests/models/test_housekeeping.py index 7df7ae0cd0..b4279808ae 100644 --- a/bookwyrm/tests/models/test_housekeeping.py +++ b/bookwyrm/tests/models/test_housekeeping.py @@ -1,4 +1,5 @@ -""" test file management """ +"""test file management""" + from datetime import datetime, timedelta, timezone from os import listdir import pathlib @@ -124,7 +125,6 @@ def tearDown(self): """clean up any files""" for filename in listdir("exports"): - if "zzz_testfile.tar" in filename: pathlib.Path(f"exports/{filename}").unlink(missing_ok=True) @@ -197,7 +197,6 @@ def test_get_cover_from_identifer(self): """Get missing cover from remote source""" with open("test_image.jpg", "r+b") as f: - self.second_edition.cover.save("test_image.jpeg", f) responses.add( responses.GET, @@ -207,13 +206,18 @@ def test_get_cover_from_identifer(self): self.assertEqual(self.first_edition.cover, None) - with patch( - "bookwyrm.models.housekeeping.search", return_value=self.query_response - ), patch( - "bookwyrm.models.housekeeping.get_data", return_value=self.book_json - ), patch( - "bookwyrm.models.housekeeping.set_cover_from_url", - return_value=["test_image.jpeg", f], + with ( + patch( + "bookwyrm.models.housekeeping.search", + return_value=self.query_response, + ), + patch( + "bookwyrm.models.housekeeping.get_data", return_value=self.book_json + ), + patch( + "bookwyrm.models.housekeeping.set_cover_from_url", + return_value=["test_image.jpeg", f], + ), ): get_cover_from_identifiers(self.first_edition) @@ -223,7 +227,6 @@ def test_get_covers_with_incorrect_filepaths(self): """does get_coverless_books return books with wrong cover filepaths?""" with open("test_image.jpg", "r+b") as f: - self.second_edition.cover.save("test_image2.jpeg", f) self.assertNotEqual(self.second_edition.cover, None) @@ -273,5 +276,4 @@ def tearDown(self): "covers/test_image2.jpeg", "covers/test_image3.jpeg", ]: - pathlib.Path(filename).unlink(missing_ok=True) diff --git a/bookwyrm/tests/models/test_import_model.py b/bookwyrm/tests/models/test_import_model.py index 5445a79dbd..e14dc10827 100644 --- a/bookwyrm/tests/models/test_import_model.py +++ b/bookwyrm/tests/models/test_import_model.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + import datetime from datetime import timezone import json diff --git a/bookwyrm/tests/models/test_job.py b/bookwyrm/tests/models/test_job.py index 41e28ba7b3..eaa5575f4f 100644 --- a/bookwyrm/tests/models/test_job.py +++ b/bookwyrm/tests/models/test_job.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_link.py b/bookwyrm/tests/models/test_link.py index f72bdc2396..01990253be 100644 --- a/bookwyrm/tests/models/test_link.py +++ b/bookwyrm/tests/models/test_link.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_list.py b/bookwyrm/tests/models/test_list.py index a902f6cca0..cbeb26dfb9 100644 --- a/bookwyrm/tests/models/test_list.py +++ b/bookwyrm/tests/models/test_list.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from uuid import UUID from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_move.py b/bookwyrm/tests/models/test_move.py index 92c7a6cce8..e87a1aad9f 100644 --- a/bookwyrm/tests/models/test_move.py +++ b/bookwyrm/tests/models/test_move.py @@ -1,4 +1,5 @@ -""" testing move models """ +"""testing move models""" + from unittest.mock import patch from django.core.exceptions import PermissionDenied from django.test import TestCase diff --git a/bookwyrm/tests/models/test_notification.py b/bookwyrm/tests/models/test_notification.py index 976ac39c98..6d9a8708da 100644 --- a/bookwyrm/tests/models/test_notification.py +++ b/bookwyrm/tests/models/test_notification.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from unittest.mock import patch from django.test import TestCase from bookwyrm import models diff --git a/bookwyrm/tests/models/test_readthrough_model.py b/bookwyrm/tests/models/test_readthrough_model.py index 239537df4a..6d4ed024eb 100644 --- a/bookwyrm/tests/models/test_readthrough_model.py +++ b/bookwyrm/tests/models/test_readthrough_model.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + import datetime from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_relationship_models.py b/bookwyrm/tests/models/test_relationship_models.py index ec9f751a42..27758a7208 100644 --- a/bookwyrm/tests/models/test_relationship_models.py +++ b/bookwyrm/tests/models/test_relationship_models.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + import json from unittest.mock import patch from django.db import IntegrityError diff --git a/bookwyrm/tests/models/test_session.py b/bookwyrm/tests/models/test_session.py index 8298391200..353f8eedc1 100644 --- a/bookwyrm/tests/models/test_session.py +++ b/bookwyrm/tests/models/test_session.py @@ -1,4 +1,5 @@ -""" test session functions """ +"""test session functions""" + from importlib import import_module from django.conf import settings diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py index f17970c509..fe75af3f7f 100644 --- a/bookwyrm/tests/models/test_shelf_model.py +++ b/bookwyrm/tests/models/test_shelf_model.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + import json from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_site.py b/bookwyrm/tests/models/test_site.py index c9f9a13159..0994e7fcff 100644 --- a/bookwyrm/tests/models/test_site.py +++ b/bookwyrm/tests/models/test_site.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from datetime import timedelta from unittest.mock import patch diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 5837b41888..2dd40d513b 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + from unittest.mock import patch import pathlib import re diff --git a/bookwyrm/tests/models/test_unicode_slugs.py b/bookwyrm/tests/models/test_unicode_slugs.py index c51a3d3c06..52400b97d6 100644 --- a/bookwyrm/tests/models/test_unicode_slugs.py +++ b/bookwyrm/tests/models/test_unicode_slugs.py @@ -1,4 +1,5 @@ -""" Test Unicode slug generation and URL routing """ +"""Test Unicode slug generation and URL routing""" + import re from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index 2e122872dc..e80c88d501 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -1,4 +1,5 @@ -""" testing models """ +"""testing models""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/templatetags/test_book_display_tags.py b/bookwyrm/tests/templatetags/test_book_display_tags.py index 40fa0f7d6f..91bcf00e7e 100644 --- a/bookwyrm/tests/templatetags/test_book_display_tags.py +++ b/bookwyrm/tests/templatetags/test_book_display_tags.py @@ -1,4 +1,5 @@ -""" style fixes and lookups for templates """ +"""style fixes and lookups for templates""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/templatetags/test_date_ext.py b/bookwyrm/tests/templatetags/test_date_ext.py index bd31a95c9c..cec22b47c0 100644 --- a/bookwyrm/tests/templatetags/test_date_ext.py +++ b/bookwyrm/tests/templatetags/test_date_ext.py @@ -1,4 +1,5 @@ """Test date extensions in templates""" + from dateutil.parser import isoparse from django.test import TestCase, override_settings diff --git a/bookwyrm/tests/templatetags/test_feed_page_tags.py b/bookwyrm/tests/templatetags/test_feed_page_tags.py index 7e3ba6a9f7..a82e71681a 100644 --- a/bookwyrm/tests/templatetags/test_feed_page_tags.py +++ b/bookwyrm/tests/templatetags/test_feed_page_tags.py @@ -1,4 +1,5 @@ -""" style fixes and lookups for templates """ +"""style fixes and lookups for templates""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/templatetags/test_interaction.py b/bookwyrm/tests/templatetags/test_interaction.py index 6d707ffac5..8fcc7987c1 100644 --- a/bookwyrm/tests/templatetags/test_interaction.py +++ b/bookwyrm/tests/templatetags/test_interaction.py @@ -1,4 +1,5 @@ -""" style fixes and lookups for templates """ +"""style fixes and lookups for templates""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/templatetags/test_markdown.py b/bookwyrm/tests/templatetags/test_markdown.py index 5b5959ad3f..2739e0435e 100644 --- a/bookwyrm/tests/templatetags/test_markdown.py +++ b/bookwyrm/tests/templatetags/test_markdown.py @@ -1,4 +1,5 @@ -""" style fixes and lookups for templates """ +"""style fixes and lookups for templates""" + from django.test import TestCase from bookwyrm.templatetags import markdown diff --git a/bookwyrm/tests/templatetags/test_notification_page_tags.py b/bookwyrm/tests/templatetags/test_notification_page_tags.py index 2d18a5ca7d..14e3ef1914 100644 --- a/bookwyrm/tests/templatetags/test_notification_page_tags.py +++ b/bookwyrm/tests/templatetags/test_notification_page_tags.py @@ -1,4 +1,5 @@ -""" style fixes and lookups for templates """ +"""style fixes and lookups for templates""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/templatetags/test_rating_tags.py b/bookwyrm/tests/templatetags/test_rating_tags.py index cb28fd7886..6d03332dc6 100644 --- a/bookwyrm/tests/templatetags/test_rating_tags.py +++ b/bookwyrm/tests/templatetags/test_rating_tags.py @@ -1,4 +1,5 @@ -""" Gettings book ratings """ +"""Gettings book ratings""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/templatetags/test_shelf_tags.py b/bookwyrm/tests/templatetags/test_shelf_tags.py index 8b3ec82d1c..95eadd3ac8 100644 --- a/bookwyrm/tests/templatetags/test_shelf_tags.py +++ b/bookwyrm/tests/templatetags/test_shelf_tags.py @@ -1,4 +1,5 @@ -""" style fixes and lookups for templates """ +"""style fixes and lookups for templates""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/templatetags/test_status_display.py b/bookwyrm/tests/templatetags/test_status_display.py index de7d3ae2fe..13eb95f9da 100644 --- a/bookwyrm/tests/templatetags/test_status_display.py +++ b/bookwyrm/tests/templatetags/test_status_display.py @@ -1,4 +1,5 @@ -""" style fixes and lookups for templates """ +"""style fixes and lookups for templates""" + import datetime from unittest.mock import patch diff --git a/bookwyrm/tests/templatetags/test_utilities.py b/bookwyrm/tests/templatetags/test_utilities.py index a6571075ee..6833ee9358 100644 --- a/bookwyrm/tests/templatetags/test_utilities.py +++ b/bookwyrm/tests/templatetags/test_utilities.py @@ -1,4 +1,5 @@ -""" style fixes and lookups for templates """ +"""style fixes and lookups for templates""" + from collections import namedtuple import re from unittest.mock import patch diff --git a/bookwyrm/tests/test_author_search.py b/bookwyrm/tests/test_author_search.py index e6b20a2c60..207b5652cb 100644 --- a/bookwyrm/tests/test_author_search.py +++ b/bookwyrm/tests/test_author_search.py @@ -1,4 +1,5 @@ -""" test searching for authors """ +"""test searching for authors""" + from django.test import TestCase from django.contrib.postgres.search import SearchRank, SearchQuery diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index cc9a00154f..9a74051046 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -1,4 +1,5 @@ -""" test searching for books """ +"""test searching for books""" + import datetime from datetime import timezone diff --git a/bookwyrm/tests/test_context_processors.py b/bookwyrm/tests/test_context_processors.py index 7c1fbb1dd6..c5155313f5 100644 --- a/bookwyrm/tests/test_context_processors.py +++ b/bookwyrm/tests/test_context_processors.py @@ -1,4 +1,5 @@ -""" test for context processor """ +"""test for context processor""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser from django.test import TestCase diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py index 186cce9302..7db550b55f 100644 --- a/bookwyrm/tests/test_emailing.py +++ b/bookwyrm/tests/test_emailing.py @@ -1,4 +1,5 @@ -""" test creating emails """ +"""test creating emails""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/test_isbn.py b/bookwyrm/tests/test_isbn.py index 5486c7151d..f348da54b4 100644 --- a/bookwyrm/tests/test_isbn.py +++ b/bookwyrm/tests/test_isbn.py @@ -1,4 +1,5 @@ -""" test ISBN hyphenator for books """ +"""test ISBN hyphenator for books""" + from django.test import TestCase from bookwyrm.isbn.isbn import hyphenator_singleton as hyphenator diff --git a/bookwyrm/tests/test_partial_date.py b/bookwyrm/tests/test_partial_date.py index 12d8c768dd..740a502590 100644 --- a/bookwyrm/tests/test_partial_date.py +++ b/bookwyrm/tests/test_partial_date.py @@ -1,4 +1,4 @@ -""" test partial_date module """ +"""test partial_date module""" import datetime from datetime import timezone diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 726118de14..32894ba9f5 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -1,4 +1,5 @@ -""" test generating preview images """ +"""test generating preview images""" + import pathlib from unittest.mock import patch from PIL import Image diff --git a/bookwyrm/tests/test_sanitize_html.py b/bookwyrm/tests/test_sanitize_html.py index 449acdafbe..c8c7659e6d 100644 --- a/bookwyrm/tests/test_sanitize_html.py +++ b/bookwyrm/tests/test_sanitize_html.py @@ -1,4 +1,5 @@ -""" make sure only valid html gets to the app """ +"""make sure only valid html gets to the app""" + from django.test import TestCase from bookwyrm.utils.sanitizer import clean diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 45ffbde20d..3d92d842c1 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -1,4 +1,5 @@ -""" getting and verifying signatures """ +"""getting and verifying signatures""" + import time from collections import namedtuple from urllib.parse import urlsplit diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py index 0a6dd8abe9..3cb391be27 100644 --- a/bookwyrm/tests/test_suggested_users.py +++ b/bookwyrm/tests/test_suggested_users.py @@ -1,4 +1,5 @@ -""" testing user follow suggestions """ +"""testing user follow suggestions""" + from collections import namedtuple from unittest.mock import patch diff --git a/bookwyrm/tests/test_utils.py b/bookwyrm/tests/test_utils.py index 82a9d6248f..85c614deae 100644 --- a/bookwyrm/tests/test_utils.py +++ b/bookwyrm/tests/test_utils.py @@ -1,4 +1,5 @@ -""" test searching for books """ +"""test searching for books""" + import os import re from io import BytesIO diff --git a/bookwyrm/tests/validate_html.py b/bookwyrm/tests/validate_html.py index 618d27f6c9..a94ade3491 100644 --- a/bookwyrm/tests/validate_html.py +++ b/bookwyrm/tests/validate_html.py @@ -1,4 +1,5 @@ -""" html validation on rendered templates """ +"""html validation on rendered templates""" + from html.parser import HTMLParser from tidylib import tidy_document diff --git a/bookwyrm/tests/views/admin/test_announcements.py b/bookwyrm/tests/views/admin/test_announcements.py index 7e8925d214..3ee18802e4 100644 --- a/bookwyrm/tests/views/admin/test_announcements.py +++ b/bookwyrm/tests/views/admin/test_announcements.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.template.response import TemplateResponse from django.test import TestCase diff --git a/bookwyrm/tests/views/admin/test_automod.py b/bookwyrm/tests/views/admin/test_automod.py index d1dbd79096..dfcd605018 100644 --- a/bookwyrm/tests/views/admin/test_automod.py +++ b/bookwyrm/tests/views/admin/test_automod.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_celery.py b/bookwyrm/tests/views/admin/test_celery.py index 9233552fa9..810b0ae461 100644 --- a/bookwyrm/tests/views/admin/test_celery.py +++ b/bookwyrm/tests/views/admin/test_celery.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_connectors.py b/bookwyrm/tests/views/admin/test_connectors.py index 73ee3f0190..558f60b3ca 100644 --- a/bookwyrm/tests/views/admin/test_connectors.py +++ b/bookwyrm/tests/views/admin/test_connectors.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch import pytest diff --git a/bookwyrm/tests/views/admin/test_dashboard.py b/bookwyrm/tests/views/admin/test_dashboard.py index 3289ad9f68..06232c6641 100644 --- a/bookwyrm/tests/views/admin/test_dashboard.py +++ b/bookwyrm/tests/views/admin/test_dashboard.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_email_blocks.py b/bookwyrm/tests/views/admin/test_email_blocks.py index 4315c40c97..ad75c94f2a 100644 --- a/bookwyrm/tests/views/admin/test_email_blocks.py +++ b/bookwyrm/tests/views/admin/test_email_blocks.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_email_config.py b/bookwyrm/tests/views/admin/test_email_config.py index b8218a284c..496d7c1d97 100644 --- a/bookwyrm/tests/views/admin/test_email_config.py +++ b/bookwyrm/tests/views/admin/test_email_config.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_federation.py b/bookwyrm/tests/views/admin/test_federation.py index 818c949f5a..2d9c38a92a 100644 --- a/bookwyrm/tests/views/admin/test_federation.py +++ b/bookwyrm/tests/views/admin/test_federation.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/admin/test_files_maintenance.py b/bookwyrm/tests/views/admin/test_files_maintenance.py index b23f332d7d..5dd97e3549 100644 --- a/bookwyrm/tests/views/admin/test_files_maintenance.py +++ b/bookwyrm/tests/views/admin/test_files_maintenance.py @@ -1,4 +1,5 @@ -""" test for files maintenance page functionality """ +"""test for files maintenance page functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_imports.py b/bookwyrm/tests/views/admin/test_imports.py index a8fdfbf04c..d901f1689f 100644 --- a/bookwyrm/tests/views/admin/test_imports.py +++ b/bookwyrm/tests/views/admin/test_imports.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_ip_blocklist.py b/bookwyrm/tests/views/admin/test_ip_blocklist.py index dfbc067973..c814907821 100644 --- a/bookwyrm/tests/views/admin/test_ip_blocklist.py +++ b/bookwyrm/tests/views/admin/test_ip_blocklist.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_link_domains.py b/bookwyrm/tests/views/admin/test_link_domains.py index 57e909567f..a075507b8d 100644 --- a/bookwyrm/tests/views/admin/test_link_domains.py +++ b/bookwyrm/tests/views/admin/test_link_domains.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_reports.py b/bookwyrm/tests/views/admin/test_reports.py index 73fbef40f7..6c91f40483 100644 --- a/bookwyrm/tests/views/admin/test_reports.py +++ b/bookwyrm/tests/views/admin/test_reports.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/admin/test_site.py b/bookwyrm/tests/views/admin/test_site.py index 0804bfe890..76dac0e6d1 100644 --- a/bookwyrm/tests/views/admin/test_site.py +++ b/bookwyrm/tests/views/admin/test_site.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_themes.py b/bookwyrm/tests/views/admin/test_themes.py index d7d4f8bf30..95af626927 100644 --- a/bookwyrm/tests/views/admin/test_themes.py +++ b/bookwyrm/tests/views/admin/test_themes.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/admin/test_user_admin.py b/bookwyrm/tests/views/admin/test_user_admin.py index d2bda4f96e..2abcdd7ac9 100644 --- a/bookwyrm/tests/views/admin/test_user_admin.py +++ b/bookwyrm/tests/views/admin/test_user_admin.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index 3adc2c0886..7df079ce30 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py index 0ef6bf4bdb..5d6e0eac1a 100644 --- a/bookwyrm/tests/views/books/test_edit_book.py +++ b/bookwyrm/tests/views/books/test_edit_book.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch import responses from responses import matchers diff --git a/bookwyrm/tests/views/books/test_editions.py b/bookwyrm/tests/views/books/test_editions.py index e54f0eb13b..36480d9273 100644 --- a/bookwyrm/tests/views/books/test_editions.py +++ b/bookwyrm/tests/views/books/test_editions.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.template.response import TemplateResponse diff --git a/bookwyrm/tests/views/books/test_links.py b/bookwyrm/tests/views/books/test_links.py index d8918ed2be..06b8683946 100644 --- a/bookwyrm/tests/views/books/test_links.py +++ b/bookwyrm/tests/views/books/test_links.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/imports/test_import.py b/bookwyrm/tests/views/imports/test_import.py index de73f4134a..6cf0de68c5 100644 --- a/bookwyrm/tests/views/imports/test_import.py +++ b/bookwyrm/tests/views/imports/test_import.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import datetime import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/views/imports/test_import_review.py b/bookwyrm/tests/views/imports/test_import_review.py index 989560c6ac..263042d4e6 100644 --- a/bookwyrm/tests/views/imports/test_import_review.py +++ b/bookwyrm/tests/views/imports/test_import_review.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.template.response import TemplateResponse from django.test import TestCase diff --git a/bookwyrm/tests/views/imports/test_import_troubleshoot.py b/bookwyrm/tests/views/imports/test_import_troubleshoot.py index 1ed04d208f..789e0d3609 100644 --- a/bookwyrm/tests/views/imports/test_import_troubleshoot.py +++ b/bookwyrm/tests/views/imports/test_import_troubleshoot.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from collections import namedtuple from unittest.mock import patch from django.template.response import TemplateResponse diff --git a/bookwyrm/tests/views/imports/test_user_import.py b/bookwyrm/tests/views/imports/test_user_import.py index d5e9aef510..8f672218a6 100644 --- a/bookwyrm/tests/views/imports/test_user_import.py +++ b/bookwyrm/tests/views/imports/test_user_import.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index b3e69b4d6c..c2356d929b 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -1,4 +1,5 @@ -""" tests incoming activities""" +"""tests incoming activities""" + import json import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/views/inbox/test_inbox_add.py b/bookwyrm/tests/views/inbox/test_inbox_add.py index 3ada89ec29..0f8776774a 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_add.py +++ b/bookwyrm/tests/views/inbox/test_inbox_add.py @@ -1,4 +1,5 @@ -""" tests incoming activities""" +"""tests incoming activities""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/views/inbox/test_inbox_announce.py b/bookwyrm/tests/views/inbox/test_inbox_announce.py index 6afb2e0e95..73d18ea600 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_announce.py +++ b/bookwyrm/tests/views/inbox/test_inbox_announce.py @@ -1,4 +1,5 @@ -""" tests incoming activities""" +"""tests incoming activities""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/views/inbox/test_inbox_block.py b/bookwyrm/tests/views/inbox/test_inbox_block.py index 956c736b43..bf8c64a25f 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_block.py +++ b/bookwyrm/tests/views/inbox/test_inbox_block.py @@ -1,4 +1,5 @@ -""" tests incoming activities""" +"""tests incoming activities""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/views/inbox/test_inbox_create.py b/bookwyrm/tests/views/inbox/test_inbox_create.py index 73a35665ab..151bf0e6bf 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_create.py +++ b/bookwyrm/tests/views/inbox/test_inbox_create.py @@ -1,4 +1,5 @@ -""" tests incoming activities""" +"""tests incoming activities""" + import json import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/views/inbox/test_inbox_delete.py b/bookwyrm/tests/views/inbox/test_inbox_delete.py index 52b26e00a3..3ff426d47a 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_delete.py +++ b/bookwyrm/tests/views/inbox/test_inbox_delete.py @@ -1,4 +1,5 @@ """tests incoming activities""" + from datetime import datetime from unittest.mock import patch diff --git a/bookwyrm/tests/views/inbox/test_inbox_follow.py b/bookwyrm/tests/views/inbox/test_inbox_follow.py index 058d660052..ac62ea2b0b 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_follow.py +++ b/bookwyrm/tests/views/inbox/test_inbox_follow.py @@ -1,4 +1,5 @@ -""" tests incoming activities""" +"""tests incoming activities""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/inbox/test_inbox_like.py b/bookwyrm/tests/views/inbox/test_inbox_like.py index 3675e91760..92fb719ddb 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_like.py +++ b/bookwyrm/tests/views/inbox/test_inbox_like.py @@ -1,4 +1,5 @@ -""" tests incoming activities""" +"""tests incoming activities""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/views/inbox/test_inbox_remove.py b/bookwyrm/tests/views/inbox/test_inbox_remove.py index 4bd5840fbd..4a44635eab 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_remove.py +++ b/bookwyrm/tests/views/inbox/test_inbox_remove.py @@ -1,4 +1,5 @@ -""" tests incoming activities""" +"""tests incoming activities""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/views/inbox/test_inbox_update.py b/bookwyrm/tests/views/inbox/test_inbox_update.py index d22a598629..e9244ea11c 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_update.py +++ b/bookwyrm/tests/views/inbox/test_inbox_update.py @@ -1,4 +1,5 @@ -""" tests incoming activities""" +"""tests incoming activities""" + import json import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/views/landing/test_invite.py b/bookwyrm/tests/views/landing/test_invite.py index eca0fa0b16..22fa5f6b0b 100644 --- a/bookwyrm/tests/views/landing/test_invite.py +++ b/bookwyrm/tests/views/landing/test_invite.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser diff --git a/bookwyrm/tests/views/landing/test_landing.py b/bookwyrm/tests/views/landing/test_landing.py index 26d9b4b937..c9a1296fd5 100644 --- a/bookwyrm/tests/views/landing/test_landing.py +++ b/bookwyrm/tests/views/landing/test_landing.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser from django.http import Http404 diff --git a/bookwyrm/tests/views/landing/test_login.py b/bookwyrm/tests/views/landing/test_login.py index be08c13ad2..bc48767baf 100644 --- a/bookwyrm/tests/views/landing/test_login.py +++ b/bookwyrm/tests/views/landing/test_login.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from importlib import import_module from unittest.mock import patch diff --git a/bookwyrm/tests/views/landing/test_password.py b/bookwyrm/tests/views/landing/test_password.py index 33ada7dd89..18bb13260c 100644 --- a/bookwyrm/tests/views/landing/test_password.py +++ b/bookwyrm/tests/views/landing/test_password.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from datetime import timedelta from unittest.mock import patch diff --git a/bookwyrm/tests/views/landing/test_register.py b/bookwyrm/tests/views/landing/test_register.py index 3c93da8f82..34ed699927 100644 --- a/bookwyrm/tests/views/landing/test_register.py +++ b/bookwyrm/tests/views/landing/test_register.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser diff --git a/bookwyrm/tests/views/lists/test_curate.py b/bookwyrm/tests/views/lists/test_curate.py index bb6dfb0601..adc040ea3e 100644 --- a/bookwyrm/tests/views/lists/test_curate.py +++ b/bookwyrm/tests/views/lists/test_curate.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/lists/test_embed.py b/bookwyrm/tests/views/lists/test_embed.py index ea8760cbf3..4b5455f17b 100644 --- a/bookwyrm/tests/views/lists/test_embed.py +++ b/bookwyrm/tests/views/lists/test_embed.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser diff --git a/bookwyrm/tests/views/lists/test_list.py b/bookwyrm/tests/views/lists/test_list.py index 724d693de6..c4a04937b2 100644 --- a/bookwyrm/tests/views/lists/test_list.py +++ b/bookwyrm/tests/views/lists/test_list.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch @@ -117,7 +118,7 @@ def test_list_page_sorted(self): """there are so many views, this just makes sure it LOADS""" view = views.List.as_view() with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): - for (i, book) in enumerate([self.book, self.book_two, self.book_three]): + for i, book in enumerate([self.book, self.book_two, self.book_three]): models.ListItem.objects.create( book_list=self.list, user=self.local_user, diff --git a/bookwyrm/tests/views/lists/test_list_item.py b/bookwyrm/tests/views/lists/test_list_item.py index bc7d829989..d5637ff1ad 100644 --- a/bookwyrm/tests/views/lists/test_list_item.py +++ b/bookwyrm/tests/views/lists/test_list_item.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/views/lists/test_lists.py b/bookwyrm/tests/views/lists/test_lists.py index 43deb9379e..ca052a11fb 100644 --- a/bookwyrm/tests/views/lists/test_lists.py +++ b/bookwyrm/tests/views/lists/test_lists.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/preferences/test_block.py b/bookwyrm/tests/views/preferences/test_block.py index 0e35425333..c65a824bf2 100644 --- a/bookwyrm/tests/views/preferences/test_block.py +++ b/bookwyrm/tests/views/preferences/test_block.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.template.response import TemplateResponse diff --git a/bookwyrm/tests/views/preferences/test_change_password.py b/bookwyrm/tests/views/preferences/test_change_password.py index 76ad5d8efc..efa6521b42 100644 --- a/bookwyrm/tests/views/preferences/test_change_password.py +++ b/bookwyrm/tests/views/preferences/test_change_password.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.template.response import TemplateResponse diff --git a/bookwyrm/tests/views/preferences/test_delete_user.py b/bookwyrm/tests/views/preferences/test_delete_user.py index 9566524832..fdcf8469c5 100644 --- a/bookwyrm/tests/views/preferences/test_delete_user.py +++ b/bookwyrm/tests/views/preferences/test_delete_user.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/preferences/test_edit_user.py b/bookwyrm/tests/views/preferences/test_edit_user.py index 8c1b8c8d5f..a31ee08f5f 100644 --- a/bookwyrm/tests/views/preferences/test_edit_user.py +++ b/bookwyrm/tests/views/preferences/test_edit_user.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import pathlib from unittest.mock import patch from PIL import Image diff --git a/bookwyrm/tests/views/preferences/test_export.py b/bookwyrm/tests/views/preferences/test_export.py index d9810e7e98..26934300d7 100644 --- a/bookwyrm/tests/views/preferences/test_export.py +++ b/bookwyrm/tests/views/preferences/test_export.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.http import HttpResponse diff --git a/bookwyrm/tests/views/preferences/test_export_user.py b/bookwyrm/tests/views/preferences/test_export_user.py index 01d86cba91..61df0eaaa5 100644 --- a/bookwyrm/tests/views/preferences/test_export_user.py +++ b/bookwyrm/tests/views/preferences/test_export_user.py @@ -1,4 +1,5 @@ -""" test for user export app functionality """ +"""test for user export app functionality""" + from unittest.mock import patch from django.http import HttpResponse diff --git a/bookwyrm/tests/views/preferences/test_move.py b/bookwyrm/tests/views/preferences/test_move.py index 2595d48997..733f7dd217 100644 --- a/bookwyrm/tests/views/preferences/test_move.py +++ b/bookwyrm/tests/views/preferences/test_move.py @@ -1,4 +1,5 @@ -""" test move functionality """ +"""test move functionality""" + import json from unittest.mock import patch import pathlib diff --git a/bookwyrm/tests/views/preferences/test_security.py b/bookwyrm/tests/views/preferences/test_security.py index 3699090e9f..c35bca0604 100644 --- a/bookwyrm/tests/views/preferences/test_security.py +++ b/bookwyrm/tests/views/preferences/test_security.py @@ -1,4 +1,5 @@ -""" test for app two factor auth functionality """ +"""test for app two factor auth functionality""" + from importlib import import_module from unittest.mock import patch import time diff --git a/bookwyrm/tests/views/shelf/test_shelf.py b/bookwyrm/tests/views/shelf/test_shelf.py index 72c4fe9a26..896ffeed2e 100644 --- a/bookwyrm/tests/views/shelf/test_shelf.py +++ b/bookwyrm/tests/views/shelf/test_shelf.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser diff --git a/bookwyrm/tests/views/shelf/test_shelf_actions.py b/bookwyrm/tests/views/shelf/test_shelf_actions.py index 73155b61a6..b78da18885 100644 --- a/bookwyrm/tests/views/shelf/test_shelf_actions.py +++ b/bookwyrm/tests/views/shelf/test_shelf_actions.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/test_annual_summary.py b/bookwyrm/tests/views/test_annual_summary.py index ff86cfa8da..5a705ff980 100644 --- a/bookwyrm/tests/views/test_annual_summary.py +++ b/bookwyrm/tests/views/test_annual_summary.py @@ -1,4 +1,5 @@ """testing the annual summary page""" + import datetime from unittest.mock import patch diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index 0d023f0adb..f43a75f937 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser, Group, Permission diff --git a/bookwyrm/tests/views/test_directory.py b/bookwyrm/tests/views/test_directory.py index 96dcd36924..7d8120081a 100644 --- a/bookwyrm/tests/views/test_directory.py +++ b/bookwyrm/tests/views/test_directory.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser diff --git a/bookwyrm/tests/views/test_discover.py b/bookwyrm/tests/views/test_discover.py index f93913df29..849d002db8 100644 --- a/bookwyrm/tests/views/test_discover.py +++ b/bookwyrm/tests/views/test_discover.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser from django.test import TestCase diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index 28a8e1bd30..1ad7beddd8 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch import pathlib diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index 1074de1182..71c63a7c0c 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index d84435df78..5f9b35201c 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.template.response import TemplateResponse from django.test import TestCase diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py index a7309e4aa3..c086e1eaed 100644 --- a/bookwyrm/tests/views/test_goal.py +++ b/bookwyrm/tests/views/test_goal.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py index 5b8a2d5aa0..c444072d3f 100644 --- a/bookwyrm/tests/views/test_group.py +++ b/bookwyrm/tests/views/test_group.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser @@ -11,6 +12,7 @@ from bookwyrm import models, views from bookwyrm.tests.validate_html import validate_html + # pylint: disable=too-many-public-methods @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") class GroupViews(TestCase): diff --git a/bookwyrm/tests/views/test_hashtag.py b/bookwyrm/tests/views/test_hashtag.py index ebf3662f83..cd085ffbaf 100644 --- a/bookwyrm/tests/views/test_hashtag.py +++ b/bookwyrm/tests/views/test_hashtag.py @@ -1,4 +1,5 @@ -""" tests for hashtag view """ +"""tests for hashtag view""" + from unittest.mock import patch from django.contrib.auth.models import AnonymousUser diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index 64241d2b4b..112fd1af54 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch import pathlib diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index d1533c4515..ead7a37167 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/views/test_isbn.py b/bookwyrm/tests/views/test_isbn.py index 517090212d..86dda3c9ad 100644 --- a/bookwyrm/tests/views/test_isbn.py +++ b/bookwyrm/tests/views/test_isbn.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/test_notifications.py b/bookwyrm/tests/views/test_notifications.py index fe80a1dfef..b73229ea69 100644 --- a/bookwyrm/tests/views/test_notifications.py +++ b/bookwyrm/tests/views/test_notifications.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.template.response import TemplateResponse from django.test import TestCase diff --git a/bookwyrm/tests/views/test_outbox.py b/bookwyrm/tests/views/test_outbox.py index 370f818008..30e0ea2e6c 100644 --- a/bookwyrm/tests/views/test_outbox.py +++ b/bookwyrm/tests/views/test_outbox.py @@ -1,4 +1,5 @@ -""" sending out activities """ +"""sending out activities""" + from unittest.mock import patch import json diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index d8172b7fb0..61e082c06c 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch import dateutil from django.test import TestCase diff --git a/bookwyrm/tests/views/test_readthrough.py b/bookwyrm/tests/views/test_readthrough.py index e85d4e6a4f..c3bc0a1d66 100644 --- a/bookwyrm/tests/views/test_readthrough.py +++ b/bookwyrm/tests/views/test_readthrough.py @@ -1,4 +1,5 @@ -""" tests updating reading progress """ +"""tests updating reading progress""" + from datetime import datetime, timezone from unittest.mock import patch from django.test import TestCase, Client diff --git a/bookwyrm/tests/views/test_report.py b/bookwyrm/tests/views/test_report.py index 4f545aa1ea..1807aa51a2 100644 --- a/bookwyrm/tests/views/test_report.py +++ b/bookwyrm/tests/views/test_report.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.test import TestCase diff --git a/bookwyrm/tests/views/test_rss_feed.py b/bookwyrm/tests/views/test_rss_feed.py index 658f3671d8..d827a04982 100644 --- a/bookwyrm/tests/views/test_rss_feed.py +++ b/bookwyrm/tests/views/test_rss_feed.py @@ -1,4 +1,5 @@ -""" testing import """ +"""testing import""" + from unittest.mock import patch from django.test import RequestFactory, TestCase @@ -134,9 +135,10 @@ def test_rss_quotation_only(self, *_): def test_rss_shelf(self, *_): """load the rss feed of a shelf""" - with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" - ), patch("bookwyrm.activitystreams.add_book_statuses_task.delay"): + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_book_statuses_task.delay"), + ): # make the shelf shelf = models.Shelf.objects.create( name="Test Shelf", identifier="test-shelf", user=self.local_user diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index 8a10018209..40a0407cd9 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/tests/views/test_setup.py b/bookwyrm/tests/views/test_setup.py index a34497a5bf..759c057c26 100644 --- a/bookwyrm/tests/views/test_setup.py +++ b/bookwyrm/tests/views/test_setup.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.sessions.middleware import SessionMiddleware diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index 5d31ad4bcb..2689fa4ce0 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch import dateutil diff --git a/bookwyrm/tests/views/test_updates.py b/bookwyrm/tests/views/test_updates.py index f35daf8c63..85c6597b8d 100644 --- a/bookwyrm/tests/views/test_updates.py +++ b/bookwyrm/tests/views/test_updates.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch @@ -55,11 +56,14 @@ def test_get_unread_status_string(self): request = self.factory.get("") request.user = self.local_user - with patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count" - ) as mock_count, patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" - ) as mock_count_by_status: + with ( + patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count" + ) as mock_count, + patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" + ) as mock_count_by_status, + ): mock_count.return_value = 3 mock_count_by_status.return_value = {"review": 5} result = views.get_unread_status_string(request, "home") @@ -74,11 +78,14 @@ def test_get_unread_status_string_with_filters(self): request = self.factory.get("") request.user = self.local_user - with patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count" - ) as mock_count, patch( - "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" - ) as mock_count_by_status: + with ( + patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count" + ) as mock_count, + patch( + "bookwyrm.activitystreams.ActivityStream.get_unread_count_by_status_type" + ) as mock_count_by_status, + ): mock_count.return_value = 3 mock_count_by_status.return_value = { "generated_note": 1, diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 187e232133..c069d78f98 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch import datetime diff --git a/bookwyrm/tests/views/test_wellknown.py b/bookwyrm/tests/views/test_wellknown.py index 14309a87ad..cd4829725f 100644 --- a/bookwyrm/tests/views/test_wellknown.py +++ b/bookwyrm/tests/views/test_wellknown.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + import json from unittest.mock import patch diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 58fd357bed..7357d88b2d 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -1,4 +1,5 @@ -""" url routing for the app and api """ +"""url routing for the app and api""" + from django.conf.urls.static import static from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns diff --git a/bookwyrm/utils/__init__.py b/bookwyrm/utils/__init__.py index f15f59aaf4..b4a8fe9a12 100644 --- a/bookwyrm/utils/__init__.py +++ b/bookwyrm/utils/__init__.py @@ -1,2 +1,3 @@ -""" useful regex """ +"""useful regex""" + from .regex import USERNAME diff --git a/bookwyrm/utils/cache.py b/bookwyrm/utils/cache.py index 5e896e6218..8ef75d4675 100644 --- a/bookwyrm/utils/cache.py +++ b/bookwyrm/utils/cache.py @@ -1,4 +1,5 @@ -""" Custom handler for caching """ +"""Custom handler for caching""" + from typing import Any, Callable, Tuple, Union from django.core.cache import cache @@ -8,7 +9,7 @@ def get_or_set( cache_key: str, function: Callable[..., Any], *args: Tuple[Any, ...], - timeout: Union[float, None] = None + timeout: Union[float, None] = None, ) -> Any: """Django's built-in get_or_set isn't cutting it""" value = cache.get(cache_key) diff --git a/bookwyrm/utils/db.py b/bookwyrm/utils/db.py index 7024d9e478..21fd163431 100644 --- a/bookwyrm/utils/db.py +++ b/bookwyrm/utils/db.py @@ -1,4 +1,4 @@ -""" Database utilities """ +"""Database utilities""" from typing import Optional, Iterable, Set, cast import sqlparse # type: ignore[import-untyped] diff --git a/bookwyrm/utils/images.py b/bookwyrm/utils/images.py index 88aed8aaec..19110bcff9 100644 --- a/bookwyrm/utils/images.py +++ b/bookwyrm/utils/images.py @@ -1,4 +1,4 @@ -""" Image utilities """ +"""Image utilities""" import logging from io import BytesIO diff --git a/bookwyrm/utils/isni.py b/bookwyrm/utils/isni.py index 0d0a868877..8cb96ce849 100644 --- a/bookwyrm/utils/isni.py +++ b/bookwyrm/utils/isni.py @@ -1,4 +1,5 @@ """ISNI author checking utilities""" + import xml.etree.ElementTree as ET from typing import Union, Optional @@ -109,7 +110,6 @@ def find_authors_by_name( # build list of possible authors possible_authors = [] for element in root.iter("responseRecord"): - # TODO: we don't seem to do anything with the # personal_name variable - is this code block needed? personal_name = element.find(".//forename/..") @@ -123,7 +123,6 @@ def find_authors_by_name( continue if bool(description): - titles = [] # prefer title records from LoC+ coop, Australia, Ireland, or Singapore # in that order diff --git a/bookwyrm/utils/log.py b/bookwyrm/utils/log.py index 7a4a2f8989..a18a26bac4 100644 --- a/bookwyrm/utils/log.py +++ b/bookwyrm/utils/log.py @@ -1,4 +1,5 @@ -""" Logging utilities """ +"""Logging utilities""" + import logging diff --git a/bookwyrm/utils/regex.py b/bookwyrm/utils/regex.py index 72e837d68b..bc6bda41c1 100644 --- a/bookwyrm/utils/regex.py +++ b/bookwyrm/utils/regex.py @@ -1,4 +1,4 @@ -""" defining regexes for regularly used concepts """ +"""defining regexes for regularly used concepts""" DOMAIN = r"[\w_\-\.]+\.[a-z\-]{2,}" LOCALNAME = r"@?[a-zA-Z_\-\.0-9]+" diff --git a/bookwyrm/utils/sanitizer.py b/bookwyrm/utils/sanitizer.py index 1467ee3e1b..d5ac0daa6f 100644 --- a/bookwyrm/utils/sanitizer.py +++ b/bookwyrm/utils/sanitizer.py @@ -1,4 +1,5 @@ """Clean user-provided text""" + import bleach diff --git a/bookwyrm/utils/tar.py b/bookwyrm/utils/tar.py index 70fdc38f11..842570cfb2 100644 --- a/bookwyrm/utils/tar.py +++ b/bookwyrm/utils/tar.py @@ -1,4 +1,5 @@ """manage tar files for user exports""" + import io import os import tarfile diff --git a/bookwyrm/utils/validate.py b/bookwyrm/utils/validate.py index 962d51a4ea..4ebd4891a4 100644 --- a/bookwyrm/utils/validate.py +++ b/bookwyrm/utils/validate.py @@ -1,4 +1,5 @@ """Validations""" + from typing import Optional from bookwyrm.settings import BASE_URL diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index d89cfd48fe..cb560cfa1a 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -1,4 +1,5 @@ -""" make sure all our nice views are available """ +"""make sure all our nice views are available""" + # site admin from .admin.announcements import Announcements, Announcement from .admin.announcements import EditAnnouncement, delete_announcement diff --git a/bookwyrm/views/admin/announcements.py b/bookwyrm/views/admin/announcements.py index c5a7c80ff8..807ae87127 100644 --- a/bookwyrm/views/admin/announcements.py +++ b/bookwyrm/views/admin/announcements.py @@ -1,4 +1,5 @@ -""" make announcements """ +"""make announcements""" + from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator from django.shortcuts import get_object_or_404, redirect diff --git a/bookwyrm/views/admin/automod.py b/bookwyrm/views/admin/automod.py index 58818ad9bf..c774900482 100644 --- a/bookwyrm/views/admin/automod.py +++ b/bookwyrm/views/admin/automod.py @@ -1,4 +1,5 @@ -""" moderation via flagged posts and users """ +"""moderation via flagged posts and users""" + from django.contrib.auth.decorators import login_required, permission_required from django.db import transaction from django.shortcuts import get_object_or_404, redirect diff --git a/bookwyrm/views/admin/celery_status.py b/bookwyrm/views/admin/celery_status.py index 5d5f079906..83179e2e9d 100644 --- a/bookwyrm/views/admin/celery_status.py +++ b/bookwyrm/views/admin/celery_status.py @@ -1,4 +1,5 @@ -""" celery status """ +"""celery status""" + import json from django.contrib.auth.decorators import login_required, permission_required @@ -31,6 +32,7 @@ r = redis.from_url(settings.REDIS_BROKER_URL) + # pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( diff --git a/bookwyrm/views/admin/connectors.py b/bookwyrm/views/admin/connectors.py index 5704c91344..ce73fdf22a 100644 --- a/bookwyrm/views/admin/connectors.py +++ b/bookwyrm/views/admin/connectors.py @@ -1,4 +1,5 @@ -""" manage book data sources """ +"""manage book data sources""" + from django.contrib.auth.decorators import login_required, permission_required from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index 15bb214912..de98333c0a 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -1,4 +1,5 @@ -""" instance overview """ +"""instance overview""" + from datetime import timedelta import re @@ -44,9 +45,9 @@ def get(self, request): ) or not re.match(regex.DOMAIN, settings.EMAIL_SENDER_DOMAIN) data["email_config_error"] = email_config_error - data[ - "email_sender" - ] = f"{settings.EMAIL_SENDER_NAME}@{settings.EMAIL_SENDER_DOMAIN}" + data["email_sender"] = ( + f"{settings.EMAIL_SENDER_NAME}@{settings.EMAIL_SENDER_DOMAIN}" + ) site = models.SiteSettings.get() # pylint: disable=protected-access @@ -201,7 +202,7 @@ def get_chart(self, start, end, interval): chart = {k: [] for k in self.queries.keys()} chart["labels"] = [] while interval_start <= end: - for (name, query) in self.queries.items(): + for name, query in self.queries.items(): chart[name].append(query(self.queryset, interval_start, interval_end)) chart["labels"].append(interval_start.strftime("%b %d")) diff --git a/bookwyrm/views/admin/email_blocklist.py b/bookwyrm/views/admin/email_blocklist.py index c31fa7366a..d69bc6ff2a 100644 --- a/bookwyrm/views/admin/email_blocklist.py +++ b/bookwyrm/views/admin/email_blocklist.py @@ -1,4 +1,5 @@ -""" Manage email blocklist""" +"""Manage email blocklist""" + from django.contrib.auth.decorators import login_required, permission_required from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse @@ -7,6 +8,7 @@ from bookwyrm import forms, models + # pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( diff --git a/bookwyrm/views/admin/email_config.py b/bookwyrm/views/admin/email_config.py index 03e85f8b01..454f4f4d99 100644 --- a/bookwyrm/views/admin/email_config.py +++ b/bookwyrm/views/admin/email_config.py @@ -1,4 +1,5 @@ -""" is your email running? """ +"""is your email running?""" + from django.contrib.auth.decorators import login_required, permission_required from django.template.response import TemplateResponse from django.utils.decorators import method_decorator @@ -7,6 +8,7 @@ from bookwyrm import emailing from bookwyrm import settings + # pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( diff --git a/bookwyrm/views/admin/federation.py b/bookwyrm/views/admin/federation.py index 13666705a2..69e72fb863 100644 --- a/bookwyrm/views/admin/federation.py +++ b/bookwyrm/views/admin/federation.py @@ -1,4 +1,5 @@ -""" manage federated servers """ +"""manage federated servers""" + import json from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator @@ -41,7 +42,7 @@ def get(self, request, status="federated"): "application_type", "server_name", ] - if not sort in sort_fields + [f"-{f}" for f in sort_fields]: + if sort not in sort_fields + [f"-{f}" for f in sort_fields]: sort = "-created_date" servers = servers.order_by(sort, "-created_date") diff --git a/bookwyrm/views/admin/federation_settings.py b/bookwyrm/views/admin/federation_settings.py index 6230dd3ec7..b4814e3d56 100644 --- a/bookwyrm/views/admin/federation_settings.py +++ b/bookwyrm/views/admin/federation_settings.py @@ -1,4 +1,5 @@ -""" big picture settings about how the instance shares data """ +"""big picture settings about how the instance shares data""" + from django.contrib.auth.decorators import login_required, permission_required from django.template.response import TemplateResponse from django.utils.decorators import method_decorator diff --git a/bookwyrm/views/admin/files_maintenance.py b/bookwyrm/views/admin/files_maintenance.py index 620ca4a6db..bfe1d61956 100644 --- a/bookwyrm/views/admin/files_maintenance.py +++ b/bookwyrm/views/admin/files_maintenance.py @@ -1,4 +1,5 @@ -""" clean up export files and find book covers """ +"""clean up export files and find book covers""" + import json from django.contrib.auth.decorators import login_required, permission_required @@ -12,6 +13,7 @@ from bookwyrm import forms, models + # pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( diff --git a/bookwyrm/views/admin/imports.py b/bookwyrm/views/admin/imports.py index 882ec3ea45..a52e4a552b 100644 --- a/bookwyrm/views/admin/imports.py +++ b/bookwyrm/views/admin/imports.py @@ -1,4 +1,5 @@ -""" manage imports """ +"""manage imports""" + from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator from django.shortcuts import get_object_or_404, redirect diff --git a/bookwyrm/views/admin/invite.py b/bookwyrm/views/admin/invite.py index 7e0b8e81be..10807b7693 100644 --- a/bookwyrm/views/admin/invite.py +++ b/bookwyrm/views/admin/invite.py @@ -1,4 +1,5 @@ -""" invites when registration is closed """ +"""invites when registration is closed""" + from functools import reduce import operator from urllib.parse import urlencode @@ -104,7 +105,7 @@ def get(self, request): "answer", ] # pylint: disable=consider-using-f-string - if not sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]: + if sort not in sort_fields + ["-{:s}".format(f) for f in sort_fields]: sort = "-created_date" requests = models.InviteRequest.objects.filter(ignored=ignored).order_by(sort) diff --git a/bookwyrm/views/admin/ip_blocklist.py b/bookwyrm/views/admin/ip_blocklist.py index a81bc738a4..62cb5783f8 100644 --- a/bookwyrm/views/admin/ip_blocklist.py +++ b/bookwyrm/views/admin/ip_blocklist.py @@ -1,4 +1,5 @@ -""" Manage IP blocklist """ +"""Manage IP blocklist""" + from django.contrib.auth.decorators import login_required, permission_required from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse @@ -7,6 +8,7 @@ from bookwyrm import forms, models + # pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( diff --git a/bookwyrm/views/admin/link_domains.py b/bookwyrm/views/admin/link_domains.py index e87465ed40..f0708c3587 100644 --- a/bookwyrm/views/admin/link_domains.py +++ b/bookwyrm/views/admin/link_domains.py @@ -1,4 +1,5 @@ -""" Manage link domains""" +"""Manage link domains""" + from django.contrib.auth.decorators import login_required, permission_required from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse @@ -10,6 +11,7 @@ from bookwyrm.models.report import APPROVE_DOMAIN, BLOCK_DOMAIN from bookwyrm.views.helpers import redirect_to_referer + # pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( diff --git a/bookwyrm/views/admin/reports.py b/bookwyrm/views/admin/reports.py index 65332ad770..f9caaf517e 100644 --- a/bookwyrm/views/admin/reports.py +++ b/bookwyrm/views/admin/reports.py @@ -1,4 +1,5 @@ -""" moderation via flagged posts and users """ +"""moderation via flagged posts and users""" + from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator from django.core.exceptions import PermissionDenied diff --git a/bookwyrm/views/admin/schedule.py b/bookwyrm/views/admin/schedule.py index c654dca9aa..5a181e8520 100644 --- a/bookwyrm/views/admin/schedule.py +++ b/bookwyrm/views/admin/schedule.py @@ -1,4 +1,5 @@ -""" Scheduled celery tasks """ +"""Scheduled celery tasks""" + from django.contrib.auth.decorators import login_required, permission_required from django.shortcuts import redirect from django.template.response import TemplateResponse diff --git a/bookwyrm/views/admin/site.py b/bookwyrm/views/admin/site.py index 3dfda91e4b..69f0bba972 100644 --- a/bookwyrm/views/admin/site.py +++ b/bookwyrm/views/admin/site.py @@ -1,4 +1,5 @@ -""" manage site settings """ +"""manage site settings""" + from django.contrib.auth.decorators import login_required, permission_required from django.template.response import TemplateResponse from django.utils.decorators import method_decorator diff --git a/bookwyrm/views/admin/themes.py b/bookwyrm/views/admin/themes.py index 284a908336..f2c25d820f 100644 --- a/bookwyrm/views/admin/themes.py +++ b/bookwyrm/views/admin/themes.py @@ -1,4 +1,5 @@ -""" manage themes """ +"""manage themes""" + from django.contrib.auth.decorators import login_required, permission_required from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py index eae2c67f6e..759f6ed55e 100644 --- a/bookwyrm/views/admin/user_admin.py +++ b/bookwyrm/views/admin/user_admin.py @@ -1,4 +1,5 @@ -""" manage user """ +"""manage user""" + from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.models import Group from django.core.paginator import Paginator diff --git a/bookwyrm/views/annual_summary.py b/bookwyrm/views/annual_summary.py index 21ac53992d..68c929f4c8 100644 --- a/bookwyrm/views/annual_summary.py +++ b/bookwyrm/views/annual_summary.py @@ -1,4 +1,5 @@ """end-of-year read books stats""" + from datetime import date from uuid import uuid4 diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index 5ab9ff9f40..76e6981837 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -1,4 +1,4 @@ -""" the good people stuff! the authors! """ +"""the good people stuff! the authors!""" from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 4acebb2ac5..ced7807c56 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -1,4 +1,4 @@ -""" the good stuff! the books! """ +"""the good stuff! the books!""" from django.contrib.auth.decorators import login_required, permission_required from django.core.paginator import Paginator @@ -83,7 +83,9 @@ def get(self, request, book_id, **kwargs): queryset = queryset.select_related("user").order_by("-published_date") paginated = Paginator(queryset, PAGE_LENGTH) - lists = models.List.privacy_filter(request.user,).filter( + lists = models.List.privacy_filter( + request.user, + ).filter( listitem__approved=True, listitem__book__in=book.parent_work.editions.all(), ) diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index e0b5f73c86..188bdb2bbd 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -1,4 +1,4 @@ -""" the good stuff! the books! """ +"""the good stuff! the books!""" from re import sub, findall @@ -123,7 +123,7 @@ def post(self, request): # check if this is an edition of an existing work author_text = ", ".join(data.get("add_author", [])) data["book_matches"] = book_search.search( - f'{form.cleaned_data.get("title")} {author_text}', + f"{form.cleaned_data.get('title')} {author_text}", min_confidence=0.1, )[:5] diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py index 5afe38dc42..78d29bde89 100644 --- a/bookwyrm/views/books/editions.py +++ b/bookwyrm/views/books/editions.py @@ -1,4 +1,4 @@ -""" the good stuff! the books! """ +"""the good stuff! the books!""" from functools import reduce import operator diff --git a/bookwyrm/views/books/links.py b/bookwyrm/views/books/links.py index 4793c60193..b69d4baa57 100644 --- a/bookwyrm/views/books/links.py +++ b/bookwyrm/views/books/links.py @@ -1,4 +1,4 @@ -""" the good stuff! the books! """ +"""the good stuff! the books!""" from django.contrib.auth.decorators import login_required, permission_required from django.db import transaction diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index 5e4ec05cad..f945c91993 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -1,4 +1,4 @@ -""" books belonging to the same series """ +"""books belonging to the same series""" from sys import float_info from django.views import View diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py index 7b2ee78b51..505f12900e 100644 --- a/bookwyrm/views/directory.py +++ b/bookwyrm/views/directory.py @@ -1,4 +1,5 @@ -""" who all's here? """ +"""who all's here?""" + from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.shortcuts import redirect @@ -8,6 +9,7 @@ from bookwyrm import suggested_users + # pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class Directory(View): diff --git a/bookwyrm/views/discover.py b/bookwyrm/views/discover.py index 2ae4a93032..78d40f6042 100644 --- a/bookwyrm/views/discover.py +++ b/bookwyrm/views/discover.py @@ -1,4 +1,5 @@ -""" What's up locally """ +"""What's up locally""" + from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.db.models import Q diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 65b4756899..4822fe9512 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -1,4 +1,5 @@ -""" non-interactive pages """ +"""non-interactive pages""" + from datetime import date from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 5a0bb28ab3..3649116cbd 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -1,4 +1,5 @@ -""" views for actions you can take in the application """ +"""views for actions you can take in the application""" + import urllib.parse import re @@ -150,7 +151,6 @@ def ostatus_follow_request(request): # don't do these checks for AnonymousUser before they sign in if request.user.is_authenticated: - # you have blocked them so you probably don't want to follow if hasattr(request.user, "blocks") and user in request.user.blocks.all(): error = "is_blocked" diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py index 9a28dfbcaf..4ced55567c 100644 --- a/bookwyrm/views/get_started.py +++ b/bookwyrm/views/get_started.py @@ -1,4 +1,4 @@ -""" Helping new users figure out the lay of the land """ +"""Helping new users figure out the lay of the land""" import re diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py index b5fd5bdc21..da2fc88c27 100644 --- a/bookwyrm/views/goal.py +++ b/bookwyrm/views/goal.py @@ -1,4 +1,5 @@ -""" non-interactive pages """ +"""non-interactive pages""" + from django.contrib.auth.decorators import login_required from django.http import HttpResponseNotFound from django.shortcuts import redirect diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py index 6d651a3922..94700ab8ff 100644 --- a/bookwyrm/views/group.py +++ b/bookwyrm/views/group.py @@ -1,4 +1,5 @@ """group views""" + from django.apps import apps from django.contrib.auth.decorators import login_required from django.db import IntegrityError, transaction diff --git a/bookwyrm/views/hashtag.py b/bookwyrm/views/hashtag.py index ec7b34f899..211e031597 100644 --- a/bookwyrm/views/hashtag.py +++ b/bookwyrm/views/hashtag.py @@ -1,4 +1,5 @@ -""" listing statuses for a given hashtag """ +"""listing statuses for a given hashtag""" + from django.core.paginator import Paginator from django.db.models import Q from django.views import View diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index aa8c254299..e639a8793e 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -1,4 +1,4 @@ -""" helper functions used in various views """ +"""helper functions used in various views""" import re from datetime import datetime, timedelta @@ -84,7 +84,6 @@ def handle_remote_webfinger(query, unknown_only=False, refresh=False): return None try: - if refresh: # Always fetch the remote info - don't even bother checking the DB raise models.User.DoesNotExist("remote_only is set to True") diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py index 63270260d1..c144dd0550 100644 --- a/bookwyrm/views/imports/import_data.py +++ b/bookwyrm/views/imports/import_data.py @@ -1,4 +1,5 @@ -""" import books from another app """ +"""import books from another app""" + from io import TextIOWrapper import datetime from typing import Optional @@ -29,6 +30,7 @@ from bookwyrm.settings import PAGE_LENGTH from bookwyrm.utils.cache import get_or_set + # pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Import(View): diff --git a/bookwyrm/views/imports/import_status.py b/bookwyrm/views/imports/import_status.py index 0201a17741..815af17475 100644 --- a/bookwyrm/views/imports/import_status.py +++ b/bookwyrm/views/imports/import_status.py @@ -1,4 +1,5 @@ -""" import books from another app """ +"""import books from another app""" + from django.contrib.auth.decorators import login_required from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator @@ -14,6 +15,7 @@ from bookwyrm.models.import_job import import_item_task from bookwyrm.settings import PAGE_LENGTH + # pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class ImportStatus(View): diff --git a/bookwyrm/views/imports/manually_review.py b/bookwyrm/views/imports/manually_review.py index afbc900600..21d236f83e 100644 --- a/bookwyrm/views/imports/manually_review.py +++ b/bookwyrm/views/imports/manually_review.py @@ -1,4 +1,5 @@ -""" verify books we're unsure about """ +"""verify books we're unsure about""" + from django.contrib.auth.decorators import login_required from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator @@ -12,6 +13,7 @@ from bookwyrm.models.import_job import import_item_task from bookwyrm.settings import PAGE_LENGTH + # pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class ImportManualReview(View): diff --git a/bookwyrm/views/imports/troubleshoot.py b/bookwyrm/views/imports/troubleshoot.py index bb7f5f842a..fcacacc131 100644 --- a/bookwyrm/views/imports/troubleshoot.py +++ b/bookwyrm/views/imports/troubleshoot.py @@ -1,4 +1,5 @@ -""" import books from another app """ +"""import books from another app""" + from django.contrib.auth.decorators import login_required from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator @@ -12,6 +13,7 @@ from bookwyrm.importers import Importer from bookwyrm.settings import PAGE_LENGTH + # pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class ImportTroubleshoot(View): diff --git a/bookwyrm/views/imports/user_troubleshoot.py b/bookwyrm/views/imports/user_troubleshoot.py index bf2fed7e5c..19b4c9766c 100644 --- a/bookwyrm/views/imports/user_troubleshoot.py +++ b/bookwyrm/views/imports/user_troubleshoot.py @@ -1,4 +1,5 @@ -""" import books from another app """ +"""import books from another app""" + from django.contrib.auth.decorators import login_required from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator @@ -13,6 +14,7 @@ from bookwyrm.views import user_import_available from bookwyrm.settings import PAGE_LENGTH + # pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class UserImportTroubleshoot(View): diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py index d21c5ca0c1..995d6c34c3 100644 --- a/bookwyrm/views/inbox.py +++ b/bookwyrm/views/inbox.py @@ -1,4 +1,5 @@ -""" incoming activities """ +"""incoming activities""" + import json import re import logging @@ -54,9 +55,9 @@ def post(self, request, username=None): return HttpResponseForbidden() if ( - not "object" in activity_json - or not "type" in activity_json - or not activity_json["type"] in activitypub.activity_objects + "object" not in activity_json + or "type" not in activity_json + or activity_json["type"] not in activitypub.activity_objects ): raise Http404() diff --git a/bookwyrm/views/interaction.py b/bookwyrm/views/interaction.py index 35441a2cf2..5d81063333 100644 --- a/bookwyrm/views/interaction.py +++ b/bookwyrm/views/interaction.py @@ -1,4 +1,5 @@ -""" boosts and favs """ +"""boosts and favs""" + from django.contrib.auth.decorators import login_required from django.core.cache import cache from django.db import IntegrityError diff --git a/bookwyrm/views/isbn.py b/bookwyrm/views/isbn.py index 3359f68d96..48ad67e4b2 100644 --- a/bookwyrm/views/isbn.py +++ b/bookwyrm/views/isbn.py @@ -1,4 +1,5 @@ -""" isbn search view """ +"""isbn search view""" + from django.core.paginator import Paginator from django.http import JsonResponse from django.template.response import TemplateResponse @@ -9,6 +10,7 @@ from bookwyrm.settings import PAGE_LENGTH from .helpers import is_api_request + # pylint: disable= no-self-use class Isbn(View): """search a book by isbn""" diff --git a/bookwyrm/views/landing/about.py b/bookwyrm/views/landing/about.py index 1beecf2426..0e80882f94 100644 --- a/bookwyrm/views/landing/about.py +++ b/bookwyrm/views/landing/about.py @@ -1,4 +1,5 @@ -""" non-interactive pages """ +"""non-interactive pages""" + from dateutil.relativedelta import relativedelta from django.http import Http404 from django.template.response import TemplateResponse diff --git a/bookwyrm/views/landing/landing.py b/bookwyrm/views/landing/landing.py index ca2b7ccc3f..4247c38af1 100644 --- a/bookwyrm/views/landing/landing.py +++ b/bookwyrm/views/landing/landing.py @@ -1,4 +1,5 @@ -""" non-interactive pages """ +"""non-interactive pages""" + from django.shortcuts import redirect from django.template.response import TemplateResponse from django.views import View diff --git a/bookwyrm/views/landing/login.py b/bookwyrm/views/landing/login.py index 959622e9f5..ba178611da 100644 --- a/bookwyrm/views/landing/login.py +++ b/bookwyrm/views/landing/login.py @@ -1,4 +1,5 @@ -""" class views for login/register views """ +"""class views for login/register views""" + import time from django.contrib.auth import authenticate, login, logout diff --git a/bookwyrm/views/landing/password.py b/bookwyrm/views/landing/password.py index 15d89a11b6..678e4dcd89 100644 --- a/bookwyrm/views/landing/password.py +++ b/bookwyrm/views/landing/password.py @@ -1,4 +1,5 @@ -""" class views for password management """ +"""class views for password management""" + from django.contrib.auth import login from django.core.exceptions import PermissionDenied, ObjectDoesNotExist from django.http import HttpResponseBadRequest diff --git a/bookwyrm/views/landing/register.py b/bookwyrm/views/landing/register.py index 5debd03cdc..a3df812f2d 100644 --- a/bookwyrm/views/landing/register.py +++ b/bookwyrm/views/landing/register.py @@ -1,4 +1,5 @@ -""" class views for login/register views """ +"""class views for login/register views""" + import zoneinfo from django.contrib.auth import login from django.core.exceptions import PermissionDenied diff --git a/bookwyrm/views/list/curate.py b/bookwyrm/views/list/curate.py index cf41636bae..cc0c552ea4 100644 --- a/bookwyrm/views/list/curate.py +++ b/bookwyrm/views/list/curate.py @@ -1,4 +1,5 @@ -""" book list views""" +"""book list views""" + from django.contrib.auth.decorators import login_required from django.db.models import Max from django.shortcuts import get_object_or_404, redirect diff --git a/bookwyrm/views/list/embed.py b/bookwyrm/views/list/embed.py index a62c9c1bac..e300168a03 100644 --- a/bookwyrm/views/list/embed.py +++ b/bookwyrm/views/list/embed.py @@ -1,4 +1,5 @@ -""" book list views""" +"""book list views""" + from django.core.paginator import Paginator from django.db.models import Avg, DecimalField from django.db.models.functions import Coalesce diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 54b449207f..0af89cf55f 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -1,4 +1,5 @@ -""" book list views""" +"""book list views""" + from typing import Optional from django.contrib.auth.decorators import login_required @@ -216,10 +217,13 @@ def add_book(request): else: # add the book at the latest order of approved books, before pending books order_max = ( - book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[ - "order__max" - ] - ) or 0 + ( + book_list.listitem_set.filter(approved=True).aggregate(Max("order"))[ + "order__max" + ] + ) + or 0 + ) increment_order_in_reverse(book_list.id, order_max + 1) item.order = order_max + 1 item.save() diff --git a/bookwyrm/views/list/list_item.py b/bookwyrm/views/list/list_item.py index 691df4da34..1de0df8351 100644 --- a/bookwyrm/views/list/list_item.py +++ b/bookwyrm/views/list/list_item.py @@ -1,4 +1,5 @@ -""" book list views""" +"""book list views""" + from django.contrib.auth.decorators import login_required from django.shortcuts import get_object_or_404, redirect from django.utils.decorators import method_decorator diff --git a/bookwyrm/views/list/lists.py b/bookwyrm/views/list/lists.py index 8990943889..5a2e7184e8 100644 --- a/bookwyrm/views/list/lists.py +++ b/bookwyrm/views/list/lists.py @@ -1,4 +1,5 @@ -""" book list views""" +"""book list views""" + from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.shortcuts import redirect @@ -14,6 +15,7 @@ logger = logging.getLogger(__name__) + # pylint: disable=no-self-use class Lists(View): """book list page""" diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py index e4549ba983..d186cf3a6c 100644 --- a/bookwyrm/views/notifications.py +++ b/bookwyrm/views/notifications.py @@ -1,4 +1,5 @@ -""" non-interactive pages """ +"""non-interactive pages""" + from django.contrib.auth.decorators import login_required from django.template.response import TemplateResponse from django.utils.decorators import method_decorator diff --git a/bookwyrm/views/outbox.py b/bookwyrm/views/outbox.py index 4bc2d2b98e..8d619f5f17 100644 --- a/bookwyrm/views/outbox.py +++ b/bookwyrm/views/outbox.py @@ -1,4 +1,5 @@ -""" the good stuff! the books! """ +"""the good stuff! the books!""" + from django.http import JsonResponse from django.shortcuts import get_object_or_404 from django.views import View @@ -22,7 +23,7 @@ def get(self, request, username): user.to_outbox( **request.GET, filter_type=filter_type, - pure=not is_bookwyrm_request(request) + pure=not is_bookwyrm_request(request), ), encoder=activitypub.ActivityEncoder, ) diff --git a/bookwyrm/views/preferences/block.py b/bookwyrm/views/preferences/block.py index 2ccd3c0656..1bbaca1ff9 100644 --- a/bookwyrm/views/preferences/block.py +++ b/bookwyrm/views/preferences/block.py @@ -1,4 +1,5 @@ -""" views for actions you can take in the application """ +"""views for actions you can take in the application""" + from django.contrib.auth.decorators import login_required from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse @@ -8,6 +9,7 @@ from bookwyrm import models + # pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Block(View): diff --git a/bookwyrm/views/preferences/change_password.py b/bookwyrm/views/preferences/change_password.py index d660355604..7544b9f646 100644 --- a/bookwyrm/views/preferences/change_password.py +++ b/bookwyrm/views/preferences/change_password.py @@ -1,4 +1,5 @@ -""" class views for password management """ +"""class views for password management""" + from django.contrib.auth import login from django.contrib.auth.decorators import login_required from django.template.response import TemplateResponse diff --git a/bookwyrm/views/preferences/delete_user.py b/bookwyrm/views/preferences/delete_user.py index 415b9babcf..2350e47ab0 100644 --- a/bookwyrm/views/preferences/delete_user.py +++ b/bookwyrm/views/preferences/delete_user.py @@ -1,4 +1,5 @@ -""" edit your own account """ +"""edit your own account""" + import time from django.contrib.auth import login, logout diff --git a/bookwyrm/views/preferences/edit_user.py b/bookwyrm/views/preferences/edit_user.py index 00bcd70aaa..307ef30d4c 100644 --- a/bookwyrm/views/preferences/edit_user.py +++ b/bookwyrm/views/preferences/edit_user.py @@ -1,4 +1,5 @@ -""" edit your own account """ +"""edit your own account""" + from io import BytesIO from uuid import uuid4 from PIL import Image diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index e13d488d46..a585ac273d 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -1,4 +1,5 @@ -""" Let users export their book data """ +"""Let users export their book data""" + from datetime import timedelta import csv import datetime @@ -23,6 +24,7 @@ from bookwyrm.models.bookwyrm_export_job import BookwyrmExportJob from bookwyrm.utils.cache import get_or_set + # pylint: disable=no-self-use,too-many-locals @method_decorator(login_required, name="dispatch") class Export(View): diff --git a/bookwyrm/views/preferences/move_user.py b/bookwyrm/views/preferences/move_user.py index 848628c889..3089c3e173 100644 --- a/bookwyrm/views/preferences/move_user.py +++ b/bookwyrm/views/preferences/move_user.py @@ -1,4 +1,4 @@ -""" move your account somewhere else """ +"""move your account somewhere else""" from django.core.exceptions import PermissionDenied from django.contrib.auth.decorators import login_required diff --git a/bookwyrm/views/preferences/security.py b/bookwyrm/views/preferences/security.py index 639cc3a3f6..34a72dbc0d 100644 --- a/bookwyrm/views/preferences/security.py +++ b/bookwyrm/views/preferences/security.py @@ -1,4 +1,5 @@ -""" class views for 2FA management """ +"""class views for 2FA management""" + from datetime import datetime, timedelta from importlib import import_module import pyotp @@ -23,6 +24,7 @@ SessionStore = import_module(settings.SESSION_ENGINE).SessionStore + # pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class UserSecurity(View): diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py index e39ad10675..b7dc85fa58 100644 --- a/bookwyrm/views/reading.py +++ b/bookwyrm/views/reading.py @@ -1,4 +1,4 @@ -""" the good stuff! the books! """ +"""the good stuff! the books!""" import logging from django.contrib.auth.decorators import login_required diff --git a/bookwyrm/views/relationships.py b/bookwyrm/views/relationships.py index 7164c25309..02c6a1f731 100644 --- a/bookwyrm/views/relationships.py +++ b/bookwyrm/views/relationships.py @@ -1,4 +1,5 @@ -""" Following and followers lists """ +"""Following and followers lists""" + from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator from django.db.models import Q, Count diff --git a/bookwyrm/views/report.py b/bookwyrm/views/report.py index 121b7a232e..abfbe5a73b 100644 --- a/bookwyrm/views/report.py +++ b/bookwyrm/views/report.py @@ -1,4 +1,5 @@ -""" moderation via flagged posts and users """ +"""moderation via flagged posts and users""" + from django.contrib.auth.decorators import login_required from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py index 2a80cb9fba..588ce8dc7f 100644 --- a/bookwyrm/views/rss_feed.py +++ b/bookwyrm/views/rss_feed.py @@ -1,4 +1,4 @@ -""" serialize user's posts in rss feed """ +"""serialize user's posts in rss feed""" from django.contrib.syndication.views import Feed from django.template.loader import get_template @@ -8,6 +8,7 @@ from .helpers import get_user_from_username + # pylint: disable=no-self-use class RssFeed(Feed): """serialize user's posts in rss feed""" @@ -195,9 +196,7 @@ def item_title(self, item): template = get_template("rss/title.html") return template.render({"user": authors, "item_title": item.title}).strip() - def get_object( - self, request, shelf_identifier, username - ): # pylint: disable=arguments-differ + def get_object(self, request, shelf_identifier, username): # pylint: disable=arguments-differ """the shelf that gets serialized""" user = get_user_from_username(request.user, username) # always get privacy, don't support rss over anything private diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index 498196c5b9..8324c2a62a 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -1,4 +1,4 @@ -""" search views""" +"""search views""" import re @@ -48,7 +48,7 @@ def get(self, request): "user": user_search, "list": list_search, } - if not search_type in endpoints: + if search_type not in endpoints: search_type = "book" return endpoints[search_type](request) diff --git a/bookwyrm/views/server_error.py b/bookwyrm/views/server_error.py index 658974dd1a..3bfd752a57 100644 --- a/bookwyrm/views/server_error.py +++ b/bookwyrm/views/server_error.py @@ -1,4 +1,5 @@ """custom 500 handler to enable context processors""" + from django.template.response import TemplateResponse diff --git a/bookwyrm/views/setup.py b/bookwyrm/views/setup.py index 8d67f35c67..b74b05f5ca 100644 --- a/bookwyrm/views/setup.py +++ b/bookwyrm/views/setup.py @@ -1,4 +1,5 @@ -""" Installation wizard 🧙 """ +"""Installation wizard 🧙""" + import re from django.contrib.auth import login diff --git a/bookwyrm/views/shelf/shelf.py b/bookwyrm/views/shelf/shelf.py index ad6a83a8f3..02b5426161 100644 --- a/bookwyrm/views/shelf/shelf.py +++ b/bookwyrm/views/shelf/shelf.py @@ -1,4 +1,5 @@ -""" shelf views """ +"""shelf views""" + from collections import namedtuple from django.db.models import OuterRef, Subquery, F, Max diff --git a/bookwyrm/views/shelf/shelf_actions.py b/bookwyrm/views/shelf/shelf_actions.py index d68ea42198..8a00a6b9a3 100644 --- a/bookwyrm/views/shelf/shelf_actions.py +++ b/bookwyrm/views/shelf/shelf_actions.py @@ -1,4 +1,4 @@ -""" shelf views """ +"""shelf views""" from django.db import IntegrityError, transaction from django.contrib.auth.decorators import login_required diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index 99401431ba..22083e5252 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -1,4 +1,4 @@ -""" what are we here for if not for posting """ +"""what are we here for if not for posting""" import re import logging diff --git a/bookwyrm/views/updates.py b/bookwyrm/views/updates.py index 82e8576480..5a38d251ca 100644 --- a/bookwyrm/views/updates.py +++ b/bookwyrm/views/updates.py @@ -1,4 +1,5 @@ -""" endpoints for getting updates about activity """ +"""endpoints for getting updates about activity""" + from django.contrib.auth.decorators import login_required from django.http import Http404, JsonResponse from django.utils.translation import ngettext diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index 0c383983cc..4441e8bb5d 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -1,4 +1,5 @@ -""" The user profile """ +"""The user profile""" + from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.db.models import Q diff --git a/bookwyrm/views/wellknown.py b/bookwyrm/views/wellknown.py index 531ab3486b..ef5db9f423 100644 --- a/bookwyrm/views/wellknown.py +++ b/bookwyrm/views/wellknown.py @@ -1,4 +1,4 @@ -""" responds to various requests to /.well-know """ +"""responds to various requests to /.well-know""" from dateutil.relativedelta import relativedelta from django.http import HttpResponseNotFound diff --git a/bw-dev b/bw-dev index f34d210589..1e39a1f011 100755 --- a/bw-dev +++ b/bw-dev @@ -191,14 +191,25 @@ case "$CMD" in prod_error clean ;; - black) + ruff) prod_error - $DOCKER_COMPOSE run --rm dev-tools black celerywyrm bookwyrm + $DOCKER_COMPOSE run --rm dev-tools ruff format celerywyrm bookwyrm + runweb ruff check bookwyrm/ ;; - pylint) + ruff-format) prod_error - # pylint depends on having the app dependencies in place, so we run it in the web container - runweb pylint bookwyrm/ + $DOCKER_COMPOSE run --rm dev-tools ruff format celerywyrm bookwyrm + ;; + ruff-check) + prod_error + # ruff check depends on having the app dependencies in place, so we run it in the web container + runweb ruff check bookwyrm/ + ;; + ruff-fix) + prod_error + # Auto-fix ruff issues that can be fixed automatically + # ruff check depends on having the app dependencies in place, so we run it in the web container + runweb ruff check --fix bookwyrm/ ;; prettier) prod_error @@ -215,8 +226,8 @@ case "$CMD" in ;; formatters) prod_error - runweb pylint bookwyrm/ - $DOCKER_COMPOSE run --rm dev-tools black celerywyrm bookwyrm + runweb ruff check bookwyrm/ + $DOCKER_COMPOSE run --rm dev-tools ruff format celerywyrm bookwyrm $DOCKER_COMPOSE run --rm dev-tools prettier --write bookwyrm/static/js/*.js $DOCKER_COMPOSE run --rm dev-tools eslint bookwyrm/static --ext .js $DOCKER_COMPOSE run --rm dev-tools stylelint --fix bookwyrm/static/css \ @@ -337,7 +348,10 @@ case "$CMD" in echo " update_locales" echo " build" echo " clean" - echo " black" + echo " ruff (format and check)" + echo " ruff-format (format code only)" + echo " ruff-check (check code only)" + echo " ruff-fix (auto-fix ruff issues)" echo " prettier" echo " eslint" echo " stylelint" diff --git a/celerywyrm/__init__.py b/celerywyrm/__init__.py index fe0c87ff12..126841352f 100644 --- a/celerywyrm/__init__.py +++ b/celerywyrm/__init__.py @@ -1,4 +1,5 @@ -""" we need this file to initialize celery """ +"""we need this file to initialize celery""" + from __future__ import absolute_import, unicode_literals # This will make sure the app is always imported when diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py index 8e45db9086..a90a38fa96 100644 --- a/celerywyrm/celery.py +++ b/celerywyrm/celery.py @@ -1,4 +1,5 @@ -""" configures celery for task management """ +"""configures celery for task management""" + from __future__ import absolute_import, unicode_literals import os diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py index 3ca9b27486..3b05fa45eb 100644 --- a/celerywyrm/settings.py +++ b/celerywyrm/settings.py @@ -1,4 +1,5 @@ -""" bookwyrm settings and configuration """ +"""bookwyrm settings and configuration""" + # pylint: disable=wildcard-import # pylint: disable=unused-wildcard-import from bookwyrm.settings import * diff --git a/celerywyrm/urls.py b/celerywyrm/urls.py index 394c0ef0d5..3b4a1f10e1 100644 --- a/celerywyrm/urls.py +++ b/celerywyrm/urls.py @@ -13,6 +13,7 @@ 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ + from django.contrib import admin from django.conf.urls.static import static from django.urls import path diff --git a/complete_bwdev.fish b/complete_bwdev.fish index f700dee1b5..47698a86af 100644 --- a/complete_bwdev.fish +++ b/complete_bwdev.fish @@ -21,7 +21,10 @@ compilemessages \ update_locales \ build \ clean \ -black \ +ruff \ +ruff-format \ +ruff-check \ +ruff-fix \ prettier \ eslint \ stylelint \ @@ -64,7 +67,10 @@ __bw_complete "$commands" "compilemessages" "compile .po local __bw_complete "$commands" "update_locales" "run makemessages and compilemessages for the en_US and additional locales" __bw_complete "$commands" "build" "build the containers" __bw_complete "$commands" "clean" "bring the cluster down and remove all containers" -__bw_complete "$commands" "black" "run Python code formatting tool" +__bw_complete "$commands" "ruff" "run ruff (format and check Python code)" +__bw_complete "$commands" "ruff-format" "run ruff format (format Python code only)" +__bw_complete "$commands" "ruff-check" "run ruff check (lint Python code only)" +__bw_complete "$commands" "ruff-fix" "run ruff check --fix (auto-fix ruff issues)" __bw_complete "$commands" "prettier" "run JavaScript code formatting tool" __bw_complete "$commands" "eslint" "run JavaScript linting tool" __bw_complete "$commands" "stylelint" "run SCSS linting tool" diff --git a/complete_bwdev.sh b/complete_bwdev.sh index c3f705ffc4..f15c122fa3 100644 --- a/complete_bwdev.sh +++ b/complete_bwdev.sh @@ -18,7 +18,10 @@ compilemessages update_locales build clean -black +ruff +ruff-format +ruff-check +ruff-fix prettier eslint stylelint diff --git a/complete_bwdev.zsh b/complete_bwdev.zsh index 72e9654aca..a8112df000 100644 --- a/complete_bwdev.zsh +++ b/complete_bwdev.zsh @@ -20,7 +20,10 @@ compilemessages update_locales build clean -black +ruff +ruff-format +ruff-check +ruff-fix prettier eslint stylelint diff --git a/dev-tools/requirements.txt b/dev-tools/requirements.txt index 3bb771f5a0..29a810a983 100644 --- a/dev-tools/requirements.txt +++ b/dev-tools/requirements.txt @@ -1 +1 @@ -black==22.* +ruff>=0.1.0 diff --git a/pyproject.toml b/pyproject.toml index 292ca8c41e..962bd6e8c0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,2 +1,48 @@ -[tool.black] -required-version = "22" +[tool.ruff] +exclude = [ + "migrations", +] + +line-length = 88 + +target-version = "py311" + +# Only select essential rules to minimize code changes +# E = pycodestyle errors (syntax errors, indentation issues) +# W = pycodestyle warnings (whitespace, etc.) +# F = pyflakes (unused imports, undefined names - critical errors only) +lint.select = [ + "E", # pycodestyle errors + "W", # pycodestyle warnings + "F", # pyflakes (critical errors only) +] + +# Ignore rules that would require code changes +lint.ignore = [ + "E501", # line too long (handled by formatter) + "E722", # bare except (too opinionated) + "E731", # lambda assignment (was disabled in pylint) +# "W503", # line break before binary operator (conflicts with formatter) + "F401", # unused imports (can be noisy, disable to minimize changes) + "F403", # star import (unable to detect undefined names from star imports) + "F841", # unused variable (can be noisy) +] + +# Per-file ignores for files with star imports +# Star imports make it impossible to detect undefined names +[tool.ruff.lint.per-file-ignores] +"bookwyrm/views/__init__.py" = ["F821"] # undefined name (due to star import from .wellknown) + +[tool.ruff.format] +# Use double quotes for strings (black-compatible) +quote-style = "double" +# Use spaces for indentation (black-compatible) +indent-style = "space" +# Respect magic trailing comma (black-compatible) +skip-magic-trailing-comma = false +# Line ending style +line-ending = "auto" +# Docstring code format - preserve existing style +docstring-code-format = false +# Docstring code line length - use same as line-length +docstring-code-line-length = "dynamic" diff --git a/requirements.txt b/requirements.txt index 1fe88baf6b..f6dc70f766 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,11 +47,10 @@ setuptools>=65.5.1 tornado>=6.3.3 # Dev -black==22.* +ruff>=0.1.0 celery-types==0.22.0 django-stubs[compatible-mypy]==4.2.7 mypy==1.7.1 -pylint==3.2.6 pytest==8.1.1 pytest-cov==5.0.0 pytest-django==4.8.0 From e860520256341271496e6860491e0d6d88d8f7ea Mon Sep 17 00:00:00 2001 From: kasiarog Date: Tue, 2 Dec 2025 14:14:21 +0100 Subject: [PATCH 192/962] remove pylint ignores & correct ruff commands --- bookwyrm/activitypub/base_activity.py | 8 +----- bookwyrm/activitypub/book.py | 4 --- bookwyrm/activitypub/note.py | 5 +--- bookwyrm/activitypub/ordered_collection.py | 2 -- bookwyrm/activitypub/person.py | 2 -- bookwyrm/activitystreams.py | 13 ++------- bookwyrm/apps.py | 3 +- bookwyrm/book_search.py | 2 -- bookwyrm/connectors/abstract_connector.py | 8 +++--- bookwyrm/connectors/connector_manager.py | 1 - bookwyrm/connectors/inventaire.py | 2 +- bookwyrm/forms/admin.py | 2 -- bookwyrm/forms/author.py | 1 - bookwyrm/forms/books.py | 1 - bookwyrm/forms/custom_form.py | 1 - bookwyrm/forms/edit_user.py | 1 - bookwyrm/forms/forms.py | 1 - bookwyrm/forms/groups.py | 1 - bookwyrm/forms/landing.py | 1 - bookwyrm/forms/links.py | 1 - bookwyrm/forms/lists.py | 1 - bookwyrm/forms/status.py | 1 - bookwyrm/forms/user_admin.py | 1 - bookwyrm/importers/bookwyrm_import.py | 1 - bookwyrm/importers/importer.py | 5 +--- bookwyrm/lists_stream.py | 13 ++------- .../commands/add_finna_connector.py | 2 -- bookwyrm/management/commands/admin_code.py | 1 - .../management/commands/compile_themes.py | 1 - .../commands/deduplicate_book_data.py | 1 - .../commands/erase_deleted_user_data.py | 5 ++-- bookwyrm/management/commands/erase_streams.py | 1 - .../management/commands/fix_isbn10_entries.py | 1 - .../commands/generate_preview_images.py | 4 --- bookwyrm/management/commands/initdb.py | 3 -- .../commands/populate_lists_streams.py | 1 - .../management/commands/populate_streams.py | 1 - .../commands/populate_suggestions.py | 1 - .../management/commands/remove_editions.py | 1 - .../remove_remote_user_preview_images.py | 2 -- .../management/commands/repair_editions.py | 1 - .../commands/revoke_preview_image_tasks.py | 1 - .../commands/show_duplicate_authors.py | 1 - bookwyrm/management/merge_command.py | 1 - bookwyrm/middleware/file_too_big.py | 2 +- bookwyrm/models/activitypub_mixin.py | 4 +-- bookwyrm/models/author.py | 2 -- bookwyrm/models/base_model.py | 1 - bookwyrm/models/book.py | 7 +---- bookwyrm/models/bookwyrm_export_job.py | 4 +-- bookwyrm/models/bookwyrm_import_job.py | 11 ++++---- bookwyrm/models/favorite.py | 1 - bookwyrm/models/fields.py | 15 +++------- bookwyrm/models/group.py | 2 +- bookwyrm/models/housekeeping.py | 4 +-- bookwyrm/models/import_job.py | 5 +--- bookwyrm/models/job.py | 10 +++---- bookwyrm/models/notification.py | 14 ---------- bookwyrm/models/relationship.py | 2 +- bookwyrm/models/site.py | 4 --- bookwyrm/models/status.py | 7 ++--- bookwyrm/models/user.py | 6 ++-- bookwyrm/preview_images.py | 4 +-- bookwyrm/redis_store.py | 3 +- bookwyrm/settings.py | 2 -- bookwyrm/suggested_users.py | 13 +++------ bookwyrm/templatetags/utilities.py | 1 - bookwyrm/tests/__init__.py | 2 +- bookwyrm/tests/activitypub/__init__.py | 3 +- .../tests/activitypub/test_base_activity.py | 4 +-- bookwyrm/tests/activitypub/test_person.py | 1 - bookwyrm/tests/activitystreams/__init__.py | 3 +- bookwyrm/tests/connectors/__init__.py | 3 +- .../connectors/test_openlibrary_connector.py | 1 - bookwyrm/tests/importers/__init__.py | 3 +- .../tests/importers/test_bookwyrm_import.py | 2 +- .../tests/importers/test_calibre_import.py | 2 +- .../tests/importers/test_goodreads_import.py | 2 +- bookwyrm/tests/importers/test_importer.py | 2 +- .../importers/test_librarything_import.py | 2 +- .../importers/test_openlibrary_import.py | 2 +- .../tests/importers/test_openreads_import.py | 1 - .../tests/importers/test_storygraph_import.py | 2 +- bookwyrm/tests/lists_stream/__init__.py | 3 +- bookwyrm/tests/management/__init__.py | 3 +- bookwyrm/tests/models/__init__.py | 3 +- .../tests/models/test_activitypub_mixin.py | 5 ++-- bookwyrm/tests/models/test_base_model.py | 1 - bookwyrm/tests/models/test_book_model.py | 1 - .../tests/models/test_bookwyrm_export_job.py | 2 +- .../tests/models/test_bookwyrm_import_job.py | 6 ++-- bookwyrm/tests/models/test_fields.py | 2 -- bookwyrm/tests/models/test_status_model.py | 3 -- bookwyrm/tests/models/test_user_model.py | 2 -- bookwyrm/tests/templatetags/__init__.py | 3 +- bookwyrm/tests/test_book_search.py | 1 - bookwyrm/tests/test_partial_date.py | 4 --- bookwyrm/tests/test_preview_images.py | 2 -- bookwyrm/tests/test_signing.py | 2 +- bookwyrm/tests/views/__init__.py | 3 +- bookwyrm/tests/views/admin/__init__.py | 3 +- bookwyrm/tests/views/books/__init__.py | 3 +- bookwyrm/tests/views/books/test_edit_book.py | 2 +- bookwyrm/tests/views/imports/__init__.py | 3 +- bookwyrm/tests/views/inbox/__init__.py | 3 +- bookwyrm/tests/views/inbox/test_inbox.py | 1 - bookwyrm/tests/views/landing/__init__.py | 3 +- bookwyrm/tests/views/landing/test_register.py | 1 - bookwyrm/tests/views/lists/__init__.py | 3 +- bookwyrm/tests/views/lists/test_list.py | 1 - bookwyrm/tests/views/preferences/__init__.py | 3 +- .../tests/views/preferences/test_export.py | 2 +- bookwyrm/tests/views/shelf/__init__.py | 3 +- bookwyrm/tests/views/test_group.py | 1 - bookwyrm/tests/views/test_helpers.py | 3 +- bookwyrm/tests/views/test_status.py | 1 - bookwyrm/thumbnail_generation.py | 6 ++-- bookwyrm/urls.py | 5 ++-- bookwyrm/utils/images.py | 2 +- bookwyrm/utils/partial_date.py | 2 -- bookwyrm/views/admin/announcements.py | 3 +- bookwyrm/views/admin/automod.py | 4 --- bookwyrm/views/admin/celery_status.py | 8 ++---- bookwyrm/views/admin/connectors.py | 4 --- bookwyrm/views/admin/dashboard.py | 3 +- bookwyrm/views/admin/email_blocklist.py | 2 -- bookwyrm/views/admin/email_config.py | 3 +- bookwyrm/views/admin/federation.py | 4 --- bookwyrm/views/admin/federation_settings.py | 1 - bookwyrm/views/admin/files_maintenance.py | 3 -- bookwyrm/views/admin/imports.py | 8 +----- bookwyrm/views/admin/invite.py | 5 ++-- bookwyrm/views/admin/ip_blocklist.py | 2 -- bookwyrm/views/admin/link_domains.py | 1 - bookwyrm/views/admin/reports.py | 1 - bookwyrm/views/admin/schedule.py | 2 -- bookwyrm/views/admin/site.py | 1 - bookwyrm/views/admin/themes.py | 5 +--- bookwyrm/views/admin/user_admin.py | 5 +--- bookwyrm/views/annual_summary.py | 3 +- bookwyrm/views/author.py | 3 -- bookwyrm/views/books/books.py | 1 - bookwyrm/views/books/edit_book.py | 4 --- bookwyrm/views/books/editions.py | 1 - bookwyrm/views/books/links.py | 2 -- bookwyrm/views/books/series.py | 1 - bookwyrm/views/directory.py | 1 - bookwyrm/views/discover.py | 1 - bookwyrm/views/feed.py | 2 -- bookwyrm/views/get_started.py | 1 - bookwyrm/views/goal.py | 1 - bookwyrm/views/group.py | 4 --- bookwyrm/views/hashtag.py | 2 -- bookwyrm/views/helpers.py | 2 -- bookwyrm/views/imports/import_data.py | 4 +-- bookwyrm/views/imports/import_status.py | 2 -- bookwyrm/views/imports/manually_review.py | 3 -- bookwyrm/views/imports/troubleshoot.py | 1 - bookwyrm/views/imports/user_troubleshoot.py | 1 - bookwyrm/views/inbox.py | 1 - bookwyrm/views/interaction.py | 1 - bookwyrm/views/isbn.py | 1 - bookwyrm/views/landing/landing.py | 1 - bookwyrm/views/landing/login.py | 2 -- bookwyrm/views/landing/password.py | 1 - bookwyrm/views/landing/register.py | 3 +- bookwyrm/views/list/curate.py | 1 - bookwyrm/views/list/embed.py | 1 - bookwyrm/views/list/list.py | 1 - bookwyrm/views/list/list_item.py | 1 - bookwyrm/views/list/lists.py | 2 -- bookwyrm/views/notifications.py | 1 - bookwyrm/views/outbox.py | 1 - bookwyrm/views/permission_denied.py | 2 +- bookwyrm/views/preferences/block.py | 1 - bookwyrm/views/preferences/change_password.py | 1 - bookwyrm/views/preferences/delete_user.py | 1 - bookwyrm/views/preferences/edit_user.py | 1 - bookwyrm/views/preferences/export.py | 6 +--- bookwyrm/views/preferences/move_user.py | 2 -- bookwyrm/views/preferences/security.py | 3 -- bookwyrm/views/reading.py | 2 -- bookwyrm/views/relationships.py | 1 - bookwyrm/views/report.py | 1 - bookwyrm/views/rss_feed.py | 11 ++++---- bookwyrm/views/search.py | 1 - bookwyrm/views/setup.py | 2 -- bookwyrm/views/shelf/shelf.py | 2 -- bookwyrm/views/status.py | 7 ++--- bookwyrm/views/user.py | 2 -- bw-dev | 11 +++----- celerywyrm/celery.py | 2 +- celerywyrm/settings.py | 4 +-- pyproject.toml | 28 ++++--------------- 194 files changed, 128 insertions(+), 453 deletions(-) diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py index 5560fafb78..77018ec52b 100644 --- a/bookwyrm/activitypub/base_activity.py +++ b/bookwyrm/activitypub/base_activity.py @@ -21,7 +21,7 @@ logger = logging.getLogger(__name__) -# pylint: disable=invalid-name + TBookWyrmModel = TypeVar("TBookWyrmModel", bound=base_model.BookWyrmModel) @@ -37,7 +37,6 @@ def default(self, o): @dataclass -# pylint: disable=invalid-name class Signature: """public key block""" @@ -112,7 +111,6 @@ def __init__( value = field.default setattr(self, field.name, value) - # pylint: disable=too-many-locals,too-many-branches,too-many-arguments def to_model( self, model: Optional[type[TBookWyrmModel]] = None, @@ -318,7 +316,6 @@ def get_model_from_type(activity_type): return model[0] -# pylint: disable=too-many-arguments @overload def resolve_remote_id( remote_id: str, @@ -330,7 +327,6 @@ def resolve_remote_id( ) -> TBookWyrmModel: ... -# pylint: disable=too-many-arguments @overload def resolve_remote_id( remote_id: str, @@ -342,7 +338,6 @@ def resolve_remote_id( ) -> base_model.BookWyrmModel: ... -# pylint: disable=too-many-arguments def resolve_remote_id( remote_id: str, model: Optional[Union[str, type[base_model.BookWyrmModel]]] = None, @@ -434,7 +429,6 @@ def get_activitypub_data(url): resp = requests.get( url, headers={ - # pylint: disable=line-too-long "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', "Date": now, "Signature": make_signature("get", sender, url, now), diff --git a/bookwyrm/activitypub/book.py b/bookwyrm/activitypub/book.py index dd1bb22dfe..26f580b591 100644 --- a/bookwyrm/activitypub/book.py +++ b/bookwyrm/activitypub/book.py @@ -7,7 +7,6 @@ from .image import Document -# pylint: disable=invalid-name @dataclass(init=False) class BookData(ActivityObject): """shared fields for all book data and authors""" @@ -26,7 +25,6 @@ class BookData(ActivityObject): lastEditedBy: Optional[str] = None -# pylint: disable=invalid-name @dataclass(init=False) class Book(BookData): """serializes an edition or work, abstract""" @@ -51,7 +49,6 @@ class Book(BookData): type: str = "Book" -# pylint: disable=invalid-name @dataclass(init=False) class Edition(Book): """Edition instance of a book object""" @@ -78,7 +75,6 @@ class Work(Book): type: str = "Work" -# pylint: disable=invalid-name @dataclass(init=False) class Author(BookData): """author of a book""" diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py index 9139889d25..ec7ebf4acd 100644 --- a/bookwyrm/activitypub/note.py +++ b/bookwyrm/activitypub/note.py @@ -17,13 +17,12 @@ class Tombstone(ActivityObject): type: str = "Tombstone" - def to_model(self, *args, **kwargs): # pylint: disable=unused-argument + def to_model(self, *args, **kwargs): """this should never really get serialized, just searched for""" model = apps.get_model("bookwyrm.Status") return model.find_existing_by_remote_id(self.id) -# pylint: disable=invalid-name @dataclass(init=False) class Note(ActivityObject): """Note activity""" @@ -42,7 +41,6 @@ class Note(ActivityObject): updated: str = None type: str = "Note" - # pylint: disable=too-many-arguments def to_model( self, model=None, @@ -100,7 +98,6 @@ class GeneratedNote(Note): type: str = "GeneratedNote" -# pylint: disable=invalid-name @dataclass(init=False) class Comment(Note): """like a note but with a book""" diff --git a/bookwyrm/activitypub/ordered_collection.py b/bookwyrm/activitypub/ordered_collection.py index 65e386a6a2..c955aa35ea 100644 --- a/bookwyrm/activitypub/ordered_collection.py +++ b/bookwyrm/activitypub/ordered_collection.py @@ -6,7 +6,6 @@ from .base_activity import ActivityObject -# pylint: disable=invalid-name @dataclass(init=False) class OrderedCollection(ActivityObject): """structure of an ordered collection activity""" @@ -43,7 +42,6 @@ class BookList(OrderedCollectionPrivate): type: str = "BookList" -# pylint: disable=invalid-name @dataclass(init=False) class OrderedCollectionPage(ActivityObject): """structure of an ordered collection activity""" diff --git a/bookwyrm/activitypub/person.py b/bookwyrm/activitypub/person.py index 1f978f3c32..e661a009d7 100644 --- a/bookwyrm/activitypub/person.py +++ b/bookwyrm/activitypub/person.py @@ -7,7 +7,6 @@ from .image import Image -# pylint: disable=invalid-name @dataclass(init=False) class PublicKey(ActivityObject): """public key block""" @@ -22,7 +21,6 @@ def serialize(self, **kwargs): return super().serialize(omit=omit) -# pylint: disable=invalid-name @dataclass(init=False) class Person(ActivityObject): """actor activitypub json""" diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index ef02c8ca23..599a41a32d 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -107,7 +107,7 @@ def populate_streams(self, user): self.populate_store(self.stream_id(user.id)) @tracer.start_as_current_span("ActivityStream._get_audience") - def _get_audience(self, status): # pylint: disable=no-self-use + def _get_audience(self, status): """given a status, what users should see it, excluding the author""" trace.get_current_span().set_attribute("status_type", status.status_type) trace.get_current_span().set_attribute("status_privacy", status.privacy) @@ -163,7 +163,7 @@ def get_stores_for_users(self, user_ids): """convert a list of user ids into redis store ids""" return [self.stream_id(user_id) for user_id in user_ids] - def get_statuses_for_user(self, user): # pylint: disable=no-self-use + def get_statuses_for_user(self, user): """given a user, what statuses should they see on this stream""" return models.Status.privacy_filter( user, @@ -315,7 +315,6 @@ def remove_book_statuses(self, user, book): @receiver(signals.post_save) -# pylint: disable=unused-argument def add_status_on_create(sender, instance, created, *args, **kwargs): """add newly created statuses to activity feeds""" # we're only interested in new statuses @@ -366,7 +365,6 @@ def add_status_on_create_command(sender, instance, created): @receiver(signals.post_delete, sender=models.Boost) -# pylint: disable=unused-argument def remove_boost_on_delete(sender, instance, *args, **kwargs): """boosts are deleted""" # remove the boost @@ -376,7 +374,6 @@ def remove_boost_on_delete(sender, instance, *args, **kwargs): @receiver(signals.post_save, sender=models.UserFollows) -# pylint: disable=unused-argument def add_statuses_on_follow(sender, instance, created, *args, **kwargs): """add a newly followed user's statuses to feeds""" if not created or not instance.user_subject.local: @@ -387,7 +384,6 @@ def add_statuses_on_follow(sender, instance, created, *args, **kwargs): @receiver(signals.post_delete, sender=models.UserFollows) -# pylint: disable=unused-argument def remove_statuses_on_unfollow(sender, instance, *args, **kwargs): """remove statuses from a feed on unfollow""" if not instance.user_subject.local: @@ -398,7 +394,6 @@ def remove_statuses_on_unfollow(sender, instance, *args, **kwargs): @receiver(signals.post_save, sender=models.UserBlocks) -# pylint: disable=unused-argument def remove_statuses_on_block(sender, instance, *args, **kwargs): """remove statuses from all feeds on block""" # blocks apply ot all feeds @@ -415,7 +410,6 @@ def remove_statuses_on_block(sender, instance, *args, **kwargs): @receiver(signals.post_delete, sender=models.UserBlocks) -# pylint: disable=unused-argument def add_statuses_on_unblock(sender, instance, *args, **kwargs): """add statuses back to all feeds on unblock""" # make sure there isn't a block in the other direction @@ -445,7 +439,6 @@ def add_statuses_on_unblock(sender, instance, *args, **kwargs): @receiver(signals.post_save, sender=models.User) -# pylint: disable=unused-argument def populate_streams_on_account_create(sender, instance, created, *args, **kwargs): """build a user's feeds when they join""" if not created or not instance.local: @@ -462,7 +455,6 @@ def populate_streams_on_account_create_command(instance_id): @receiver(signals.pre_save, sender=models.ShelfBook) -# pylint: disable=unused-argument def add_statuses_on_shelve(sender, instance, *args, **kwargs): """update books stream when user shelves a book""" if not instance.user.local: @@ -478,7 +470,6 @@ def add_statuses_on_shelve(sender, instance, *args, **kwargs): @receiver(signals.post_delete, sender=models.ShelfBook) -# pylint: disable=unused-argument def remove_statuses_on_unshelve(sender, instance, *args, **kwargs): """update books stream when user unshelves a book""" if not instance.user.local: diff --git a/bookwyrm/apps.py b/bookwyrm/apps.py index d5384bb7b5..7667220b51 100644 --- a/bookwyrm/apps.py +++ b/bookwyrm/apps.py @@ -23,7 +23,7 @@ def download_file(url, destination): logger.error("Failed to download file %s: %s", url, err) except OSError as err: logger.error("Couldn't open font file %s for writing: %s", destination, err) - except Exception as err: # pylint:disable=broad-except + except Exception as err: logger.error("Unknown error in file download: %s", err) @@ -36,7 +36,6 @@ class BookwyrmConfig(AppConfig): def ready(self): """set up OTLP and preview image files, if desired""" if settings.OTEL_EXPORTER_OTLP_ENDPOINT or settings.OTEL_EXPORTER_CONSOLE: - # pylint: disable=import-outside-toplevel from bookwyrm.telemetry import open_telemetry open_telemetry.instrumentDjango() diff --git a/bookwyrm/book_search.py b/bookwyrm/book_search.py index 8a472127e3..7d15b33302 100644 --- a/bookwyrm/book_search.py +++ b/bookwyrm/book_search.py @@ -114,7 +114,6 @@ def search_identifiers( # Oh did you think the 'S' in ISBN stood for 'standard'? normalized_isbn = query.strip().upper().rjust(10, "0") query = normalized_isbn - # pylint: disable=W0212 or_filters = [ {f.name: query} for f in models.Edition._meta.get_fields() @@ -178,7 +177,6 @@ class SearchResult: confidence: float = 1.0 def __repr__(self): - # pylint: disable=consider-using-f-string return "".format( self.key, self.title, self.author, self.confidence ) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 6e71eb39db..1d53e5747f 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -79,7 +79,7 @@ async def get_results( query: str, ) -> Optional[ConnectorResults]: """try this specific connector""" - # pylint: disable=line-too-long + headers = { "Accept": ( 'application/json, application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8' @@ -189,7 +189,7 @@ def get_or_create_book(self, remote_id: str) -> Optional[models.Book]: load_more_data.delay(self.connector.id, work.id) return edition - def get_book_data(self, remote_id: str) -> JsonDict: # pylint: disable=no-self-use + def get_book_data(self, remote_id: str) -> JsonDict: """this allows connectors to override the default behavior""" return get_data(remote_id, is_activitypub=False) @@ -324,7 +324,7 @@ def get_data( resp = requests.get( url, params=params, - headers={ # pylint: disable=line-too-long + headers={ "Accept": ( 'application/json, application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8' ), @@ -406,7 +406,7 @@ def get_value(self, data: JsonDict) -> Optional[Any]: return None try: return self.formatter(value) - except: # pylint: disable=bare-except + except: return None diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py index a24dc8b357..df4397b5eb 100644 --- a/bookwyrm/connectors/connector_manager.py +++ b/bookwyrm/connectors/connector_manager.py @@ -178,7 +178,6 @@ def load_connector( @receiver(signals.post_save, sender="bookwyrm.FederatedServer") -# pylint: disable=unused-argument def create_connector( sender: Any, instance: models.FederatedServer, diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 1cacd44bf6..bba22df031 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -130,7 +130,7 @@ def is_work_data(self, data: JsonDict) -> bool: def load_edition_data(self, work_uri: str) -> JsonDict: """get a list of editions for a work""" - # pylint: disable=line-too-long + url = f"{self.books_url}?action=reverse-claims&property=wdt:P629&value={work_uri}&sort=true" return get_data(url, is_activitypub=False) diff --git a/bookwyrm/forms/admin.py b/bookwyrm/forms/admin.py index 2bae65a030..77aca86a6f 100644 --- a/bookwyrm/forms/admin.py +++ b/bookwyrm/forms/admin.py @@ -13,7 +13,6 @@ from .custom_form import CustomForm, StyledForm -# pylint: disable=missing-class-docstring class ExpiryWidget(widgets.Select): def value_from_datadict(self, data, files, name): """human-readable expiration time buckets""" @@ -208,7 +207,6 @@ class Meta: "period": forms.Select(attrs={"aria-describedby": "desc_period"}), } - # pylint: disable=arguments-differ def save(self, request, *args, **kwargs): """This is an outside model so the perms check works differently""" if not request.user.has_perm("bookwyrm.moderate_user"): diff --git a/bookwyrm/forms/author.py b/bookwyrm/forms/author.py index 2364b488b2..8ec25374db 100644 --- a/bookwyrm/forms/author.py +++ b/bookwyrm/forms/author.py @@ -6,7 +6,6 @@ from .custom_form import CustomForm -# pylint: disable=missing-class-docstring class AuthorForm(CustomForm): class Meta: model = models.Author diff --git a/bookwyrm/forms/books.py b/bookwyrm/forms/books.py index e2206d9e7b..cfb3056fd2 100644 --- a/bookwyrm/forms/books.py +++ b/bookwyrm/forms/books.py @@ -10,7 +10,6 @@ from .widgets import ArrayWidget, SelectDateWidget, Select -# pylint: disable=missing-class-docstring class CoverForm(CustomForm): class Meta: model = models.Book diff --git a/bookwyrm/forms/custom_form.py b/bookwyrm/forms/custom_form.py index 98a77aa93d..fcbe5dd9b6 100644 --- a/bookwyrm/forms/custom_form.py +++ b/bookwyrm/forms/custom_form.py @@ -30,7 +30,6 @@ def __init__(self, *args, **kwargs): class CustomForm(StyledForm): """Check permissions on save""" - # pylint: disable=arguments-differ def save(self, request, *args, **kwargs): """Save and check perms""" self.instance.raise_not_editable(request.user) diff --git a/bookwyrm/forms/edit_user.py b/bookwyrm/forms/edit_user.py index 1fe794045f..72ec6f2dac 100644 --- a/bookwyrm/forms/edit_user.py +++ b/bookwyrm/forms/edit_user.py @@ -10,7 +10,6 @@ from .custom_form import CustomForm -# pylint: disable=missing-class-docstring class EditUserForm(CustomForm): class Meta: model = models.User diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py index 52d327a22f..e1e182cb06 100644 --- a/bookwyrm/forms/forms.py +++ b/bookwyrm/forms/forms.py @@ -11,7 +11,6 @@ from .custom_form import CustomForm -# pylint: disable=missing-class-docstring class FeedStatusTypesForm(CustomForm): class Meta: model = models.User diff --git a/bookwyrm/forms/groups.py b/bookwyrm/forms/groups.py index 3138d3f7a2..8d3efdc844 100644 --- a/bookwyrm/forms/groups.py +++ b/bookwyrm/forms/groups.py @@ -4,7 +4,6 @@ from .custom_form import CustomForm -# pylint: disable=missing-class-docstring class GroupForm(CustomForm): class Meta: model = models.Group diff --git a/bookwyrm/forms/landing.py b/bookwyrm/forms/landing.py index c14b1d4722..b2158ba6e2 100644 --- a/bookwyrm/forms/landing.py +++ b/bookwyrm/forms/landing.py @@ -13,7 +13,6 @@ from .custom_form import CustomForm -# pylint: disable=missing-class-docstring class LoginForm(CustomForm): class Meta: model = models.User diff --git a/bookwyrm/forms/links.py b/bookwyrm/forms/links.py index eda5b675c1..4f4bcef67d 100644 --- a/bookwyrm/forms/links.py +++ b/bookwyrm/forms/links.py @@ -8,7 +8,6 @@ from .custom_form import CustomForm -# pylint: disable=missing-class-docstring class LinkDomainForm(CustomForm): class Meta: model = models.LinkDomain diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py index 5a5392ca70..6c2a38c816 100644 --- a/bookwyrm/forms/lists.py +++ b/bookwyrm/forms/lists.py @@ -8,7 +8,6 @@ from .custom_form import CustomForm -# pylint: disable=missing-class-docstring class ListForm(CustomForm): class Meta: model = models.List diff --git a/bookwyrm/forms/status.py b/bookwyrm/forms/status.py index f026780746..cee5c96728 100644 --- a/bookwyrm/forms/status.py +++ b/bookwyrm/forms/status.py @@ -4,7 +4,6 @@ from .custom_form import CustomForm -# pylint: disable=missing-class-docstring class RatingForm(CustomForm): class Meta: model = models.ReviewRating diff --git a/bookwyrm/forms/user_admin.py b/bookwyrm/forms/user_admin.py index 1efd366a40..f46bd41bfa 100644 --- a/bookwyrm/forms/user_admin.py +++ b/bookwyrm/forms/user_admin.py @@ -4,7 +4,6 @@ from .custom_form import CustomForm -# pylint: disable=missing-class-docstring class UserGroupForm(CustomForm): class Meta: model = models.User diff --git a/bookwyrm/importers/bookwyrm_import.py b/bookwyrm/importers/bookwyrm_import.py index a1cdec811d..031db4d220 100644 --- a/bookwyrm/importers/bookwyrm_import.py +++ b/bookwyrm/importers/bookwyrm_import.py @@ -12,7 +12,6 @@ class BookwyrmImporter: This is kind of a combination of an importer and a connector. """ - # pylint: disable=no-self-use def process_import( self, user: User, archive_file: bytes, settings: QueryDict ) -> BookwyrmImportJob: diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index 926fa4a726..116d9a5fc0 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -46,7 +46,6 @@ class Importer: "reading": ["currently-reading", "reading", "currently reading"], } - # pylint: disable=too-many-arguments def create_job( self, user: User, @@ -132,14 +131,12 @@ def get_shelf(self, normalized_row: dict[str, Optional[str]]) -> Optional[str]: ] return shelf[0] if shelf else normalized_row.get("shelf") or None - # pylint: disable=no-self-use def normalize_row( self, entry: dict[str, str], mappings: dict[str, Optional[str]] ) -> dict[str, Optional[str]]: """use the dataclass to create the formatted row of data""" return {k: entry.get(v) if v else None for k, v in mappings.items()} - # pylint: disable=no-self-use def get_import_limit(self, user: User) -> tuple[int, int]: """check if import limit is set and return how many imports are left""" site_settings = SiteSettings.get() @@ -153,7 +150,7 @@ def get_import_limit(self, user: User) -> tuple[int, int]: import_jobs = ImportJob.objects.filter( user=user, created_date__gte=time_range ) - # pylint: disable=consider-using-generator + imported_books = sum([job.successful_item_count for job in import_jobs]) allowed_imports = import_size_limit - imported_books return enforce_limit, allowed_imports diff --git a/bookwyrm/lists_stream.py b/bookwyrm/lists_stream.py index 1030b3834d..07b3ee7001 100644 --- a/bookwyrm/lists_stream.py +++ b/bookwyrm/lists_stream.py @@ -12,7 +12,7 @@ class ListsStream(RedisStore): """all the lists you can see""" - def stream_id(self, user): # pylint: disable=no-self-use + def stream_id(self, user): """the redis key for this user's instance of this stream""" if isinstance(user, int): # allows the function to take an int or an obj @@ -59,7 +59,7 @@ def populate_lists(self, user): """go from zero to a timeline""" self.populate_store(self.stream_id(user)) - def get_audience(self, book_list): # pylint: disable=no-self-use + def get_audience(self, book_list): """given a list, what users should see it""" # everybody who could plausibly see this list audience = models.User.objects.filter( @@ -101,7 +101,7 @@ def get_stores_for_object(self, obj): """the stores that an object belongs in""" return [self.stream_id(u) for u in self.get_audience(obj)] - def get_lists_for_user(self, user): # pylint: disable=no-self-use + def get_lists_for_user(self, user): """given a user, what lists should they see on this stream""" return models.List.privacy_filter( user, @@ -114,7 +114,6 @@ def get_objects_for_store(self, store): @receiver(signals.post_save, sender=models.List) -# pylint: disable=unused-argument def add_list_on_create(sender, instance, created, *args, update_fields=None, **kwargs): """add newly created lists streams""" if created: @@ -132,7 +131,6 @@ def add_list_on_create(sender, instance, created, *args, update_fields=None, **k @receiver(signals.post_delete, sender=models.List) -# pylint: disable=unused-argument def remove_list_on_delete(sender, instance, *args, **kwargs): """remove deleted lists to streams""" remove_list_task.delay(instance.id) @@ -144,7 +142,6 @@ def add_list_on_create_command(instance_id): @receiver(signals.post_save, sender=models.UserFollows) -# pylint: disable=unused-argument def add_lists_on_follow(sender, instance, created, *args, **kwargs): """add a newly followed user's lists to feeds""" if not created or not instance.user_subject.local: @@ -153,7 +150,6 @@ def add_lists_on_follow(sender, instance, created, *args, **kwargs): @receiver(signals.post_delete, sender=models.UserFollows) -# pylint: disable=unused-argument def remove_lists_on_unfollow(sender, instance, *args, **kwargs): """remove lists from a feed on unfollow""" if not instance.user_subject.local: @@ -165,7 +161,6 @@ def remove_lists_on_unfollow(sender, instance, *args, **kwargs): @receiver(signals.post_save, sender=models.UserBlocks) -# pylint: disable=unused-argument def remove_lists_on_block(sender, instance, *args, **kwargs): """remove lists from all feeds on block""" # blocks apply ot all feeds @@ -178,7 +173,6 @@ def remove_lists_on_block(sender, instance, *args, **kwargs): @receiver(signals.post_delete, sender=models.UserBlocks) -# pylint: disable=unused-argument def add_lists_on_unblock(sender, instance, *args, **kwargs): """add lists back to all feeds on unblock""" # make sure there isn't a block in the other direction @@ -204,7 +198,6 @@ def add_lists_on_unblock(sender, instance, *args, **kwargs): @receiver(signals.post_save, sender=models.User) -# pylint: disable=unused-argument def populate_lists_on_account_create(sender, instance, created, *args, **kwargs): """build a user's feeds when they join""" if not created or not instance.local: diff --git a/bookwyrm/management/commands/add_finna_connector.py b/bookwyrm/management/commands/add_finna_connector.py index 94250d8d06..6f77f05a28 100644 --- a/bookwyrm/management/commands/add_finna_connector.py +++ b/bookwyrm/management/commands/add_finna_connector.py @@ -33,8 +33,6 @@ def remove_finna_connector(): print("Finna connector deactivated") -# pylint: disable=no-self-use -# pylint: disable=unused-argument class Command(BaseCommand): """command-line options""" diff --git a/bookwyrm/management/commands/admin_code.py b/bookwyrm/management/commands/admin_code.py index 90da08f28a..d153bfe601 100644 --- a/bookwyrm/management/commands/admin_code.py +++ b/bookwyrm/management/commands/admin_code.py @@ -15,7 +15,6 @@ class Command(BaseCommand): help = "Gets admin code for configuring BookWyrm" - # pylint: disable=unused-argument def handle(self, *args, **options): """execute init""" self.stdout.write("*******************************************") diff --git a/bookwyrm/management/commands/compile_themes.py b/bookwyrm/management/commands/compile_themes.py index c120f977e2..692e62f609 100644 --- a/bookwyrm/management/commands/compile_themes.py +++ b/bookwyrm/management/commands/compile_themes.py @@ -19,7 +19,6 @@ class Command(BaseCommand): help = "SCSS compile all BookWyrm themes" - # pylint: disable=unused-argument def handle(self, *args, **options): """compile""" themes_dir = os.path.join( diff --git a/bookwyrm/management/commands/deduplicate_book_data.py b/bookwyrm/management/commands/deduplicate_book_data.py index 2637079ccf..8c978b9b71 100644 --- a/bookwyrm/management/commands/deduplicate_book_data.py +++ b/bookwyrm/management/commands/deduplicate_book_data.py @@ -50,7 +50,6 @@ def add_arguments(self, parser): help="don't actually merge, only print what would happen", ) - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run deduplications""" dedupe_model(models.Edition, dry_run=options["dry_run"]) diff --git a/bookwyrm/management/commands/erase_deleted_user_data.py b/bookwyrm/management/commands/erase_deleted_user_data.py index d907327d22..33b018c7c7 100644 --- a/bookwyrm/management/commands/erase_deleted_user_data.py +++ b/bookwyrm/management/commands/erase_deleted_user_data.py @@ -6,20 +6,19 @@ from bookwyrm.models.user import erase_user_data -# pylint: disable=missing-function-docstring class Command(BaseCommand): """command-line options""" help = "Remove Two Factor Authorisation from user" - def add_arguments(self, parser): # pylint: disable=no-self-use + def add_arguments(self, parser): parser.add_argument( "--dryrun", action="store_true", help="Preview users to be cleared without altering the database", ) - def handle(self, *args, **options): # pylint: disable=unused-argument + def handle(self, *args, **options): # Check for anything fishy bad_state = models.User.objects.filter(is_deleted=True, is_active=True) if bad_state.exists(): diff --git a/bookwyrm/management/commands/erase_streams.py b/bookwyrm/management/commands/erase_streams.py index 4c2964e673..f2f7dd468f 100644 --- a/bookwyrm/management/commands/erase_streams.py +++ b/bookwyrm/management/commands/erase_streams.py @@ -18,7 +18,6 @@ class Command(BaseCommand): help = "Delete all the user streams" - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """flush all, baby""" erase_streams() diff --git a/bookwyrm/management/commands/fix_isbn10_entries.py b/bookwyrm/management/commands/fix_isbn10_entries.py index dea0ed97c2..4b2b25fa7a 100644 --- a/bookwyrm/management/commands/fix_isbn10_entries.py +++ b/bookwyrm/management/commands/fix_isbn10_entries.py @@ -23,7 +23,6 @@ class Command(BaseCommand): help = "Find and fix isbn-10 entries that have incorrect checksum" - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run fix""" find_long_isbn10_editions() diff --git a/bookwyrm/management/commands/generate_preview_images.py b/bookwyrm/management/commands/generate_preview_images.py index 6adf265354..2f1ce60cf2 100644 --- a/bookwyrm/management/commands/generate_preview_images.py +++ b/bookwyrm/management/commands/generate_preview_images.py @@ -5,13 +5,11 @@ from bookwyrm import models, preview_images -# pylint: disable=line-too-long class Command(BaseCommand): """Creates previews for existing objects""" help = "Generate preview images" - # pylint: disable=no-self-use def add_arguments(self, parser): """options for how the command is run""" parser.add_argument( @@ -21,7 +19,6 @@ def add_arguments(self, parser): help="Generates images for ALL types: site, users and books. Can use a lot of computing power.", ) - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """generate preview images""" self.stdout.write( @@ -41,7 +38,6 @@ def handle(self, *args, **options): preview_images.generate_site_preview_image_task.delay() self.stdout.write(" OK 🖼") - # pylint: disable=consider-using-f-string if options["all"]: # Users users = models.User.objects.filter( diff --git a/bookwyrm/management/commands/initdb.py b/bookwyrm/management/commands/initdb.py index 9192f0173f..5c9d8a2c54 100644 --- a/bookwyrm/management/commands/initdb.py +++ b/bookwyrm/management/commands/initdb.py @@ -90,7 +90,6 @@ def init_connectors(): priority=2, ) - # pylint: disable=line-too-long models.Connector.objects.get_or_create( identifier="inventaire.io", name="Inventaire", @@ -145,8 +144,6 @@ def init_link_domains(): ) -# pylint: disable=no-self-use -# pylint: disable=unused-argument class Command(BaseCommand): """command-line options""" diff --git a/bookwyrm/management/commands/populate_lists_streams.py b/bookwyrm/management/commands/populate_lists_streams.py index 313502e5c3..ec4b9c687e 100644 --- a/bookwyrm/management/commands/populate_lists_streams.py +++ b/bookwyrm/management/commands/populate_lists_streams.py @@ -23,7 +23,6 @@ class Command(BaseCommand): help = "Populate list streams for all users" - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run feed builder""" populate_lists_streams() diff --git a/bookwyrm/management/commands/populate_streams.py b/bookwyrm/management/commands/populate_streams.py index 2aa769699a..8ff2ef36e4 100644 --- a/bookwyrm/management/commands/populate_streams.py +++ b/bookwyrm/management/commands/populate_streams.py @@ -33,7 +33,6 @@ def add_arguments(self, parser): help="Specifies which time of stream to populate", ) - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run feed builder""" stream = options.get("stream") diff --git a/bookwyrm/management/commands/populate_suggestions.py b/bookwyrm/management/commands/populate_suggestions.py index fd195d4ac8..ac35df5bc9 100644 --- a/bookwyrm/management/commands/populate_suggestions.py +++ b/bookwyrm/management/commands/populate_suggestions.py @@ -21,7 +21,6 @@ class Command(BaseCommand): help = "Populate suggested users for all users" - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run builder""" populate_suggestions() diff --git a/bookwyrm/management/commands/remove_editions.py b/bookwyrm/management/commands/remove_editions.py index f07d075ac4..a67161f7a8 100644 --- a/bookwyrm/management/commands/remove_editions.py +++ b/bookwyrm/management/commands/remove_editions.py @@ -38,7 +38,6 @@ class Command(BaseCommand): help = "merges duplicate book data" - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run deduplications""" remove_editions() diff --git a/bookwyrm/management/commands/remove_remote_user_preview_images.py b/bookwyrm/management/commands/remove_remote_user_preview_images.py index d7d816e6d6..95e57f7127 100644 --- a/bookwyrm/management/commands/remove_remote_user_preview_images.py +++ b/bookwyrm/management/commands/remove_remote_user_preview_images.py @@ -6,13 +6,11 @@ from bookwyrm import models, preview_images -# pylint: disable=line-too-long class Command(BaseCommand): """Remove preview images for remote users""" help = "Remove preview images for remote users" - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """generate preview images""" self.stdout.write( diff --git a/bookwyrm/management/commands/repair_editions.py b/bookwyrm/management/commands/repair_editions.py index 56ffd93591..c8d9c10594 100644 --- a/bookwyrm/management/commands/repair_editions.py +++ b/bookwyrm/management/commands/repair_editions.py @@ -9,7 +9,6 @@ class Command(BaseCommand): help = "Repairs an edition that is in a broken state" - # pylint: disable=unused-argument def handle(self, *args, **options): """Find and repair broken editions""" # Find broken editions diff --git a/bookwyrm/management/commands/revoke_preview_image_tasks.py b/bookwyrm/management/commands/revoke_preview_image_tasks.py index 311811017c..d2a596f9c6 100644 --- a/bookwyrm/management/commands/revoke_preview_image_tasks.py +++ b/bookwyrm/management/commands/revoke_preview_image_tasks.py @@ -8,7 +8,6 @@ class Command(BaseCommand): """Find and revoke image tasks""" - # pylint: disable=unused-argument def handle(self, *args, **options): """revoke nonessential low priority tasks""" types = [ diff --git a/bookwyrm/management/commands/show_duplicate_authors.py b/bookwyrm/management/commands/show_duplicate_authors.py index 34e5da2b0e..95f7d632b2 100644 --- a/bookwyrm/management/commands/show_duplicate_authors.py +++ b/bookwyrm/management/commands/show_duplicate_authors.py @@ -41,7 +41,6 @@ class Command(BaseCommand): help = "show authors with same name but different id" - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """run deduplications""" find_duplicate_author_names() diff --git a/bookwyrm/management/merge_command.py b/bookwyrm/management/merge_command.py index 66e60814ae..cd170c8056 100644 --- a/bookwyrm/management/merge_command.py +++ b/bookwyrm/management/merge_command.py @@ -14,7 +14,6 @@ def add_arguments(self, parser): help="don't actually merge, only print what would happen", ) - # pylint: disable=no-self-use,unused-argument def handle(self, *args, **options): """merge the two objects""" model = self.MODEL diff --git a/bookwyrm/middleware/file_too_big.py b/bookwyrm/middleware/file_too_big.py index 0949821cfb..f87e9425a8 100644 --- a/bookwyrm/middleware/file_too_big.py +++ b/bookwyrm/middleware/file_too_big.py @@ -18,7 +18,7 @@ def __call__(self, request): """If RequestDataTooBig is thrown, render the 413 error page""" try: - body = request.body # pylint: disable=unused-variable + body = request.body except RequestDataTooBig: rendered = render(request, "413.html") diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index 1e8ab6c4b8..d94780112d 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -68,7 +68,6 @@ def __init__(self, *args, **kwargs): ) if hasattr(self, "property_fields"): self.activity_fields += [ - # pylint: disable=cell-var-from-loop PropertyField(lambda a, o: set_activity_from_property_field(a, o, f)) for f in self.property_fields ] @@ -212,7 +211,7 @@ def to_activity_dataclass(self): activity = generate_activity(self) return self.activity_serializer(**activity) - def to_activity(self, **kwargs): # pylint: disable=unused-argument + def to_activity(self, **kwargs): """convert from a model to a json activity""" return self.to_activity_dataclass().serialize() @@ -608,7 +607,6 @@ async def sign_and_send( logger.exception(err) -# pylint: disable=unused-argument def to_ordered_collection_page( queryset, remote_id, id_only=False, page=1, pure=False, **kwargs ): diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 29e2954f92..54f7f0e0bd 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -75,8 +75,6 @@ def get_remote_id(self): class Meta: """sets up indexes and triggers""" - # pylint: disable=line-too-long - indexes = (GinIndex(fields=["search_vector"]),) triggers = [ pgtrigger.Trigger( diff --git a/bookwyrm/models/base_model.py b/bookwyrm/models/base_model.py index 837c18ecb9..67e91acc1f 100644 --- a/bookwyrm/models/base_model.py +++ b/bookwyrm/models/base_model.py @@ -186,7 +186,6 @@ def direct_filter(cls, queryset, viewer): @receiver(models.signals.post_save) -# pylint: disable=unused-argument def set_remote_id(sender, instance, created, *args, **kwargs): """set the remote_id after save (when the id is available)""" if not created or not hasattr(instance, "get_remote_id"): diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index a16b0a7f40..bdcbb9d6fd 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -119,7 +119,6 @@ def save( super().save(*args, update_fields=update_fields, **kwargs) - # pylint: disable=arguments-differ def broadcast(self, activity, sender, software="bookwyrm", **kwargs): """only send book data updates to other bookwyrm instances""" super().broadcast(activity, sender, software=software, **kwargs) @@ -148,7 +147,7 @@ def merge_into(self, canonical: Self, dry_run=False) -> Dict[str, Any]: # the linking table anyway. If we update it through that model # instead then we won’t lose the extra fields in the linking # table. - # pylint: disable=protected-access + related_field_obj = related_model._meta.get_field(related_field) if isinstance(related_field_obj, ManyToManyField): through = related_field_obj.remote_field.through @@ -374,7 +373,6 @@ def guess_sort_title(self, user=None): return re.sub(f"^{' |^'.join(articles)} ", "", str(self.title).lower()) def __repr__(self): - # pylint: disable=consider-using-f-string return "<{} key={!r} title={!r}>".format( self.__class__, self.openlibrary_key, @@ -384,8 +382,6 @@ def __repr__(self): class Meta: """set up indexes and triggers""" - # pylint: disable=line-too-long - indexes = (GinIndex(fields=["search_vector"]),) triggers = [ pgtrigger.Trigger( @@ -768,7 +764,6 @@ def normalize_isbn(isbn): return re.sub(r"[^0-9X]", "", isbn) -# pylint: disable=unused-argument @receiver(models.signals.post_save, sender=Edition) def preview_image(instance, *args, **kwargs): """create preview image on book create""" diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 25eea2b862..2d6289712d 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -74,7 +74,7 @@ def create_export_json_task(**kwargs): # trigger task to create tar file create_archive_task.delay(job_id=job.id) - except Exception as err: # pylint: disable=broad-except + except Exception as err: logger.exception( "create_export_json_task for job %s failed with error: %s", job.id, err ) @@ -163,7 +163,7 @@ def create_archive_task(**kwargs): job.complete_job() - except Exception as err: # pylint: disable=broad-except + except Exception as err: logger.exception( "create_archive_task for job %s failed with error: %s", job.id, err ) diff --git a/bookwyrm/models/bookwyrm_import_job.py b/bookwyrm/models/bookwyrm_import_job.py index 9e545e025b..3c0c9d868d 100644 --- a/bookwyrm/models/bookwyrm_import_job.py +++ b/bookwyrm/models/bookwyrm_import_job.py @@ -232,7 +232,6 @@ def on_success(self, retval, task_id, args, kwargs): subtask.complete_job() -# pylint: disable=too-many-branches @app.task(queue=IMPORTS, base=ImportUserTask) def start_import_task(**kwargs): """trigger the child import tasks for each user data @@ -305,7 +304,7 @@ def start_import_task(**kwargs): archive_file.close() - except Exception as err: # pylint: disable=broad-except + except Exception as err: logger.error( "User Import Job %s Failed with error: %s", job.id, err, exc_info=True ) @@ -348,7 +347,7 @@ def create_book_from_json(book_data): @app.task(queue=IMPORTS, base=UserImportSubTask) -def import_book_task(**kwargs): # pylint: disable=too-many-branches +def import_book_task(**kwargs): """Take work and edition data, find or create the edition and work in the database""" @@ -389,7 +388,7 @@ def import_book_task(**kwargs): # pylint: disable=too-many-branches if "include_lists" in required: upsert_lists(task.parent_job.user, book.id, book_data.get("lists")) - except Exception as err: # pylint: disable=broad-except + except Exception as err: logger.error( "Book Import Task %s for Job %s Failed with error: %s", task.id, job.id, err ) @@ -492,7 +491,7 @@ def upsert_status_task(**kwargs): task.save(update_fields=["fail_reason"]) task.set_status("failed") - except Exception as err: # pylint: disable=broad-except + except Exception as err: logger.error("User Status Import Task %s Failed with error: %s", task.id, err) task.fail_reason = _("Unknown error importing book status") task.save(update_fields=["fail_reason"]) @@ -723,7 +722,7 @@ def import_user_relationship_task(**kwargs): task.save(update_fields=["fail_reason"]) task.set_status("failed") - except Exception as err: # pylint: disable=broad-except + except Exception as err: logger.error( "User Import Relationship Task %s Failed with error: %s", task.id, err ) diff --git a/bookwyrm/models/favorite.py b/bookwyrm/models/favorite.py index 5df23bac9a..10a766201f 100644 --- a/bookwyrm/models/favorite.py +++ b/bookwyrm/models/favorite.py @@ -21,7 +21,6 @@ class Favorite(ActivityMixin, BookWyrmModel): activity_serializer = activitypub.Like - # pylint: disable=unused-argument @classmethod def ignore_activity(cls, activity, allow_external_connections=True): """don't bother with incoming favs of unknown statuses""" diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 317293cb40..ecc1976db6 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -130,7 +130,6 @@ def field_to_activity(self, value): return {self.activitypub_wrapper: value} return value - # pylint: disable=unused-argument def field_from_activity(self, value, allow_external_connections=True, trigger=None): """formatter to convert activitypub into a model value""" if value and hasattr(self, "activitypub_wrapper"): @@ -294,7 +293,7 @@ def set_activity_from_field(self, activity, instance): activity["cc"] = [] -class ForeignKey( # pylint: disable=abstract-method +class ForeignKey( ActivitypubRelatedFieldMixin, models.ForeignKey, ): @@ -306,9 +305,7 @@ def field_to_activity(self, value): return value.remote_id -class OneToOneField( # pylint: disable=abstract-method - ActivitypubRelatedFieldMixin, models.OneToOneField -): +class OneToOneField(ActivitypubRelatedFieldMixin, models.OneToOneField): """activitypub-aware foreign key field""" def field_to_activity(self, value): @@ -317,9 +314,7 @@ def field_to_activity(self, value): return value.to_activity() -class ManyToManyField( # pylint: disable=abstract-method - ActivitypubFieldMixin, models.ManyToManyField -): +class ManyToManyField(ActivitypubFieldMixin, models.ManyToManyField): """activitypub-aware many to many field""" def __init__(self, *args, link_only=False, **kwargs): @@ -370,7 +365,7 @@ def field_from_activity(self, value, allow_external_connections=True, trigger=No return items -class TagField(ManyToManyField): # pylint: disable=abstract-method +class TagField(ManyToManyField): """special case of many to many that uses Tags""" def __init__(self, *args, **kwargs): @@ -463,7 +458,6 @@ def __init__(self, *args, alt_field=None, **kwargs): self.alt_field = alt_field super().__init__(*args, **kwargs) - # pylint: disable=arguments-renamed,too-many-arguments def set_field_from_activity( self, instance, data, save=True, overwrite=True, allow_external_connections=True ): @@ -579,7 +573,6 @@ def field_to_activity(self, value) -> str: return value.partial_isoformat() if value else None def field_from_activity(self, value, allow_external_connections=True, trigger=None): - # pylint: disable=no-else-return try: return from_partial_isoformat(value) except ValueError: diff --git a/bookwyrm/models/group.py b/bookwyrm/models/group.py index 9314cf569f..f0ccc42808 100644 --- a/bookwyrm/models/group.py +++ b/bookwyrm/models/group.py @@ -143,7 +143,7 @@ def save(self, *args, **kwargs): @transaction.atomic def accept(self): """turn this request into the real deal""" - # pylint: disable-next=import-outside-toplevel + from .notification import Notification, NotificationType # circular dependency GroupMember.from_request(self) diff --git a/bookwyrm/models/housekeeping.py b/bookwyrm/models/housekeeping.py index f9525dee05..815b946243 100644 --- a/bookwyrm/models/housekeeping.py +++ b/bookwyrm/models/housekeeping.py @@ -67,7 +67,6 @@ def start_job(self): class CleanUpExportsTask(ParentTask): """Task to delete expired user export files""" - # pylint: disable=too-many-arguments, unused-argument, no-self-use def after_return(self, status, retval, task_id, args, kwargs, einfo): """Handler called after the task returns""" @@ -155,7 +154,6 @@ def on_success(self, retval, task_id, args, kwargs): job.found_covers.add(edition) - # pylint: disable=too-many-arguments, unused-argument, no-self-use def after_return(self, status, retval, task_id, args, kwargs, einfo): """Handler called after the task returns""" @@ -184,7 +182,7 @@ def get_cover_from_identifiers(edition): """for a given edition, can we find a book cover from the fedi?""" # idk there is probably a more pythonic way of doing this - # pylint: disable=protected-access + fields = [ f.name for f in models.Edition._meta.get_fields() diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index 2b0ed9edb6..982e9bb1e8 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -336,11 +336,9 @@ def reads(self): return [] def __repr__(self): - # pylint: disable=consider-using-f-string return "<{!r} Item {!r}>".format(self.index, self.normalized_data.get("title")) def __str__(self): - # pylint: disable=consider-using-f-string return "{} by {}".format( self.normalized_data.get("title"), self.normalized_data.get("authors") ) @@ -391,7 +389,7 @@ def import_item_task(item_id): item.update_job() -def handle_imported_book(item): # pylint: disable=too-many-branches +def handle_imported_book(item): """process a csv and then post about it""" job = item.job if job.complete: @@ -455,7 +453,6 @@ def handle_imported_book(item): # pylint: disable=too-many-branches item.date_reviewed or item.date_read or item.date_added or timezone.now() ) if item.review: - # pylint: disable=consider-using-f-string review_title = "Review of {!r} on {!r}".format( item.book.title, job.source, diff --git a/bookwyrm/models/job.py b/bookwyrm/models/job.py index 1c7c2e6f09..9147473068 100644 --- a/bookwyrm/models/job.py +++ b/bookwyrm/models/job.py @@ -122,7 +122,7 @@ def notify_child_job_complete(self): if not self.complete and self.has_completed: self.complete_job() - def __terminate_job(self): # pylint: disable=unused-private-member + def __terminate_job(self): """Tell workers to ignore and not execute this task & pending child tasks. Extend. """ @@ -186,7 +186,7 @@ class ParentTask(app.Task): Usage e.g. @app.task(base=ParentTask) """ - def before_start(self, task_id, args, kwargs): # pylint: disable=no-self-use, unused-argument + def before_start(self, task_id, args, kwargs): """Handler called before the task starts. Override. Prepare ParentJob before the task starts. @@ -211,7 +211,7 @@ def before_start(self, task_id, args, kwargs): # pylint: disable=no-self-use, u if kwargs.get("no_children"): job.set_status(ChildJob.Status.ACTIVE) - def on_success(self, retval, task_id, args, kwargs): # pylint: disable=no-self-use, unused-argument + def on_success(self, retval, task_id, args, kwargs): """Run by the worker if the task executes successfully. Override. Update ParentJob on Task complete. @@ -244,7 +244,7 @@ class SubTask(app.Task): Usage e.g. @app.task(base=SubTask) """ - def before_start(self, task_id, args, kwargs): # pylint: disable=no-self-use, unused-argument + def before_start(self, task_id, args, kwargs): """Handler called before the task starts. Override. Prepare ChildJob before the task starts. @@ -266,7 +266,7 @@ def before_start(self, task_id, args, kwargs): # pylint: disable=no-self-use, u child_job.save(update_fields=["task_id"]) child_job.set_status(ChildJob.Status.ACTIVE) - def on_success(self, retval, task_id, args, kwargs): # pylint: disable=no-self-use, unused-argument + def on_success(self, retval, task_id, args, kwargs): """Run by the worker if the task executes successfully. Override. Notify ChildJob of task completion. diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py index fefc8dd807..aa9d81efc9 100644 --- a/bookwyrm/models/notification.py +++ b/bookwyrm/models/notification.py @@ -131,7 +131,6 @@ def unnotify(cls, user, related_user, **kwargs): @receiver(models.signals.post_save, sender=Favorite) -# pylint: disable=unused-argument def notify_on_fav(sender, instance, *args, **kwargs): """someone liked your content, you ARE loved""" Notification.notify( @@ -143,7 +142,6 @@ def notify_on_fav(sender, instance, *args, **kwargs): @receiver(models.signals.post_delete, sender=Favorite) -# pylint: disable=unused-argument def notify_on_unfav(sender, instance, *args, **kwargs): """oops, didn't like that after all""" if not instance.status.user.local: @@ -158,7 +156,6 @@ def notify_on_unfav(sender, instance, *args, **kwargs): @receiver(models.signals.post_save) @transaction.atomic -# pylint: disable=unused-argument def notify_user_on_mention(sender, instance, *args, **kwargs): """creating and deleting statuses with @ mentions and replies""" if not issubclass(sender, Status): @@ -195,7 +192,6 @@ def notify_user_on_mention(sender, instance, *args, **kwargs): @receiver(models.signals.post_save, sender=Boost) -# pylint: disable=unused-argument def notify_user_on_boost(sender, instance, *args, **kwargs): """boosting a status""" if ( @@ -213,7 +209,6 @@ def notify_user_on_boost(sender, instance, *args, **kwargs): @receiver(models.signals.post_delete, sender=Boost) -# pylint: disable=unused-argument def notify_user_on_unboost(sender, instance, *args, **kwargs): """unboosting a status""" Notification.unnotify( @@ -225,7 +220,6 @@ def notify_user_on_unboost(sender, instance, *args, **kwargs): @receiver(models.signals.post_save, sender=ImportJob) -# pylint: disable=unused-argument def notify_user_on_import_complete( sender, instance, *args, update_fields=None, **kwargs ): @@ -241,7 +235,6 @@ def notify_user_on_import_complete( @receiver(models.signals.post_save, sender=BookwyrmImportJob) -# pylint: disable=unused-argument def notify_user_on_user_import_complete( sender, instance, *args, update_fields=None, **kwargs ): @@ -255,7 +248,6 @@ def notify_user_on_user_import_complete( @receiver(models.signals.post_save, sender=BookwyrmExportJob) -# pylint: disable=unused-argument def notify_user_on_user_export_complete( sender, instance, *args, update_fields=None, **kwargs ): @@ -272,7 +264,6 @@ def notify_user_on_user_export_complete( @receiver(models.signals.post_save, sender=Report) @transaction.atomic -# pylint: disable=unused-argument def notify_admins_on_report(sender, instance, created, *args, **kwargs): """something is up, make sure the admins know""" if not created: @@ -291,7 +282,6 @@ def notify_admins_on_report(sender, instance, created, *args, **kwargs): @receiver(models.signals.post_save, sender=LinkDomain) @transaction.atomic -# pylint: disable=unused-argument def notify_admins_on_link_domain(sender, instance, created, *args, **kwargs): """a new link domain needs to be verified""" if not created: @@ -310,7 +300,6 @@ def notify_admins_on_link_domain(sender, instance, created, *args, **kwargs): @receiver(models.signals.post_save, sender=InviteRequest) @transaction.atomic -# pylint: disable=unused-argument def notify_admins_on_invite_request(sender, instance, created, *args, **kwargs): """need to handle a new invite request""" if not created: @@ -327,7 +316,6 @@ def notify_admins_on_invite_request(sender, instance, created, *args, **kwargs): @receiver(models.signals.post_save, sender=GroupMemberInvitation) -# pylint: disable=unused-argument def notify_user_on_group_invite(sender, instance, *args, **kwargs): """Cool kids club here we come""" Notification.notify( @@ -340,7 +328,6 @@ def notify_user_on_group_invite(sender, instance, *args, **kwargs): @receiver(models.signals.post_save, sender=ListItem) @transaction.atomic -# pylint: disable=unused-argument def notify_user_on_list_item_add(sender, instance, created, *args, **kwargs): """Someone added to your list""" if not created: @@ -360,7 +347,6 @@ def notify_user_on_list_item_add(sender, instance, created, *args, **kwargs): @receiver(models.signals.post_save, sender=UserFollowRequest) @transaction.atomic -# pylint: disable=unused-argument def notify_user_on_follow(sender, instance, created, *args, **kwargs): """Someone added to your list""" if not created or not instance.user_object.local: diff --git a/bookwyrm/models/relationship.py b/bookwyrm/models/relationship.py index 5117bef084..d8bbe3b049 100644 --- a/bookwyrm/models/relationship.py +++ b/bookwyrm/models/relationship.py @@ -81,7 +81,7 @@ class UserFollows(ActivityMixin, UserRelationship): status = "follows" - def to_activity(self): # pylint: disable=arguments-differ + def to_activity(self): """overrides default to manually set serializer""" return activitypub.Follow(**generate_activity(self)) diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index efe8fd1009..160b296c62 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -32,7 +32,6 @@ class Meta: abstract = True - # pylint: disable=no-self-use def raise_not_editable(self, viewer: User) -> None: """Check if the user has the right permissions""" if viewer.has_perm("bookwyrm.edit_instance_settings"): @@ -175,7 +174,6 @@ class Theme(SiteModel): loads = models.BooleanField(null=True, blank=True) def __str__(self) -> str: - # pylint: disable=invalid-str-returned return self.name @@ -190,7 +188,6 @@ class SiteInvite(models.Model): user = models.ForeignKey(User, on_delete=models.CASCADE) invitees = models.ManyToManyField(User, related_name="invitees") - # pylint: disable=no-self-use def raise_not_editable(self, viewer: User) -> None: """Admins only""" if viewer.has_perm("bookwyrm.create_invites"): @@ -256,7 +253,6 @@ def link(self) -> str: return f"{BASE_URL}/password-reset/{self.code}" -# pylint: disable=unused-argument @receiver(models.signals.post_save, sender=SiteSettings) def preview_image(instance: SiteSettings, *args, **kwargs) -> None: """Update image preview for the default site image""" diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index ed04b2ee80..8ed01ce9f9 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -109,7 +109,7 @@ def delete(self, *args, **kwargs): # clear user content self.content = None if hasattr(self, "quotation"): - self.quotation = None # pylint: disable=attribute-defined-outside-init + self.quotation = None self.deleted_date = timezone.now() self.save(*args, **kwargs) @@ -126,7 +126,7 @@ def recipients(self): return list(mentions) @classmethod - def ignore_activity(cls, activity, allow_external_connections=True): # pylint: disable=too-many-return-statements + def ignore_activity(cls, activity, allow_external_connections=True): """keep notes if they are replies to existing statuses""" if activity.type == "Announce": boosted = activitypub.resolve_remote_id( @@ -252,7 +252,7 @@ def to_activity_dataclass(self, pure=False): activity.attachment = covers return activity - def to_activity(self, pure=False): # pylint: disable=arguments-differ + def to_activity(self, pure=False): """json serialized activitypub class""" return self.to_activity_dataclass(pure=pure).serialize() @@ -531,7 +531,6 @@ def __init__(self, *args, **kwargs): self.deserialize_reverse_fields = [] -# pylint: disable=unused-argument @receiver(models.signals.post_save) def preview_image(instance, sender, *args, **kwargs): """Updates book previews if the rating has changed""" diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index bc363909a0..4694376090 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -49,7 +49,6 @@ def get_feed_filter_choices(): return [f[0] for f in FeedFilterChoices] -# pylint: disable=too-many-public-methods class User(OrderedCollectionPageMixin, AbstractUser): """a user who wants to read books""" @@ -227,7 +226,7 @@ def following_link(self): @property def alt_text(self): """alt text with username""" - # pylint: disable=consider-using-f-string + return "avatar for {:s}".format(self.localname or self.username) @property @@ -479,7 +478,7 @@ def reactivate(self): @property def local_path(self): """this model doesn't inherit bookwyrm model, so here we are""" - # pylint: disable=consider-using-f-string + return "/user/{:s}".format(self.localname or self.username) def create_shelves(self): @@ -650,7 +649,6 @@ def get_remote_reviews(outbox): activitypub.Review(**activity).to_model() -# pylint: disable=unused-argument @receiver(models.signals.post_save, sender=User) def preview_image(instance, *args, **kwargs): """create preview images when user is updated""" diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index ed0a1d5196..58730fcfee 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -280,8 +280,6 @@ def generate_default_inner_img(): return default_cover -# pylint: disable=too-many-locals -# pylint: disable=too-many-statements def generate_preview_image( texts=None, picture=None, rating=None, show_instance_layer=True ): @@ -296,7 +294,7 @@ def generate_preview_image( ) color_thief = ColorThief(picture) dominant_color = color_thief.get_color(quality=1) - except: # pylint: disable=bare-except + except: inner_img_layer = generate_default_inner_img() dominant_color = ImageColor.getrgb(DEFAULT_COVER_COLOR) diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py index f7520152cf..4d2262a408 100644 --- a/bookwyrm/redis_store.py +++ b/bookwyrm/redis_store.py @@ -33,7 +33,6 @@ def add_object_to_stores(self, obj, stores, execute=True): # and go! return pipeline.execute() - # pylint: disable=no-self-use def remove_object_from_stores(self, obj, stores): """remove an object from all stores""" # if the stores are provided, the object can just be an id @@ -62,7 +61,7 @@ def bulk_remove_objects_from_store(self, objs, store): pipeline.zrem(store, -1, obj.id) pipeline.execute() - def get_store(self, store, **kwargs): # pylint: disable=no-self-use + def get_store(self, store, **kwargs): """load the values in a store""" return r.zrevrange(store, 0, -1, **kwargs) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index c170ec4f8f..a7a3982c6c 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -11,8 +11,6 @@ from django.core.exceptions import ImproperlyConfigured -# pylint: disable=line-too-long - env = Env() env.read_env() DOMAIN = env("DOMAIN") diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py index 7efadcb6c1..41a71b038a 100644 --- a/bookwyrm/suggested_users.py +++ b/bookwyrm/suggested_users.py @@ -27,13 +27,13 @@ def get_rank(self, obj): """get computed rank""" return obj.mutuals # + (1.0 - (1.0 / (obj.shared_books + 1))) - def store_id(self, user): # pylint: disable=no-self-use + def store_id(self, user): """the key used to store this user's recs""" if isinstance(user, int): return f"{user}-suggestions" return f"{user.id}-suggestions" - def get_counts_from_rank(self, rank): # pylint: disable=no-self-use + def get_counts_from_rank(self, rank): """calculate mutuals count and shared books count from rank""" return { "mutuals": math.floor(rank), @@ -56,7 +56,7 @@ def get_stores_for_object(self, obj): """the stores that an object belongs in""" return [self.store_id(u) for u in self.get_users_for_object(obj)] - def get_users_for_object(self, obj): # pylint: disable=no-self-use + def get_users_for_object(self, obj): """given a user, who might want to follow them""" return models.User.objects.filter(local=True, is_active=True).exclude( Q(id=obj.id) | Q(followers=obj) | Q(id__in=obj.blocks.all()) | Q(blocks=obj) @@ -148,7 +148,6 @@ def get_annotated_users(viewer, *args, **kwargs): @receiver(signals.post_save, sender=models.UserFollows) -# pylint: disable=unused-argument def update_suggestions_on_follow(sender, instance, created, *args, **kwargs): """remove a follow from the recs and update the ranks""" if not created or not instance.user_object.discoverable: @@ -160,7 +159,6 @@ def update_suggestions_on_follow(sender, instance, created, *args, **kwargs): @receiver(signals.post_save, sender=models.UserFollowRequest) -# pylint: disable=unused-argument def update_suggestions_on_follow_request(sender, instance, created, *args, **kwargs): """remove a follow from the recs and update the ranks""" if not created or not instance.user_object.discoverable: @@ -171,7 +169,6 @@ def update_suggestions_on_follow_request(sender, instance, created, *args, **kwa @receiver(signals.post_save, sender=models.UserBlocks) -# pylint: disable=unused-argument def update_suggestions_on_block(sender, instance, *args, **kwargs): """remove blocked users from recs""" if instance.user_subject.local and instance.user_object.discoverable: @@ -181,7 +178,6 @@ def update_suggestions_on_block(sender, instance, *args, **kwargs): @receiver(signals.post_delete, sender=models.UserFollows) -# pylint: disable=unused-argument def update_suggestions_on_unfollow(sender, instance, **kwargs): """update rankings, but don't re-suggest because it was probably intentional""" if instance.user_object.discoverable: @@ -190,7 +186,7 @@ def update_suggestions_on_unfollow(sender, instance, **kwargs): # @receiver(signals.post_save, sender=models.ShelfBook) # @receiver(signals.post_delete, sender=models.ShelfBook) -# # pylint: disable=unused-argument +# # def update_rank_on_shelving(sender, instance, *args, **kwargs): # """when a user shelves or unshelves a book, re-compute their rank""" # # if it's a local user, re-calculate who is rec'ed to them @@ -203,7 +199,6 @@ def update_suggestions_on_unfollow(sender, instance, **kwargs): @receiver(signals.post_save, sender=models.User) -# pylint: disable=unused-argument def update_user(sender, instance, created, update_fields=None, **kwargs): """an updated user, neat""" # a new user is found, create suggestions for them diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index 67d3e746c0..31ebc84fb0 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -100,7 +100,6 @@ def get_isni_bio(existing, author): return "" -# pylint: disable=unused-argument @register.filter(name="get_isni", needs_autoescape=True) def get_isni(existing, author, autoescape=True): """Returns the isni ID if an existing author has an ISNI listing""" diff --git a/bookwyrm/tests/__init__.py b/bookwyrm/tests/__init__.py index 998288ed5d..ead4300ca8 100644 --- a/bookwyrm/tests/__init__.py +++ b/bookwyrm/tests/__init__.py @@ -1,3 +1,3 @@ """import ALL the tests""" -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/activitypub/__init__.py b/bookwyrm/tests/activitypub/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/activitypub/__init__.py +++ b/bookwyrm/tests/activitypub/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/activitypub/test_base_activity.py b/bookwyrm/tests/activitypub/test_base_activity.py index 7b79c6a206..ed236f0400 100644 --- a/bookwyrm/tests/activitypub/test_base_activity.py +++ b/bookwyrm/tests/activitypub/test_base_activity.py @@ -207,7 +207,7 @@ def test_to_model_image(self, *_): self.assertIsNone(self.user.avatar.name) with self.assertRaises(ValueError): - self.user.avatar.file # pylint: disable=pointless-statement + self.user.avatar.file # this would trigger a broadcast because it's a local user with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): @@ -342,7 +342,7 @@ def test_do_not_raise_error_on_410(self, *_): self.assertEqual( logger.output, [ - "WARNING:bookwyrm.activitypub.base_activity:request for object dropped because it is gone (410) - remote_id: https://example.com/user/mouse" # pylint: disable=line-too-long + "WARNING:bookwyrm.activitypub.base_activity:request for object dropped because it is gone (410) - remote_id: https://example.com/user/mouse" ], ) diff --git a/bookwyrm/tests/activitypub/test_person.py b/bookwyrm/tests/activitypub/test_person.py index 2722aaefdc..dbe59bf0b9 100644 --- a/bookwyrm/tests/activitypub/test_person.py +++ b/bookwyrm/tests/activitypub/test_person.py @@ -1,4 +1,3 @@ -# pylint: disable=missing-module-docstring, missing-class-docstring, missing-function-docstring import json import pathlib from unittest.mock import patch diff --git a/bookwyrm/tests/activitystreams/__init__.py b/bookwyrm/tests/activitystreams/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/activitystreams/__init__.py +++ b/bookwyrm/tests/activitystreams/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/connectors/__init__.py b/bookwyrm/tests/connectors/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/connectors/__init__.py +++ b/bookwyrm/tests/connectors/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 380ae2c82b..19df39599d 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -17,7 +17,6 @@ from bookwyrm.connectors.connector_manager import ConnectorException -# pylint: disable=too-many-public-methods class Openlibrary(TestCase): """test loading data from openlibrary.org""" diff --git a/bookwyrm/tests/importers/__init__.py b/bookwyrm/tests/importers/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/importers/__init__.py +++ b/bookwyrm/tests/importers/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/importers/test_bookwyrm_import.py b/bookwyrm/tests/importers/test_bookwyrm_import.py index 5fca685f6d..f90acd74ac 100644 --- a/bookwyrm/tests/importers/test_bookwyrm_import.py +++ b/bookwyrm/tests/importers/test_bookwyrm_import.py @@ -26,7 +26,7 @@ def setUp(self): """use a test csv""" self.importer = BookwyrmBooksImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/bookwyrm.csv") - # pylint: disable-next=consider-using-with + self.csv = open(datafile, "r", encoding=self.importer.encoding) def tearDown(self): diff --git a/bookwyrm/tests/importers/test_calibre_import.py b/bookwyrm/tests/importers/test_calibre_import.py index 1a1f1875e5..5cdddd7b58 100644 --- a/bookwyrm/tests/importers/test_calibre_import.py +++ b/bookwyrm/tests/importers/test_calibre_import.py @@ -20,7 +20,7 @@ def setUp(self): """use a test csv""" self.importer = CalibreImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/calibre.csv") - # pylint: disable-next=consider-using-with + self.csv = open(datafile, "r", encoding=self.importer.encoding) def tearDown(self): diff --git a/bookwyrm/tests/importers/test_goodreads_import.py b/bookwyrm/tests/importers/test_goodreads_import.py index 615719ff43..91788848a7 100644 --- a/bookwyrm/tests/importers/test_goodreads_import.py +++ b/bookwyrm/tests/importers/test_goodreads_import.py @@ -26,7 +26,7 @@ def setUp(self): """use a test csv""" self.importer = GoodreadsImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/goodreads.csv") - # pylint: disable-next=consider-using-with + self.csv = open(datafile, "r", encoding=self.importer.encoding) def tearDown(self): diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index a051d5c082..4e3386b99b 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -30,7 +30,7 @@ def setUp(self): """use a test csv""" self.importer = Importer() datafile = pathlib.Path(__file__).parent.joinpath("../data/generic.csv") - # pylint: disable-next=consider-using-with + self.csv = open(datafile, "r", encoding=self.importer.encoding) def tearDown(self): diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index 6ce41a5d78..d564801c90 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -28,7 +28,7 @@ def setUp(self): datafile = pathlib.Path(__file__).parent.joinpath("../data/librarything.tsv") # Librarything generates latin encoded exports... - # pylint: disable-next=consider-using-with + self.csv = open(datafile, "r", encoding=self.importer.encoding) def tearDown(self): diff --git a/bookwyrm/tests/importers/test_openlibrary_import.py b/bookwyrm/tests/importers/test_openlibrary_import.py index cbb2310fb1..7408a2e166 100644 --- a/bookwyrm/tests/importers/test_openlibrary_import.py +++ b/bookwyrm/tests/importers/test_openlibrary_import.py @@ -26,7 +26,7 @@ def setUp(self): """use a test csv""" self.importer = OpenLibraryImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/openlibrary.csv") - # pylint: disable-next=consider-using-with + self.csv = open(datafile, "r", encoding=self.importer.encoding) def tearDown(self): diff --git a/bookwyrm/tests/importers/test_openreads_import.py b/bookwyrm/tests/importers/test_openreads_import.py index affba3078f..729bbd44d0 100644 --- a/bookwyrm/tests/importers/test_openreads_import.py +++ b/bookwyrm/tests/importers/test_openreads_import.py @@ -29,7 +29,6 @@ def setUp(self): "../data/openreads-csv-example.csv" ) - # pylint: disable-next=consider-using-with self.csv = open(datafile, "r", encoding=self.importer.encoding) def tearDown(self): diff --git a/bookwyrm/tests/importers/test_storygraph_import.py b/bookwyrm/tests/importers/test_storygraph_import.py index 4ba4be2533..10fc6b7dd9 100644 --- a/bookwyrm/tests/importers/test_storygraph_import.py +++ b/bookwyrm/tests/importers/test_storygraph_import.py @@ -26,7 +26,7 @@ def setUp(self): """use a test csv""" self.importer = StorygraphImporter() datafile = pathlib.Path(__file__).parent.joinpath("../data/storygraph.csv") - # pylint: disable-next=consider-using-with + self.csv = open(datafile, "r", encoding=self.importer.encoding) def tearDown(self): diff --git a/bookwyrm/tests/lists_stream/__init__.py b/bookwyrm/tests/lists_stream/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/lists_stream/__init__.py +++ b/bookwyrm/tests/lists_stream/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/management/__init__.py b/bookwyrm/tests/management/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/management/__init__.py +++ b/bookwyrm/tests/management/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/models/__init__.py b/bookwyrm/tests/models/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/models/__init__.py +++ b/bookwyrm/tests/models/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 1562cb51fb..3a257ca744 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -21,7 +21,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable=too-many-public-methods @patch("bookwyrm.activitystreams.add_status_task.delay") @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") class ActivitypubMixins(TestCase): @@ -288,11 +287,11 @@ def save(self, *args, **kwargs): with patch("django.db.models.Model.save"): super().save(*args, **kwargs) - def broadcast(self, activity, sender, **kwargs): # pylint: disable=arguments-differ + def broadcast(self, activity, sender, **kwargs): """do something""" raise Success() - def to_create_activity(self, user): # pylint: disable=arguments-differ + def to_create_activity(self, user): return {} with self.assertRaises(Success): diff --git a/bookwyrm/tests/models/test_base_model.py b/bookwyrm/tests/models/test_base_model.py index 62e1b9b5ae..cec4e9aa3c 100644 --- a/bookwyrm/tests/models/test_base_model.py +++ b/bookwyrm/tests/models/test_base_model.py @@ -9,7 +9,6 @@ from bookwyrm.settings import BASE_URL -# pylint: disable=attribute-defined-outside-init class BaseModel(TestCase): """functionality shared across models""" diff --git a/bookwyrm/tests/models/test_book_model.py b/bookwyrm/tests/models/test_book_model.py index ebf01de2e2..852fb22819 100644 --- a/bookwyrm/tests/models/test_book_model.py +++ b/bookwyrm/tests/models/test_book_model.py @@ -212,7 +212,6 @@ def test_thumbnail_fields(self): self.assertIsNotNone(book.cover_bw_book_xxlarge_webp.url) self.assertIsNotNone(book.cover_bw_book_xxlarge_jpg.url) - # pylint: disable=unused-variable def test_populate_sort_title(self): """The sort title should remove the initial article on save""" books = [] diff --git a/bookwyrm/tests/models/test_bookwyrm_export_job.py b/bookwyrm/tests/models/test_bookwyrm_export_job.py index 5c9d756149..52970b5a84 100644 --- a/bookwyrm/tests/models/test_bookwyrm_export_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_export_job.py @@ -17,7 +17,7 @@ class BookwyrmExportJob(TestCase): """testing user export functions""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(self): """lots of stuff to set up for a user export""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), diff --git a/bookwyrm/tests/models/test_bookwyrm_import_job.py b/bookwyrm/tests/models/test_bookwyrm_import_job.py index 5c5853a1f3..3fd7894e22 100644 --- a/bookwyrm/tests/models/test_bookwyrm_import_job.py +++ b/bookwyrm/tests/models/test_bookwyrm_import_job.py @@ -15,11 +15,11 @@ from bookwyrm.models import bookwyrm_import_job -class BookwyrmImport(TestCase): # pylint: disable=too-many-public-methods +class BookwyrmImport(TestCase): """testing user import functions""" @classmethod - def setUpTestData(self): # pylint: disable=bad-classmethod-argument + def setUpTestData(self): """setting stuff up""" with ( patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), @@ -764,7 +764,7 @@ def test_is_alias(self): def test_status_already_exists(self): """test status checking""" - string = '{"id":"https://www.example.com/user/rat/comment/4","type":"Comment","published":"2023-08-14T04:48:18.746+00:00","attributedTo":"https://www.example.com/user/rat","content":"

    this is a comment about an amazing book

    ","to":["https://www.w3.org/ns/activitystreams#Public"],"cc":["https://www.example.com/user/rat/followers"],"replies":{"id":"https://www.example.com/user/rat/comment/4/replies","type":"OrderedCollection","totalItems":0,"first":"https://www.example.com/user/rat/comment/4/replies?page=1","last":"https://www.example.com/user/rat/comment/4/replies?page=1","@context":"https://www.w3.org/ns/activitystreams"},"tag":[],"attachment":[],"sensitive":false,"inReplyToBook":"https://www.example.com/book/4","readingStatus":null,"@context":"https://www.w3.org/ns/activitystreams"}' # pylint: disable=line-too-long + string = '{"id":"https://www.example.com/user/rat/comment/4","type":"Comment","published":"2023-08-14T04:48:18.746+00:00","attributedTo":"https://www.example.com/user/rat","content":"

    this is a comment about an amazing book

    ","to":["https://www.w3.org/ns/activitystreams#Public"],"cc":["https://www.example.com/user/rat/followers"],"replies":{"id":"https://www.example.com/user/rat/comment/4/replies","type":"OrderedCollection","totalItems":0,"first":"https://www.example.com/user/rat/comment/4/replies?page=1","last":"https://www.example.com/user/rat/comment/4/replies?page=1","@context":"https://www.w3.org/ns/activitystreams"},"tag":[],"attachment":[],"sensitive":false,"inReplyToBook":"https://www.example.com/book/4","readingStatus":null,"@context":"https://www.w3.org/ns/activitystreams"}' status = json.loads(string) parsed = activitypub.parse(status) diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index d0ab4868e8..af6b008389 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -26,7 +26,6 @@ from bookwyrm.settings import PROTOCOL, NETLOC -# pylint: disable=too-many-public-methods @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.lists_stream.populate_lists_task.delay") @@ -164,7 +163,6 @@ def test_privacy_field_set_field_from_activity(self, *_): class TestActivity(ActivityObject): """real simple mock""" - # pylint: disable=invalid-name to: List[str] cc: List[str] id: str = "http://hi.com" diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 2dd40d513b..78fec9bb0f 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -14,8 +14,6 @@ from bookwyrm import activitypub, models, settings -# pylint: disable=too-many-public-methods -# pylint: disable=line-too-long @patch("bookwyrm.models.Status.broadcast") @patch("bookwyrm.activitystreams.add_status_task.delay") @patch("bookwyrm.activitystreams.remove_status_task.delay") @@ -478,7 +476,6 @@ def test_boost(self, *_): self.assertEqual(activity["type"], "Announce") self.assertEqual(activity, boost.to_activity(pure=True)) - # pylint: disable=unused-argument def test_create_broadcast(self, one, two, broadcast_mock, *_): """should send out two versions of a status on create""" models.Comment.objects.create( diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index e80c88d501..26508735f0 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -13,8 +13,6 @@ from bookwyrm.settings import DOMAIN, BASE_URL -# pylint: disable=missing-class-docstring -# pylint: disable=missing-function-docstring class User(TestCase): @classmethod def setUpTestData(cls): diff --git a/bookwyrm/tests/templatetags/__init__.py b/bookwyrm/tests/templatetags/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/templatetags/__init__.py +++ b/bookwyrm/tests/templatetags/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/test_book_search.py b/bookwyrm/tests/test_book_search.py index 9a74051046..e64ac2711a 100644 --- a/bookwyrm/tests/test_book_search.py +++ b/bookwyrm/tests/test_book_search.py @@ -283,7 +283,6 @@ def test_search_vector_fields(self): book.refresh_from_db() self.assertEqual( book.search_vector, - # pylint: disable-next=line-too-long "'cool':5B 'goodby':3A 'long':2A 'name':9 'rays':7C 'seri':8 'the':6C 'wow':4B", ) diff --git a/bookwyrm/tests/test_partial_date.py b/bookwyrm/tests/test_partial_date.py index 740a502590..8c99814cfa 100644 --- a/bookwyrm/tests/test_partial_date.py +++ b/bookwyrm/tests/test_partial_date.py @@ -13,8 +13,6 @@ class PartialDateTest(unittest.TestCase): """test PartialDate class in isolation""" - # pylint: disable=missing-function-docstring - def setUp(self): self._dt = datetime.datetime(2023, 10, 20, 17, 33, 10, tzinfo=timezone.utc) @@ -105,8 +103,6 @@ def test_partial_isoformat_no_time_allowed(self): class PartialDateFormFieldTest(unittest.TestCase): """test form support for PartialDate objects""" - # pylint: disable=missing-function-docstring - def setUp(self): self._dt = datetime.datetime(2022, 11, 21, 17, 1, 0, tzinfo=timezone.utc) self.field = partial_date.PartialDateFormField() diff --git a/bookwyrm/tests/test_preview_images.py b/bookwyrm/tests/test_preview_images.py index 32894ba9f5..9a150ac6d8 100644 --- a/bookwyrm/tests/test_preview_images.py +++ b/bookwyrm/tests/test_preview_images.py @@ -20,8 +20,6 @@ ) -# pylint: disable=unused-argument -# pylint: disable=missing-function-docstring class PreviewImages(TestCase): """every response to a get request, html or json""" diff --git a/bookwyrm/tests/test_signing.py b/bookwyrm/tests/test_signing.py index 3d92d842c1..82461ff6b5 100644 --- a/bookwyrm/tests/test_signing.py +++ b/bookwyrm/tests/test_signing.py @@ -82,7 +82,7 @@ def send(self, signature, now, data, digest): }, ) - def send_test_request( # pylint: disable=too-many-arguments + def send_test_request( self, sender, signer=None, send_data=None, digest=None, date=None ): """sends a follow request to the "rat" user""" diff --git a/bookwyrm/tests/views/__init__.py b/bookwyrm/tests/views/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/views/__init__.py +++ b/bookwyrm/tests/views/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/views/admin/__init__.py b/bookwyrm/tests/views/admin/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/views/admin/__init__.py +++ b/bookwyrm/tests/views/admin/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/views/books/__init__.py b/bookwyrm/tests/views/books/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/views/books/__init__.py +++ b/bookwyrm/tests/views/books/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py index 5d6e0eac1a..6827841363 100644 --- a/bookwyrm/tests/views/books/test_edit_book.py +++ b/bookwyrm/tests/views/books/test_edit_book.py @@ -54,7 +54,7 @@ def setUpTestData(cls): def setUp(self): """individual test setup""" self.factory = RequestFactory() - # pylint: disable=line-too-long + self.authors_body = "1.10000000084510024" self.author_body = "0000000084510024https://isni.org/isni/000000008451002460Catherine Amy Dawson Scottpoet and novelistpublicVIAFWKPQ544961C. A.Dawson Scott1865-1934publicVIAFNLPa28927850VIAF45886165ALLCREhttp://viaf.org/viaf/45886165Wikipediahttps://en.wikipedia.org/wiki/Catherine_Amy_Dawson_Scott" diff --git a/bookwyrm/tests/views/imports/__init__.py b/bookwyrm/tests/views/imports/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/views/imports/__init__.py +++ b/bookwyrm/tests/views/imports/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/views/inbox/__init__.py b/bookwyrm/tests/views/inbox/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/views/inbox/__init__.py +++ b/bookwyrm/tests/views/inbox/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/views/inbox/test_inbox.py b/bookwyrm/tests/views/inbox/test_inbox.py index c2356d929b..d6571dbaa8 100644 --- a/bookwyrm/tests/views/inbox/test_inbox.py +++ b/bookwyrm/tests/views/inbox/test_inbox.py @@ -134,7 +134,6 @@ def test_is_blocked_user_agent(self): request = self.factory.post( "", headers={ - # pylint: disable-next=line-too-long "user-agent": "http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)", }, ) diff --git a/bookwyrm/tests/views/landing/__init__.py b/bookwyrm/tests/views/landing/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/views/landing/__init__.py +++ b/bookwyrm/tests/views/landing/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/views/landing/test_register.py b/bookwyrm/tests/views/landing/test_register.py index 34ed699927..b2e5f43afc 100644 --- a/bookwyrm/tests/views/landing/test_register.py +++ b/bookwyrm/tests/views/landing/test_register.py @@ -14,7 +14,6 @@ from bookwyrm.tests.validate_html import validate_html -# pylint: disable=too-many-public-methods @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.lists_stream.populate_lists_task.delay") diff --git a/bookwyrm/tests/views/lists/__init__.py b/bookwyrm/tests/views/lists/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/views/lists/__init__.py +++ b/bookwyrm/tests/views/lists/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/views/lists/test_list.py b/bookwyrm/tests/views/lists/test_list.py index c4a04937b2..43f8b9c7ba 100644 --- a/bookwyrm/tests/views/lists/test_list.py +++ b/bookwyrm/tests/views/lists/test_list.py @@ -14,7 +14,6 @@ from bookwyrm.tests.validate_html import validate_html -# pylint: disable=too-many-public-methods class ListViews(TestCase): """list view""" diff --git a/bookwyrm/tests/views/preferences/__init__.py b/bookwyrm/tests/views/preferences/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/views/preferences/__init__.py +++ b/bookwyrm/tests/views/preferences/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/views/preferences/test_export.py b/bookwyrm/tests/views/preferences/test_export.py index 26934300d7..733a0b5560 100644 --- a/bookwyrm/tests/views/preferences/test_export.py +++ b/bookwyrm/tests/views/preferences/test_export.py @@ -66,7 +66,7 @@ def test_export_file(self, *_): export = views.Export.as_view()(request) self.assertIsInstance(export, HttpResponse) self.assertEqual(export.status_code, 200) - # pylint: disable=line-too-long + self.assertEqual( export.content, b"title,author_text,remote_id,openlibrary_key,finna_key,inventaire_id,librarything_key,goodreads_key,bnf_id,viaf,wikidata,asin,aasin,isfdb,isbn_10,isbn_13,oclc_number,start_date,finish_date,stopped_date,rating,review_name,review_cw,review_content,review_published,shelf,shelf_name,shelf_date\r\n" diff --git a/bookwyrm/tests/views/shelf/__init__.py b/bookwyrm/tests/views/shelf/__init__.py index b1753c3a09..b6e690fd59 100644 --- a/bookwyrm/tests/views/shelf/__init__.py +++ b/bookwyrm/tests/views/shelf/__init__.py @@ -1,2 +1 @@ -# pylint: disable=missing-module-docstring -from . import * # pylint: disable=import-self +from . import * diff --git a/bookwyrm/tests/views/test_group.py b/bookwyrm/tests/views/test_group.py index c444072d3f..7eaa6555b5 100644 --- a/bookwyrm/tests/views/test_group.py +++ b/bookwyrm/tests/views/test_group.py @@ -13,7 +13,6 @@ from bookwyrm.tests.validate_html import validate_html -# pylint: disable=too-many-public-methods @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") class GroupViews(TestCase): """view group and edit details""" diff --git a/bookwyrm/tests/views/test_helpers.py b/bookwyrm/tests/views/test_helpers.py index 112fd1af54..d8cbc657f8 100644 --- a/bookwyrm/tests/views/test_helpers.py +++ b/bookwyrm/tests/views/test_helpers.py @@ -16,7 +16,7 @@ @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.suggested_users.rerank_user_task.delay") -class ViewsHelpers(TestCase): # pylint: disable=too-many-public-methods +class ViewsHelpers(TestCase): """viewing and creating statuses""" @classmethod @@ -115,7 +115,6 @@ def test_is_bookwyrm_request(self, *_): "", {"q": "Test Book"}, headers={ - # pylint: disable-next=line-too-long "user-agent": "http.rb/4.4.1 (Mastodon/3.3.0; +https://mastodon.social/)", }, ) diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index 2689fa4ce0..8a3f2c0373 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -75,7 +75,6 @@ def test_create_status_saves(self, *_): @patch("bookwyrm.lists_stream.populate_lists_task.delay") @patch("bookwyrm.activitystreams.remove_status_task.delay") @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") -# pylint: disable=too-many-public-methods class StatusViews(TestCase): """viewing and creating statuses""" diff --git a/bookwyrm/thumbnail_generation.py b/bookwyrm/thumbnail_generation.py index 64f7ebefbb..c74cd6399b 100644 --- a/bookwyrm/thumbnail_generation.py +++ b/bookwyrm/thumbnail_generation.py @@ -7,14 +7,14 @@ class Strategy: but also on demand, for old images (JustInTime). """ - def on_source_saved(self, file): # pylint: disable=no-self-use + def on_source_saved(self, file): """What happens on source saved""" file.generate() - def on_existence_required(self, file): # pylint: disable=no-self-use + def on_existence_required(self, file): """What happens on existence required""" file.generate() - def on_content_required(self, file): # pylint: disable=no-self-use + def on_content_required(self, file): """What happens on content required""" file.generate() diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 7357d88b2d..0eab4821a4 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -330,7 +330,6 @@ views.LinkDomain.as_view(), name="settings-link-domain", ), - # pylint: disable=line-too-long re_path( r"^setting/link-domains/(?P(pending|approved|blocked))/(?P\d+)/?$", views.LinkDomain.as_view(), @@ -964,8 +963,8 @@ # Serves /static when DEBUG is true. urlpatterns.extend(staticfiles_urlpatterns()) -# pylint: disable=invalid-name + handler500 = "bookwyrm.views.server_error" -# pylint: disable=invalid-name + handler403 = "bookwyrm.views.permission_denied" diff --git a/bookwyrm/utils/images.py b/bookwyrm/utils/images.py index 19110bcff9..3a4173757a 100644 --- a/bookwyrm/utils/images.py +++ b/bookwyrm/utils/images.py @@ -53,7 +53,7 @@ def set_cover_from_url(url: str) -> None | list[Any]: """load cover image from a url""" try: image_content, extension = get_image(url) - except: # pylint: disable=bare-except + except: return None if not image_content or not extension: return None diff --git a/bookwyrm/utils/partial_date.py b/bookwyrm/utils/partial_date.py index 03d1e64387..a4894b5120 100644 --- a/bookwyrm/utils/partial_date.py +++ b/bookwyrm/utils/partial_date.py @@ -13,7 +13,6 @@ from django.forms.widgets import SelectDateWidget from django.utils import timezone -# pylint: disable=no-else-return __all__ = [ "PartialDate", @@ -230,7 +229,6 @@ def formfield(self, **kwargs): # type: ignore[no-untyped-def] kwargs.setdefault("form_class", PartialDateFormField) return super().formfield(**kwargs) - # pylint: disable-next=arguments-renamed,line-too-long def contribute_to_class(self, model, our_name_in_model, **kwargs): # type: ignore[no-untyped-def] # Define precision field. descriptor = self.descriptor_class(self) diff --git a/bookwyrm/views/admin/announcements.py b/bookwyrm/views/admin/announcements.py index 807ae87127..7c88250a46 100644 --- a/bookwyrm/views/admin/announcements.py +++ b/bookwyrm/views/admin/announcements.py @@ -12,7 +12,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.edit_instance_settings", raise_exception=True), @@ -33,7 +32,7 @@ def get(self, request): "end_date", "active", ] - # pylint: disable=consider-using-f-string + if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]: announcements = announcements.order_by(sort) data = { diff --git a/bookwyrm/views/admin/automod.py b/bookwyrm/views/admin/automod.py index c774900482..7441905a11 100644 --- a/bookwyrm/views/admin/automod.py +++ b/bookwyrm/views/admin/automod.py @@ -21,7 +21,6 @@ permission_required("bookwyrm.moderate_post", raise_exception=True), name="dispatch", ) -# pylint: disable=no-self-use class AutoMod(View): """Manage automated flagging""" @@ -67,7 +66,6 @@ def schedule_automod_task(request): @require_POST @permission_required("bookwyrm.moderate_user", raise_exception=True) @permission_required("bookwyrm.moderate_post", raise_exception=True) -# pylint: disable=unused-argument def unschedule_automod_task(request, task_id): """unscheduler""" get_object_or_404(PeriodicTask, id=task_id).delete() @@ -77,7 +75,6 @@ def unschedule_automod_task(request, task_id): @require_POST @permission_required("bookwyrm.moderate_user", raise_exception=True) @permission_required("bookwyrm.moderate_post", raise_exception=True) -# pylint: disable=unused-argument def automod_delete(request, rule_id): """Remove a rule""" get_object_or_404(models.AutoMod, id=rule_id).delete() @@ -87,7 +84,6 @@ def automod_delete(request, rule_id): @require_POST @permission_required("bookwyrm.moderate_user", raise_exception=True) @permission_required("bookwyrm.moderate_post", raise_exception=True) -# pylint: disable=unused-argument def run_automod(request): """run scan""" models.automod_task.delay() diff --git a/bookwyrm/views/admin/celery_status.py b/bookwyrm/views/admin/celery_status.py index 83179e2e9d..dfaa361005 100644 --- a/bookwyrm/views/admin/celery_status.py +++ b/bookwyrm/views/admin/celery_status.py @@ -33,7 +33,6 @@ r = redis.from_url(settings.REDIS_BROKER_URL) -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.edit_instance_settings", raise_exception=True), @@ -49,7 +48,7 @@ def get(self, request): inspect = celery.control.inspect() stats = inspect.stats() active_tasks = inspect.active() - # pylint: disable=broad-except + except Exception as err: stats = active_tasks = None errors.append(err) @@ -71,7 +70,7 @@ def get(self, request): BROADCAST: r.llen(BROADCAST), MISC: r.llen(MISC), } - # pylint: disable=broad-except + except Exception as err: queues = None errors.append(err) @@ -143,14 +142,13 @@ def __init__(self, *args, **kwargs): @require_GET -# pylint: disable=unused-argument def celery_ping(request): """Just tells you if Celery is on or not""" try: ping = celery.control.inspect().ping() if ping: return HttpResponse() - # pylint: disable=broad-except + except Exception: pass diff --git a/bookwyrm/views/admin/connectors.py b/bookwyrm/views/admin/connectors.py index ce73fdf22a..a732c7399b 100644 --- a/bookwyrm/views/admin/connectors.py +++ b/bookwyrm/views/admin/connectors.py @@ -19,7 +19,6 @@ class ConnectorSettings(View): """show connector settings page""" - # pylint: disable=no-self-use def get(self, request): """list of connectors""" @@ -65,7 +64,6 @@ def get(self, request): return TemplateResponse(request, "settings/connectors/connectors.html", data) -# pylint: disable=unused-argument def deactivate_connector(request, connector_id): """we don't want to use this connector""" @@ -74,7 +72,6 @@ def deactivate_connector(request, connector_id): return redirect("/settings/connectors/") -# pylint: disable=unused-argument def activate_connector(request, connector_id: int): """oops changed our mind""" @@ -92,7 +89,6 @@ def set_connector_priority(request, connector_id: int): return redirect("/settings/connectors/") -# pylint: disable=unused-argument def update_connector(request, connector_id: int): """update connector info such as API endpoints""" diff --git a/bookwyrm/views/admin/dashboard.py b/bookwyrm/views/admin/dashboard.py index de98333c0a..2ad72f1f46 100644 --- a/bookwyrm/views/admin/dashboard.py +++ b/bookwyrm/views/admin/dashboard.py @@ -22,7 +22,6 @@ from bookwyrm.utils import regex -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.moderate_user", raise_exception=True), @@ -50,7 +49,7 @@ def get(self, request): ) site = models.SiteSettings.get() - # pylint: disable=protected-access + data["missing_conduct"] = ( not site.code_of_conduct or site.code_of_conduct diff --git a/bookwyrm/views/admin/email_blocklist.py b/bookwyrm/views/admin/email_blocklist.py index d69bc6ff2a..3ffa79b616 100644 --- a/bookwyrm/views/admin/email_blocklist.py +++ b/bookwyrm/views/admin/email_blocklist.py @@ -9,7 +9,6 @@ from bookwyrm import forms, models -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.moderate_user", raise_exception=True), @@ -49,7 +48,6 @@ def post(self, request, domain_id=None): request, "settings/email_blocklist/email_blocklist.html", data ) - # pylint: disable=unused-argument def delete(self, request, domain_id): """remove a domain block""" domain = get_object_or_404(models.EmailBlocklist, id=domain_id) diff --git a/bookwyrm/views/admin/email_config.py b/bookwyrm/views/admin/email_config.py index 454f4f4d99..70ccffb54f 100644 --- a/bookwyrm/views/admin/email_config.py +++ b/bookwyrm/views/admin/email_config.py @@ -9,7 +9,6 @@ from bookwyrm import settings -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.edit_instance_settings", raise_exception=True), @@ -30,7 +29,7 @@ def post(self, request): try: emailing.test_email(request.user) data["success"] = True - except Exception as err: # pylint: disable=broad-except + except Exception as err: data["error"] = err return TemplateResponse(request, "settings/email_config.html", data) diff --git a/bookwyrm/views/admin/federation.py b/bookwyrm/views/admin/federation.py index 69e72fb863..dea79099bf 100644 --- a/bookwyrm/views/admin/federation.py +++ b/bookwyrm/views/admin/federation.py @@ -15,7 +15,6 @@ from bookwyrm.models.user import get_or_create_remote_server -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.control_federation", raise_exception=True), @@ -164,7 +163,6 @@ def post(self, request, server): @login_required @require_POST @permission_required("bookwyrm.control_federation", raise_exception=True) -# pylint: disable=unused-argument def block_server(request, server): """block a server""" server = get_object_or_404(models.FederatedServer, id=server) @@ -175,7 +173,6 @@ def block_server(request, server): @login_required @require_POST @permission_required("bookwyrm.control_federation", raise_exception=True) -# pylint: disable=unused-argument def unblock_server(request, server): """unblock a server""" server = get_object_or_404(models.FederatedServer, id=server) @@ -186,7 +183,6 @@ def unblock_server(request, server): @login_required @require_POST @permission_required("bookwyrm.control_federation", raise_exception=True) -# pylint: disable=unused-argument def refresh_server(request, server): """unblock a server""" server = get_object_or_404(models.FederatedServer, id=server) diff --git a/bookwyrm/views/admin/federation_settings.py b/bookwyrm/views/admin/federation_settings.py index b4814e3d56..03bd83a320 100644 --- a/bookwyrm/views/admin/federation_settings.py +++ b/bookwyrm/views/admin/federation_settings.py @@ -8,7 +8,6 @@ from bookwyrm import forms, models -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.control_federation", raise_exception=True), diff --git a/bookwyrm/views/admin/files_maintenance.py b/bookwyrm/views/admin/files_maintenance.py index bfe1d61956..9f3438f7de 100644 --- a/bookwyrm/views/admin/files_maintenance.py +++ b/bookwyrm/views/admin/files_maintenance.py @@ -14,7 +14,6 @@ from bookwyrm import forms, models -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.edit_instance_settings", raise_exception=True), @@ -51,7 +50,6 @@ def schedule_export_delete_task(request): return redirect("settings-files") -# pylint: disable=unused-argument @require_POST @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) def unschedule_file_maintenance_task(request, task_id): @@ -68,7 +66,6 @@ def run_export_deletions(request): return redirect("settings-files") -# pylint: disable=unused-argument @require_POST @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) def cancel_export_delete_job(request, job_id): diff --git a/bookwyrm/views/admin/imports.py b/bookwyrm/views/admin/imports.py index a52e4a552b..4d9f293097 100644 --- a/bookwyrm/views/admin/imports.py +++ b/bookwyrm/views/admin/imports.py @@ -13,7 +13,6 @@ from bookwyrm.settings import PAGE_LENGTH, USE_AZURE -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.moderate_user", raise_exception=True), @@ -34,7 +33,7 @@ def get(self, request, status="active"): imports = models.ImportJob.objects.filter(complete=complete).order_by( "created_date" ) - # pylint: disable=consider-using-f-string + if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]: imports = imports.order_by(sort) @@ -73,7 +72,6 @@ def post(self, request, import_id): @require_POST @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) -# pylint: disable=unused-argument def disable_imports(request): """When you just need people to please stop starting imports""" site = models.SiteSettings.get() @@ -84,7 +82,6 @@ def disable_imports(request): @require_POST @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) -# pylint: disable=unused-argument def enable_imports(request): """When you just need people to please stop starting imports""" site = models.SiteSettings.get() @@ -109,7 +106,6 @@ def set_import_size_limit(request): @require_POST @login_required @permission_required("bookwyrm.moderate_user", raise_exception=True) -# pylint: disable=unused-argument def set_user_import_completed(request, import_id): """Mark a user import as complete""" import_job = get_object_or_404(models.BookwyrmImportJob, id=import_id) @@ -129,7 +125,6 @@ def set_user_import_limit(request): @require_POST @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) -# pylint: disable=unused-argument def enable_user_exports(request): """Allow users to export account data""" site = models.SiteSettings.get() @@ -140,7 +135,6 @@ def enable_user_exports(request): @require_POST @permission_required("bookwyrm.edit_instance_settings", raise_exception=True) -# pylint: disable=unused-argument def disable_user_exports(request): """Don't allow users to export account data""" site = models.SiteSettings.get() diff --git a/bookwyrm/views/admin/invite.py b/bookwyrm/views/admin/invite.py index 10807b7693..0681a948fc 100644 --- a/bookwyrm/views/admin/invite.py +++ b/bookwyrm/views/admin/invite.py @@ -19,7 +19,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.create_invites", raise_exception=True), @@ -104,7 +103,7 @@ def get(self, request): "invite__invitees__created_date", "answer", ] - # pylint: disable=consider-using-f-string + if sort not in sort_fields + ["-{:s}".format(f) for f in sort_fields]: sort = "-created_date" @@ -159,7 +158,7 @@ def post(self, request): ) invite_request.save() emailing.invite_email(invite_request) - # pylint: disable=consider-using-f-string + return redirect( "{:s}?{:s}".format( reverse("settings-invite-requests"), urlencode(request.GET.dict()) diff --git a/bookwyrm/views/admin/ip_blocklist.py b/bookwyrm/views/admin/ip_blocklist.py index 62cb5783f8..2a5494cf51 100644 --- a/bookwyrm/views/admin/ip_blocklist.py +++ b/bookwyrm/views/admin/ip_blocklist.py @@ -9,7 +9,6 @@ from bookwyrm import forms, models -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.moderate_user", raise_exception=True), @@ -49,7 +48,6 @@ def post(self, request, block_id=None): request, "settings/ip_blocklist/ip_blocklist.html", data ) - # pylint: disable=unused-argument def delete(self, request, domain_id): """remove a domain block""" domain = get_object_or_404(models.IPBlocklist, id=domain_id) diff --git a/bookwyrm/views/admin/link_domains.py b/bookwyrm/views/admin/link_domains.py index f0708c3587..d2fc7735e8 100644 --- a/bookwyrm/views/admin/link_domains.py +++ b/bookwyrm/views/admin/link_domains.py @@ -12,7 +12,6 @@ from bookwyrm.views.helpers import redirect_to_referer -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.moderate_user", raise_exception=True), diff --git a/bookwyrm/views/admin/reports.py b/bookwyrm/views/admin/reports.py index f9caaf517e..541c0e7938 100644 --- a/bookwyrm/views/admin/reports.py +++ b/bookwyrm/views/admin/reports.py @@ -14,7 +14,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.moderate_user", raise_exception=True), diff --git a/bookwyrm/views/admin/schedule.py b/bookwyrm/views/admin/schedule.py index 5a181e8520..45893ced7d 100644 --- a/bookwyrm/views/admin/schedule.py +++ b/bookwyrm/views/admin/schedule.py @@ -13,7 +13,6 @@ permission_required("bookwyrm.edit_instance_settings", raise_exception=True), name="dispatch", ) -# pylint: disable=no-self-use class ScheduledTasks(View): """Manage automated flagging""" @@ -24,7 +23,6 @@ def get(self, request): data["schedules"] = IntervalSchedule.objects.all() return TemplateResponse(request, "settings/schedules.html", data) - # pylint: disable=unused-argument def post(self, request, task_id): """un-schedule a task""" task = PeriodicTask.objects.get(id=task_id) diff --git a/bookwyrm/views/admin/site.py b/bookwyrm/views/admin/site.py index 69f0bba972..75dc5bf69f 100644 --- a/bookwyrm/views/admin/site.py +++ b/bookwyrm/views/admin/site.py @@ -8,7 +8,6 @@ from bookwyrm import forms, models -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.edit_instance_settings", raise_exception=True), diff --git a/bookwyrm/views/admin/themes.py b/bookwyrm/views/admin/themes.py index f2c25d820f..0285888621 100644 --- a/bookwyrm/views/admin/themes.py +++ b/bookwyrm/views/admin/themes.py @@ -12,7 +12,6 @@ from bookwyrm import forms, models -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.system_administration", raise_exception=True), @@ -51,7 +50,6 @@ def get_view_data(): @require_POST @permission_required("bookwyrm.system_administration", raise_exception=True) -# pylint: disable=unused-argument def delete_theme(request, theme_id): """Remove a theme""" get_object_or_404(models.Theme, id=theme_id).delete() @@ -60,7 +58,6 @@ def delete_theme(request, theme_id): @require_POST @permission_required("bookwyrm.system_administration", raise_exception=True) -# pylint: disable=unused-argument def test_theme(request, theme_id): """Remove a theme""" theme = get_object_or_404(models.Theme, id=theme_id) @@ -68,7 +65,7 @@ def test_theme(request, theme_id): try: sass_processor(theme.path) theme.loads = True - except Exception: # pylint: disable=broad-except + except Exception: theme.loads = False theme.save() diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py index 759f6ed55e..bd24a89df7 100644 --- a/bookwyrm/views/admin/user_admin.py +++ b/bookwyrm/views/admin/user_admin.py @@ -13,7 +13,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.moderate_user", raise_exception=True), @@ -53,7 +52,7 @@ def get(self, request, status="local"): "federated_server__server_name", "is_active", ] - # pylint: disable=consider-using-f-string + if sort in sort_fields + ["-{:s}".format(f) for f in sort_fields]: users = users.order_by(sort) @@ -79,7 +78,6 @@ def get(self, request, status="local"): class UserAdmin(View): """moderate an individual user""" - # pylint: disable=unused-argument def get(self, request, user_id, report_id=None): """user view""" user = get_object_or_404(models.User, id=user_id) @@ -113,7 +111,6 @@ def post(self, request, user_id, report_id=None): class ActivateUserAdmin(View): """activate a user manually""" - # pylint: disable=unused-argument def post(self, request, user_id): """activate user""" user = get_object_or_404(models.User, id=user_id) diff --git a/bookwyrm/views/annual_summary.py b/bookwyrm/views/annual_summary.py index 68c929f4c8..6885e67033 100644 --- a/bookwyrm/views/annual_summary.py +++ b/bookwyrm/views/annual_summary.py @@ -21,11 +21,10 @@ LAST_DAY = 15 -# pylint: disable= no-self-use class AnnualSummary(View): """display a summary of the year for the current user""" - def get(self, request, username, year): # pylint: disable=too-many-locals + def get(self, request, username, year): """get response""" user = get_user_from_username(request.user, username) diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index 76e6981837..60f8ad1dc3 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -20,11 +20,9 @@ ) -# pylint: disable= no-self-use class Author(View): """this person wrote a book""" - # pylint: disable=unused-argument @vary_on_headers("Accept") def get(self, request, author_id, slug=None): """landing page for an author""" @@ -83,7 +81,6 @@ def post(self, request, author_id): @login_required @require_POST @permission_required("bookwyrm.edit_book", raise_exception=True) -# pylint: disable=unused-argument def update_author_from_remote(request, author_id, connector_identifier): """load the remote data for this author""" connector = connector_manager.load_connector( diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index ced7807c56..8b5cb042db 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -22,7 +22,6 @@ ) -# pylint: disable=no-self-use class Book(View): """a book! this is the stuff""" diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index 188bdb2bbd..b4e332f553 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -24,7 +24,6 @@ from bookwyrm.views.helpers import get_edition, get_mergeable_object_or_404 -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch" @@ -205,7 +204,6 @@ def add_authors(request, data): if sub(r"\D", "", str(i.isni)) == sub(r"\D", "", str(a.isni)) ] - # pylint: disable=cell-var-from-loop matches = list(filter(lambda x: x not in exists, isni_authors)) # combine existing and isni authors matches.extend(author_matches) @@ -242,8 +240,6 @@ def create_book_from_data(request): class ConfirmEditBook(View): """confirm edits to a book""" - # pylint: disable=too-many-locals - # pylint: disable=too-many-branches def post(self, request, book_id=None): """edit a book cool""" # returns None if no match is found diff --git a/bookwyrm/views/books/editions.py b/bookwyrm/views/books/editions.py index 78d29bde89..085b4b2700 100644 --- a/bookwyrm/views/books/editions.py +++ b/bookwyrm/views/books/editions.py @@ -20,7 +20,6 @@ from bookwyrm.views.helpers import is_api_request, get_mergeable_object_or_404 -# pylint: disable=no-self-use class Editions(View): """list of editions""" diff --git a/bookwyrm/views/books/links.py b/bookwyrm/views/books/links.py index b69d4baa57..777f0556f3 100644 --- a/bookwyrm/views/books/links.py +++ b/bookwyrm/views/books/links.py @@ -12,7 +12,6 @@ from bookwyrm.views.helpers import get_mergeable_object_or_404 -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch" @@ -60,7 +59,6 @@ def get_annotated_links(book, form=None): @require_POST @login_required -# pylint: disable=unused-argument def delete_link(request, book_id, link_id): """delete link""" link = get_object_or_404(models.FileLink, id=link_id, book=book_id) diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index f945c91993..f1e1894084 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -17,7 +17,6 @@ def sort_by_series(book): return float_info.max -# pylint: disable=no-self-use class BookSeriesBy(View): """book series by author""" diff --git a/bookwyrm/views/directory.py b/bookwyrm/views/directory.py index 505f12900e..9ca93d7b7a 100644 --- a/bookwyrm/views/directory.py +++ b/bookwyrm/views/directory.py @@ -10,7 +10,6 @@ from bookwyrm import suggested_users -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class Directory(View): """display of known bookwyrm users""" diff --git a/bookwyrm/views/discover.py b/bookwyrm/views/discover.py index 78d40f6042..d780f7d429 100644 --- a/bookwyrm/views/discover.py +++ b/bookwyrm/views/discover.py @@ -10,7 +10,6 @@ from bookwyrm import activitystreams -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Discover(View): """preview of recently reviewed books""" diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 4822fe9512..2faa9586eb 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -22,7 +22,6 @@ from .annual_summary import get_annual_summary_year -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Feed(View): """activity stream""" @@ -131,7 +130,6 @@ def get(self, request, username=None): class Status(View): """get posting""" - # pylint: disable=unused-argument @vary_on_headers("Accept") def get(self, request, username, status_id, slug=None): """display a particular status (and replies, etc)""" diff --git a/bookwyrm/views/get_started.py b/bookwyrm/views/get_started.py index 4ced55567c..c9a84913e4 100644 --- a/bookwyrm/views/get_started.py +++ b/bookwyrm/views/get_started.py @@ -18,7 +18,6 @@ from .preferences.edit_user import save_user_form -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class GetStartedProfile(View): """tell us about yourself""" diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py index da2fc88c27..9cdc3ea86c 100644 --- a/bookwyrm/views/goal.py +++ b/bookwyrm/views/goal.py @@ -15,7 +15,6 @@ from .helpers import get_user_from_username -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Goal(View): """track books for the year""" diff --git a/bookwyrm/views/group.py b/bookwyrm/views/group.py index 94700ab8ff..776efea49f 100644 --- a/bookwyrm/views/group.py +++ b/bookwyrm/views/group.py @@ -19,11 +19,9 @@ from .helpers import get_user_from_username, maybe_redirect_local_path -# pylint: disable=no-self-use class Group(View): """group page""" - # pylint: disable=unused-argument def get(self, request, group_id, slug=None): """display a group""" @@ -87,7 +85,6 @@ def post(self, request, group_id): class UserGroups(View): """a user's groups page""" - # pylint: disable=unused-argument def get(self, request, username, slug=None): """display a group""" user = get_user_from_username(request.user, username) @@ -108,7 +105,6 @@ def get(self, request, username, slug=None): return TemplateResponse(request, "user/groups.html", data) @method_decorator(login_required, name="dispatch") - # pylint: disable=unused-argument def post(self, request, username): """create a user group""" form = forms.GroupForm(request.POST) diff --git a/bookwyrm/views/hashtag.py b/bookwyrm/views/hashtag.py index 211e031597..b45b8f2efb 100644 --- a/bookwyrm/views/hashtag.py +++ b/bookwyrm/views/hashtag.py @@ -11,11 +11,9 @@ from bookwyrm.views.helpers import maybe_redirect_local_path -# pylint: disable= no-self-use class Hashtag(View): """listing statuses for a given hashtag""" - # pylint: disable=unused-argument def get(self, request, hashtag_id, slug=None): """show hashtag with related statuses""" hashtag = get_object_or_404(models.Hashtag, id=hashtag_id) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index e639a8793e..63edfde536 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -20,7 +20,6 @@ from bookwyrm.utils.validate import validate_url_domain -# pylint: disable=unnecessary-pass class WebFingerError(Exception): """empty error class for problems finding user information with webfinger""" @@ -249,7 +248,6 @@ def redirect_to_referer(request, *args, **kwargs): return redirect(*args or "/", **kwargs) -# pylint: disable=redefined-builtin def get_mergeable_object_or_404(klass, id): """variant of get_object_or_404 that also redirects if id has been merged into another object""" diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py index c144dd0550..c3bcb64ebc 100644 --- a/bookwyrm/views/imports/import_data.py +++ b/bookwyrm/views/imports/import_data.py @@ -31,7 +31,6 @@ from bookwyrm.utils.cache import get_or_set -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Import(View): """import view""" @@ -65,7 +64,7 @@ def get(self, request, invalid=False): import_jobs = models.ImportJob.objects.filter( user=request.user, created_date__gte=time_range ) - # pylint: disable=consider-using-generator + imported_books = sum([job.successful_item_count for job in import_jobs]) data["import_size_limit"] = site_settings.import_size_limit data["import_limit_reset"] = site_settings.import_limit_reset @@ -144,7 +143,6 @@ def get_average_import_time() -> float: return None -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class UserImport(View): """import user view""" diff --git a/bookwyrm/views/imports/import_status.py b/bookwyrm/views/imports/import_status.py index 815af17475..f0784624dc 100644 --- a/bookwyrm/views/imports/import_status.py +++ b/bookwyrm/views/imports/import_status.py @@ -16,7 +16,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class ImportStatus(View): """status of an existing import""" @@ -87,7 +86,6 @@ def stop_import(request, job_id): return redirect("import-status", job_id) -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class UserImportStatus(View): """status of an existing import""" diff --git a/bookwyrm/views/imports/manually_review.py b/bookwyrm/views/imports/manually_review.py index 21d236f83e..c9202e9e0d 100644 --- a/bookwyrm/views/imports/manually_review.py +++ b/bookwyrm/views/imports/manually_review.py @@ -14,7 +14,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class ImportManualReview(View): """problems items in an existing import""" @@ -45,7 +44,6 @@ def get(self, request, job_id): @login_required @require_POST -# pylint: disable=unused-argument def approve_import_item(request, job_id, item_id): """we guessed right""" item = get_object_or_404( @@ -63,7 +61,6 @@ def approve_import_item(request, job_id, item_id): @login_required @require_POST -# pylint: disable=unused-argument def delete_import_item(request, job_id, item_id): """we guessed right""" item = get_object_or_404( diff --git a/bookwyrm/views/imports/troubleshoot.py b/bookwyrm/views/imports/troubleshoot.py index fcacacc131..86afcf6fa2 100644 --- a/bookwyrm/views/imports/troubleshoot.py +++ b/bookwyrm/views/imports/troubleshoot.py @@ -14,7 +14,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class ImportTroubleshoot(View): """problems items in an existing import""" diff --git a/bookwyrm/views/imports/user_troubleshoot.py b/bookwyrm/views/imports/user_troubleshoot.py index 19b4c9766c..5d6cfe06f1 100644 --- a/bookwyrm/views/imports/user_troubleshoot.py +++ b/bookwyrm/views/imports/user_troubleshoot.py @@ -15,7 +15,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class UserImportTroubleshoot(View): """failed items in an existing user import""" diff --git a/bookwyrm/views/inbox.py b/bookwyrm/views/inbox.py index 995d6c34c3..e5e74e1126 100644 --- a/bookwyrm/views/inbox.py +++ b/bookwyrm/views/inbox.py @@ -28,7 +28,6 @@ class UserIsGoneError(Exception): @method_decorator(csrf_exempt, name="dispatch") @method_decorator(require_federation, name="dispatch") -# pylint: disable=no-self-use class Inbox(View): """requests sent by outside servers""" diff --git a/bookwyrm/views/interaction.py b/bookwyrm/views/interaction.py index 5d81063333..22f64fba04 100644 --- a/bookwyrm/views/interaction.py +++ b/bookwyrm/views/interaction.py @@ -12,7 +12,6 @@ from .helpers import is_api_request -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Favorite(View): """like a status""" diff --git a/bookwyrm/views/isbn.py b/bookwyrm/views/isbn.py index 48ad67e4b2..39fbfa0457 100644 --- a/bookwyrm/views/isbn.py +++ b/bookwyrm/views/isbn.py @@ -11,7 +11,6 @@ from .helpers import is_api_request -# pylint: disable= no-self-use class Isbn(View): """search a book by isbn""" diff --git a/bookwyrm/views/landing/landing.py b/bookwyrm/views/landing/landing.py index 4247c38af1..083f28d14a 100644 --- a/bookwyrm/views/landing/landing.py +++ b/bookwyrm/views/landing/landing.py @@ -8,7 +8,6 @@ from bookwyrm.views.feed import Feed -# pylint: disable= no-self-use class Home(View): """landing page or home feed depending on auth""" diff --git a/bookwyrm/views/landing/login.py b/bookwyrm/views/landing/login.py index ba178611da..2b21ec0f71 100644 --- a/bookwyrm/views/landing/login.py +++ b/bookwyrm/views/landing/login.py @@ -15,7 +15,6 @@ from bookwyrm.views.helpers import set_language -# pylint: disable=no-self-use class Login(View): """authenticate an existing user""" @@ -31,7 +30,6 @@ def get(self, request, confirmed=None): } return TemplateResponse(request, "landing/login.html", data) - # pylint: disable=too-many-return-statements @sensitive_variables("password") @method_decorator(sensitive_post_parameters("password")) def post(self, request): diff --git a/bookwyrm/views/landing/password.py b/bookwyrm/views/landing/password.py index 678e4dcd89..94694e695d 100644 --- a/bookwyrm/views/landing/password.py +++ b/bookwyrm/views/landing/password.py @@ -12,7 +12,6 @@ from bookwyrm.emailing import password_reset_email -# pylint: disable= no-self-use class PasswordResetRequest(View): """forgot password flow""" diff --git a/bookwyrm/views/landing/register.py b/bookwyrm/views/landing/register.py index a3df812f2d..357600e2e1 100644 --- a/bookwyrm/views/landing/register.py +++ b/bookwyrm/views/landing/register.py @@ -13,11 +13,10 @@ from bookwyrm.settings import DOMAIN -# pylint: disable=no-self-use class Register(View): """register a user""" - def get(self, request): # pylint: disable=unused-argument + def get(self, request): """whether or not you're logged in, just go to the home view""" return redirect("/") diff --git a/bookwyrm/views/list/curate.py b/bookwyrm/views/list/curate.py index cc0c552ea4..8cc3dcf110 100644 --- a/bookwyrm/views/list/curate.py +++ b/bookwyrm/views/list/curate.py @@ -12,7 +12,6 @@ from bookwyrm.views.list.list import normalize_book_list_ordering -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class Curate(View): """approve or discard list suggestions""" diff --git a/bookwyrm/views/list/embed.py b/bookwyrm/views/list/embed.py index e300168a03..928444fc6f 100644 --- a/bookwyrm/views/list/embed.py +++ b/bookwyrm/views/list/embed.py @@ -13,7 +13,6 @@ from bookwyrm.settings import PAGE_LENGTH -# pylint: disable=no-self-use class EmbedList(View): """embedded book list page""" diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 0af89cf55f..10c2e763df 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -27,7 +27,6 @@ ) -# pylint: disable=no-self-use class List(View): """book list page""" diff --git a/bookwyrm/views/list/list_item.py b/bookwyrm/views/list/list_item.py index 1de0df8351..29b6bb7ec1 100644 --- a/bookwyrm/views/list/list_item.py +++ b/bookwyrm/views/list/list_item.py @@ -9,7 +9,6 @@ from bookwyrm.views.status import to_markdown -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class ListItem(View): """book list page""" diff --git a/bookwyrm/views/list/lists.py b/bookwyrm/views/list/lists.py index 5a2e7184e8..64598435b4 100644 --- a/bookwyrm/views/list/lists.py +++ b/bookwyrm/views/list/lists.py @@ -16,7 +16,6 @@ logger = logging.getLogger(__name__) -# pylint: disable=no-self-use class Lists(View): """book list page""" @@ -35,7 +34,6 @@ def get(self, request): return TemplateResponse(request, "lists/lists.html", data) @method_decorator(login_required, name="dispatch") - # pylint: disable=unused-argument def post(self, request): """create a book_list""" form = forms.ListForm(request.POST) diff --git a/bookwyrm/views/notifications.py b/bookwyrm/views/notifications.py index d186cf3a6c..c8811c5c68 100644 --- a/bookwyrm/views/notifications.py +++ b/bookwyrm/views/notifications.py @@ -7,7 +7,6 @@ from django.views import View -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Notifications(View): """notifications view""" diff --git a/bookwyrm/views/outbox.py b/bookwyrm/views/outbox.py index 8d619f5f17..77366eb069 100644 --- a/bookwyrm/views/outbox.py +++ b/bookwyrm/views/outbox.py @@ -8,7 +8,6 @@ from .helpers import is_bookwyrm_request -# pylint: disable= no-self-use class Outbox(View): """outbox""" diff --git a/bookwyrm/views/permission_denied.py b/bookwyrm/views/permission_denied.py index 9e62b09335..e4cd7023c2 100644 --- a/bookwyrm/views/permission_denied.py +++ b/bookwyrm/views/permission_denied.py @@ -6,7 +6,7 @@ from .helpers import is_api_request -def permission_denied(request, exception): # pylint: disable=unused-argument +def permission_denied(request, exception): """permission denied page""" if request.method == "POST" or is_api_request(request): diff --git a/bookwyrm/views/preferences/block.py b/bookwyrm/views/preferences/block.py index 1bbaca1ff9..beb12fa985 100644 --- a/bookwyrm/views/preferences/block.py +++ b/bookwyrm/views/preferences/block.py @@ -10,7 +10,6 @@ from bookwyrm import models -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Block(View): """blocking users""" diff --git a/bookwyrm/views/preferences/change_password.py b/bookwyrm/views/preferences/change_password.py index 7544b9f646..1530a060d9 100644 --- a/bookwyrm/views/preferences/change_password.py +++ b/bookwyrm/views/preferences/change_password.py @@ -10,7 +10,6 @@ from bookwyrm import forms -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class ChangePassword(View): """change password as logged in user""" diff --git a/bookwyrm/views/preferences/delete_user.py b/bookwyrm/views/preferences/delete_user.py index 2350e47ab0..28559e840c 100644 --- a/bookwyrm/views/preferences/delete_user.py +++ b/bookwyrm/views/preferences/delete_user.py @@ -12,7 +12,6 @@ from bookwyrm import forms, models -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class DeleteUser(View): """delete user view""" diff --git a/bookwyrm/views/preferences/edit_user.py b/bookwyrm/views/preferences/edit_user.py index 307ef30d4c..58785b04e8 100644 --- a/bookwyrm/views/preferences/edit_user.py +++ b/bookwyrm/views/preferences/edit_user.py @@ -15,7 +15,6 @@ from bookwyrm.views.helpers import set_language -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class EditUser(View): """edit user view""" diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index a585ac273d..b940a9adc2 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -25,7 +25,6 @@ from bookwyrm.utils.cache import get_or_set -# pylint: disable=no-self-use,too-many-locals @method_decorator(login_required, name="dispatch") class Export(View): """Let users export data""" @@ -56,7 +55,7 @@ def post(self, request): deduplication_fields = [ f.name - for f in models.Edition._meta.get_fields() # pylint: disable=protected-access + for f in models.Edition._meta.get_fields() if getattr(f, "deduplication_field", False) ] fields = ( @@ -148,7 +147,6 @@ def post(self, request): ) -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class ExportUser(View): """ @@ -187,7 +185,6 @@ def get(self, request): try: export["size"] = job.export_data.size export["url"] = reverse("prefs-export-file", args=[job.task_id]) - # pylint: disable=broad-exception-caught except ( FileNotFoundError, Exception, @@ -262,7 +259,6 @@ def get(self, request, archive_id): export.export_data, content_type="application/gzip", headers={ - # pylint: disable=line-too-long "Content-Disposition": 'attachment; filename="bookwyrm-account-export.tar.gz"' }, ) diff --git a/bookwyrm/views/preferences/move_user.py b/bookwyrm/views/preferences/move_user.py index 3089c3e173..4419ad7c14 100644 --- a/bookwyrm/views/preferences/move_user.py +++ b/bookwyrm/views/preferences/move_user.py @@ -12,7 +12,6 @@ from bookwyrm.views.helpers import handle_remote_webfinger -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class MoveUser(View): """move user view""" @@ -53,7 +52,6 @@ def post(self, request): return TemplateResponse(request, "preferences/move_user.html", data) -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class AliasUser(View): """alias user view""" diff --git a/bookwyrm/views/preferences/security.py b/bookwyrm/views/preferences/security.py index 34a72dbc0d..32e8628ff3 100644 --- a/bookwyrm/views/preferences/security.py +++ b/bookwyrm/views/preferences/security.py @@ -25,7 +25,6 @@ SessionStore = import_module(settings.SESSION_ENGINE).SessionStore -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class UserSecurity(View): """change security settings as logged in user""" @@ -47,7 +46,6 @@ def get(self, request): @login_required @require_POST -# pylint: disable= unused-argument def logout_session(request, session_key: str = None): """log out session""" @@ -63,7 +61,6 @@ def logout_session(request, session_key: str = None): return redirect("/preferences/security") -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class Edit2FA(View): """change 2FA settings as logged in user""" diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py index b7dc85fa58..418bc8db37 100644 --- a/bookwyrm/views/reading.py +++ b/bookwyrm/views/reading.py @@ -21,7 +21,6 @@ logger = logging.getLogger(__name__) -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class ReadingStatus(View): """consider reading a book""" @@ -165,7 +164,6 @@ def post(self, request): @transaction.atomic -# pylint: disable=too-many-arguments def update_readthrough_on_shelve( user, annotated_book, status, start_date=None, finish_date=None, stopped_date=None ): diff --git a/bookwyrm/views/relationships.py b/bookwyrm/views/relationships.py index 02c6a1f731..19a807e188 100644 --- a/bookwyrm/views/relationships.py +++ b/bookwyrm/views/relationships.py @@ -12,7 +12,6 @@ from .helpers import get_user_from_username, is_api_request -# pylint: disable=no-self-use class Relationships(View): """list of followers/following view""" diff --git a/bookwyrm/views/report.py b/bookwyrm/views/report.py index abfbe5a73b..b100ccf45e 100644 --- a/bookwyrm/views/report.py +++ b/bookwyrm/views/report.py @@ -9,7 +9,6 @@ from bookwyrm import emailing, forms, models -# pylint: disable=no-self-use @method_decorator(login_required, name="dispatch") class Report(View): """Make reports""" diff --git a/bookwyrm/views/rss_feed.py b/bookwyrm/views/rss_feed.py index 588ce8dc7f..244da9cb1d 100644 --- a/bookwyrm/views/rss_feed.py +++ b/bookwyrm/views/rss_feed.py @@ -9,7 +9,6 @@ from .helpers import get_user_from_username -# pylint: disable=no-self-use class RssFeed(Feed): """serialize user's posts in rss feed""" @@ -24,7 +23,7 @@ def item_title(self, item): template = get_template("rss/title.html") return template.render({"user": item.user, "item_title": title}).strip() - def get_object(self, request, username): # pylint: disable=arguments-differ + def get_object(self, request, username): """the user who's posts get serialized""" return get_user_from_username(request.user, username) @@ -69,7 +68,7 @@ def item_title(self, item): template = get_template("rss/title.html") return template.render({"user": item.user, "item_title": title}).strip() - def get_object(self, request, username): # pylint: disable=arguments-differ + def get_object(self, request, username): """the user who's posts get serialized""" return get_user_from_username(request.user, username) @@ -111,7 +110,7 @@ def item_title(self, item): template = get_template("rss/title.html") return template.render({"user": item.user, "item_title": title}).strip() - def get_object(self, request, username): # pylint: disable=arguments-differ + def get_object(self, request, username): """the user who's posts get serialized""" return get_user_from_username(request.user, username) @@ -153,7 +152,7 @@ def item_title(self, item): template = get_template("rss/title.html") return template.render({"user": item.user, "item_title": title}).strip() - def get_object(self, request, username): # pylint: disable=arguments-differ + def get_object(self, request, username): """the user who's posts get serialized""" return get_user_from_username(request.user, username) @@ -196,7 +195,7 @@ def item_title(self, item): template = get_template("rss/title.html") return template.render({"user": authors, "item_title": item.title}).strip() - def get_object(self, request, shelf_identifier, username): # pylint: disable=arguments-differ + def get_object(self, request, shelf_identifier, username): """the shelf that gets serialized""" user = get_user_from_username(request.user, username) # always get privacy, don't support rss over anything private diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index 8324c2a62a..0c8fbf160e 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -23,7 +23,6 @@ from .helpers import handle_remote_webfinger -# pylint: disable= no-self-use class Search(View): """search users or books""" diff --git a/bookwyrm/views/setup.py b/bookwyrm/views/setup.py index b74b05f5ca..5075fa3c02 100644 --- a/bookwyrm/views/setup.py +++ b/bookwyrm/views/setup.py @@ -16,7 +16,6 @@ from bookwyrm.utils import regex -# pylint: disable= no-self-use class InstanceConfig(View): """make sure the instance looks correct before adding any data""" @@ -36,7 +35,6 @@ def get(self, request): ) warnings["localhost"] = settings.DOMAIN == "localhost" - # pylint: disable=line-too-long data = { "warnings": warnings, "info": { diff --git a/bookwyrm/views/shelf/shelf.py b/bookwyrm/views/shelf/shelf.py index 02b5426161..ec9c3c2c78 100644 --- a/bookwyrm/views/shelf/shelf.py +++ b/bookwyrm/views/shelf/shelf.py @@ -20,11 +20,9 @@ from bookwyrm.book_search import search -# pylint: disable=no-self-use class Shelf(View): """shelf page""" - # pylint: disable=R0914 @vary_on_headers("Accept") def get(self, request, username, shelf_identifier=None): """display a shelf""" diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index 22083e5252..2f698f04e0 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -27,7 +27,6 @@ logger = logging.getLogger(__name__) -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class EditStatus(View): """the view for *posting*""" @@ -47,18 +46,16 @@ def get(self, request, status_id): return TemplateResponse(request, "compose.html", data) -# pylint: disable= no-self-use @method_decorator(login_required, name="dispatch") class CreateStatus(View): """the view for *posting*""" - def get(self, request, status_type): # pylint: disable=unused-argument + def get(self, request, status_type): """compose view (...not used?)""" book = get_mergeable_object_or_404(models.Edition, id=request.GET.get("book")) data = {"book": book} return TemplateResponse(request, "compose.html", data) - # pylint: disable=too-many-branches @transaction.atomic def post(self, request, status_type, existing_status_id=None): """create status of whatever type""" @@ -187,7 +184,7 @@ def post(self, request, status_id, report_id=None): @login_required @require_POST -def update_progress(request, book_id): # pylint: disable=unused-argument +def update_progress(request, book_id): """Either it's just a progress update, or it's a comment with a progress update""" if request.POST.get("post-status"): return CreateStatus.as_view()(request, "comment") diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index 4441e8bb5d..675e9ac981 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -17,7 +17,6 @@ from .helpers import get_user_from_username, is_api_request -# pylint: disable=no-self-use class User(View): """user profile page""" @@ -165,7 +164,6 @@ def hide_suggestions(request): return redirect("/") -# pylint: disable=unused-argument def user_redirect(request, username): """redirect to a user's feed""" return redirect("user-feed", username=username) diff --git a/bw-dev b/bw-dev index 1e39a1f011..2ad07c27c3 100755 --- a/bw-dev +++ b/bw-dev @@ -194,7 +194,7 @@ case "$CMD" in ruff) prod_error $DOCKER_COMPOSE run --rm dev-tools ruff format celerywyrm bookwyrm - runweb ruff check bookwyrm/ + $DOCKER_COMPOSE run --rm dev-tools ruff check celerywyrm bookwyrm ;; ruff-format) prod_error @@ -202,14 +202,11 @@ case "$CMD" in ;; ruff-check) prod_error - # ruff check depends on having the app dependencies in place, so we run it in the web container - runweb ruff check bookwyrm/ + $DOCKER_COMPOSE run --rm dev-tools ruff check celerywyrm bookwyrm ;; ruff-fix) prod_error - # Auto-fix ruff issues that can be fixed automatically - # ruff check depends on having the app dependencies in place, so we run it in the web container - runweb ruff check --fix bookwyrm/ + $DOCKER_COMPOSE run --rm dev-tools ruff check --fix celerywyrm bookwyrm ;; prettier) prod_error @@ -226,8 +223,8 @@ case "$CMD" in ;; formatters) prod_error - runweb ruff check bookwyrm/ $DOCKER_COMPOSE run --rm dev-tools ruff format celerywyrm bookwyrm + $DOCKER_COMPOSE run --rm dev-tools ruff check --fix celerywyrm bookwyrm $DOCKER_COMPOSE run --rm dev-tools prettier --write bookwyrm/static/js/*.js $DOCKER_COMPOSE run --rm dev-tools eslint bookwyrm/static --ext .js $DOCKER_COMPOSE run --rm dev-tools stylelint --fix bookwyrm/static/css \ diff --git a/celerywyrm/celery.py b/celerywyrm/celery.py index a90a38fa96..d0dcd5c213 100644 --- a/celerywyrm/celery.py +++ b/celerywyrm/celery.py @@ -4,7 +4,7 @@ import os from celery import Celery -from . import settings # pylint: disable=unused-import +from . import settings # set the default Django settings module for the 'celery' program. diff --git a/celerywyrm/settings.py b/celerywyrm/settings.py index 3b05fa45eb..bf67678df7 100644 --- a/celerywyrm/settings.py +++ b/celerywyrm/settings.py @@ -1,12 +1,10 @@ """bookwyrm settings and configuration""" -# pylint: disable=wildcard-import -# pylint: disable=unused-wildcard-import from bookwyrm.settings import * QUERY_TIMEOUT = env.int("CELERY_QUERY_TIMEOUT", env.int("QUERY_TIMEOUT", 30)) -# pylint: disable=line-too-long + REDIS_BROKER_PASSWORD = requests.compat.quote(env("REDIS_BROKER_PASSWORD", "")) REDIS_BROKER_HOST = env("REDIS_BROKER_HOST", "redis_broker") REDIS_BROKER_PORT = env.int("REDIS_BROKER_PORT", 6379) diff --git a/pyproject.toml b/pyproject.toml index 962bd6e8c0..1109e1d7b2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,42 +7,26 @@ line-length = 88 target-version = "py311" -# Only select essential rules to minimize code changes -# E = pycodestyle errors (syntax errors, indentation issues) -# W = pycodestyle warnings (whitespace, etc.) -# F = pyflakes (unused imports, undefined names - critical errors only) lint.select = [ "E", # pycodestyle errors "W", # pycodestyle warnings "F", # pyflakes (critical errors only) ] -# Ignore rules that would require code changes lint.ignore = [ - "E501", # line too long (handled by formatter) - "E722", # bare except (too opinionated) - "E731", # lambda assignment (was disabled in pylint) -# "W503", # line break before binary operator (conflicts with formatter) - "F401", # unused imports (can be noisy, disable to minimize changes) + "E501", # line too long + "E722", # bare except + "E731", # lambda assignment + "F401", # unused imports "F403", # star import (unable to detect undefined names from star imports) - "F841", # unused variable (can be noisy) + "F405", # `env` may be undefined, or defined from star imports + "F841", # unused variable ] -# Per-file ignores for files with star imports -# Star imports make it impossible to detect undefined names -[tool.ruff.lint.per-file-ignores] -"bookwyrm/views/__init__.py" = ["F821"] # undefined name (due to star import from .wellknown) - [tool.ruff.format] -# Use double quotes for strings (black-compatible) quote-style = "double" -# Use spaces for indentation (black-compatible) indent-style = "space" -# Respect magic trailing comma (black-compatible) skip-magic-trailing-comma = false -# Line ending style line-ending = "auto" -# Docstring code format - preserve existing style docstring-code-format = false -# Docstring code line length - use same as line-length docstring-code-line-length = "dynamic" From ec475bb8abc83e7341190378b25473193b56c08f Mon Sep 17 00:00:00 2001 From: kasiarog Date: Tue, 2 Dec 2025 14:22:16 +0100 Subject: [PATCH 193/962] delete .pylintrc file --- .pylintrc | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .pylintrc diff --git a/.pylintrc b/.pylintrc deleted file mode 100644 index e89f7d5363..0000000000 --- a/.pylintrc +++ /dev/null @@ -1,21 +0,0 @@ -[MAIN] -ignore=migrations -load-plugins=pylint.extensions.no_self_use - -[MESSAGES CONTROL] -disable = - cyclic-import, - duplicate-code, - fixme, - no-member, - raise-missing-from, - too-few-public-methods, - too-many-ancestors, - too-many-instance-attributes, - unnecessary-lambda-assignment, - unsubscriptable-object, -enable = - useless-suppression - -[FORMAT] -max-line-length=88 From 0a6c57efe1926f76fa924113c91eb1e53a85a2e5 Mon Sep 17 00:00:00 2001 From: kasiarog Date: Tue, 2 Dec 2025 22:47:38 +0100 Subject: [PATCH 194/962] update ruff version --- dev-tools/requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/requirements.txt b/dev-tools/requirements.txt index 29a810a983..f18e656ddb 100644 --- a/dev-tools/requirements.txt +++ b/dev-tools/requirements.txt @@ -1 +1 @@ -ruff>=0.1.0 +ruff>=0.14.7 diff --git a/requirements.txt b/requirements.txt index f6dc70f766..46c8304d5d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -47,7 +47,7 @@ setuptools>=65.5.1 tornado>=6.3.3 # Dev -ruff>=0.1.0 +ruff>=0.14.7 celery-types==0.22.0 django-stubs[compatible-mypy]==4.2.7 mypy==1.7.1 From f347a079128555ed705fc0f9ba738c3eded0c3dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Dec 2025 14:22:39 +0000 Subject: [PATCH 195/962] Bump django from 5.2.8 to 5.2.9 Bumps [django](https://github.com/django/django) from 5.2.8 to 5.2.9. - [Commits](https://github.com/django/django/compare/5.2.8...5.2.9) --- updated-dependencies: - dependency-name: django dependency-version: 5.2.9 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1fe88baf6b..0419ac103c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ boto3==1.34.74 bw-file-resubmit==0.6.0rc2 celery==5.3.6 colorthief==0.2.1 -Django==5.2.8 +Django==5.2.9 django-celery-beat==2.8.1 django-compressor==4.4 django-csp==3.8 From f859e3fc3bf0ea1d62607432e4540595f9314bd2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 5 Dec 2025 12:11:59 -0800 Subject: [PATCH 196/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index da75671ef4..e49bd5100e 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-23 21:11\n" +"PO-Revision-Date: 2025-12-05 20:11\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -4715,7 +4715,7 @@ msgstr "Naujojoje savo „BookWyrm“ paskyroje galėsite pasirinkti norimus imp #: bookwyrm/templates/preferences/export-user.html:45 msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." -msgstr "Jeigu norite migruoti įrašus (komentarus, apžvalgas ar citatas), turite arba prudėti naująją paskyrą kaip šios pseudonimą, arba perkelti šią paskyrą į naująją prieš importuodami naudotojo duomenis." +msgstr "Jeigu norite migruoti įrašus (komentarus, apžvalgas ar citatas), turite arba pridėti naująją paskyrą kaip šios pseudonimą, arba perkelti šią paskyrą į naująją prieš importuodami naudotojo duomenis." #: bookwyrm/templates/preferences/export-user.html:50 msgid "New user exports are currently disabled." @@ -4821,27 +4821,27 @@ msgstr "Migruoti paskyrą į kitą serverį" #: bookwyrm/templates/preferences/move_user.html:16 msgid "Moving your account will notify all your followers and direct them to follow the new account." -msgstr "" +msgstr "Perkeliant paskyrą, apie tai bus pranešta jūsų sekėjams; jie bus nukreipti sekti naujosios paskyros." #: bookwyrm/templates/preferences/move_user.html:19 #, python-format msgid "\n" " %(user)s will be marked as moved and will not be discoverable or usable unless you undo the move.\n" " " -msgstr "" +msgstr "Paskyra %(user)s bus pažymėta kaip perkelta; ji nebebus randama ir ja nebegalėsite pasinaudoti, nebent atšauktumėte perkėlimą." #: bookwyrm/templates/preferences/move_user.html:25 msgid "Remember to add this user as an alias of the target account before you try to move." -msgstr "" +msgstr "Nepamirškite prieš pradėdami perkėlimą nurodyti šios paskyros kaip naujosios paskyros pseudonimo." #: bookwyrm/templates/preferences/move_user.html:30 msgid "Enter the username for the account you want to move to e.g. user@example.com :" -msgstr "" +msgstr "Įveskite perkeliamos paskyros naudotojo vardą, pvz., naudotojas@example.com:" #: bookwyrm/templates/preferences/security.html:4 #: bookwyrm/templates/preferences/security.html:7 msgid "Account Security" -msgstr "" +msgstr "Paskyros sauga" #: bookwyrm/templates/preferences/security.html:13 msgid "Two Factor Authentication" @@ -4906,55 +4906,55 @@ msgstr "Sutvarkyti 2FA" #: bookwyrm/templates/preferences/security.html:111 msgid "Sessions" -msgstr "" +msgstr "Sesijos" #: bookwyrm/templates/preferences/security.html:114 msgid "Some legacy sessions may not be displayed." -msgstr "" +msgstr "Kai kurios senos sesijos gali būti nerodomos." #: bookwyrm/templates/preferences/security.html:119 msgid "You are logged in to the following sessions:" -msgstr "" +msgstr "Jūsų paskyra prijungta šiose sesijose:" #: bookwyrm/templates/preferences/security.html:126 msgid "Date first logged in" -msgstr "" +msgstr "Pirmojo prisijungimo data" #: bookwyrm/templates/preferences/security.html:127 msgid "IP address" -msgstr "" +msgstr "IP adresas" #: bookwyrm/templates/preferences/security.html:127 msgid "IP" -msgstr "" +msgstr "IP" #: bookwyrm/templates/preferences/security.html:128 msgid "Operating System" -msgstr "" +msgstr "Operacinė sistema" #: bookwyrm/templates/preferences/security.html:128 msgid "OS" -msgstr "" +msgstr "OS" #: bookwyrm/templates/preferences/security.html:129 msgid "Web Browser" -msgstr "" +msgstr "Interneto naršyklė" #: bookwyrm/templates/preferences/security.html:129 msgid "Browser" -msgstr "" +msgstr "Naršyklė" #: bookwyrm/templates/preferences/security.html:143 msgid "You" -msgstr "" +msgstr "Jūs" #: bookwyrm/templates/preferences/security.html:147 msgid "Log Out" -msgstr "" +msgstr "Atsijungti" #: bookwyrm/templates/preferences/security.html:161 msgid "Currently your logged-in sessions are unable to be displayed." -msgstr "" +msgstr "Šiuo metu jūsų sesijų parodyti nepavyksta." #: bookwyrm/templates/reading_progress/finish.html:5 #, python-format @@ -5383,19 +5383,19 @@ msgstr "Eilės" #: bookwyrm/templates/settings/celery.html:26 msgid "Streams" -msgstr "" +msgstr "Srautai" #: bookwyrm/templates/settings/celery.html:32 msgid "Broadcast" -msgstr "" +msgstr "Transliacija" #: bookwyrm/templates/settings/celery.html:38 msgid "Inbox" -msgstr "" +msgstr "Gautieji" #: bookwyrm/templates/settings/celery.html:51 msgid "Import triggered" -msgstr "" +msgstr "Importas suplanuotas" #: bookwyrm/templates/settings/celery.html:57 #: bookwyrm/templates/settings/layout.html:104 From 61709d1673273e1506e8691a606bdd3027aa4d19 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 5 Dec 2025 13:24:22 -0800 Subject: [PATCH 197/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 158 ++++++++++++++--------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index e49bd5100e..17bd14aaeb 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-12-05 20:11\n" +"PO-Revision-Date: 2025-12-05 21:24\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -5400,7 +5400,7 @@ msgstr "Importas suplanuotas" #: bookwyrm/templates/settings/celery.html:57 #: bookwyrm/templates/settings/layout.html:104 msgid "Connectors" -msgstr "" +msgstr "Integracijos" #: bookwyrm/templates/settings/celery.html:64 #: bookwyrm/templates/settings/site.html:91 @@ -5409,7 +5409,7 @@ msgstr "Paveikslėliai" #: bookwyrm/templates/settings/celery.html:70 msgid "Suggested Users" -msgstr "" +msgstr "Siūlomi nariai" #: bookwyrm/templates/settings/celery.html:83 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:43 @@ -5419,7 +5419,7 @@ msgstr "El. paštas" #: bookwyrm/templates/settings/celery.html:89 msgid "Misc" -msgstr "" +msgstr "Kita" #: bookwyrm/templates/settings/celery.html:96 msgid "Low priority" @@ -5493,11 +5493,11 @@ msgstr "Klaidos" #: bookwyrm/templates/settings/connectors/available.html:15 msgid "Finna.fi is a search service that collects material from hundreds of Finnish organisations under one roof." -msgstr "" +msgstr "„Finna.fi“ yra ieškos tarnyba, po vienu stogu kaupianti medžiagą iš šimtų Suomijoje veikiančių organizacijų." #: bookwyrm/templates/settings/connectors/available.html:28 msgid "Create new connector" -msgstr "" +msgstr "Kurti naują integarciją" #: bookwyrm/templates/settings/connectors/connector.html:35 #: bookwyrm/templates/settings/connectors/update.html:33 @@ -5508,29 +5508,29 @@ msgstr "Išjungimo priežastis:" #: bookwyrm/templates/settings/connectors/connector.html:50 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" -msgstr "" +msgstr "Išjungti" #: bookwyrm/templates/settings/connectors/connector.html:61 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" -msgstr "" +msgstr "Įjungti" #: bookwyrm/templates/settings/connectors/connectors.html:4 #: bookwyrm/templates/settings/connectors/connectors.html:6 msgid "Connector Settings" -msgstr "" +msgstr "Integracijos nustatymai" #: bookwyrm/templates/settings/connectors/connectors.html:11 msgid "Connectors are sources of data about books and authors." -msgstr "" +msgstr "Integracijos padeda gauti duomenis apie knygas ir autorius iš įvairių šaltinių." #: bookwyrm/templates/settings/connectors/connectors.html:12 msgid "The priority determines the order in which search results appear. The highest priority is 1. The default priority is 2." -msgstr "" +msgstr "Prioritetas nusprendžia radinių rodymo tvarką. Aukščiausias prioritetas yra 1, numatytasis – 2." #: bookwyrm/templates/settings/connectors/connectors.html:14 msgid "Connector settings only determine whether a connector will be used to deliver search results. To manage more interactions with other federated servers, including domain blocks, see" -msgstr "" +msgstr "Integracijos nustatymuose galima tik pasirinkti, ar konkreti integracija bus naudojama ieškos rezultatams teikti. Daugiau nustatymų, susijusių su komunikacija tarp federuojamų serverių, įskaitant blokuojamus domenus, rasite" #: bookwyrm/templates/settings/connectors/connectors.html:14 #: bookwyrm/templates/settings/federation/edit_instance.html:12 @@ -5544,12 +5544,12 @@ msgstr "Susijungę serveriai" #: bookwyrm/templates/settings/connectors/update.html:66 msgid "should be updated. Check recent release notes for more information." -msgstr "" +msgstr "derėtų atnaujinti. Išsamesnės informacijos ieškokite paskiausių laidų apžvalgose." #: bookwyrm/templates/settings/connectors/update.html:76 #: bookwyrm/templates/snippets/create_status/post_options_block.html:19 msgid "Update" -msgstr "" +msgstr "Naujinti" #: bookwyrm/templates/settings/dashboard/dashboard.html:6 #: bookwyrm/templates/settings/dashboard/dashboard.html:8 @@ -5610,11 +5610,11 @@ msgstr "Būsenos publikuotos" #: bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html:12 msgid "Would you like to automatically check for new BookWyrm releases? (recommended)" -msgstr "" +msgstr "Ar norėtumėte automatiškai ieškoti išleistų „BookWyrm“ naujinimų? (rekomenduojama)" #: bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html:20 msgid "Schedule checks" -msgstr "" +msgstr "Suplanuoti patikras" #: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 #, python-format @@ -5895,15 +5895,15 @@ msgstr "Serverių nerasta" #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" -msgstr "" +msgstr "Failų priežiūra" #: bookwyrm/templates/settings/files.html:17 msgid "Schedule file deletion" -msgstr "" +msgstr "Suplanuoti failų šalinimą" #: bookwyrm/templates/settings/files.html:21 msgid "This job deletes uploaded user export and import files that have reached the expiry age." -msgstr "" +msgstr "Ši procedūra pašalina nebegaliojančius eksporto ir importo failus." #: bookwyrm/templates/settings/files.html:102 msgid "Export file expiration" @@ -5933,43 +5933,43 @@ msgstr "Užbaigta" #: bookwyrm/templates/settings/files.html:206 msgid "Find book covers from connectors" -msgstr "" +msgstr "Ieškoti knygų viršelių per integracijas" #: bookwyrm/templates/settings/files.html:209 msgid "These jobs find cover images where they are missing or have incorrect filepaths." -msgstr "" +msgstr "Šios procedūros ieško viršelių atvaizdų, kai jie nenurodyti arba nurodyti klaidingai." #: bookwyrm/templates/settings/files.html:212 msgid "Find missing covers" -msgstr "" +msgstr "Ieškoti trūkstamų viršelių" #: bookwyrm/templates/settings/files.html:215 msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." -msgstr "" +msgstr "Suplanuokite periodinę leidimų be viršelių nuotraukų paiešką. Ši procedūra gali būti reikli ištekliams, todėl rekomenduojama ją vykdyti ne dažniau nei kartą per savaitę." #: bookwyrm/templates/settings/files.html:296 msgid "Fix broken book cover filepaths" -msgstr "" +msgstr "Taisyti sugadintus knygų viršelių failų kelius" #: bookwyrm/templates/settings/files.html:299 msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." -msgstr "" +msgstr "Jei praradote savo knygų viršelių failus (pavyzdžiui, dėl nepavykusios serverio migracijos), aukščiau nurodyta planinė procedūra jų neatitaisys. Jei norite ieškoti viršelių knygoms, kurių viršelių failų vardai rodo į nepasiekiamus failus, suplanuokite šią procedūrą." #: bookwyrm/templates/settings/files.html:306 msgid "This job cannot be scheduled to run regularly" -msgstr "" +msgstr "Šios procedūros neleidžiama planuoti kaip periodinės" #: bookwyrm/templates/settings/files.html:320 msgid "Editions checked" -msgstr "" +msgstr "Leidimų patikrinta" #: bookwyrm/templates/settings/files.html:321 msgid "Covers fixed" -msgstr "" +msgstr "Viršelių pataisyta" #: bookwyrm/templates/settings/files.html:371 msgid "Successfully updated expiry time" -msgstr "" +msgstr "Galiojimas sėkmingai pratęstas" #: bookwyrm/templates/settings/imports/complete_import_modal.html:4 #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 @@ -5978,7 +5978,7 @@ msgstr "Sustabdyti importavimą?" #: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 msgid "This action will stop the user import before it is complete and cannot be un-done" -msgstr "" +msgstr "Šiuo veiksmu bus negrįžtamai nutrauktas neužbaigtas naudotojo importas" #: bookwyrm/templates/settings/imports/imports.html:19 msgid "Disable starting new imports" @@ -5994,7 +5994,7 @@ msgstr "Kai importavimas išjungtas - naujų pradėti negalima, bet seni importa #: bookwyrm/templates/settings/imports/imports.html:32 msgid "This setting prevents both book imports and user imports." -msgstr "" +msgstr "Ši parinktis suteikia galimybę uždrausti knygų ir naudotojų importą." #: bookwyrm/templates/settings/imports/imports.html:37 msgid "Disable imports" @@ -6039,55 +6039,55 @@ msgstr "Nustatyti limitą" #: bookwyrm/templates/settings/imports/imports.html:98 msgid "Disable starting new user exports" -msgstr "" +msgstr "Neleisti pradėti naujų naudotojų importo" #: bookwyrm/templates/settings/imports/imports.html:109 msgid "This is only intended to be used when things have gone very wrong with exports and you need to pause the feature while addressing issues." -msgstr "" +msgstr "Ši pasinktis turėtų būti naudojama tik tuomet, jei su eksportu iškilo rimtų problemų ir jį reikia laikinai pristabdyti, kol jas išspręsite." #: bookwyrm/templates/settings/imports/imports.html:110 msgid "While exports are disabled, users will not be allowed to start new user exports, but existing exports will not be affected." -msgstr "" +msgstr "Kol eksportas neleidžiamas, naudotojai negalės pradėti naujo paskyrų eksporto, tačiau jau pradėtų procesų tai nepaveiks." #: bookwyrm/templates/settings/imports/imports.html:115 msgid "Disable user exports" -msgstr "" +msgstr "Neleisti naudotojų eksporto" #: bookwyrm/templates/settings/imports/imports.html:123 msgid "Limit how often users can import and export" -msgstr "" +msgstr "Riboti naudotojų leidžiamų importo ir eksporto procesų dažnį" #: bookwyrm/templates/settings/imports/imports.html:134 msgid "Some users might try to run user imports or exports very frequently, which you want to limit." -msgstr "" +msgstr "Kai kurie naudotojai gali per dažnai norėti vykdyti importą ar eksportą. Čia galite tai apriboti." #: bookwyrm/templates/settings/imports/imports.html:138 msgid "Limit how often users can import and export user data" -msgstr "" +msgstr "Riboti naudotojų leidžiamų importo ir eksporto procesų dažnį" #: bookwyrm/templates/settings/imports/imports.html:140 msgid "hours" -msgstr "" +msgstr "val." #: bookwyrm/templates/settings/imports/imports.html:144 msgid "Change limit" -msgstr "" +msgstr "Keisti ribą" #: bookwyrm/templates/settings/imports/imports.html:159 msgid "Users are currently unable to start new user exports. This is the default setting." -msgstr "" +msgstr "Šiuo metu naudotojams neleidžiama pradėti naujų eksportų. Tai – numatytoji parinkties reikšmė." #: bookwyrm/templates/settings/imports/imports.html:161 msgid "It is not currently possible to provide user exports when using Azure storage." -msgstr "" +msgstr "Šiuo metu nėra galimybės naudotojams leisti duomenų eksportą, kai naudojamasi „Azure“ saugykla." #: bookwyrm/templates/settings/imports/imports.html:167 msgid "Enable user exports" -msgstr "" +msgstr "Leisti naudotojų eksportą" #: bookwyrm/templates/settings/imports/imports.html:174 msgid "Book Imports" -msgstr "" +msgstr "Knygų importas" #: bookwyrm/templates/settings/imports/imports.html:198 #: bookwyrm/templates/settings/imports/imports.html:288 @@ -6269,7 +6269,7 @@ msgstr "Tvarkyti naudotojus" #: bookwyrm/templates/settings/users/force_password_reset.html:7 #: bookwyrm/templates/settings/users/force_password_reset.html:11 msgid "Force Password Reset" -msgstr "" +msgstr "Priverstinai atkurti slaptažodį" #: bookwyrm/templates/settings/layout.html:59 msgid "Moderation" @@ -6283,7 +6283,7 @@ msgstr "Pranešimai" #: bookwyrm/templates/settings/layout.html:67 msgid "Auto-Moderation Rules" -msgstr "" +msgstr "Automatinio moderavimo taisyklės" #: bookwyrm/templates/settings/layout.html:79 #: bookwyrm/templates/settings/link_domains/link_domains.html:5 @@ -6297,11 +6297,11 @@ msgstr "Sistema" #: bookwyrm/templates/settings/layout.html:96 msgid "Scheduled Tasks" -msgstr "" +msgstr "Planinės užduotys" #: bookwyrm/templates/settings/layout.html:108 msgid "Files Maintenance" -msgstr "" +msgstr "Failų priežiūra" #: bookwyrm/templates/settings/layout.html:113 msgid "Instance Settings" @@ -6444,22 +6444,22 @@ msgstr "Raportuotos nuorodos" #: bookwyrm/templates/settings/reports/report.html:66 msgid "Moderation Activity" -msgstr "" +msgstr "Moderavimo veikla" #: bookwyrm/templates/settings/reports/report.html:73 #, python-format msgid "%(user)s opened this report" -msgstr "" +msgstr "%(user)s atidarė šį pranešimą" #: bookwyrm/templates/settings/reports/report.html:86 #, python-format msgid "%(user)s commented on this report:" -msgstr "" +msgstr "%(user)s parašė komentarą po šiuo pranešimu:" #: bookwyrm/templates/settings/reports/report.html:90 #, python-format msgid "%(user)s took an action on this report:" -msgstr "" +msgstr "%(user)s atliko veiksmą, remdamasi(s) šiuo pranešimu:" #: bookwyrm/templates/settings/reports/report_header.html:6 #, python-format @@ -6483,7 +6483,7 @@ msgstr "Pranešimas #%(report_id)s: naudotojas @%(username)s" #: bookwyrm/templates/settings/reports/report_links_table.html:19 msgid "Approve domain" -msgstr "" +msgstr "Patvirtinti domeną" #: bookwyrm/templates/settings/reports/report_links_table.html:26 msgid "Block domain" @@ -6531,24 +6531,24 @@ msgstr "Pranešimų nerasta." #: bookwyrm/templates/settings/schedules.html:7 #: bookwyrm/templates/settings/schedules.html:11 msgid "Scheduled tasks" -msgstr "" +msgstr "Planinės užduotys" #: bookwyrm/templates/settings/schedules.html:17 #: bookwyrm/templates/settings/schedules.html:101 msgid "Tasks" -msgstr "" +msgstr "Užduotys" #: bookwyrm/templates/settings/schedules.html:22 msgid "Name" -msgstr "" +msgstr "Pavadinimas" #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" -msgstr "" +msgstr "„Celery“ užduotis" #: bookwyrm/templates/settings/schedules.html:28 msgid "Date changed" -msgstr "" +msgstr "Keitimo data" #: bookwyrm/templates/settings/schedules.html:31 msgid "Last run at" @@ -6775,7 +6775,7 @@ msgstr "" #: bookwyrm/templates/settings/users/force_password_reset.html:53 msgid "Are you sure you want to force password reset for these users:" -msgstr "" +msgstr "Ar tikrai norite nurodyti šiems naudotojams atkurti slaptažodžius:" #: bookwyrm/templates/settings/users/user_admin.html:9 #, python-format @@ -6810,7 +6810,7 @@ msgstr "Nenustatytas" #: bookwyrm/templates/settings/users/user_info.html:20 msgid "This account is the instance actor for signing HTTP requests." -msgstr "" +msgstr "Šią paskyrą serveris naudoja HTTP užklausoms pasirašyti." #: bookwyrm/templates/settings/users/user_info.html:24 msgid "View user profile" @@ -6878,15 +6878,15 @@ msgstr "Nario veiksmai" #: bookwyrm/templates/settings/users/user_moderation_actions.html:15 msgid "This is the instance admin actor" -msgstr "" +msgstr "Tai – serverio administratoriaus paskyra" #: bookwyrm/templates/settings/users/user_moderation_actions.html:18 msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." -msgstr "" +msgstr "Šios paskyros neturėtumėte šalinti ar atjungti, nes ji yra būtina tinkamam šio serverio veikimui. Ši paskyra naudojama GET užklausoms pasirašyti, bendraujant su kitais „ActivityPub“ serveriais." #: bookwyrm/templates/settings/users/user_moderation_actions.html:19 msgid "This account is not discoverable by ordinary users and does not have a profile page." -msgstr "" +msgstr "Ši paskyra neatrandama įprastiems naudotojams ir neturi profilio puslapio." #: bookwyrm/templates/settings/users/user_moderation_actions.html:35 msgid "Activate user" @@ -6954,7 +6954,7 @@ msgstr "Atrodo, kad jūsų domenas nesukonfigūruotas. Į jį neturėtų įeiti #: bookwyrm/templates/setup/config.html:42 msgid "You are running BookWyrm with localhost. This should never be used in a production environment." -msgstr "" +msgstr "Jūs naudojatės „BookWyrm“ per localhost. Tokia konfigūracija niekada neturėtų būti naudojama produkcinėje aplinkoje." #: bookwyrm/templates/setup/config.html:52 bookwyrm/templates/user_menu.html:44 msgid "Settings" @@ -6966,7 +6966,7 @@ msgstr "Serverio informacija:" #: bookwyrm/templates/setup/config.html:62 msgid "Instance base URL:" -msgstr "" +msgstr "Serverio bazinis URL adresas:" #: bookwyrm/templates/setup/config.html:75 msgid "Using S3:" @@ -7075,7 +7075,7 @@ msgstr "Iki" #: bookwyrm/templates/shelf/shelf.html:221 #, python-format msgid "We couldn't find any books that matched %(shelves_filter_query)s" -msgstr "" +msgstr "Nepavyko rasti jokių knygų, aititinkančių paiešką „%(shelves_filter_query)s“" #: bookwyrm/templates/shelf/shelf.html:225 msgid "This shelf is empty." @@ -7083,11 +7083,11 @@ msgstr "Ši lentyna tuščia." #: bookwyrm/templates/shelf/shelves_filter_field.html:6 msgid "Filter by keyword" -msgstr "" +msgstr "Filtruoti pagal raktinį žodį" #: bookwyrm/templates/shelf/shelves_filter_field.html:7 msgid "Enter text here" -msgstr "" +msgstr "Įveskite tekstą čia" #: bookwyrm/templates/snippets/add_to_group_button.html:16 msgid "Invite" @@ -7291,7 +7291,7 @@ msgstr "Paremkite %(site_name)s per GitHub." -msgstr "„BookWyrm“ šaltinio kodas yra laisvai prieinamas. Galite prisidėti arba pranešti apie klaidas per GitHub." +msgstr "„BookWyrm“ pirminiai tekstai yra laisvai prieinami. Prisidėti prie šios platformos vystymo arba pranešti apie klaidas galite per „GitHub“." #: bookwyrm/templates/snippets/form_rate_stars.html:20 #: bookwyrm/templates/snippets/stars.html:38 @@ -7397,12 +7397,12 @@ msgstr "%(username)s perskaitė %(read_count)s iš %(goal_c #: bookwyrm/templates/snippets/move_user_buttons.html:10 msgid "Follow at new account" -msgstr "" +msgstr "Sekti naująją paskyrą" #: bookwyrm/templates/snippets/moved_user_notice.html:7 #, python-format msgid "%(user)s has moved to %(moved_to_name)s" -msgstr "" +msgstr "%(user)s perkėlė paskyrą į %(moved_to_name)s" #: bookwyrm/templates/snippets/page_text.html:8 #, python-format @@ -7547,7 +7547,7 @@ msgstr "Baigti skaityti" #: bookwyrm/templates/snippets/stars.html:13 msgid "Show rating" -msgstr "" +msgstr "Rodyti įvertinimą" #: bookwyrm/templates/snippets/status/content_status.html:69 msgid "Show status" @@ -7712,7 +7712,7 @@ msgstr "Rodyti mažiau" #: bookwyrm/templates/snippets/user_active_tag.html:5 msgid "Moved" -msgstr "" +msgstr "Perkelta" #: bookwyrm/templates/snippets/user_active_tag.html:12 msgid "Deleted" @@ -7880,10 +7880,10 @@ msgstr "Įrašų dar nėra" #, python-format msgid "%(display_count)s follower" msgid_plural "%(display_count)s followers" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%(display_count)s sekėjas" +msgstr[1] "%(display_count)s sekėjai" +msgstr[2] "%(display_count)s sekėjų" +msgstr[3] "%(display_count)s sekėjų" #: bookwyrm/templates/user/user_preview.html:31 #, python-format @@ -7910,7 +7910,7 @@ msgstr "Žiūrėti paskyrą ir dar daugiau" #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28 #, python-format msgid "File exceeds maximum size: %(max_size)sMB" -msgstr "" +msgstr "Failo dydis viršija leistiną: %(max_size)s MB" #: bookwyrm/templatetags/list_page_tags.py:14 #, python-format @@ -7933,7 +7933,7 @@ msgstr "%(title)s: %(subtitle)s" #: bookwyrm/templatetags/utilities.py:133 msgid "a new user account" -msgstr "" +msgstr "nauja naudotojo paskyra" #: bookwyrm/views/updates.py:45 #, python-format From 313e1e721c18453179b9fa99d77f998d61e0b04d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 5 Dec 2025 14:37:29 -0800 Subject: [PATCH 198/962] New translations django.po (Lithuanian) --- locale/lt_LT/LC_MESSAGES/django.po | 68 +++++++++++++++--------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 17bd14aaeb..08697c6e64 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-12-05 21:24\n" +"PO-Revision-Date: 2025-12-05 22:37\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -6327,7 +6327,7 @@ msgstr "Registracija" #: bookwyrm/templates/settings/themes.html:4 #: bookwyrm/templates/settings/themes.html:6 msgid "Themes" -msgstr "Temos" +msgstr "Grafiniai apvalkalai" #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:5 #, python-format @@ -6552,36 +6552,36 @@ msgstr "Keitimo data" #: bookwyrm/templates/settings/schedules.html:31 msgid "Last run at" -msgstr "" +msgstr "Paskutinio vykdymo data" #: bookwyrm/templates/settings/schedules.html:34 #: bookwyrm/templates/settings/schedules.html:98 msgid "Schedule" -msgstr "" +msgstr "Tvarkaraštis" #: bookwyrm/templates/settings/schedules.html:37 msgid "Schedule ID" -msgstr "" +msgstr "Tvarkaraščio ID" #: bookwyrm/templates/settings/schedules.html:40 msgid "Enabled" -msgstr "" +msgstr "Įjungta" #: bookwyrm/templates/settings/schedules.html:73 msgid "Un-schedule" -msgstr "" +msgstr "Išjungti tvarkaraštį" #: bookwyrm/templates/settings/schedules.html:81 msgid "No scheduled tasks" -msgstr "" +msgstr "Planinių užduočių nėra" #: bookwyrm/templates/settings/schedules.html:90 msgid "Schedules" -msgstr "" +msgstr "Tvarkaraščiai" #: bookwyrm/templates/settings/schedules.html:119 msgid "No schedules found" -msgstr "" +msgstr "Tvarkaraščių nerasta" #: bookwyrm/templates/settings/site.html:10 #: bookwyrm/templates/settings/site.html:43 @@ -6663,27 +6663,27 @@ msgstr "Papildoma informacija:" #: bookwyrm/templates/settings/themes.html:10 msgid "Set instance default theme" -msgstr "Nustatyti numatytąją serverio temą" +msgstr "Nustatyti numatytąjį serverio grafinį apvalkalą" #: bookwyrm/templates/settings/themes.html:19 msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." -msgstr "" +msgstr "Panašu, kad vienas jūsų grafinių apvalkalų yra sugadintas. Pasirinkus šį apvalkalą, sistema taps nenaudotina." #: bookwyrm/templates/settings/themes.html:28 msgid "Successfully added theme" -msgstr "Tema pridėta sėkmingai" +msgstr "Grafinis apvalkalas pridėtas sėkmingai" #: bookwyrm/templates/settings/themes.html:35 msgid "How to add a theme" -msgstr "Kaip pridėti temą" +msgstr "Kaip pridėti grafinį apvalkalą" #: bookwyrm/templates/settings/themes.html:38 msgid "Copy the theme file into the bookwyrm/static/css/themes directory on your server from the command line." -msgstr "Nukopijuokite fialus į serverio katalogą bookwyrm/static/css/themes iš komandinės eilutės." +msgstr "Nukopijuokite grafinio apvalkalo failą į serverio katalogą bookwyrm/static/css/themes." #: bookwyrm/templates/settings/themes.html:41 msgid "Run ./bw-dev compile_themes and ./bw-dev collectstatic." -msgstr "Paleisti ./bw-dev compile_themes ir ./bw-dev collectstatic." +msgstr "Įvykdykite ./bw-dev compile_themes ir ./bw-dev collectstatic komandas." #: bookwyrm/templates/settings/themes.html:44 msgid "Add the file name using the form below to make it available in the application interface." @@ -6692,24 +6692,24 @@ msgstr "Pridėkite failo pavadinimą, naudodamiesi žemiau esančia forma, kad j #: bookwyrm/templates/settings/themes.html:51 #: bookwyrm/templates/settings/themes.html:91 msgid "Add theme" -msgstr "Pridėti temą" +msgstr "Pridėti grafinį apvalkalą" #: bookwyrm/templates/settings/themes.html:57 msgid "Unable to save theme" -msgstr "Nepavyko išsaugoti temos" +msgstr "Nepavyko įrašyti grafinio apvalkalo" #: bookwyrm/templates/settings/themes.html:72 #: bookwyrm/templates/settings/themes.html:102 msgid "Theme name" -msgstr "Temos pavadinimas" +msgstr "Grafinio apvalkalo pavadinimas" #: bookwyrm/templates/settings/themes.html:82 msgid "Theme filename" -msgstr "Temos failo vardas" +msgstr "Grafinio apvalkalo failo vardas" #: bookwyrm/templates/settings/themes.html:97 msgid "Available Themes" -msgstr "Galimos temos" +msgstr "Galimi grafiniai apvalkalai" #: bookwyrm/templates/settings/themes.html:105 msgid "File" @@ -6717,19 +6717,19 @@ msgstr "Failas" #: bookwyrm/templates/settings/themes.html:123 msgid "Remove theme" -msgstr "Pašalinti temą" +msgstr "Pašalinti grafinį apvalkalą" #: bookwyrm/templates/settings/themes.html:134 msgid "Test theme" -msgstr "" +msgstr "Išbandyti grafinį apvalkalą" #: bookwyrm/templates/settings/themes.html:143 msgid "Broken theme" -msgstr "" +msgstr "Sugadintas grafinis apvalkalas" #: bookwyrm/templates/settings/themes.html:152 msgid "Loaded successfully" -msgstr "" +msgstr "Įkeltas sėkmingai" #: bookwyrm/templates/settings/users/delete_user_form.html:5 #: bookwyrm/templates/settings/users/user_moderation_actions.html:52 @@ -6739,39 +6739,39 @@ msgstr "Visam laikui pašalinti naudotoją" #: bookwyrm/templates/settings/users/delete_user_form.html:12 #, python-format msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." -msgstr "" +msgstr "Ar tikrai norite negrįžtamai pašalinti paskyrą %(username)s?" #: bookwyrm/templates/settings/users/delete_user_form.html:18 msgid "I understand that this is a permanent action:" -msgstr "" +msgstr "Aš suprantu, kad šis veiksmas negrįžtamas:" #: bookwyrm/templates/settings/users/force_password_reset.html:17 msgid "All users in the selected category will be logged out and required to set a new password to log back in." -msgstr "" +msgstr "Visi naudotojai šioje kategorijoje bus atjungti nuo sistemos ir priversti pasikeisti slaptažodį prieš iš naujo prisijungdami." #: bookwyrm/templates/settings/users/force_password_reset.html:18 msgid "If your account is in the group, you will be logged out out after submitting." -msgstr "" +msgstr "Jei jūsų paskyra yra šioje grupėje, jūsų sesija taipogi bus nutraukta." #: bookwyrm/templates/settings/users/force_password_reset.html:22 msgid "Users given password resets:" -msgstr "" +msgstr "Naudotojai, kuriems bus atkurti slaptažodžiai:" #: bookwyrm/templates/settings/users/force_password_reset.html:35 msgid "All users" -msgstr "" +msgstr "Visi naudotojai" #: bookwyrm/templates/settings/users/force_password_reset.html:39 msgid "users" -msgstr "" +msgstr "naudotojai" #: bookwyrm/templates/settings/users/force_password_reset.html:43 msgid "Force password reset" -msgstr "" +msgstr "Priverstinai atkurti slaptažodį" #: bookwyrm/templates/settings/users/force_password_reset.html:48 msgid "Number of users that will be effected:" -msgstr "" +msgstr "Paveiksimų naudotojų skaičius:" #: bookwyrm/templates/settings/users/force_password_reset.html:53 msgid "Are you sure you want to force password reset for these users:" From cac6469eb358747c08dfbce5f73e29c8b2973a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20C=C3=A1mara?= Date: Sun, 7 Dec 2025 10:48:16 +0000 Subject: [PATCH 199/962] Set pages as deduplication_field --- bookwyrm/models/book.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 5f71221ea8..8e05af06cc 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -583,7 +583,7 @@ class Edition(Book): oclc_number = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) - pages = fields.IntegerField(blank=True, null=True) + pages = fields.IntegerField(blank=True, null=True, deduplication_field=True) physical_format = fields.CharField( max_length=255, choices=FormatChoices, null=True, blank=True ) From 33261ecc18e8fe139215705774dac1ddca4b6507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20C=C3=A1mara?= Date: Sun, 7 Dec 2025 20:13:05 +0000 Subject: [PATCH 200/962] Attempt to fix testing errors --- bookwyrm/tests/views/preferences/test_export.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/views/preferences/test_export.py b/bookwyrm/tests/views/preferences/test_export.py index d9810e7e98..6b7eec3bc4 100644 --- a/bookwyrm/tests/views/preferences/test_export.py +++ b/bookwyrm/tests/views/preferences/test_export.py @@ -38,6 +38,7 @@ def setUpTestData(cls): remote_id="https://example.com/book/1", parent_work=cls.work, isbn_13="9781234567890", + pages=123, bnf_id="beep", ) @@ -68,7 +69,7 @@ def test_export_file(self, *_): # pylint: disable=line-too-long self.assertEqual( export.content, - b"title,author_text,remote_id,openlibrary_key,finna_key,inventaire_id,librarything_key,goodreads_key,bnf_id,viaf,wikidata,asin,aasin,isfdb,isbn_10,isbn_13,oclc_number,start_date,finish_date,stopped_date,rating,review_name,review_cw,review_content,review_published,shelf,shelf_name,shelf_date\r\n" - + b"Test Book,,%b,,,,,,beep,,,,,,123456789X,9781234567890,,,,,,,,,,to-read,To Read,%b\r\n" + b"title,author_text,remote_id,openlibrary_key,finna_key,inventaire_id,librarything_key,goodreads_key,bnf_id,viaf,wikidata,asin,aasin,isfdb,isbn_10,isbn_13,oclc_number,pages,start_date,finish_date,stopped_date,rating,review_name,review_cw,review_content,review_published,shelf,shelf_name,shelf_date\r\n" + + b"Test Book,,%b,,,,,,beep,,,,,,123456789X,9781234567890,,,,,,,,,,,to-read,To Read,%b\r\n" % (self.book.remote_id.encode("utf-8"), book_date), ) From 542ab52cce27a02674fd5741dcbb8381db683125 Mon Sep 17 00:00:00 2001 From: kasiarog Date: Mon, 8 Dec 2025 12:46:53 +0100 Subject: [PATCH 201/962] added [tool.ruff.lint] table --- pyproject.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1109e1d7b2..8c31124dbc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,13 +7,14 @@ line-length = 88 target-version = "py311" -lint.select = [ +[tool.ruff.lint] +select = [ "E", # pycodestyle errors "W", # pycodestyle warnings "F", # pyflakes (critical errors only) ] -lint.ignore = [ +ignore = [ "E501", # line too long "E722", # bare except "E731", # lambda assignment From 13f3190c14a1d97714ffe13681e11c13d703ce49 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Tue, 9 Dec 2025 18:48:41 +1100 Subject: [PATCH 202/962] fix mock in test_existings_authors_aliases_add_author_helper The mock/patch in `test_existings_authors_aliases_add_author_helper`, which is probably also slowing down our test suite and potentially causing unexpected failures when the ISNI endpoint doesn't resolve at the time the tests are run. See https://docs.python.org/3/library/unittest.mock.html#where-to-patch --- bookwyrm/tests/views/books/test_edit_book.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py index 0ef6bf4bdb..502b6f2219 100644 --- a/bookwyrm/tests/views/books/test_edit_book.py +++ b/bookwyrm/tests/views/books/test_edit_book.py @@ -426,7 +426,7 @@ def test_existings_authors_aliases_add_author_helper(self): request = self.factory.post("", form.data) request.user = self.local_user - with patch("bookwyrm.utils.isni.find_authors_by_name") as mock: + with patch("bookwyrm.views.books.edit_book.find_authors_by_name") as mock: mock.return_value = [] result = add_authors(request, form.data) From fd6ba916eb7c8387e13331d3c314a345319b3872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20C=C3=A1mara?= Date: Tue, 9 Dec 2025 13:46:28 +0000 Subject: [PATCH 203/962] Export pages and update tests --- bookwyrm/models/book.py | 2 +- bookwyrm/tests/views/preferences/test_export.py | 2 +- bookwyrm/views/preferences/export.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 8e05af06cc..5f71221ea8 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -583,7 +583,7 @@ class Edition(Book): oclc_number = fields.CharField( max_length=255, blank=True, null=True, deduplication_field=True ) - pages = fields.IntegerField(blank=True, null=True, deduplication_field=True) + pages = fields.IntegerField(blank=True, null=True) physical_format = fields.CharField( max_length=255, choices=FormatChoices, null=True, blank=True ) diff --git a/bookwyrm/tests/views/preferences/test_export.py b/bookwyrm/tests/views/preferences/test_export.py index 6b7eec3bc4..934515037c 100644 --- a/bookwyrm/tests/views/preferences/test_export.py +++ b/bookwyrm/tests/views/preferences/test_export.py @@ -70,6 +70,6 @@ def test_export_file(self, *_): self.assertEqual( export.content, b"title,author_text,remote_id,openlibrary_key,finna_key,inventaire_id,librarything_key,goodreads_key,bnf_id,viaf,wikidata,asin,aasin,isfdb,isbn_10,isbn_13,oclc_number,pages,start_date,finish_date,stopped_date,rating,review_name,review_cw,review_content,review_published,shelf,shelf_name,shelf_date\r\n" - + b"Test Book,,%b,,,,,,beep,,,,,,123456789X,9781234567890,,,,,,,,,,,to-read,To Read,%b\r\n" + + b"Test Book,,%b,,,,,,beep,,,,,,123456789X,9781234567890,,123,,,,,,,,,to-read,To Read,%b\r\n" % (self.book.remote_id.encode("utf-8"), book_date), ) diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index e13d488d46..1b7aa55284 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -61,6 +61,7 @@ def post(self, request): ["title", "author_text"] + deduplication_fields + [ + "pages", "start_date", "finish_date", "stopped_date", From f666bceebf67f11e30e033c29e147dc5e5deac29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20C=C3=A1mara?= Date: Tue, 9 Dec 2025 13:56:22 +0000 Subject: [PATCH 204/962] Delete trailing whitespace --- bookwyrm/views/preferences/export.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index 1b7aa55284..04a94fbbd2 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -61,7 +61,7 @@ def post(self, request): ["title", "author_text"] + deduplication_fields + [ - "pages", + "pages", "start_date", "finish_date", "stopped_date", From 0a955e5e7cfe3d5a6794765587f85f0fbdaf589f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 10 Dec 2025 05:43:13 -0800 Subject: [PATCH 205/962] New translations django.po (Galician) --- locale/gl_ES/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po index 1d7fb0f4cb..91fbd0aeb7 100644 --- a/locale/gl_ES/LC_MESSAGES/django.po +++ b/locale/gl_ES/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-17 12:36\n" +"PO-Revision-Date: 2025-12-10 13:43\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -1728,7 +1728,7 @@ msgstr "Idioma %(languages)s" #: bookwyrm/templates/book/publisher_info.html:63 #, python-format msgid "Published %(date)s by %(publisher)s." -msgstr "Publicado en %(date)s por %(publisher)s." +msgstr "Data de publicación %(date)s, por %(publisher)s." #: bookwyrm/templates/book/publisher_info.html:65 #, python-format From 81e902f24ccc59f6662dd40931d388fbc9e219ae Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Sat, 13 Dec 2025 15:55:59 +0200 Subject: [PATCH 206/962] docker-compose: use healthchecks and service_healthy dependencies --- docker-compose.yml | 50 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 76c371d4ac..5f37b1f7f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,8 @@ services: - "${PORT:-80}:80" - "${PORT:-443:443}" depends_on: - - web + web: + condition: service_healthy networks: - main environment: @@ -38,7 +39,7 @@ services: test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"] interval: 10s retries: 5 - start_period: 30s + start_period: 5s timeout: 10s volumes: - pgdata:/var/lib/postgresql/data @@ -53,12 +54,16 @@ services: - static_volume:/app/static - media_volume:/app/images - exports_volume:/app/exports + healthcheck: + test: ["CMD-SHELL", "curl -f http://localhost:8000"] + interval: 10s + timeout: 10s + start_period: 3s + retries: 6 depends_on: db: condition: service_healthy restart: true - celery_worker: - condition: service_started redis_activity: condition: service_started networks: @@ -89,14 +94,24 @@ services: networks: - main command: celery -A celerywyrm worker -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc + healthcheck: + test: celery -A celerywyrm status + interval: 10s + timeout: 10s + start_period: 2s + retries: 6 volumes: - .:/app - static_volume:/app/static - media_volume:/app/images - exports_volume:/app/exports depends_on: - - db - - redis_broker + web: + condition: service_healthy + db: + condition: service_healthy + redis_broker: + condition: service_started restart: on-failure celery_beat: env_file: .env @@ -104,17 +119,30 @@ services: networks: - main command: celery -A celerywyrm beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler + healthcheck: + test: celery -A celerywyrm status + interval: 10s + timeout: 10s + retries: 6 + start_period: 2s volumes: - .:/app - static_volume:/app/static - media_volume:/app/images - exports_volume:/app/exports depends_on: - - celery_worker + celery_worker: + condition: service_healthy restart: on-failure flower: build: . command: celery -A celerywyrm flower --basic_auth=${FLOWER_USER}:${FLOWER_PASSWORD} --url_prefix=flower + healthcheck: + test: celery -A celerywyrm status + interval: 10s + timeout: 10s + retries: 6 + start_period: 2s env_file: .env volumes: - .:/app @@ -122,8 +150,12 @@ services: networks: - main depends_on: - - db - - redis_broker + db: + condition: service_healthy + redis_broker: + condition: service_started + web: + condition: service_healthy restart: on-failure dev-tools: build: dev-tools From 3ade95dff1392aab473523c6e1208bca0dd19264 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Sat, 13 Dec 2025 16:06:04 +0200 Subject: [PATCH 207/962] dev-tools: use node image as source instead of apt --- dev-tools/Dockerfile | 11 +++++------ dev-tools/nodejs.pref | 4 ---- dev-tools/nodejs.sources | 34 ---------------------------------- 3 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 dev-tools/nodejs.pref delete mode 100644 dev-tools/nodejs.sources diff --git a/dev-tools/Dockerfile b/dev-tools/Dockerfile index 563467f09e..adb0f84784 100644 --- a/dev-tools/Dockerfile +++ b/dev-tools/Dockerfile @@ -4,15 +4,14 @@ WORKDIR /app/dev-tools ENV PATH="/app/dev-tools/node_modules/.bin:$PATH" ENV PYTHONUNBUFFERED=1 ENV NPM_CONFIG_UPDATE_NOTIFIER=false -ENV PIP_ROOT_USER_ACTION=ignore PIP_DISABLE_PIP_VERSION_CHECK=1 +ENV PIP_ROOT_USER_ACTION=ignore +ENV PIP_DISABLE_PIP_VERSION_CHECK=1 -COPY nodejs.pref /etc/apt/preferences.d/ -COPY nodejs.sources /etc/apt/sources.list.d/ +COPY --from=node:18-slim /usr/local/bin /usr/local/bin +COPY --from=node:18-slim /usr/local/lib/node_modules /usr/local/lib/node_modules COPY package.json requirements.txt .stylelintrc.js .stylelintignore /app/dev-tools/ -RUN apt-get update && \ - apt-get install -y nodejs && \ - pip install -r requirements.txt && \ +RUN pip install --no-cache-dir -r requirements.txt && \ npm install . WORKDIR /app diff --git a/dev-tools/nodejs.pref b/dev-tools/nodejs.pref deleted file mode 100644 index 69e01c2c55..0000000000 --- a/dev-tools/nodejs.pref +++ /dev/null @@ -1,4 +0,0 @@ -Package: nodejs -Pin: origin deb.nodesource.com -Pin-Priority: 995 -Explanation: prefer upstream packaging over Debian's diff --git a/dev-tools/nodejs.sources b/dev-tools/nodejs.sources deleted file mode 100644 index 1e0c3ba404..0000000000 --- a/dev-tools/nodejs.sources +++ /dev/null @@ -1,34 +0,0 @@ -Types: deb -URIs: https://deb.nodesource.com/node_18.x -Suites: nodistro -Components: main -Signed-By: - -----BEGIN PGP PUBLIC KEY BLOCK----- - . - mQENBFdDN1ABCADaNd/I3j3tn40deQNgz7hB2NvT+syXe6k4ZmdiEcOfBvFrkS8B - hNS67t93etHsxEy7E0qwsZH32bKazMqe9zDwoa3aVImryjh6SHC9lMtW27JPHFeM - Srkt9YmH1WMwWcRO6eSY9B3PpazquhnvbammLuUojXRIxkDroy6Fw4UKmUNSRr32 - 9Ej87jRoR1B2/57Kfp2Y4+vFGGzSvh3AFQpBHq51qsNHALU6+8PjLfIt+5TPvaWR - TB+kAZnQZkaIQM2nr1n3oj6ak2RATY/+kjLizgFWzgEfbCrbsyq68UoY5FPBnu4Z - E3iDZpaIqwKr0seUC7iA1xM5eHi5kty1oB7HABEBAAG0Ik5Tb2xpZCA8bnNvbGlk - LWdwZ0Bub2Rlc291cmNlLmNvbT6JATgEEwECACIFAldDN1ACGwMGCwkIBwMCBhUI - AgkKCwQWAgMBAh4BAheAAAoJEC9ZtfmbG+C0y7wH/i4xnab36dtrYW7RZwL8i6Sc - NjMx4j9+U1kr/F6YtqWd+JwCbBdar5zRghxPcYEq/qf7MbgAYcs1eSOuTOb7n7+o - xUwdH2iCtHhKh3Jr2mRw1ks7BbFZPB5KmkxHaEBfLT4d+I91ZuUdPXJ+0SXs9gzk - Dbz65Uhoz3W03aiF8HeL5JNARZFMbHHNVL05U1sTGTCOtu+1c/33f3TulQ/XZ3Y4 - hwGCpLe0Tv7g7Lp3iLMZMWYPEa0a7S4u8he5IEJQLd8bE8jltcQvrdr3Fm8kI2Jg - BJmUmX4PSfhuTCFaR/yeCt3UoW883bs9LfbTzIx9DJGpRIu8Y0IL3b4sj/GoZVq5 - AQ0EV0M3UAEIAKrTaC62ayzqOIPa7nS90BHHck4Z33a2tZF/uof38xNOiyWGhT8u - JeFoTTHn5SQq5Ftyu4K3K2fbbpuu/APQF05AaljzVkDGNMW4pSkgOasdysj831cu - ssrHX2RYS22wg80k6C/Hwmh5F45faEuNxsV+bPx7oPUrt5n6GMx84vEP3i1+FDBi - 0pt/B/QnDFBXki1BGvJ35f5NwDefK8VaInxXP3ZN/WIbtn5dqxppkV/YkO7GiJlp - Jlju9rf3kKUIQzKQWxFsbCAPIHoWv7rH9RSxgDithXtG6Yg5R1aeBbJaPNXL9wpJ - YBJbiMjkAFaz4B95FOqZm3r7oHugiCGsHX0AEQEAAYkBHwQYAQIACQUCV0M3UAIb - DAAKCRAvWbX5mxvgtE/OB/0VN88DR3Y3fuqy7lq/dthkn7Dqm9YXdorZl3L152eE - IF882aG8FE3qZdaLGjQO4oShAyNWmRfSGuoH0XERXAI9n0r8m4mDMxE6rtP7tHet - y/5M8x3CTyuMgx5GLDaEUvBusnTD+/v/fBMwRK/cZ9du5PSG4R50rtst+oYyC2ao - x4I2SgjtF/cY7bECsZDplzatN3gv34PkcdIg8SLHAVlL4N5tzumDeizRspcSyoy2 - K2+hwKU4C4+dekLLTg8rjnRROvplV2KtaEk6rxKtIRFDCoQng8wfJuIMrDNKvqZw - FRGt7cbvW5MCnuH8MhItOl9Uxp1wHp6gtav/h8Gp6MBa - =MARt - -----END PGP PUBLIC KEY BLOCK----- From 6e11d75980b8a00e1d40cb853ae7b46cdd877fed Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 14 Dec 2025 19:44:02 +1100 Subject: [PATCH 208/962] fix series title search in ConfirmEditBook Q object query was wrong. Also fixed an except block I messed up when merging. --- bookwyrm/connectors/abstract_connector.py | 5 ++++- bookwyrm/connectors/bookwyrm_connector.py | 1 - bookwyrm/management/commands/upgrade_series.py | 2 -- bookwyrm/models/bookwyrm_export_job.py | 10 +++++----- bookwyrm/tests/activitypub/test_series.py | 1 + bookwyrm/tests/models/test_series.py | 2 +- bookwyrm/tests/views/books/test_series.py | 3 ++- bookwyrm/views/books/edit_book.py | 6 ++---- bookwyrm/views/books/series.py | 1 - 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index f7e7eb5336..fcb4018884 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -175,7 +175,10 @@ def get_or_create_seriesbook_from_data( # pylint: disable=no-self-use edition.save() activitydata_to_seriesbook( - user=user, work=work, new=series, instance=instance # type: ignore + user=user, + work=work, + new=series, + instance=instance, # type: ignore ) @abstractmethod diff --git a/bookwyrm/connectors/bookwyrm_connector.py b/bookwyrm/connectors/bookwyrm_connector.py index 9930febf51..4df3f12719 100644 --- a/bookwyrm/connectors/bookwyrm_connector.py +++ b/bookwyrm/connectors/bookwyrm_connector.py @@ -16,7 +16,6 @@ def __init__(self, identifier: str): super().__init__(identifier) def get_or_create_book(self, remote_id: str) -> models.Edition: - edition = activitypub.resolve_remote_id(remote_id, model=models.Edition) if edition.series: diff --git a/bookwyrm/management/commands/upgrade_series.py b/bookwyrm/management/commands/upgrade_series.py index 102340915e..c75c1bcec0 100644 --- a/bookwyrm/management/commands/upgrade_series.py +++ b/bookwyrm/management/commands/upgrade_series.py @@ -18,7 +18,6 @@ def upgrade_series_data(): for book in ( Edition.objects.filter(parent_work__seriesbooks=None).exclude(series=None).all() ): - vector = SearchVector("name", weight="A") + SearchVector( "alternative_names", weight="B" ) @@ -30,7 +29,6 @@ def upgrade_series_data(): ) if possible_series.exists(): - books = Book.objects.filter(authors__in=Subquery(book.authors.values("pk"))) if same_author_sb := SeriesBook.objects.filter(book__in=books).filter( diff --git a/bookwyrm/models/bookwyrm_export_job.py b/bookwyrm/models/bookwyrm_export_job.py index 3227665f0b..e03bed5771 100644 --- a/bookwyrm/models/bookwyrm_export_job.py +++ b/bookwyrm/models/bookwyrm_export_job.py @@ -76,11 +76,11 @@ def create_export_json_task(**kwargs): # trigger task to create tar file create_archive_task.delay(job_id=job.id) - except Exception as err: - logger.exception( - "create_export_json_task for job %s failed with error: %s", job.id, err - ) - job.set_status("failed") + except Exception as err: + logger.exception( + "create_export_json_task for job %s failed with error: %s", job.id, err + ) + job.set_status("failed") def archive_file_location(file, directory="") -> str: diff --git a/bookwyrm/tests/activitypub/test_series.py b/bookwyrm/tests/activitypub/test_series.py index aad78a8cdd..92007316fe 100644 --- a/bookwyrm/tests/activitypub/test_series.py +++ b/bookwyrm/tests/activitypub/test_series.py @@ -1,4 +1,5 @@ """test author serializer""" + from unittest.mock import patch import responses diff --git a/bookwyrm/tests/models/test_series.py b/bookwyrm/tests/models/test_series.py index 8d811c7c0a..d9cb83c51e 100644 --- a/bookwyrm/tests/models/test_series.py +++ b/bookwyrm/tests/models/test_series.py @@ -1,4 +1,4 @@ -""" testing series models """ +"""testing series models""" from django.test import TestCase diff --git a/bookwyrm/tests/views/books/test_series.py b/bookwyrm/tests/views/books/test_series.py index d4a8b4d674..9d63fb92aa 100644 --- a/bookwyrm/tests/views/books/test_series.py +++ b/bookwyrm/tests/views/books/test_series.py @@ -1,4 +1,5 @@ -""" test for app action functionality """ +"""test for app action functionality""" + from unittest.mock import patch from django.contrib.auth.models import Group, Permission from django.contrib.contenttypes.models import ContentType diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index f76d9d5236..4f33bc7475 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -365,7 +365,6 @@ def post(self, request, book_id=None): if not models.SeriesBook.objects.filter( series=series, book=book.parent_work, user=user ).exists(): # don't create a dupe! - models.SeriesBook.objects.create( series=series, book=book.parent_work, @@ -376,10 +375,9 @@ def post(self, request, book_id=None): book = clear_series(book) else: - if maybe_series := models.Series.objects.filter( - Q(title=book__series) - | Q(alternative_titles__contains(book__series)) + Q(title=book.series) + | Q(alternative_titles__contains=book.series) ): # is there a SeriesBook already despite what the user claims? maybe_seriesbooks = models.SeriesBook.filter( diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index 65785ea364..181bf43d7e 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -64,7 +64,6 @@ def get(self, request, series_id=None): return TemplateResponse(request, "book/edit/edit_series.html", data) - def post(self, request, series_id): """submit the series edit form""" From 69993c83795a489ac86c272a7f21f98e9e3a9c50 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 16 Dec 2025 10:25:33 -0800 Subject: [PATCH 209/962] New translations django.po (Yiddish) --- locale/yi_DE/LC_MESSAGES/django.po | 7870 ++++++++++++++++++++++++++++ 1 file changed, 7870 insertions(+) create mode 100644 locale/yi_DE/LC_MESSAGES/django.po diff --git a/locale/yi_DE/LC_MESSAGES/django.po b/locale/yi_DE/LC_MESSAGES/django.po new file mode 100644 index 0000000000..9c51fa6558 --- /dev/null +++ b/locale/yi_DE/LC_MESSAGES/django.po @@ -0,0 +1,7870 @@ +msgid "" +msgstr "" +"Project-Id-Version: bookwyrm\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2025-11-16 19:21+0000\n" +"PO-Revision-Date: 2025-12-16 18:25\n" +"Last-Translator: Mouse Reeve \n" +"Language-Team: Yiddish\n" +"Language: yi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Crowdin-Project: bookwyrm\n" +"X-Crowdin-Project-ID: 479239\n" +"X-Crowdin-Language: yi\n" +"X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" +"X-Crowdin-File-ID: 1553\n" + +#: bookwyrm/forms/admin.py:42 +msgid "One Day" +msgstr "" + +#: bookwyrm/forms/admin.py:43 +msgid "One Week" +msgstr "" + +#: bookwyrm/forms/admin.py:44 +msgid "One Month" +msgstr "" + +#: bookwyrm/forms/admin.py:45 +msgid "Does Not Expire" +msgstr "" + +#: bookwyrm/forms/admin.py:50 +msgid "Unlimited" +msgstr "" + +#: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 +msgid "Password does not match" +msgstr "" + +#: bookwyrm/forms/edit_user.py:129 +msgid "Incorrect Password" +msgstr "" + +#: bookwyrm/forms/forms.py:59 +msgid "Reading finish date cannot be before start date." +msgstr "" + +#: bookwyrm/forms/forms.py:64 +msgid "Reading stopped date cannot be before start date." +msgstr "" + +#: bookwyrm/forms/forms.py:72 +msgid "Reading stopped date cannot be in the future." +msgstr "" + +#: bookwyrm/forms/forms.py:79 +msgid "Reading finished date cannot be in the future." +msgstr "" + +#: bookwyrm/forms/landing.py:37 +msgid "Username or password are incorrect" +msgstr "" + +#: bookwyrm/forms/landing.py:56 +msgid "User with this username already exists" +msgstr "" + +#: bookwyrm/forms/landing.py:65 +msgid "A user with this email already exists." +msgstr "" + +#: bookwyrm/forms/landing.py:69 +msgid "This email address cannot be registered." +msgstr "" + +#: bookwyrm/forms/landing.py:114 +msgid "Password cannot be the same as your current password" +msgstr "" + +#: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 +msgid "Incorrect code" +msgstr "" + +#: bookwyrm/forms/links.py:36 +msgid "This domain is blocked. Please contact your administrator if you think this is an error." +msgstr "" + +#: bookwyrm/forms/links.py:51 +msgid "This link with file type has already been added for this book. If it is not visible, the domain is still pending." +msgstr "" + +#: bookwyrm/forms/lists.py:26 +msgid "List Order" +msgstr "" + +#: bookwyrm/forms/lists.py:27 +msgid "Book Title" +msgstr "" + +#: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 +#: bookwyrm/templates/shelf/shelf.html:196 +#: bookwyrm/templates/snippets/create_status/review.html:32 +msgid "Rating" +msgstr "" + +#: bookwyrm/forms/lists.py:30 bookwyrm/templates/lists/list.html:185 +msgid "Sort By" +msgstr "" + +#: bookwyrm/forms/lists.py:34 +msgid "Ascending" +msgstr "" + +#: bookwyrm/forms/lists.py:35 +msgid "Descending" +msgstr "" + +#: bookwyrm/models/announcement.py:11 +msgid "Primary" +msgstr "" + +#: bookwyrm/models/announcement.py:12 +msgid "Success" +msgstr "" + +#: bookwyrm/models/announcement.py:13 +#: bookwyrm/templates/settings/invites/manage_invites.html:47 +msgid "Link" +msgstr "" + +#: bookwyrm/models/announcement.py:14 +msgid "Warning" +msgstr "" + +#: bookwyrm/models/announcement.py:15 +msgid "Danger" +msgstr "" + +#: bookwyrm/models/antispam.py:113 bookwyrm/models/antispam.py:147 +msgid "Automatically generated report" +msgstr "" + +#: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:49 +#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:76 +#: bookwyrm/templates/import/import_status.html:214 +#: bookwyrm/templates/settings/link_domains/link_domains.html:19 +msgid "Pending" +msgstr "" + +#: bookwyrm/models/base_model.py:19 +msgid "Self deletion" +msgstr "" + +#: bookwyrm/models/base_model.py:20 +msgid "Self deactivation" +msgstr "" + +#: bookwyrm/models/base_model.py:21 +msgid "Moderator suspension" +msgstr "" + +#: bookwyrm/models/base_model.py:22 +msgid "Moderator deletion" +msgstr "" + +#: bookwyrm/models/base_model.py:23 +msgid "Domain block" +msgstr "" + +#: bookwyrm/models/book.py:473 +msgid "Audiobook" +msgstr "" + +#: bookwyrm/models/book.py:474 +msgid "eBook" +msgstr "" + +#: bookwyrm/models/book.py:475 +msgid "Graphic novel" +msgstr "" + +#: bookwyrm/models/book.py:476 +msgid "Hardcover" +msgstr "" + +#: bookwyrm/models/book.py:477 +msgid "Paperback" +msgstr "" + +#: bookwyrm/models/book.py:486 bookwyrm/models/book.py:493 +#: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:509 bookwyrm/models/book.py:527 +#: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 +#, python-format +msgid "%(value)s doesn't look like an ISBN" +msgstr "" + +#: bookwyrm/models/book.py:515 bookwyrm/models/book.py:555 +#, python-format +msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:84 +#: bookwyrm/templates/settings/reports/report.html:115 +#: bookwyrm/templates/snippets/create_status.html:26 +msgid "Comment" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:152 +#: bookwyrm/templates/import/import_status.html:127 +#: bookwyrm/templates/import/manual_review.html:13 +#: bookwyrm/templates/snippets/create_status.html:16 +msgid "Review" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:153 +msgid "Quotation" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:181 +#: bookwyrm/templates/snippets/follow_button.html:22 +msgid "Follow" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:182 +#: bookwyrm/templates/settings/federation/instance.html:116 +#: bookwyrm/templates/settings/link_domains/link_domains.html:87 +#: bookwyrm/templates/snippets/block_button.html:5 +msgid "Block" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:398 +msgid "Unknown error importing book" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:496 +msgid "unauthorized" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:502 +msgid "Unknown error importing book status" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:696 +#: bookwyrm/models/bookwyrm_import_job.py:722 +msgid "connection_error" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:732 +msgid "invalid_relationship" +msgstr "" + +#: bookwyrm/models/bookwyrm_import_job.py:740 +msgid "Unkown error importing relationship" +msgstr "" + +#: bookwyrm/models/federated_server.py:11 +#: bookwyrm/templates/settings/federation/edit_instance.html:55 +#: bookwyrm/templates/settings/federation/instance_list.html:22 +msgid "Federated" +msgstr "" + +#: bookwyrm/models/federated_server.py:12 bookwyrm/models/link.py:75 +#: bookwyrm/templates/settings/federation/edit_instance.html:56 +#: bookwyrm/templates/settings/federation/instance.html:10 +#: bookwyrm/templates/settings/federation/instance_list.html:26 +#: bookwyrm/templates/settings/link_domains/link_domains.html:27 +msgid "Blocked" +msgstr "" + +#: bookwyrm/models/fields.py:35 +#, python-format +msgid "%(value)s is not a valid remote_id" +msgstr "" + +#: bookwyrm/models/fields.py:44 bookwyrm/models/fields.py:53 +#, python-format +msgid "%(value)s is not a valid username" +msgstr "" + +#: bookwyrm/models/fields.py:201 bookwyrm/templates/layout.html:129 +#: bookwyrm/templates/ostatus/error.html:29 +msgid "username" +msgstr "" + +#: bookwyrm/models/fields.py:206 +msgid "A user with that username already exists." +msgstr "" + +#: bookwyrm/models/fields.py:225 +#: bookwyrm/templates/snippets/privacy-icons.html:3 +#: bookwyrm/templates/snippets/privacy-icons.html:4 +#: bookwyrm/templates/snippets/privacy_select.html:11 +#: bookwyrm/templates/snippets/privacy_select_no_followers.html:11 +msgid "Public" +msgstr "" + +#: bookwyrm/models/fields.py:226 +#: bookwyrm/templates/snippets/privacy-icons.html:7 +#: bookwyrm/templates/snippets/privacy-icons.html:8 +#: bookwyrm/templates/snippets/privacy_select.html:14 +#: bookwyrm/templates/snippets/privacy_select_no_followers.html:14 +msgid "Unlisted" +msgstr "" + +#: bookwyrm/models/fields.py:227 +#: bookwyrm/templates/snippets/privacy_select.html:17 +#: bookwyrm/templates/user/relationships/followers.html:6 +#: bookwyrm/templates/user/relationships/followers.html:11 +#: bookwyrm/templates/user/relationships/followers.html:21 +#: bookwyrm/templates/user/relationships/layout.html:11 +msgid "Followers" +msgstr "" + +#: bookwyrm/models/fields.py:228 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:6 +#: bookwyrm/templates/snippets/privacy-icons.html:15 +#: bookwyrm/templates/snippets/privacy-icons.html:16 +#: bookwyrm/templates/snippets/privacy_select.html:20 +#: bookwyrm/templates/snippets/privacy_select_no_followers.html:17 +msgid "Private" +msgstr "" + +#: bookwyrm/models/housekeeping.py:116 +msgid "Missing" +msgstr "" + +#: bookwyrm/models/housekeeping.py:117 +msgid "Wrong Path" +msgstr "" + +#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 +#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import_user.html:225 +#: bookwyrm/templates/import/user_import_status.html:56 +#: bookwyrm/templates/preferences/export-user.html:146 +#: bookwyrm/templates/settings/files.html:162 +#: bookwyrm/templates/settings/files.html:344 +#: bookwyrm/templates/settings/imports/imports.html:180 +#: bookwyrm/templates/settings/imports/imports.html:270 +#: bookwyrm/templates/snippets/user_active_tag.html:8 +msgid "Active" +msgstr "" + +#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:20 +#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import_user.html:223 +#: bookwyrm/templates/import/user_import_status.html:54 +#: bookwyrm/templates/preferences/export-user.html:144 +#: bookwyrm/templates/settings/files.html:160 +#: bookwyrm/templates/settings/files.html:342 +msgid "Complete" +msgstr "" + +#: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:21 +msgid "Stopped" +msgstr "" + +#: bookwyrm/models/import_job.py:86 bookwyrm/models/import_job.py:94 +msgid "Import stopped" +msgstr "" + +#: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 +msgid "Error loading book" +msgstr "" + +#: bookwyrm/models/import_job.py:387 +msgid "Could not find a match for book" +msgstr "" + +#: bookwyrm/models/job.py:22 +#: bookwyrm/templates/import/user_import_status.html:69 +msgid "Failed" +msgstr "" + +#: bookwyrm/models/link.py:55 +msgid "Free" +msgstr "" + +#: bookwyrm/models/link.py:56 +msgid "Purchasable" +msgstr "" + +#: bookwyrm/models/link.py:57 +msgid "Available for loan" +msgstr "" + +#: bookwyrm/models/link.py:74 +#: bookwyrm/templates/settings/link_domains/link_domains.html:23 +msgid "Approved" +msgstr "" + +#: bookwyrm/models/report.py:85 +msgid "Resolved report" +msgstr "" + +#: bookwyrm/models/report.py:86 +msgid "Re-opened report" +msgstr "" + +#: bookwyrm/models/report.py:87 +msgid "Messaged reporter" +msgstr "" + +#: bookwyrm/models/report.py:88 +msgid "Messaged reported user" +msgstr "" + +#: bookwyrm/models/report.py:89 +msgid "Suspended user" +msgstr "" + +#: bookwyrm/models/report.py:90 +msgid "Un-suspended user" +msgstr "" + +#: bookwyrm/models/report.py:91 +msgid "Changed user permission level" +msgstr "" + +#: bookwyrm/models/report.py:92 +msgid "Deleted user account" +msgstr "" + +#: bookwyrm/models/report.py:93 +msgid "Blocked domain" +msgstr "" + +#: bookwyrm/models/report.py:94 +msgid "Approved domain" +msgstr "" + +#: bookwyrm/models/report.py:95 +msgid "Deleted item" +msgstr "" + +#: bookwyrm/models/session.py:42 +msgid "Unknown" +msgstr "" + +#: bookwyrm/models/status.py:192 +#, python-format +msgid "%(display_name)s's status" +msgstr "" + +#: bookwyrm/models/status.py:367 +#, python-format +msgid "%(display_name)s's comment on %(book_title)s" +msgstr "" + +#: bookwyrm/models/status.py:418 +#, python-format +msgid "%(display_name)s's quote from %(book_title)s" +msgstr "" + +#: bookwyrm/models/status.py:454 +#, python-format +msgid "%(display_name)s's review of %(book_title)s" +msgstr "" + +#: bookwyrm/models/status.py:486 +#, python-format +msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" +msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 +msgid "Reviews" +msgstr "" + +#: bookwyrm/models/user.py:40 +msgid "Comments" +msgstr "" + +#: bookwyrm/models/user.py:41 bookwyrm/templates/import/import_user.html:154 +msgid "Quotations" +msgstr "" + +#: bookwyrm/models/user.py:42 +msgid "Everything else" +msgstr "" + +#: bookwyrm/settings.py:238 +msgid "Home Timeline" +msgstr "" + +#: bookwyrm/settings.py:238 +msgid "Home" +msgstr "" + +#: bookwyrm/settings.py:239 +msgid "Books Timeline" +msgstr "" + +#: bookwyrm/settings.py:239 +#: bookwyrm/templates/guided_tour/user_profile.html:101 +#: bookwyrm/templates/import/user_import_status.html:73 +#: bookwyrm/templates/search/layout.html:22 +#: bookwyrm/templates/search/layout.html:44 +#: bookwyrm/templates/user/layout.html:107 +msgid "Books" +msgstr "" + +#: bookwyrm/settings.py:316 +msgid "English" +msgstr "" + +#: bookwyrm/settings.py:317 +msgid "Català (Catalan)" +msgstr "" + +#: bookwyrm/settings.py:318 +msgid "Deutsch (German)" +msgstr "" + +#: bookwyrm/settings.py:319 +msgid "Esperanto (Esperanto)" +msgstr "" + +#: bookwyrm/settings.py:320 +msgid "Español (Spanish)" +msgstr "" + +#: bookwyrm/settings.py:321 +msgid "Euskara (Basque)" +msgstr "" + +#: bookwyrm/settings.py:322 +msgid "Galego (Galician)" +msgstr "" + +#: bookwyrm/settings.py:323 +msgid "Italiano (Italian)" +msgstr "" + +#: bookwyrm/settings.py:324 +msgid "한국어 (Korean)" +msgstr "" + +#: bookwyrm/settings.py:325 +msgid "Suomi (Finnish)" +msgstr "" + +#: bookwyrm/settings.py:326 +msgid "Français (French)" +msgstr "" + +#: bookwyrm/settings.py:327 +msgid "Lietuvių (Lithuanian)" +msgstr "" + +#: bookwyrm/settings.py:328 +msgid "Nederlands (Dutch)" +msgstr "" + +#: bookwyrm/settings.py:329 +msgid "Norsk (Norwegian)" +msgstr "" + +#: bookwyrm/settings.py:330 +msgid "Polski (Polish)" +msgstr "" + +#: bookwyrm/settings.py:331 +msgid "Português do Brasil (Brazilian Portuguese)" +msgstr "" + +#: bookwyrm/settings.py:332 +msgid "Português Europeu (European Portuguese)" +msgstr "" + +#: bookwyrm/settings.py:333 +msgid "Română (Romanian)" +msgstr "" + +#: bookwyrm/settings.py:334 +msgid "Svenska (Swedish)" +msgstr "" + +#: bookwyrm/settings.py:335 +msgid "Українська (Ukrainian)" +msgstr "" + +#: bookwyrm/settings.py:336 +msgid "简体中文 (Simplified Chinese)" +msgstr "" + +#: bookwyrm/settings.py:337 +msgid "繁體中文 (Traditional Chinese)" +msgstr "" + +#: bookwyrm/templates/403.html:5 +msgid "Oh no!" +msgstr "" + +#: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 +msgid "Permission Denied" +msgstr "" + +#: bookwyrm/templates/403.html:11 +#, python-format +msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." +msgstr "" + +#: bookwyrm/templates/403.html:15 +msgid "If you think you should have access, please speak to your BookWyrm server administrator." +msgstr "" + +#: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 +msgid "Not Found" +msgstr "" + +#: bookwyrm/templates/404.html:9 +msgid "The page you requested doesn't seem to exist!" +msgstr "" + +#: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 +msgid "File too large" +msgstr "" + +#: bookwyrm/templates/413.html:9 +msgid "The file you are uploading is too large." +msgstr "" + +#: bookwyrm/templates/413.html:11 +msgid "You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting." +msgstr "" + +#: bookwyrm/templates/500.html:4 +msgid "Oops!" +msgstr "" + +#: bookwyrm/templates/500.html:8 +msgid "Server Error" +msgstr "" + +#: bookwyrm/templates/500.html:9 +msgid "Something went wrong! Sorry about that." +msgstr "" + +#: bookwyrm/templates/about/about.html:9 +#: bookwyrm/templates/about/layout.html:35 +msgid "About" +msgstr "" + +#: bookwyrm/templates/about/about.html:22 +#: bookwyrm/templates/get_started/layout.html:22 +#, python-format +msgid "Welcome to %(site_name)s!" +msgstr "" + +#: bookwyrm/templates/about/about.html:26 +#, python-format +msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." +msgstr "" + +#: bookwyrm/templates/about/about.html:47 +#, python-format +msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." +msgstr "" + +#: bookwyrm/templates/about/about.html:66 +#, python-format +msgid "More %(site_name)s users want to read %(title)s than any other book." +msgstr "" + +#: bookwyrm/templates/about/about.html:85 +#, python-format +msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." +msgstr "" + +#: bookwyrm/templates/about/about.html:96 +msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." +msgstr "" + +#: bookwyrm/templates/about/about.html:107 +msgid "Meet your admins" +msgstr "" + +#: bookwyrm/templates/about/about.html:110 +#, python-format +msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." +msgstr "" + +#: bookwyrm/templates/about/about.html:124 +msgid "Moderator" +msgstr "" + +#: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 +msgid "Admin" +msgstr "" + +#: bookwyrm/templates/about/about.html:142 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:28 +#: bookwyrm/templates/snippets/status/status_options.html:35 +#: bookwyrm/templates/snippets/user_options.html:14 +msgid "Send direct message" +msgstr "" + +#: bookwyrm/templates/about/conduct.html:4 +#: bookwyrm/templates/about/conduct.html:9 +#: bookwyrm/templates/about/layout.html:41 +#: bookwyrm/templates/snippets/footer.html:27 +msgid "Code of Conduct" +msgstr "" + +#: bookwyrm/templates/about/impressum.html:4 +#: bookwyrm/templates/about/impressum.html:9 +#: bookwyrm/templates/about/layout.html:54 +#: bookwyrm/templates/snippets/footer.html:34 +msgid "Impressum" +msgstr "" + +#: bookwyrm/templates/about/layout.html:11 +msgid "Active users:" +msgstr "" + +#: bookwyrm/templates/about/layout.html:15 +msgid "Statuses posted:" +msgstr "" + +#: bookwyrm/templates/about/layout.html:19 +#: bookwyrm/templates/setup/config.html:68 +msgid "Software version:" +msgstr "" + +#: bookwyrm/templates/about/layout.html:30 +#: bookwyrm/templates/embed-layout.html:34 +#: bookwyrm/templates/snippets/footer.html:8 +#, python-format +msgid "About %(site_name)s" +msgstr "" + +#: bookwyrm/templates/about/layout.html:47 +#: bookwyrm/templates/about/privacy.html:4 +#: bookwyrm/templates/about/privacy.html:9 +#: bookwyrm/templates/snippets/footer.html:30 +msgid "Privacy Policy" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:7 +#: bookwyrm/templates/feed/summary_card.html:8 +#, python-format +msgid "%(year)s in the books" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:43 +#, python-format +msgid "%(year)s in the books" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:47 +#, python-format +msgid "%(display_name)s’s year of reading" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:53 +msgid "Share this page" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:67 +msgid "Copy address" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:68 +#: bookwyrm/templates/lists/list.html:277 +msgid "Copied!" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:77 +msgid "Sharing status: public with key" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:78 +msgid "The page can be seen by anyone with the complete address." +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:83 +msgid "Make page private" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:89 +msgid "Sharing status: private" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:90 +msgid "The page is private, only you can see it." +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:95 +msgid "Make page public" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:99 +msgid "When you make your page private, the old key won’t give access to the page anymore. A new key will be created if the page is once again made public." +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:112 +#, python-format +msgid "Sadly %(display_name)s didn’t finish any books in %(year)s" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:118 +#, python-format +msgid "In %(year)s, %(display_name)s read %(books_total)s book
    for a total of %(pages_total)s pages!" +msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
    for a total of %(pages_total)s pages!" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/annual_summary/layout.html:124 +msgid "That’s great!" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:128 +#, python-format +msgid "That makes an average of %(pages)s pages per book." +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:134 +#, python-format +msgid "(No page data was available for %(no_page_number)s book)" +msgid_plural "(No page data was available for %(no_page_number)s books)" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/annual_summary/layout.html:150 +msgid "Their shortest read this year…" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:157 +#: bookwyrm/templates/annual_summary/layout.html:178 +#: bookwyrm/templates/annual_summary/layout.html:247 +#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/discover/large-book.html:22 +#: bookwyrm/templates/landing/large-book.html:26 +#: bookwyrm/templates/landing/small-book.html:18 +msgid "by" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:163 +#: bookwyrm/templates/annual_summary/layout.html:184 +#, python-format +msgid "%(pages)s pages" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:171 +msgid "…and the longest" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:202 +#, python-format +msgid "%(display_name)s set a goal of reading %(goal)s book in %(year)s,
    and achieved %(goal_percent)s%% of that goal" +msgid_plural "%(display_name)s set a goal of reading %(goal)s books in %(year)s,
    and achieved %(goal_percent)s%% of that goal" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/annual_summary/layout.html:211 +msgid "Way to go!" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:226 +#, python-format +msgid "%(display_name)s left %(ratings_total)s rating,
    their average rating is %(rating_average)s" +msgid_plural "%(display_name)s left %(ratings_total)s ratings,
    their average rating is %(rating_average)s" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/annual_summary/layout.html:240 +msgid "Their best rated review" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:253 +#, python-format +msgid "Their rating: %(rating)s" +msgstr "" + +#: bookwyrm/templates/annual_summary/layout.html:270 +#, python-format +msgid "All the books %(display_name)s read in %(year)s" +msgstr "" + +#: bookwyrm/templates/author/author.html:19 +#: bookwyrm/templates/author/author.html:20 +msgid "Edit Author" +msgstr "" + +#: bookwyrm/templates/author/author.html:36 +msgid "Author details" +msgstr "" + +#: bookwyrm/templates/author/author.html:40 +#: bookwyrm/templates/author/edit_author.html:42 +msgid "Aliases:" +msgstr "" + +#: bookwyrm/templates/author/author.html:49 +msgid "Born:" +msgstr "" + +#: bookwyrm/templates/author/author.html:56 +msgid "Died:" +msgstr "" + +#: bookwyrm/templates/author/author.html:66 +msgid "External links" +msgstr "" + +#: bookwyrm/templates/author/author.html:71 +msgid "Wikipedia" +msgstr "" + +#: bookwyrm/templates/author/author.html:79 +msgid "View on Wikidata" +msgstr "" + +#: bookwyrm/templates/author/author.html:87 +msgid "Website" +msgstr "" + +#: bookwyrm/templates/author/author.html:95 +msgid "View ISNI record" +msgstr "" + +#: bookwyrm/templates/author/author.html:103 +#: bookwyrm/templates/book/book.html:183 +msgid "View on ISFDB" +msgstr "" + +#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/sync_modal.html:5 +#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/sync_modal.html:5 +msgid "Load data" +msgstr "" + +#: bookwyrm/templates/author/author.html:112 +#: bookwyrm/templates/book/book.html:154 +msgid "View on OpenLibrary" +msgstr "" + +#: bookwyrm/templates/author/author.html:127 +#: bookwyrm/templates/book/book.html:168 +msgid "View on Inventaire" +msgstr "" + +#: bookwyrm/templates/author/author.html:143 +msgid "View on LibraryThing" +msgstr "" + +#: bookwyrm/templates/author/author.html:151 +msgid "View on Goodreads" +msgstr "" + +#: bookwyrm/templates/author/author.html:166 +#, python-format +msgid "Books by %(name)s" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:5 +msgid "Edit Author:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:13 +#: bookwyrm/templates/book/edit/edit_book.html:25 +msgid "Added:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:14 +#: bookwyrm/templates/book/edit/edit_book.html:28 +msgid "Updated:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:16 +#: bookwyrm/templates/book/edit/edit_book.html:32 +msgid "Last edited by:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:33 +#: bookwyrm/templates/book/edit/edit_book_form.html:21 +msgid "Metadata" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:35 +#: bookwyrm/templates/lists/form.html:9 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:14 +#: bookwyrm/templates/shelf/form.html:9 +msgid "Name:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:91 +#: bookwyrm/templates/book/edit/edit_book_form.html:161 +msgid "Separate multiple values with commas." +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:50 +msgid "Bio:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:56 +msgid "Wikipedia link:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:58 +msgid "Wikidata:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:62 +msgid "Website:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:67 +msgid "Birth date:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:74 +msgid "Death date:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:81 +msgid "Author Identifiers" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:83 +msgid "Openlibrary key:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:90 +#: bookwyrm/templates/book/edit/edit_book_form.html:336 +msgid "Inventaire ID:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:97 +msgid "Librarything key:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:104 +#: bookwyrm/templates/book/edit/edit_book_form.html:345 +msgid "Goodreads key:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:111 +msgid "ISFDB:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:118 +msgid "ISNI:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:128 +#: bookwyrm/templates/book/book.html:249 +#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/file_links/add_link_modal.html:60 +#: bookwyrm/templates/book/file_links/edit_links.html:86 +#: bookwyrm/templates/groups/form.html:32 +#: bookwyrm/templates/lists/bookmark_button.html:15 +#: bookwyrm/templates/lists/edit_item_form.html:15 +#: bookwyrm/templates/lists/form.html:130 +#: bookwyrm/templates/preferences/edit_user.html:146 +#: bookwyrm/templates/readthrough/readthrough_modal.html:81 +#: bookwyrm/templates/settings/announcements/edit_announcement.html:120 +#: bookwyrm/templates/settings/federation/edit_instance.html:98 +#: bookwyrm/templates/settings/federation/instance.html:105 +#: bookwyrm/templates/settings/registration.html:96 +#: bookwyrm/templates/settings/registration_limited.html:76 +#: bookwyrm/templates/settings/site.html:144 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:89 +#: bookwyrm/templates/shelf/form.html:25 +#: bookwyrm/templates/snippets/reading_modals/layout.html:18 +msgid "Save" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:129 +#: bookwyrm/templates/author/sync_modal.html:23 +#: bookwyrm/templates/book/book.html:250 +#: bookwyrm/templates/book/cover_add_modal.html:33 +#: bookwyrm/templates/book/edit/edit_book.html:152 +#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/file_links/add_link_modal.html:59 +#: bookwyrm/templates/book/file_links/verification_modal.html:26 +#: bookwyrm/templates/book/sync_modal.html:23 +#: bookwyrm/templates/groups/delete_group_modal.html:15 +#: bookwyrm/templates/lists/add_item_modal.html:36 +#: bookwyrm/templates/lists/delete_list_modal.html:16 +#: bookwyrm/templates/preferences/disable-2fa.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 +#: bookwyrm/templates/readthrough/readthrough_modal.html:80 +#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/settings/federation/instance.html:106 +#: bookwyrm/templates/settings/files.html:193 +#: bookwyrm/templates/settings/files.html:354 +#: bookwyrm/templates/settings/imports/complete_import_modal.html:16 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 +#: bookwyrm/templates/snippets/report_modal.html:52 +msgid "Cancel" +msgstr "" + +#: bookwyrm/templates/author/sync_modal.html:15 +#, python-format +msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." +msgstr "" + +#: bookwyrm/templates/author/sync_modal.html:24 +#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/sync_modal.html:24 +#: bookwyrm/templates/groups/members.html:29 +#: bookwyrm/templates/landing/force_password_reset.html:94 +#: bookwyrm/templates/landing/password_reset.html:52 +#: bookwyrm/templates/preferences/security.html:80 +#: bookwyrm/templates/settings/imports/complete_import_modal.html:19 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19 +#: bookwyrm/templates/settings/users/force_password_reset.html:55 +#: bookwyrm/templates/snippets/remove_from_group_button.html:17 +msgid "Confirm" +msgstr "" + +#: bookwyrm/templates/book/book.html:24 +msgid "Unable to connect to remote source." +msgstr "" + +#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +msgid "Edit Book" +msgstr "" + +#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +msgid "Click to add cover" +msgstr "" + +#: bookwyrm/templates/book/book.html:116 +msgid "Failed to load cover" +msgstr "" + +#: bookwyrm/templates/book/book.html:127 +msgid "Click to enlarge" +msgstr "" + +#: bookwyrm/templates/book/book.html:190 +msgid "View on Finna" +msgstr "" + +#: bookwyrm/templates/book/book.html:222 +#, python-format +msgid "(%(review_count)s review)" +msgid_plural "(%(review_count)s reviews)" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/book/book.html:238 +msgid "Add Description" +msgstr "" + +#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/edit/edit_book_form.html:55 +#: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 +msgid "Description:" +msgstr "" + +#: bookwyrm/templates/book/book.html:261 +#, python-format +msgid "%(count)s edition" +msgid_plural "%(count)s editions" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/book/book.html:275 +msgid "You have shelved this edition in:" +msgstr "" + +#: bookwyrm/templates/book/book.html:290 +#, python-format +msgid "A different edition of this book is on your %(shelf_name)s shelf." +msgstr "" + +#: bookwyrm/templates/book/book.html:301 +msgid "Your reading activity" +msgstr "" + +#: bookwyrm/templates/book/book.html:307 +#: bookwyrm/templates/guided_tour/book.html:56 +msgid "Add read dates" +msgstr "" + +#: bookwyrm/templates/book/book.html:315 +msgid "You don't have any reading activity for this book." +msgstr "" + +#: bookwyrm/templates/book/book.html:341 +msgid "Your reviews" +msgstr "" + +#: bookwyrm/templates/book/book.html:347 +msgid "Your comments" +msgstr "" + +#: bookwyrm/templates/book/book.html:353 +msgid "Your quotes" +msgstr "" + +#: bookwyrm/templates/book/book.html:389 +msgid "Subjects" +msgstr "" + +#: bookwyrm/templates/book/book.html:401 +msgid "Places" +msgstr "" + +#: bookwyrm/templates/book/book.html:412 +#: bookwyrm/templates/groups/group.html:19 +#: bookwyrm/templates/guided_tour/lists.html:14 +#: bookwyrm/templates/guided_tour/user_books.html:102 +#: bookwyrm/templates/guided_tour/user_profile.html:78 +#: bookwyrm/templates/layout.html:88 bookwyrm/templates/lists/curate.html:8 +#: bookwyrm/templates/lists/list.html:12 bookwyrm/templates/lists/lists.html:5 +#: bookwyrm/templates/lists/lists.html:12 +#: bookwyrm/templates/search/layout.html:27 +#: bookwyrm/templates/search/layout.html:55 +#: bookwyrm/templates/settings/celery.html:77 +#: bookwyrm/templates/user/layout.html:101 bookwyrm/templates/user/lists.html:6 +msgid "Lists" +msgstr "" + +#: bookwyrm/templates/book/book.html:424 +msgid "Add to list" +msgstr "" + +#: bookwyrm/templates/book/book.html:434 +#: bookwyrm/templates/book/cover_add_modal.html:32 +#: bookwyrm/templates/lists/add_item_modal.html:39 +#: bookwyrm/templates/lists/list.html:255 +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 +msgid "Add" +msgstr "" + +#: bookwyrm/templates/book/book_identifiers.html:8 +msgid "ISBN:" +msgstr "" + +#: bookwyrm/templates/book/book_identifiers.html:12 +#: bookwyrm/templates/book/book_identifiers.html:13 +msgid "Copy ISBN" +msgstr "" + +#: bookwyrm/templates/book/book_identifiers.html:16 +msgid "Copied ISBN!" +msgstr "" + +#: bookwyrm/templates/book/book_identifiers.html:23 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/rss/edition.html:6 +msgid "OCLC Number:" +msgstr "" + +#: bookwyrm/templates/book/book_identifiers.html:30 +#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/rss/edition.html:7 +msgid "ASIN:" +msgstr "" + +#: bookwyrm/templates/book/book_identifiers.html:37 +#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/rss/edition.html:8 +msgid "Audible ASIN:" +msgstr "" + +#: bookwyrm/templates/book/book_identifiers.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/rss/edition.html:9 +msgid "ISFDB ID:" +msgstr "" + +#: bookwyrm/templates/book/book_identifiers.html:51 +#: bookwyrm/templates/rss/edition.html:10 +msgid "Goodreads:" +msgstr "" + +#: bookwyrm/templates/book/book_identifiers.html:58 +#: bookwyrm/templates/book/edit/edit_book_form.html:390 +msgid "Finna ID:" +msgstr "" + +#: bookwyrm/templates/book/cover_add_modal.html:5 +msgid "Add cover" +msgstr "" + +#: bookwyrm/templates/book/cover_add_modal.html:17 +#: bookwyrm/templates/book/edit/edit_book_form.html:246 +msgid "Upload cover:" +msgstr "" + +#: bookwyrm/templates/book/cover_add_modal.html:23 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 +msgid "Load cover from URL:" +msgstr "" + +#: bookwyrm/templates/book/cover_show_modal.html:6 +msgid "Book cover preview" +msgstr "" + +#: bookwyrm/templates/book/cover_show_modal.html:11 +#: bookwyrm/templates/components/inline_form.html:8 +#: bookwyrm/templates/components/modal.html:13 +#: bookwyrm/templates/components/modal.html:30 +#: bookwyrm/templates/feed/suggested_books.html:67 +#: bookwyrm/templates/get_started/layout.html:27 +#: bookwyrm/templates/get_started/layout.html:60 +msgid "Close" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:8 +#: bookwyrm/templates/book/edit/edit_book.html:18 +#, python-format +msgid "Edit \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:10 +#: bookwyrm/templates/book/edit/edit_book.html:20 +msgid "Add Book" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:43 +msgid "Failed to save book, see errors below for more information." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:70 +msgid "Confirm Book Info" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:78 +#, python-format +msgid "Is \"%(name)s\" one of these authors?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:89 +#, python-format +msgid "Author of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:93 +#, python-format +msgid "Author of %(alt_title)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:95 +msgid "Find more information at isni.org" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:105 +msgid "This is a new author" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:115 +#, python-format +msgid "Creating a new author: %(name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:122 +msgid "Is this an edition of an existing work?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:130 +msgid "This is a new work" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/feed/status.html:17 +#: bookwyrm/templates/guided_tour/book.html:44 +#: bookwyrm/templates/guided_tour/book.html:68 +#: bookwyrm/templates/guided_tour/book.html:91 +#: bookwyrm/templates/guided_tour/book.html:116 +#: bookwyrm/templates/guided_tour/book.html:140 +#: bookwyrm/templates/guided_tour/book.html:164 +#: bookwyrm/templates/guided_tour/book.html:188 +#: bookwyrm/templates/guided_tour/book.html:213 +#: bookwyrm/templates/guided_tour/book.html:237 +#: bookwyrm/templates/guided_tour/book.html:262 +#: bookwyrm/templates/guided_tour/book.html:290 +#: bookwyrm/templates/guided_tour/group.html:43 +#: bookwyrm/templates/guided_tour/group.html:66 +#: bookwyrm/templates/guided_tour/group.html:89 +#: bookwyrm/templates/guided_tour/group.html:108 +#: bookwyrm/templates/guided_tour/home.html:91 +#: bookwyrm/templates/guided_tour/home.html:115 +#: bookwyrm/templates/guided_tour/home.html:140 +#: bookwyrm/templates/guided_tour/home.html:165 +#: bookwyrm/templates/guided_tour/home.html:189 +#: bookwyrm/templates/guided_tour/home.html:212 +#: bookwyrm/templates/guided_tour/lists.html:47 +#: bookwyrm/templates/guided_tour/lists.html:70 +#: bookwyrm/templates/guided_tour/lists.html:94 +#: bookwyrm/templates/guided_tour/lists.html:117 +#: bookwyrm/templates/guided_tour/lists.html:136 +#: bookwyrm/templates/guided_tour/search.html:83 +#: bookwyrm/templates/guided_tour/search.html:110 +#: bookwyrm/templates/guided_tour/search.html:134 +#: bookwyrm/templates/guided_tour/search.html:155 +#: bookwyrm/templates/guided_tour/user_books.html:44 +#: bookwyrm/templates/guided_tour/user_books.html:67 +#: bookwyrm/templates/guided_tour/user_books.html:90 +#: bookwyrm/templates/guided_tour/user_books.html:118 +#: bookwyrm/templates/guided_tour/user_groups.html:44 +#: bookwyrm/templates/guided_tour/user_groups.html:67 +#: bookwyrm/templates/guided_tour/user_groups.html:91 +#: bookwyrm/templates/guided_tour/user_groups.html:110 +#: bookwyrm/templates/guided_tour/user_profile.html:43 +#: bookwyrm/templates/guided_tour/user_profile.html:66 +#: bookwyrm/templates/guided_tour/user_profile.html:89 +#: bookwyrm/templates/guided_tour/user_profile.html:112 +#: bookwyrm/templates/guided_tour/user_profile.html:135 +#: bookwyrm/templates/user/user.html:93 bookwyrm/templates/user_menu.html:18 +msgid "Back" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:26 +#: bookwyrm/templates/snippets/create_status/review.html:15 +msgid "Title:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:36 +msgid "Sort Title:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:46 +msgid "Subtitle:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:66 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:76 +msgid "Series number:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:87 +msgid "Languages:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:99 +msgid "Subjects:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:103 +msgid "Add subject" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:121 +msgid "Remove subject" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:144 +msgid "Add Another Subject" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:152 +msgid "Publication" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:157 +msgid "Publisher:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:169 +msgid "First published date:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:177 +msgid "Published date:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/import/user_import_status.html:155 +#: bookwyrm/templates/search/layout.html:23 +#: bookwyrm/templates/search/layout.html:47 +msgid "Authors" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#, python-format +msgid "Remove %(name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#, python-format +msgid "Author page for %(name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:210 +msgid "Add Authors:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:213 +#: bookwyrm/templates/book/edit/edit_book_form.html:216 +msgid "Add Author" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:214 +#: bookwyrm/templates/book/edit/edit_book_form.html:217 +msgid "Jane Doe" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:223 +msgid "Add Another Author" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/shelf/shelf.html:155 +msgid "Cover" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:265 +msgid "Physical Properties" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/editions/format_filter.html:6 +msgid "Format:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:282 +msgid "Format details:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:293 +msgid "Pages:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:304 +msgid "Book Identifiers" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/rss/edition.html:5 +msgid "ISBN 13:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:318 +msgid "ISBN 10:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:327 +msgid "Openlibrary ID:" +msgstr "" + +#: bookwyrm/templates/book/editions/editions.html:4 +#, python-format +msgid "Editions of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/book/editions/editions.html:8 +#, python-format +msgid "Editions of %(work_title)s" +msgstr "" + +#: bookwyrm/templates/book/editions/editions.html:55 +msgid "Can't find the edition you're looking for?" +msgstr "" + +#: bookwyrm/templates/book/editions/editions.html:76 +msgid "Add another edition" +msgstr "" + +#: bookwyrm/templates/book/editions/format_filter.html:9 +#: bookwyrm/templates/book/editions/language_filter.html:9 +msgid "Any" +msgstr "" + +#: bookwyrm/templates/book/editions/language_filter.html:6 +#: bookwyrm/templates/preferences/edit_user.html:101 +msgid "Language:" +msgstr "" + +#: bookwyrm/templates/book/editions/search_filter.html:6 +msgid "Search editions" +msgstr "" + +#: bookwyrm/templates/book/file_links/add_link_modal.html:6 +msgid "Add file link" +msgstr "" + +#: bookwyrm/templates/book/file_links/add_link_modal.html:19 +msgid "Links from unknown domains will need to be approved by a moderator before they are added." +msgstr "" + +#: bookwyrm/templates/book/file_links/add_link_modal.html:24 +msgid "URL:" +msgstr "" + +#: bookwyrm/templates/book/file_links/add_link_modal.html:29 +msgid "File type:" +msgstr "" + +#: bookwyrm/templates/book/file_links/add_link_modal.html:48 +msgid "Availability:" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:5 +#: bookwyrm/templates/book/file_links/edit_links.html:21 +#: bookwyrm/templates/book/file_links/links.html:53 +msgid "Edit links" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:11 +#, python-format +msgid "Links for \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:32 +#: bookwyrm/templates/settings/link_domains/link_table.html:6 +msgid "URL" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:33 +#: bookwyrm/templates/settings/link_domains/link_table.html:7 +msgid "Added by" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:34 +#: bookwyrm/templates/settings/link_domains/link_table.html:8 +msgid "Filetype" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:35 +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:25 +#: bookwyrm/templates/settings/reports/report_links_table.html:5 +msgid "Domain" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:36 +#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import_status.html:134 +#: bookwyrm/templates/import/import_user.html:192 +#: bookwyrm/templates/import/user_import_status.html:162 +#: bookwyrm/templates/import/user_troubleshoot.html:62 +#: bookwyrm/templates/preferences/export-user.html:113 +#: bookwyrm/templates/settings/announcements/announcements.html:37 +#: bookwyrm/templates/settings/files.html:137 +#: bookwyrm/templates/settings/files.html:319 +#: bookwyrm/templates/settings/imports/imports.html:304 +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:48 +#: bookwyrm/templates/settings/invites/status_filter.html:5 +#: bookwyrm/templates/settings/themes.html:111 +#: bookwyrm/templates/settings/users/user_admin.html:56 +#: bookwyrm/templates/settings/users/user_info.html:35 +msgid "Status" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:37 +#: bookwyrm/templates/settings/announcements/announcements.html:41 +#: bookwyrm/templates/settings/federation/instance.html:112 +#: bookwyrm/templates/settings/imports/imports.html:223 +#: bookwyrm/templates/settings/imports/imports.html:302 +#: bookwyrm/templates/settings/reports/report_links_table.html:6 +#: bookwyrm/templates/settings/themes.html:108 +msgid "Actions" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:48 +#: bookwyrm/templates/settings/link_domains/link_table.html:21 +msgid "Unknown user" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:57 +#: bookwyrm/templates/book/file_links/verification_modal.html:22 +msgid "Report spam" +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:102 +msgid "No links available for this book." +msgstr "" + +#: bookwyrm/templates/book/file_links/edit_links.html:113 +#: bookwyrm/templates/book/file_links/links.html:18 +msgid "Add link to file" +msgstr "" + +#: bookwyrm/templates/book/file_links/file_link_page.html:6 +msgid "File Links" +msgstr "" + +#: bookwyrm/templates/book/file_links/links.html:9 +msgid "Get a copy" +msgstr "" + +#: bookwyrm/templates/book/file_links/links.html:47 +msgid "No links available" +msgstr "" + +#: bookwyrm/templates/book/file_links/verification_modal.html:5 +msgid "Leaving BookWyrm" +msgstr "" + +#: bookwyrm/templates/book/file_links/verification_modal.html:11 +#, python-format +msgid "This link is taking you to: %(link_url)s.
    Is that where you'd like to go?" +msgstr "" + +#: bookwyrm/templates/book/file_links/verification_modal.html:27 +#: bookwyrm/templates/setup/config.html:134 +msgid "Continue" +msgstr "" + +#: bookwyrm/templates/book/publisher_info.html:23 +#, python-format +msgid "%(format)s, %(pages)s pages" +msgstr "" + +#: bookwyrm/templates/book/publisher_info.html:25 +#, python-format +msgid "%(pages)s pages" +msgstr "" + +#: bookwyrm/templates/book/publisher_info.html:38 +#, python-format +msgid "%(languages)s language" +msgstr "" + +#: bookwyrm/templates/book/publisher_info.html:63 +#, python-format +msgid "Published %(date)s by %(publisher)s." +msgstr "" + +#: bookwyrm/templates/book/publisher_info.html:65 +#, python-format +msgid "Published by %(publisher)s." +msgstr "" + +#: bookwyrm/templates/book/publisher_info.html:67 +#, python-format +msgid "Published %(date)s" +msgstr "" + +#: bookwyrm/templates/book/rating.html:19 +msgid "rated it" +msgstr "" + +#: bookwyrm/templates/book/series.html:11 +msgid "Series by" +msgstr "" + +#: bookwyrm/templates/book/series.html:28 +#, python-format +msgid "Book %(series_number)s" +msgstr "" + +#: bookwyrm/templates/book/series.html:28 +msgid "Unsorted Book" +msgstr "" + +#: bookwyrm/templates/book/sync_modal.html:15 +#, python-format +msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." +msgstr "" + +#: bookwyrm/templates/compose.html:7 bookwyrm/templates/compose.html:21 +msgid "Edit review" +msgstr "" + +#: bookwyrm/templates/compose.html:9 bookwyrm/templates/compose.html:23 +msgid "Edit quote" +msgstr "" + +#: bookwyrm/templates/compose.html:11 bookwyrm/templates/compose.html:25 +msgid "Edit comment" +msgstr "" + +#: bookwyrm/templates/compose.html:13 bookwyrm/templates/compose.html:27 +msgid "Edit status" +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:4 +msgid "Confirm email" +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:7 +msgid "Confirm your email address" +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:13 +msgid "A confirmation code has been sent to the email address you used to register your account." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:15 +msgid "Sorry! We couldn't find that code." +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/settings/users/user_info.html:92 +msgid "Confirmation code:" +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:25 +#: bookwyrm/templates/landing/layout.html:81 +#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/snippets/report_modal.html:53 +msgid "Submit" +msgstr "" + +#: bookwyrm/templates/confirm_email/confirm_email.html:38 +msgid "Can't find your code?" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend.html:5 +#: bookwyrm/templates/confirm_email/resend_modal.html:5 +msgid "Resend confirmation link" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_modal.html:15 +#: bookwyrm/templates/landing/layout.html:68 +#: bookwyrm/templates/landing/password_reset_request.html:24 +#: bookwyrm/templates/preferences/edit_user.html:53 +#: bookwyrm/templates/snippets/register_form.html:27 +msgid "Email address:" +msgstr "" + +#: bookwyrm/templates/confirm_email/resend_modal.html:30 +msgid "Resend link" +msgstr "" + +#: bookwyrm/templates/directory/community_filter.html:5 +msgid "Community" +msgstr "" + +#: bookwyrm/templates/directory/community_filter.html:8 +#: bookwyrm/templates/settings/users/user_admin.html:25 +msgid "Local users" +msgstr "" + +#: bookwyrm/templates/directory/community_filter.html:12 +#: bookwyrm/templates/settings/users/user_admin.html:33 +msgid "Federated community" +msgstr "" + +#: bookwyrm/templates/directory/directory.html:4 +#: bookwyrm/templates/directory/directory.html:9 +#: bookwyrm/templates/user_menu.html:34 +msgid "Directory" +msgstr "" + +#: bookwyrm/templates/directory/directory.html:17 +msgid "Make your profile discoverable to other BookWyrm users." +msgstr "" + +#: bookwyrm/templates/directory/directory.html:21 +msgid "Join Directory" +msgstr "" + +#: bookwyrm/templates/directory/directory.html:24 +#, python-format +msgid "You can opt-out at any time in your profile settings." +msgstr "" + +#: bookwyrm/templates/directory/directory.html:29 +#: bookwyrm/templates/directory/directory.html:31 +#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/summary_card.html:12 +#: bookwyrm/templates/feed/summary_card.html:14 +#: bookwyrm/templates/snippets/announcement.html:31 +msgid "Dismiss message" +msgstr "" + +#: bookwyrm/templates/directory/sort_filter.html:5 +msgid "Order by" +msgstr "" + +#: bookwyrm/templates/directory/sort_filter.html:9 +msgid "Recently active" +msgstr "" + +#: bookwyrm/templates/directory/sort_filter.html:10 +msgid "Suggested" +msgstr "" + +#: bookwyrm/templates/directory/user_card.html:17 +#: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:23 +#: bookwyrm/templates/ostatus/remote_follow.html:24 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:21 +#: bookwyrm/templates/ostatus/success.html:22 +#: bookwyrm/templates/user/moved.html:19 bookwyrm/templates/user/moved.html:20 +#: bookwyrm/templates/user/user_preview.html:16 +#: bookwyrm/templates/user/user_preview.html:17 +msgid "Locked account" +msgstr "" + +#: bookwyrm/templates/directory/user_card.html:40 +msgid "follower you follow" +msgid_plural "followers you follow" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/directory/user_card.html:47 +msgid "book on your shelves" +msgid_plural "books on your shelves" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/directory/user_card.html:55 +msgid "posts" +msgstr "" + +#: bookwyrm/templates/directory/user_card.html:61 +msgid "last active" +msgstr "" + +#: bookwyrm/templates/directory/user_type_filter.html:5 +msgid "User type" +msgstr "" + +#: bookwyrm/templates/directory/user_type_filter.html:8 +msgid "BookWyrm users" +msgstr "" + +#: bookwyrm/templates/directory/user_type_filter.html:12 +msgid "All known users" +msgstr "" + +#: bookwyrm/templates/discover/card-header.html:8 +#, python-format +msgid "%(username)s wants to read %(book_title)s" +msgstr "" + +#: bookwyrm/templates/discover/card-header.html:13 +#, python-format +msgid "%(username)s finished reading %(book_title)s" +msgstr "" + +#: bookwyrm/templates/discover/card-header.html:18 +#, python-format +msgid "%(username)s started reading %(book_title)s" +msgstr "" + +#: bookwyrm/templates/discover/card-header.html:23 +#, python-format +msgid "%(username)s rated %(book_title)s" +msgstr "" + +#: bookwyrm/templates/discover/card-header.html:27 +#, python-format +msgid "%(username)s reviewed %(book_title)s" +msgstr "" + +#: bookwyrm/templates/discover/card-header.html:31 +#, python-format +msgid "%(username)s commented on %(book_title)s" +msgstr "" + +#: bookwyrm/templates/discover/card-header.html:35 +#, python-format +msgid "%(username)s quoted %(book_title)s" +msgstr "" + +#: bookwyrm/templates/discover/discover.html:4 +#: bookwyrm/templates/discover/discover.html:10 +#: bookwyrm/templates/layout.html:91 +msgid "Discover" +msgstr "" + +#: bookwyrm/templates/discover/discover.html:12 +#, python-format +msgid "See what's new in the local %(site_name)s community" +msgstr "" + +#: bookwyrm/templates/discover/large-book.html:52 +#: bookwyrm/templates/discover/small-book.html:36 +msgid "View status" +msgstr "" + +#: bookwyrm/templates/email/confirm/html_content.html:6 +#: bookwyrm/templates/email/confirm/text_content.html:4 +#, python-format +msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:" +msgstr "" + +#: bookwyrm/templates/email/confirm/html_content.html:11 +msgid "Confirm Email" +msgstr "" + +#: bookwyrm/templates/email/confirm/html_content.html:15 +#, python-format +msgid "Or enter the code \"%(confirmation_code)s\" at login." +msgstr "" + +#: bookwyrm/templates/email/confirm/subject.html:2 +msgid "Please confirm your email" +msgstr "" + +#: bookwyrm/templates/email/confirm/text_content.html:10 +#, python-format +msgid "Or enter the code \"%(confirmation_code)s\" at login." +msgstr "" + +#: bookwyrm/templates/email/html_layout.html:15 +#: bookwyrm/templates/email/text_layout.html:2 +msgid "Hi there," +msgstr "" + +#: bookwyrm/templates/email/html_layout.html:21 +#, python-format +msgid "BookWyrm hosted on %(site_name)s" +msgstr "" + +#: bookwyrm/templates/email/html_layout.html:23 +msgid "Email preference" +msgstr "" + +#: bookwyrm/templates/email/invite/html_content.html:6 +#: bookwyrm/templates/email/invite/subject.html:2 +#, python-format +msgid "You're invited to join %(site_name)s!" +msgstr "" + +#: bookwyrm/templates/email/invite/html_content.html:9 +msgid "Join Now" +msgstr "" + +#: bookwyrm/templates/email/invite/html_content.html:15 +#, python-format +msgid "Learn more about %(site_name)s." +msgstr "" + +#: bookwyrm/templates/email/invite/text_content.html:4 +#, python-format +msgid "You're invited to join %(site_name)s! Click the link below to create an account." +msgstr "" + +#: bookwyrm/templates/email/invite/text_content.html:8 +#, python-format +msgid "Learn more about %(site_name)s:" +msgstr "" + +#: bookwyrm/templates/email/moderation_report/html_content.html:8 +#: bookwyrm/templates/email/moderation_report/text_content.html:6 +#, python-format +msgid "@%(reporter)s has flagged a link domain for moderation." +msgstr "" + +#: bookwyrm/templates/email/moderation_report/html_content.html:14 +#: bookwyrm/templates/email/moderation_report/text_content.html:10 +#, python-format +msgid "@%(reporter)s has flagged behavior by @%(reportee)s for moderation." +msgstr "" + +#: bookwyrm/templates/email/moderation_report/html_content.html:21 +#: bookwyrm/templates/email/moderation_report/text_content.html:15 +msgid "View report" +msgstr "" + +#: bookwyrm/templates/email/moderation_report/subject.html:2 +#, python-format +msgid "New report for %(site_name)s" +msgstr "" + +#: bookwyrm/templates/email/password_reset/html_content.html:6 +#: bookwyrm/templates/email/password_reset/text_content.html:4 +#, python-format +msgid "You requested to reset your %(site_name)s password. Click the link below to set a new password and log in to your account." +msgstr "" + +#: bookwyrm/templates/email/password_reset/html_content.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:9 +#: bookwyrm/templates/landing/force_password_reset.html:28 +#: bookwyrm/templates/landing/password_reset.html:4 +#: bookwyrm/templates/landing/password_reset.html:10 +#: bookwyrm/templates/landing/password_reset_request.html:4 +#: bookwyrm/templates/landing/password_reset_request.html:10 +msgid "Reset Password" +msgstr "" + +#: bookwyrm/templates/email/password_reset/html_content.html:13 +#: bookwyrm/templates/email/password_reset/text_content.html:8 +msgid "If you didn't request to reset your password, you can ignore this email." +msgstr "" + +#: bookwyrm/templates/email/password_reset/subject.html:2 +#, python-format +msgid "Reset your %(site_name)s password" +msgstr "" + +#: bookwyrm/templates/email/test/html_content.html:6 +#: bookwyrm/templates/email/test/text_content.html:4 +msgid "This is a test email." +msgstr "" + +#: bookwyrm/templates/email/test/subject.html:2 +msgid "Test email" +msgstr "" + +#: bookwyrm/templates/embed-layout.html:21 +#: bookwyrm/templates/landing/force_password_reset.html:18 +#: bookwyrm/templates/layout.html:33 bookwyrm/templates/layout.html:163 +#: bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 +#: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 +#, python-format +msgid "%(site_name)s home page" +msgstr "" + +#: bookwyrm/templates/embed-layout.html:40 +#: bookwyrm/templates/snippets/footer.html:12 +msgid "Contact site admin" +msgstr "" + +#: bookwyrm/templates/embed-layout.html:46 +msgid "Join BookWyrm" +msgstr "" + +#: bookwyrm/templates/feed/direct_messages.html:8 +#, python-format +msgid "Direct Messages with %(username)s" +msgstr "" + +#: bookwyrm/templates/feed/direct_messages.html:10 +#: bookwyrm/templates/user_menu.html:39 +msgid "Direct Messages" +msgstr "" + +#: bookwyrm/templates/feed/direct_messages.html:13 +msgid "All messages" +msgstr "" + +#: bookwyrm/templates/feed/direct_messages.html:22 +msgid "You have no messages right now." +msgstr "" + +#: bookwyrm/templates/feed/feed.html:55 +msgid "There aren't any activities right now! Try following a user to get started" +msgstr "" + +#: bookwyrm/templates/feed/feed.html:56 +msgid "Alternatively, you can try enabling more status types" +msgstr "" + +#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/layout.html:14 +#: bookwyrm/templates/user/goal_form.html:6 +#, python-format +msgid "%(year)s Reading Goal" +msgstr "" + +#: bookwyrm/templates/feed/goal_card.html:18 +#, python-format +msgid "You can set or change your reading goal any time from your profile page" +msgstr "" + +#: bookwyrm/templates/feed/layout.html:4 +msgid "Updates" +msgstr "" + +#: bookwyrm/templates/feed/suggested_books.html:6 +#: bookwyrm/templates/guided_tour/home.html:127 +#: bookwyrm/templates/layout.html:94 +msgid "Your Books" +msgstr "" + +#: bookwyrm/templates/feed/suggested_books.html:10 +msgid "There are no books here right now! Try searching for a book to get started" +msgstr "" + +#: bookwyrm/templates/feed/suggested_books.html:13 +msgid "Do you have book data from another service like GoodReads?" +msgstr "" + +#: bookwyrm/templates/feed/suggested_books.html:16 +msgid "Import your reading history" +msgstr "" + +#: bookwyrm/templates/feed/suggested_users.html:5 +#: bookwyrm/templates/get_started/users.html:6 +msgid "Who to follow" +msgstr "" + +#: bookwyrm/templates/feed/suggested_users.html:9 +msgid "Don't show suggested users" +msgstr "" + +#: bookwyrm/templates/feed/suggested_users.html:14 +msgid "View directory" +msgstr "" + +#: bookwyrm/templates/feed/summary_card.html:21 +msgid "The end of the year is the best moment to take stock of all the books read during the last 12 months. How many pages have you read? Which book is your best-rated of the year? We compiled these stats, and more!" +msgstr "" + +#: bookwyrm/templates/feed/summary_card.html:26 +#, python-format +msgid "Discover your stats for %(year)s!" +msgstr "" + +#: bookwyrm/templates/get_started/book_preview.html:6 +#, python-format +msgid "Have you read %(book_title)s?" +msgstr "" + +#: bookwyrm/templates/get_started/book_preview.html:7 +msgid "Add to your books" +msgstr "" + +#: bookwyrm/templates/get_started/book_preview.html:10 +#: bookwyrm/templates/shelf/shelf.html:93 bookwyrm/templates/user/user.html:37 +#: bookwyrm/templatetags/shelf_tags.py:14 +msgid "To Read" +msgstr "" + +#: bookwyrm/templates/get_started/book_preview.html:11 +#: bookwyrm/templates/shelf/shelf.html:94 bookwyrm/templates/user/user.html:38 +#: bookwyrm/templatetags/shelf_tags.py:15 +msgid "Currently Reading" +msgstr "" + +#: bookwyrm/templates/get_started/book_preview.html:12 +#: bookwyrm/templates/shelf/shelf.html:95 +#: bookwyrm/templates/snippets/shelf_selector.html:46 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:24 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 +#: bookwyrm/templates/user/user.html:39 bookwyrm/templatetags/shelf_tags.py:16 +msgid "Read" +msgstr "" + +#: bookwyrm/templates/get_started/book_preview.html:13 +#: bookwyrm/templates/shelf/shelf.html:96 bookwyrm/templates/user/user.html:40 +#: bookwyrm/templatetags/shelf_tags.py:17 +msgid "Stopped Reading" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:6 +msgid "What are you reading?" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:9 +#: bookwyrm/templates/layout.html:41 bookwyrm/templates/lists/list.html:213 +msgid "Search for a book" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:11 +#, 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/groups/members.html:15 +#: bookwyrm/templates/groups/members.html:16 bookwyrm/templates/layout.html:47 +#: bookwyrm/templates/layout.html:48 bookwyrm/templates/lists/list.html:217 +#: bookwyrm/templates/search/layout.html:5 +#: bookwyrm/templates/search/layout.html:10 +#: bookwyrm/templates/search/layout.html:33 +msgid "Search" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:27 +msgid "Suggested Books" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:33 +msgid "Search results" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:46 +#, python-format +msgid "Popular on %(site_name)s" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:58 +#: bookwyrm/templates/lists/list.html:230 +msgid "No books found" +msgstr "" + +#: bookwyrm/templates/get_started/books.html:63 +#: bookwyrm/templates/get_started/profile.html:64 +msgid "Save & continue" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:5 +#: bookwyrm/templates/landing/layout.html:5 +msgid "Welcome" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:24 +msgid "These are some first steps to get you started." +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:38 +#: bookwyrm/templates/get_started/profile.html:6 +msgid "Create your profile" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:42 +msgid "Add books" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:46 +msgid "Find friends" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:52 +msgid "Skip this step" +msgstr "" + +#: bookwyrm/templates/get_started/layout.html:56 +#: bookwyrm/templates/guided_tour/group.html:101 +msgid "Finish" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:15 +#: bookwyrm/templates/preferences/edit_user.html:41 +msgid "Display name:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:29 +#: bookwyrm/templates/preferences/edit_user.html:47 +#: bookwyrm/templates/settings/announcements/edit_announcement.html:49 +msgid "Summary:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:34 +msgid "A little bit about you" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:43 +#: bookwyrm/templates/preferences/edit_user.html:27 +msgid "Avatar:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:52 +msgid "Manually approve followers:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:58 +msgid "Show this account in suggested users:" +msgstr "" + +#: bookwyrm/templates/get_started/profile.html:62 +msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." +msgstr "" + +#: bookwyrm/templates/get_started/users.html:8 +msgid "You can follow users on other BookWyrm instances and federated services like Mastodon." +msgstr "" + +#: bookwyrm/templates/get_started/users.html:11 +msgid "Search for a user" +msgstr "" + +#: bookwyrm/templates/get_started/users.html:13 +#, python-format +msgid "No users found for \"%(query)s\"" +msgstr "" + +#: bookwyrm/templates/groups/create_form.html:5 +#: bookwyrm/templates/guided_tour/user_groups.html:32 +#: bookwyrm/templates/user/groups.html:22 +msgid "Create group" +msgstr "" + +#: bookwyrm/templates/groups/created_text.html:4 +#, python-format +msgid "Managed by %(username)s" +msgstr "" + +#: bookwyrm/templates/groups/delete_group_modal.html:4 +msgid "Delete this group?" +msgstr "" + +#: bookwyrm/templates/groups/delete_group_modal.html:7 +#: bookwyrm/templates/lists/delete_list_modal.html:7 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:12 +#: bookwyrm/templates/settings/imports/complete_import_modal.html:7 +msgid "This action cannot be un-done" +msgstr "" + +#: bookwyrm/templates/groups/delete_group_modal.html:17 +#: bookwyrm/templates/lists/delete_list_modal.html:19 +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:29 +#: bookwyrm/templates/settings/announcements/announcement.html:23 +#: bookwyrm/templates/settings/announcements/announcements.html:56 +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:49 +#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:36 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +#: bookwyrm/templates/snippets/join_invitation_buttons.html:14 +msgid "Delete" +msgstr "" + +#: bookwyrm/templates/groups/edit_form.html:5 +msgid "Edit Group" +msgstr "" + +#: bookwyrm/templates/groups/form.html:8 +msgid "Group Name:" +msgstr "" + +#: bookwyrm/templates/groups/form.html:12 +msgid "Group Description:" +msgstr "" + +#: bookwyrm/templates/groups/form.html:21 +msgid "Delete group" +msgstr "" + +#: bookwyrm/templates/groups/group.html:21 +msgid "Members of this group can create group-curated lists." +msgstr "" + +#: bookwyrm/templates/groups/group.html:26 +#: bookwyrm/templates/lists/create_form.html:5 +#: bookwyrm/templates/lists/lists.html:20 +msgid "Create List" +msgstr "" + +#: bookwyrm/templates/groups/group.html:39 +msgid "This group has no lists" +msgstr "" + +#: bookwyrm/templates/groups/layout.html:17 +msgid "Edit group" +msgstr "" + +#: bookwyrm/templates/groups/members.html:11 +msgid "Search to add a user" +msgstr "" + +#: bookwyrm/templates/groups/members.html:32 +msgid "Leave group" +msgstr "" + +#: bookwyrm/templates/groups/members.html:54 +#: bookwyrm/templates/groups/suggested_users.html:35 +#: bookwyrm/templates/snippets/suggested_users.html:31 +#: bookwyrm/templates/user/user_preview.html:39 +#: bookwyrm/templates/user/user_preview.html:47 +msgid "Follows you" +msgstr "" + +#: bookwyrm/templates/groups/suggested_users.html:7 +msgid "Add new members!" +msgstr "" + +#: bookwyrm/templates/groups/suggested_users.html:20 +#: bookwyrm/templates/snippets/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/groups/suggested_users.html:27 +#: bookwyrm/templates/snippets/suggested_users.html:23 +#, 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/groups/suggested_users.html:43 +#, python-format +msgid "No potential members found for \"%(user_query)s\"" +msgstr "" + +#: bookwyrm/templates/groups/user_groups.html:15 +msgid "Manager" +msgstr "" + +#: bookwyrm/templates/groups/user_groups.html:35 +msgid "No groups found." +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:10 +msgid "This is home page of a book. Let's see what you can do while you're here!" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:11 +msgid "Book page" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:19 +#: bookwyrm/templates/guided_tour/group.html:19 +#: bookwyrm/templates/guided_tour/lists.html:22 +#: bookwyrm/templates/guided_tour/search.html:29 +#: bookwyrm/templates/guided_tour/search.html:56 +#: bookwyrm/templates/guided_tour/user_books.html:19 +#: bookwyrm/templates/guided_tour/user_groups.html:19 +#: bookwyrm/templates/guided_tour/user_profile.html:19 +msgid "End Tour" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:26 +#: bookwyrm/templates/guided_tour/book.html:50 +#: bookwyrm/templates/guided_tour/book.html:74 +#: bookwyrm/templates/guided_tour/book.html:97 +#: bookwyrm/templates/guided_tour/book.html:122 +#: bookwyrm/templates/guided_tour/book.html:146 +#: bookwyrm/templates/guided_tour/book.html:170 +#: bookwyrm/templates/guided_tour/book.html:194 +#: bookwyrm/templates/guided_tour/book.html:219 +#: bookwyrm/templates/guided_tour/book.html:243 +#: bookwyrm/templates/guided_tour/book.html:268 +#: bookwyrm/templates/guided_tour/book.html:274 +#: bookwyrm/templates/guided_tour/group.html:26 +#: bookwyrm/templates/guided_tour/group.html:49 +#: bookwyrm/templates/guided_tour/group.html:72 +#: bookwyrm/templates/guided_tour/group.html:95 +#: bookwyrm/templates/guided_tour/home.html:74 +#: bookwyrm/templates/guided_tour/home.html:97 +#: bookwyrm/templates/guided_tour/home.html:121 +#: bookwyrm/templates/guided_tour/home.html:146 +#: bookwyrm/templates/guided_tour/home.html:171 +#: bookwyrm/templates/guided_tour/home.html:195 +#: bookwyrm/templates/guided_tour/lists.html:29 +#: bookwyrm/templates/guided_tour/lists.html:53 +#: bookwyrm/templates/guided_tour/lists.html:76 +#: bookwyrm/templates/guided_tour/lists.html:100 +#: bookwyrm/templates/guided_tour/lists.html:123 +#: bookwyrm/templates/guided_tour/search.html:36 +#: bookwyrm/templates/guided_tour/search.html:63 +#: bookwyrm/templates/guided_tour/search.html:89 +#: bookwyrm/templates/guided_tour/search.html:116 +#: bookwyrm/templates/guided_tour/search.html:140 +#: bookwyrm/templates/guided_tour/user_books.html:26 +#: bookwyrm/templates/guided_tour/user_books.html:50 +#: bookwyrm/templates/guided_tour/user_books.html:73 +#: bookwyrm/templates/guided_tour/user_books.html:96 +#: bookwyrm/templates/guided_tour/user_groups.html:26 +#: bookwyrm/templates/guided_tour/user_groups.html:50 +#: bookwyrm/templates/guided_tour/user_groups.html:73 +#: bookwyrm/templates/guided_tour/user_groups.html:97 +#: bookwyrm/templates/guided_tour/user_profile.html:26 +#: bookwyrm/templates/guided_tour/user_profile.html:49 +#: bookwyrm/templates/guided_tour/user_profile.html:72 +#: bookwyrm/templates/guided_tour/user_profile.html:95 +#: bookwyrm/templates/guided_tour/user_profile.html:118 +#: bookwyrm/templates/snippets/pagination.html:30 +msgid "Next" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:31 +msgid "This is where you can set a reading status for this book. You can press the button to move to the next stage, or use the drop down button to select the reading status you want to set." +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:32 +msgid "Reading status" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:55 +msgid "You can also manually add reading dates here. Unlike changing the reading status using the previous method, adding dates manually will not automatically add them to your Read or Reading shelves." +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:55 +msgid "Got a favourite you re-read every year? We've got you covered - you can add multiple read dates for the same book 😀" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:79 +msgid "There can be multiple editions of a book, in various formats or languages. You can choose which edition you want to use." +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:80 +msgid "Other editions" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:102 +msgid "You can post a review, comment, or quote here." +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:103 +msgid "Share your thoughts" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:127 +msgid "If you have read this book you can post a review including an optional star rating" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:128 +msgid "Post a review" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:151 +msgid "You can share your thoughts on this book generally with a simple comment" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:152 +msgid "Post a comment" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:175 +msgid "Just read some perfect prose? Let the world know by sharing a quote!" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:176 +msgid "Share a quote" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:199 +msgid "If your review or comment might ruin the book for someone who hasn't read it yet, you can hide your post behind a spoiler alert" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:200 +msgid "Spoiler alerts" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:224 +msgid "Choose who can see your post here. Post privacy can be Public (everyone can see), Unlisted (everyone can see, but it doesn't appear in public feeds or discovery pages), Followers (only your followers can see), or Private (only you can see)" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:225 +#: bookwyrm/templates/snippets/privacy_select.html:6 +#: bookwyrm/templates/snippets/privacy_select_no_followers.html:6 +msgid "Post privacy" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:248 +msgid "Some ebooks can be downloaded for free from external sources. They will be shown here." +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:249 +msgid "Download links" +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:273 +msgid "Continue the tour by selecting Your books from the drop down menu." +msgstr "" + +#: bookwyrm/templates/guided_tour/book.html:296 +#: bookwyrm/templates/guided_tour/home.html:50 +#: bookwyrm/templates/guided_tour/home.html:218 +#: bookwyrm/templates/guided_tour/search.html:161 +#: bookwyrm/templates/guided_tour/user_books.html:124 +#: bookwyrm/templates/guided_tour/user_groups.html:116 +#: bookwyrm/templates/guided_tour/user_profile.html:141 +msgid "Ok" +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:10 +msgid "Welcome to the page for your group! This is where you can add and remove users, create user-curated lists, and edit the group details." +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:11 +msgid "Your group" +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:31 +msgid "Use this search box to find users to join your group. Currently users must be members of the same Bookwyrm instance and be invited by the group owner." +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:32 +msgid "Find users" +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:54 +msgid "Your group members will appear here. The group owner is marked with a star symbol." +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:55 +msgid "Group members" +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:77 +msgid "As well as creating lists from the Lists page, you can create a group-curated list here on the group's homepage. Any member of the group can create a list curated by group members." +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:78 +msgid "Group lists" +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:100 +msgid "Congratulations, you've finished the tour! Now you know the basics, but there is lots more to explore on your own. Happy reading!" +msgstr "" + +#: bookwyrm/templates/guided_tour/group.html:115 +msgid "End tour" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:16 +msgid "Welcome to Bookwyrm!

    Would you like to take the guided tour to help you get started?" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:17 +#: bookwyrm/templates/guided_tour/home.html:39 +#: bookwyrm/templates/snippets/footer.html:20 +msgid "Guided Tour" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:25 +#: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:36 +msgid "No thanks" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:33 +msgid "Yes please!" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:38 +msgid "If you ever change your mind, just click on the Guided Tour link to start your tour" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:62 +msgid "Search for books, users, or lists using this search box." +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:63 +msgid "Search box" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:79 +msgid "Search book records by scanning an ISBN barcode using your device's camera - great when you're in the bookstore or library!" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:80 +msgid "Barcode reader" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:102 +msgid "Use the Lists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:103 +msgid "Navigation Bar" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:126 +msgid "Books on your reading status shelves will be shown here." +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:151 +msgid "Updates from people you are following will appear in your Home timeline.

    The Books tab shows activity from anyone, related to your books." +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:152 +msgid "Timelines" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:176 +msgid "The bell will light up when you have a new notification. When it does, click on it to find out what exciting thing has happened!" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:177 +#: bookwyrm/templates/layout.html:77 bookwyrm/templates/layout.html:107 +#: bookwyrm/templates/layout.html:108 +#: bookwyrm/templates/notifications/notifications_page.html:5 +#: bookwyrm/templates/notifications/notifications_page.html:10 +msgid "Notifications" +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:200 +msgid "Your profile, user directory, direct messages, and settings can be accessed by clicking on your name in the menu here." +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:200 +msgid "Try selecting Profile from the drop down menu to continue the tour." +msgstr "" + +#: bookwyrm/templates/guided_tour/home.html:201 +msgid "Profile and settings menu" +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:13 +msgid "This is the lists page where you can discover book lists created by any user. A List is a collection of books, similar to a shelf." +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:13 +msgid "Shelves are for organising books for yourself, whereas Lists are generally for sharing with others." +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:34 +msgid "Let's see how to create a new list." +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:34 +msgid "Click the Create List button, then Next to continue the tour" +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:35 +#: bookwyrm/templates/guided_tour/lists.html:59 +msgid "Creating a new list" +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:58 +msgid "You must give your list a name and can optionally give it a description to help other people understand what your list is about." +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:81 +msgid "Choose who can see your list here. List privacy options work just like we saw when posting book reviews. This is a common pattern throughout Bookwyrm." +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:82 +msgid "List privacy" +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:105 +msgid "You can also decide how your list is to be curated - only by you, by anyone, or by a group." +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:106 +msgid "List curation" +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:128 +msgid "Next in our tour we will explore Groups!" +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:129 +msgid "Next: Groups" +msgstr "" + +#: bookwyrm/templates/guided_tour/lists.html:143 +msgid "Take me there" +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:16 +msgid "If the book you are looking for is available on a remote catalogue such as Open Library, click on Import book." +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:17 +#: bookwyrm/templates/guided_tour/search.html:44 +msgid "Searching" +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:43 +msgid "If the book you are looking for is already on this Bookwyrm instance, you can click on the title to go to the book's page." +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:71 +msgid "If the book you are looking for is not listed, try loading more records from other sources like Open Library or Inventaire." +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:72 +msgid "Load more records" +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:98 +msgid "If your book is not in the results, try adjusting your search terms." +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:99 +msgid "Search again" +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:121 +msgid "If you still can't find your book, you can add a record manually." +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:122 +msgid "Add a record manually" +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:147 +msgid "Import, manually add, or view an existing book to continue the tour." +msgstr "" + +#: bookwyrm/templates/guided_tour/search.html:148 +msgid "Continue the tour" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:10 +msgid "This is the page where your books are listed, organised into shelves." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:11 +#: bookwyrm/templates/user/books_header.html:4 +msgid "Your books" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:31 +msgid "To Read, Currently Reading, Read, and Stopped Reading are default shelves. When you change the reading status of a book it will automatically be moved to the matching shelf. A book can only be on one default shelf at a time." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:32 +msgid "Reading status shelves" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:55 +msgid "You can create additional custom shelves to organise your books. A book on a custom shelf can be on any number of other shelves simultaneously, including one of the default reading status shelves" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:56 +msgid "Adding custom shelves." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:78 +msgid "If you have an export file from another service like Goodreads or LibraryThing, you can import it here." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:79 +msgid "Import from another service" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:101 +msgid "Now that we've explored book shelves, let's take a look at a related concept: book lists!" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_books.html:101 +msgid "Click on the Lists link here to continue the tour." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:10 +msgid "You can create or join a group with other users. Groups can share group-curated book lists, and in future will be able to do other things." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:11 +#: bookwyrm/templates/guided_tour/user_profile.html:55 +#: bookwyrm/templates/preferences/export-user.html:37 +#: bookwyrm/templates/user/groups.html:6 bookwyrm/templates/user/layout.html:95 +msgid "Groups" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:31 +msgid "Let's create a new group!" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:31 +msgid "Click the Create group button, then Next to continue the tour" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:55 +msgid "Give your group a name and describe what it is about. You can make user groups for any purpose - a reading group, a bunch of friends, whatever!" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:56 +msgid "Creating a group" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:78 +msgid "Groups have privacy settings just like posts and lists, except that group privacy cannot be Followers." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:79 +msgid "Group visibility" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:102 +msgid "Once you're happy with how everything is set up, click the Save button to create your new group." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:102 +msgid "Create and save a group to continue the tour." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_groups.html:103 +msgid "Save your group" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:10 +msgid "This is your user profile. All your latest activities will be listed here. Other Bookwyrm users can see parts of this page too - what they can see depends on your privacy settings." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:11 +#: bookwyrm/templates/user/layout.html:20 bookwyrm/templates/user/user.html:14 +msgid "User Profile" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:31 +msgid "This tab shows everything you have read towards your annual reading goal, or allows you to set one. You don't have to set a reading goal if that's not your thing!" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:32 +#: bookwyrm/templates/user/goal.html:6 bookwyrm/templates/user/layout.html:89 +msgid "Reading Goal" +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:54 +msgid "Here you can see your groups, or create a new one. A group brings together Bookwyrm users and allows them to curate lists together." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:77 +msgid "You can see your lists, or create a new one, here. A list is a collection of books that have something in common." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:100 +msgid "The Books tab shows your book shelves. We'll explore this later in the tour." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:123 +msgid "Now you understand the basics of your profile page, let's add a book to your shelves." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:123 +msgid "Search for a title or author to continue the tour." +msgstr "" + +#: bookwyrm/templates/guided_tour/user_profile.html:124 +msgid "Find a book" +msgstr "" + +#: bookwyrm/templates/hashtag.html:12 +#, python-format +msgid "See tagged statuses in the local %(site_name)s community" +msgstr "" + +#: bookwyrm/templates/hashtag.html:25 +msgid "No activities for this hashtag yet!" +msgstr "" + +#: bookwyrm/templates/import/import.html:5 +#: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/preferences/layout.html:43 +msgid "Import Book List" +msgstr "" + +#: bookwyrm/templates/import/import.html:12 +msgid "Not a valid CSV file" +msgstr "" + +#: bookwyrm/templates/import/import.html:20 +#, python-format +msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." +msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/import/import.html:26 +#, python-format +msgid "You have %(display_left)s left." +msgstr "" + +#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import_user.html:40 +#, python-format +msgid "On average, recent imports have taken %(hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import_user.html:44 +#, python-format +msgid "On average, recent imports have taken %(minutes)s minutes." +msgstr "" + +#: bookwyrm/templates/import/import.html:52 +msgid "Data source:" +msgstr "" + +#: bookwyrm/templates/import/import.html:58 +msgid "Goodreads (CSV)" +msgstr "" + +#: bookwyrm/templates/import/import.html:61 +msgid "Storygraph (CSV)" +msgstr "" + +#: bookwyrm/templates/import/import.html:64 +msgid "LibraryThing (TSV)" +msgstr "" + +#: bookwyrm/templates/import/import.html:67 +msgid "OpenLibrary (CSV)" +msgstr "" + +#: bookwyrm/templates/import/import.html:70 +msgid "OpenReads (CSV)" +msgstr "" + +#: bookwyrm/templates/import/import.html:73 +msgid "Calibre (CSV)" +msgstr "" + +#: bookwyrm/templates/import/import.html:76 +msgid "BookWyrm (CSV)" +msgstr "" + +#: bookwyrm/templates/import/import.html:82 +msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." +msgstr "" + +#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import_user.html:64 +msgid "Data file:" +msgstr "" + +#: bookwyrm/templates/import/import.html:99 +msgid "Include reviews" +msgstr "" + +#: bookwyrm/templates/import/import.html:104 +msgid "Create new shelves if they do not exist" +msgstr "" + +#: bookwyrm/templates/import/import.html:109 +msgid "Privacy setting for imported reviews and shelves:" +msgstr "" + +#: bookwyrm/templates/import/import.html:116 +#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import_user.html:170 +#: bookwyrm/templates/import/import_user.html:172 +#: bookwyrm/templates/settings/federation/instance_blocklist.html:78 +msgid "Import" +msgstr "" + +#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import_user.html:173 +msgid "You've reached the import limit." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import_user.html:27 +msgid "Imports are temporarily disabled; thank you for your patience." +msgstr "" + +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import_user.html:181 +msgid "Recent Imports" +msgstr "" + +#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import_user.html:186 +#: bookwyrm/templates/settings/imports/imports.html:202 +#: bookwyrm/templates/settings/imports/imports.html:292 +msgid "Date Created" +msgstr "" + +#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import_user.html:189 +msgid "Last Updated" +msgstr "" + +#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/settings/imports/imports.html:211 +msgid "Items" +msgstr "" + +#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import_user.html:198 +#: bookwyrm/templates/preferences/export-user.html:122 +msgid "No recent imports" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:6 +#: bookwyrm/templates/import/import_status.html:15 +#: bookwyrm/templates/import/import_status.html:29 +msgid "Import Status" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:13 +#: bookwyrm/templates/import/import_status.html:27 +msgid "Retry Status" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:22 +#: bookwyrm/templates/settings/celery.html:45 +#: bookwyrm/templates/settings/imports/imports.html:6 +#: bookwyrm/templates/settings/imports/imports.html:9 +#: bookwyrm/templates/settings/layout.html:88 +msgid "Imports" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:39 +#: bookwyrm/templates/import/user_import_status.html:35 +msgid "Import started:" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:48 +#: bookwyrm/templates/import/user_import_status.html:99 +msgid "In progress" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:50 +#: bookwyrm/templates/import/user_import_status.html:101 +msgid "Refresh" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:72 +#: bookwyrm/templates/import/user_import_status.html:123 +#: bookwyrm/templates/settings/imports/imports.html:243 +#: bookwyrm/templates/settings/imports/imports.html:320 +msgid "Stop import" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:78 +#, python-format +msgid "%(display_counter)s item needs manual approval." +msgid_plural "%(display_counter)s items need manual approval." +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/import/import_status.html:83 +#: bookwyrm/templates/import/manual_review.html:8 +msgid "Review items" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:89 +#: bookwyrm/templates/import/user_import_status.html:129 +#, python-format +msgid "%(display_counter)s item failed to import." +msgid_plural "%(display_counter)s items failed to import." +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/import/import_status.html:95 +#: bookwyrm/templates/import/user_import_status.html:135 +msgid "View and troubleshoot failed items" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:107 +msgid "Row" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:110 +#: bookwyrm/templates/import/user_import_status.html:149 +#: bookwyrm/templates/shelf/shelf.html:156 +#: bookwyrm/templates/shelf/shelf.html:178 +msgid "Title" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:113 +#: bookwyrm/templates/import/user_import_status.html:152 +msgid "ISBN" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:117 +msgid "Openlibrary key" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:121 +#: bookwyrm/templates/shelf/shelf.html:157 +#: bookwyrm/templates/shelf/shelf.html:181 +msgid "Author" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:124 +msgid "Shelf" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:131 +#: bookwyrm/templates/import/user_import_status.html:159 +#: bookwyrm/templates/import/user_troubleshoot.html:59 +#: bookwyrm/templates/settings/link_domains/link_table.html:9 +msgid "Book" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:142 +msgid "Import preview unavailable." +msgstr "" + +#: bookwyrm/templates/import/import_status.html:150 +msgid "No items currently need review" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:186 +msgid "View imported review" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:200 +#: bookwyrm/templates/import/user_import_status.html:68 +#: bookwyrm/templates/import/user_import_status.html:191 +msgid "Imported" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:206 +msgid "Needs manual review" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:219 +msgid "Retry" +msgstr "" + +#: bookwyrm/templates/import/import_status.html:237 +msgid "This import is in an old format that is no longer supported. If you would like to troubleshoot missing items from this import, click the button below to update the import format." +msgstr "" + +#: bookwyrm/templates/import/import_status.html:239 +msgid "Update import" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:5 +#: bookwyrm/templates/import/import_user.html:6 +#: bookwyrm/templates/preferences/layout.html:51 +msgid "Import BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:13 +msgid "Not a valid import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:18 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an alias of the one you are migrating from, or move that account to this one, before you import your user data." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:32 +#, python-format +msgid "Currently you are allowed to import one user every %(hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:33 +#, python-format +msgid "You will next be able to import a user file at %(next_time)s" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:56 +msgid "Step 1:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:58 +msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:73 +msgid "Step 2:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:75 +msgid "Deselect any checkboxes for data you do not wish to include in your import." +msgstr "" + +#: bookwyrm/templates/import/import_user.html:86 +#: bookwyrm/templates/preferences/export-user.html:21 +#: bookwyrm/templates/shelf/shelf.html:31 +#: bookwyrm/templates/user/relationships/followers.html:18 +#: bookwyrm/templates/user/relationships/following.html:18 +msgid "User profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:89 +msgid "Overwrites display name, summary, and avatar" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:95 +msgid "User settings" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:98 +msgid "Overwrites:" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:101 +msgid "Whether manual approval is required for other users to follow your account" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:104 +msgid "Whether following/followers are shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:107 +msgid "Whether your reading goal is shown on your profile" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:110 +msgid "Whether you see user follow suggestions" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:113 +msgid "Whether your account is suggested to others" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:116 +msgid "Your timezone" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:119 +msgid "Your default post privacy setting" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:127 +msgid "Followers and following" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:131 +msgid "User blocks" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:138 +#: bookwyrm/templates/preferences/export-user.html:23 +msgid "Reading goals" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:141 +msgid "Overwrites reading goals for all years listed in the import file" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:145 +#: bookwyrm/templates/preferences/export-user.html:24 +msgid "Shelves" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:148 +#: bookwyrm/templates/preferences/export-user.html:25 +msgid "Reading history" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:151 +#: bookwyrm/templates/preferences/export-user.html:26 +msgid "Book reviews" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:157 +msgid "Comments about books" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:160 +msgid "Book lists" +msgstr "" + +#: bookwyrm/templates/import/import_user.html:163 +msgid "Saved lists" +msgstr "" + +#: bookwyrm/templates/import/manual_review.html:5 +#: bookwyrm/templates/import/troubleshoot.html:4 +msgid "Import Troubleshooting" +msgstr "" + +#: bookwyrm/templates/import/manual_review.html:21 +msgid "Approving a suggestion will permanently add the suggested book to your shelves and associate your reading dates, reviews, and ratings with that book." +msgstr "" + +#: bookwyrm/templates/import/manual_review.html:58 +#: bookwyrm/templates/lists/curate.html:71 +#: bookwyrm/templates/settings/link_domains/link_domains.html:76 +msgid "Approve" +msgstr "" + +#: bookwyrm/templates/import/manual_review.html:66 +msgid "Reject" +msgstr "" + +#: bookwyrm/templates/import/troubleshoot.html:7 +#: bookwyrm/templates/import/user_troubleshoot.html:8 +#: bookwyrm/templates/settings/imports/imports.html:220 +msgid "Failed items" +msgstr "" + +#: bookwyrm/templates/import/troubleshoot.html:12 +#: bookwyrm/templates/import/user_troubleshoot.html:13 +msgid "Troubleshooting" +msgstr "" + +#: bookwyrm/templates/import/troubleshoot.html:20 +#: bookwyrm/templates/import/user_troubleshoot.html:23 +msgid "Re-trying an import can fix missing items in cases such as:" +msgstr "" + +#: bookwyrm/templates/import/troubleshoot.html:23 +msgid "The book has been added to the instance since this import" +msgstr "" + +#: bookwyrm/templates/import/troubleshoot.html:24 +#: bookwyrm/templates/import/user_troubleshoot.html:27 +msgid "A transient error or timeout caused the external data source to be unavailable." +msgstr "" + +#: bookwyrm/templates/import/troubleshoot.html:25 +#: bookwyrm/templates/import/user_troubleshoot.html:28 +msgid "BookWyrm has been updated since this import with a bug fix" +msgstr "" + +#: bookwyrm/templates/import/troubleshoot.html:28 +#: bookwyrm/templates/import/user_troubleshoot.html:38 +msgid "Contact your admin or open an issue if you are seeing unexpected failed items." +msgstr "" + +#: bookwyrm/templates/import/user_import_status.html:6 +#: bookwyrm/templates/import/user_import_status.html:15 +#: bookwyrm/templates/import/user_import_status.html:26 +msgid "User Import Status" +msgstr "" + +#: bookwyrm/templates/import/user_import_status.html:13 +msgid "User Import Retry Status" +msgstr "" + +#: bookwyrm/templates/import/user_import_status.html:22 +#: bookwyrm/templates/settings/imports/imports.html:264 +msgid "User Imports" +msgstr "" + +#: bookwyrm/templates/import/user_import_status.html:70 +#: bookwyrm/templates/settings/dashboard/user_chart.html:11 +msgid "Total" +msgstr "" + +#: bookwyrm/templates/import/user_import_status.html:79 +#: bookwyrm/templates/preferences/export-user.html:27 +#: bookwyrm/templates/settings/dashboard/dashboard.html:27 +msgid "Statuses" +msgstr "" + +#: bookwyrm/templates/import/user_import_status.html:85 +msgid "Follows & Blocks" +msgstr "" + +#: bookwyrm/templates/import/user_import_status.html:144 +msgid "Imported books" +msgstr "" + +#: bookwyrm/templates/import/user_troubleshoot.html:5 +msgid "User Import Troubleshooting" +msgstr "" + +#: bookwyrm/templates/import/user_troubleshoot.html:26 +msgid "Your account was not set as an alias of the original user account" +msgstr "" + +#: bookwyrm/templates/import/user_troubleshoot.html:31 +msgid "Re-trying an import will not work in cases such as:" +msgstr "" + +#: bookwyrm/templates/import/user_troubleshoot.html:34 +msgid "A user, status, or BookWyrm server was deleted after your import file was created" +msgstr "" + +#: bookwyrm/templates/import/user_troubleshoot.html:35 +msgid "Importing statuses when your old account has been deleted" +msgstr "" + +#: bookwyrm/templates/import/user_troubleshoot.html:43 +#, python-format +msgid "Currently you are allowed to import or retry one user every %(hours)s hours." +msgstr "" + +#: bookwyrm/templates/import/user_troubleshoot.html:44 +#, python-format +msgid "You will be able to retry this import at %(next_time)s" +msgstr "" + +#: bookwyrm/templates/import/user_troubleshoot.html:65 +msgid "Relationship" +msgstr "" + +#: bookwyrm/templates/import/user_troubleshoot.html:68 +msgid "Reason" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:30 +msgid "You must set a new password before logging in." +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:50 +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:68 +#: bookwyrm/templates/preferences/change_password.html:28 +msgid "New password:" +msgstr "" + +#: bookwyrm/templates/landing/force_password_reset.html:85 +#: bookwyrm/templates/landing/password_reset.html:43 +#: bookwyrm/templates/preferences/change_password.html:33 +msgid "Confirm password:" +msgstr "" + +#: bookwyrm/templates/landing/invite.html:4 +#: bookwyrm/templates/landing/invite.html:8 +#: bookwyrm/templates/landing/login.html:50 +#: bookwyrm/templates/landing/reactivate.html:43 +msgid "Create an Account" +msgstr "" + +#: bookwyrm/templates/landing/invite.html:22 +msgid "Sorry! This invite code is no longer valid." +msgstr "" + +#: bookwyrm/templates/landing/landing.html:9 +msgid "Recent Books" +msgstr "" + +#: bookwyrm/templates/landing/layout.html:17 +msgid "Decentralized" +msgstr "" + +#: bookwyrm/templates/landing/layout.html:23 +msgid "Friendly" +msgstr "" + +#: bookwyrm/templates/landing/layout.html:29 +msgid "Anti-Corporate" +msgstr "" + +#: bookwyrm/templates/landing/layout.html:46 +#, python-format +msgid "Join %(name)s" +msgstr "" + +#: bookwyrm/templates/landing/layout.html:48 +msgid "Request an Invitation" +msgstr "" + +#: bookwyrm/templates/landing/layout.html:50 +#, python-format +msgid "%(name)s registration is closed" +msgstr "" + +#: bookwyrm/templates/landing/layout.html:61 +msgid "Thank you! Your request has been received." +msgstr "" + +#: bookwyrm/templates/landing/layout.html:90 +msgid "Your Account" +msgstr "" + +#: bookwyrm/templates/landing/login.html:4 +msgid "Login" +msgstr "" + +#: bookwyrm/templates/landing/login.html:7 +#: bookwyrm/templates/landing/login.html:38 bookwyrm/templates/layout.html:142 +#: bookwyrm/templates/ostatus/error.html:37 +msgid "Log in" +msgstr "" + +#: bookwyrm/templates/landing/login.html:15 +msgid "Success! Email address confirmed." +msgstr "" + +#: bookwyrm/templates/landing/login.html:21 +#: bookwyrm/templates/landing/reactivate.html:17 +#: bookwyrm/templates/layout.html:128 bookwyrm/templates/ostatus/error.html:28 +#: bookwyrm/templates/snippets/register_form.html:4 +msgid "Username:" +msgstr "" + +#: bookwyrm/templates/landing/login.html:28 +#: bookwyrm/templates/landing/password_reset.html:26 +#: bookwyrm/templates/landing/reactivate.html:24 +#: bookwyrm/templates/layout.html:132 bookwyrm/templates/ostatus/error.html:32 +#: bookwyrm/templates/preferences/security.html:94 +#: bookwyrm/templates/snippets/register_form.html:45 +msgid "Password:" +msgstr "" + +#: bookwyrm/templates/landing/login.html:41 bookwyrm/templates/layout.html:139 +#: bookwyrm/templates/ostatus/error.html:34 +msgid "Forgot your password?" +msgstr "" + +#: bookwyrm/templates/landing/login.html:63 +#: bookwyrm/templates/landing/reactivate.html:56 +msgid "More about this site" +msgstr "" + +#: bookwyrm/templates/landing/password_reset_request.html:14 +#, python-format +msgid "A password reset link will be sent to %(email)s if there is an account using that email address." +msgstr "" + +#: bookwyrm/templates/landing/password_reset_request.html:20 +msgid "A link to reset your password will be sent to your email address" +msgstr "" + +#: bookwyrm/templates/landing/password_reset_request.html:34 +msgid "Reset password" +msgstr "" + +#: bookwyrm/templates/landing/reactivate.html:4 +#: bookwyrm/templates/landing/reactivate.html:7 +msgid "Reactivate Account" +msgstr "" + +#: bookwyrm/templates/landing/reactivate.html:34 +msgid "Reactivate account" +msgstr "" + +#: bookwyrm/templates/layout.html:13 +#, python-format +msgid "%(site_name)s search" +msgstr "" + +#: bookwyrm/templates/layout.html:39 +msgid "Search for a book, author, user, or list" +msgstr "" + +#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +msgid "Scan Barcode" +msgstr "" + +#: bookwyrm/templates/layout.html:69 +msgid "Main navigation menu" +msgstr "" + +#: bookwyrm/templates/layout.html:134 bookwyrm/templates/ostatus/error.html:33 +msgid "password" +msgstr "" + +#: bookwyrm/templates/layout.html:136 +msgid "Show/Hide password" +msgstr "" + +#: bookwyrm/templates/layout.html:150 +msgid "Join" +msgstr "" + +#: bookwyrm/templates/layout.html:196 +msgid "Successfully posted status" +msgstr "" + +#: bookwyrm/templates/layout.html:197 +msgid "Error posting status" +msgstr "" + +#: bookwyrm/templates/lists/add_item_modal.html:8 +#, python-format +msgid "Add \"%(title)s\" to this list" +msgstr "" + +#: bookwyrm/templates/lists/add_item_modal.html:12 +#, python-format +msgid "Suggest \"%(title)s\" for this list" +msgstr "" + +#: bookwyrm/templates/lists/add_item_modal.html:41 +#: bookwyrm/templates/lists/list.html:257 +msgid "Suggest" +msgstr "" + +#: bookwyrm/templates/lists/bookmark_button.html:30 +msgid "Un-save" +msgstr "" + +#: bookwyrm/templates/lists/created_text.html:5 +#, python-format +msgid "Created by %(username)s and managed by %(groupname)s" +msgstr "" + +#: bookwyrm/templates/lists/created_text.html:7 +#, python-format +msgid "Created and curated by %(username)s" +msgstr "" + +#: bookwyrm/templates/lists/created_text.html:9 +#, python-format +msgid "Created by %(username)s" +msgstr "" + +#: bookwyrm/templates/lists/curate.html:12 +msgid "Curate" +msgstr "" + +#: bookwyrm/templates/lists/curate.html:21 +msgid "Pending Books" +msgstr "" + +#: bookwyrm/templates/lists/curate.html:24 +msgid "You're all set!" +msgstr "" + +#: bookwyrm/templates/lists/curate.html:45 +#: bookwyrm/templates/lists/list.html:93 +#, python-format +msgid "%(username)s says:" +msgstr "" + +#: bookwyrm/templates/lists/curate.html:55 +msgid "Suggested by" +msgstr "" + +#: bookwyrm/templates/lists/curate.html:77 +msgid "Discard" +msgstr "" + +#: bookwyrm/templates/lists/delete_list_modal.html:4 +msgid "Delete this list?" +msgstr "" + +#: bookwyrm/templates/lists/edit_form.html:5 +#: bookwyrm/templates/lists/layout.html:23 +msgid "Edit List" +msgstr "" + +#: bookwyrm/templates/lists/embed-list.html:8 +#, python-format +msgid "%(list_name)s, a list by %(owner)s" +msgstr "" + +#: bookwyrm/templates/lists/embed-list.html:20 +#, python-format +msgid "on %(site_name)s" +msgstr "" + +#: bookwyrm/templates/lists/embed-list.html:29 +msgid "This list is currently empty" +msgstr "" + +#: bookwyrm/templates/lists/form.html:19 +msgid "List curation:" +msgstr "" + +#: bookwyrm/templates/lists/form.html:31 +msgid "Closed" +msgstr "" + +#: bookwyrm/templates/lists/form.html:34 +msgid "Only you can add and remove books to this list" +msgstr "" + +#: bookwyrm/templates/lists/form.html:48 +msgid "Curated" +msgstr "" + +#: bookwyrm/templates/lists/form.html:51 +msgid "Anyone can suggest books, subject to your approval" +msgstr "" + +#: bookwyrm/templates/lists/form.html:65 +msgctxt "curation type" +msgid "Open" +msgstr "" + +#: bookwyrm/templates/lists/form.html:68 +msgid "Anyone can add books to this list" +msgstr "" + +#: bookwyrm/templates/lists/form.html:82 +msgid "Group" +msgstr "" + +#: bookwyrm/templates/lists/form.html:85 +msgid "Group members can add to and remove from this list" +msgstr "" + +#: bookwyrm/templates/lists/form.html:90 +msgid "Select Group" +msgstr "" + +#: bookwyrm/templates/lists/form.html:94 +msgid "Select a group" +msgstr "" + +#: bookwyrm/templates/lists/form.html:105 +msgid "You don't have any Groups yet!" +msgstr "" + +#: bookwyrm/templates/lists/form.html:107 +msgid "Create a Group" +msgstr "" + +#: bookwyrm/templates/lists/form.html:121 +msgid "Delete list" +msgstr "" + +#: bookwyrm/templates/lists/item_notes_field.html:7 +#: bookwyrm/templates/settings/federation/edit_instance.html:86 +msgid "Notes:" +msgstr "" + +#: bookwyrm/templates/lists/item_notes_field.html:19 +msgid "An optional note that will be displayed with the book." +msgstr "" + +#: bookwyrm/templates/lists/list.html:37 +msgid "That book is already on this list." +msgstr "" + +#: bookwyrm/templates/lists/list.html:45 +msgid "You successfully suggested a book for this list!" +msgstr "" + +#: bookwyrm/templates/lists/list.html:47 +msgid "You successfully added a book to this list!" +msgstr "" + +#: bookwyrm/templates/lists/list.html:54 +msgid "This list is currently empty." +msgstr "" + +#: bookwyrm/templates/lists/list.html:104 +msgid "Edit notes" +msgstr "" + +#: bookwyrm/templates/lists/list.html:119 +msgid "Add notes" +msgstr "" + +#: bookwyrm/templates/lists/list.html:131 +#, python-format +msgid "Added by %(username)s" +msgstr "" + +#: bookwyrm/templates/lists/list.html:146 +msgid "List position" +msgstr "" + +#: bookwyrm/templates/lists/list.html:152 +#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/update.html:27 +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 +msgid "Set" +msgstr "" + +#: bookwyrm/templates/lists/list.html:167 +#: bookwyrm/templates/snippets/remove_follower_button.html:4 +#: bookwyrm/templates/snippets/remove_from_group_button.html:20 +msgid "Remove" +msgstr "" + +#: bookwyrm/templates/lists/list.html:181 +#: bookwyrm/templates/lists/list.html:198 +msgid "Sort List" +msgstr "" + +#: bookwyrm/templates/lists/list.html:191 +msgid "Direction" +msgstr "" + +#: bookwyrm/templates/lists/list.html:205 +msgid "Add Books" +msgstr "" + +#: bookwyrm/templates/lists/list.html:207 +msgid "Suggest Books" +msgstr "" + +#: bookwyrm/templates/lists/list.html:218 +msgid "search" +msgstr "" + +#: bookwyrm/templates/lists/list.html:224 +msgid "Clear search" +msgstr "" + +#: bookwyrm/templates/lists/list.html:229 +#, python-format +msgid "No books found matching the query \"%(query)s\"" +msgstr "" + +#: bookwyrm/templates/lists/list.html:268 +msgid "Embed this list on a website" +msgstr "" + +#: bookwyrm/templates/lists/list.html:276 +msgid "Copy embed code" +msgstr "" + +#: bookwyrm/templates/lists/list.html:278 +#, python-format +msgid "%(list_name)s, a list by %(owner)s on %(site_name)s" +msgstr "" + +#: bookwyrm/templates/lists/list_items.html:15 +msgid "Saved" +msgstr "" + +#: bookwyrm/templates/lists/list_items.html:50 +msgid "No lists found." +msgstr "" + +#: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:14 +msgid "Your Lists" +msgstr "" + +#: bookwyrm/templates/lists/lists.html:36 +msgid "All Lists" +msgstr "" + +#: bookwyrm/templates/lists/lists.html:40 +msgid "Saved Lists" +msgstr "" + +#: bookwyrm/templates/moved.html:27 +#, python-format +msgid "You have moved your account to %(username)s" +msgstr "" + +#: bookwyrm/templates/moved.html:32 +msgid "You can undo the move to restore full functionality, but some followers may have already unfollowed this account." +msgstr "" + +#: bookwyrm/templates/moved.html:42 +msgid "Undo move" +msgstr "" + +#: bookwyrm/templates/moved.html:46 bookwyrm/templates/user_menu.html:77 +msgid "Log out" +msgstr "" + +#: bookwyrm/templates/notifications/items/accept.html:18 +#, python-format +msgid "%(related_user)s accepted your invitation to join group \"%(group_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/accept.html:26 +#, python-format +msgid "%(related_user)s and %(second_user)s accepted your invitation to join group \"%(group_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/accept.html:36 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others accepted your invitation to join group \"%(group_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/add.html:33 +#, python-format +msgid "%(related_user)s added %(book_title)s to your list \"%(list_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/add.html:39 +#, python-format +msgid "%(related_user)s suggested adding %(book_title)s to your list \"%(list_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/add.html:47 +#, python-format +msgid "%(related_user)s added %(book_title)s and %(second_book_title)s to your list \"%(list_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/add.html:54 +#, python-format +msgid "%(related_user)s suggested adding %(book_title)s and %(second_book_title)s to your list \"%(list_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/add.html:66 +#, python-format +msgid "%(related_user)s added a book to one of your lists" +msgstr "" + +#: bookwyrm/templates/notifications/items/add.html:72 +#, python-format +msgid "%(related_user)s added %(book_title)s, %(second_book_title)s, and %(display_count)s other book to your list \"%(list_name)s\"" +msgid_plural "%(related_user)s added %(book_title)s, %(second_book_title)s, and %(display_count)s other books to your list \"%(list_name)s\"" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/notifications/items/add.html:88 +#, python-format +msgid "%(related_user)s suggested adding %(book_title)s, %(second_book_title)s, and %(display_count)s other book to your list \"%(list_name)s\"" +msgid_plural "%(related_user)s suggested adding %(book_title)s, %(second_book_title)s, and %(display_count)s other books to your list \"%(list_name)s\"" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/notifications/items/boost.html:21 +#, python-format +msgid "%(related_user)s boosted your review of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:27 +#, python-format +msgid "%(related_user)s and %(second_user)s boosted your review of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:36 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others boosted your review of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:44 +#, python-format +msgid "%(related_user)s boosted your comment on %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:50 +#, python-format +msgid "%(related_user)s and %(second_user)s boosted your comment on %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:59 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others boosted your comment on %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:67 +#, python-format +msgid "%(related_user)s boosted your quote from %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:73 +#, python-format +msgid "%(related_user)s and %(second_user)s boosted your quote from %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:82 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others boosted your quote from %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:90 +#, python-format +msgid "%(related_user)s boosted your status" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:96 +#, python-format +msgid "%(related_user)s and %(second_user)s boosted your status" +msgstr "" + +#: bookwyrm/templates/notifications/items/boost.html:105 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others boosted your status" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:21 +#, python-format +msgid "%(related_user)s liked your review of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:27 +#, python-format +msgid "%(related_user)s and %(second_user)s liked your review of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:36 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others liked your review of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:44 +#, python-format +msgid "%(related_user)s liked your comment on %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:50 +#, python-format +msgid "%(related_user)s and %(second_user)s liked your comment on %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:59 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others liked your comment on %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:67 +#, python-format +msgid "%(related_user)s liked your quote from %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:73 +#, python-format +msgid "%(related_user)s and %(second_user)s liked your quote from %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:82 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others liked your quote from %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:90 +#, python-format +msgid "%(related_user)s liked your status" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:96 +#, python-format +msgid "%(related_user)s and %(second_user)s liked your status" +msgstr "" + +#: bookwyrm/templates/notifications/items/fav.html:105 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others liked your status" +msgstr "" + +#: bookwyrm/templates/notifications/items/follow.html:16 +#, python-format +msgid "%(related_user)s followed you" +msgstr "" + +#: bookwyrm/templates/notifications/items/follow.html:20 +#, python-format +msgid "%(related_user)s and %(second_user)s followed you" +msgstr "" + +#: bookwyrm/templates/notifications/items/follow.html:25 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others followed you" +msgstr "" + +#: bookwyrm/templates/notifications/items/follow_request.html:15 +#, python-format +msgid "%(related_user)s sent you a follow request" +msgstr "" + +#: bookwyrm/templates/notifications/items/import.html:14 +#, python-format +msgid "Your import completed." +msgstr "" + +#: bookwyrm/templates/notifications/items/invite.html:16 +#, python-format +msgid "%(related_user)s invited you to join the group \"%(group_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/invite_request.html:15 +#, python-format +msgid "New invite request awaiting response" +msgid_plural "%(display_count)s new invite requests awaiting response" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/notifications/items/join.html:16 +#, python-format +msgid "has joined your group \"%(group_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/leave.html:18 +#, python-format +msgid "%(related_user)s has left your group \"%(group_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/leave.html:26 +#, python-format +msgid "%(related_user)s and %(second_user)s have left your group \"%(group_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/leave.html:36 +#, python-format +msgid "%(related_user)s and %(other_user_display_count)s others have left your group \"%(group_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/link_domain.html:15 +#, python-format +msgid "A new link domain needs review" +msgid_plural "%(display_count)s new link domains need review" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/notifications/items/mention.html:20 +#, python-format +msgid "%(related_user)s mentioned you in a review of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/mention.html:26 +#, python-format +msgid "%(related_user)s mentioned you in a comment on %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/mention.html:32 +#, python-format +msgid "%(related_user)s mentioned you in a quote from %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/mention.html:38 +#, python-format +msgid "%(related_user)s mentioned you in a status" +msgstr "" + +#: bookwyrm/templates/notifications/items/move_user.html:18 +#, python-format +msgid "%(related_user)s has moved to %(username)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/move_user.html:25 +#, python-format +msgid "%(related_user)s has undone their move" +msgstr "" + +#: bookwyrm/templates/notifications/items/remove.html:17 +#, python-format +msgid "has been removed from your group \"%(group_name)s\"" +msgstr "" + +#: bookwyrm/templates/notifications/items/remove.html:23 +#, python-format +msgid "You have been removed from the \"%(group_name)s\" group" +msgstr "" + +#: bookwyrm/templates/notifications/items/reply.html:21 +#, python-format +msgid "%(related_user)s replied to your review of %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/reply.html:27 +#, python-format +msgid "%(related_user)s replied to your comment on %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/reply.html:33 +#, python-format +msgid "%(related_user)s replied to your quote from %(book_title)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/reply.html:39 +#, python-format +msgid "%(related_user)s replied to your status" +msgstr "" + +#: bookwyrm/templates/notifications/items/report.html:15 +#, python-format +msgid "A new report needs moderation" +msgid_plural "%(display_count)s new reports need moderation" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:62 +msgid "Content warning" +msgstr "" + +#: bookwyrm/templates/notifications/items/update.html:16 +#, python-format +msgid "has changed the privacy level for %(group_name)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/update.html:20 +#, python-format +msgid "has changed the name of %(group_name)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/update.html:24 +#, python-format +msgid "has changed the description of %(group_name)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/user_export.html:14 +#, python-format +msgid "Your user export is ready." +msgstr "" + +#: bookwyrm/templates/notifications/items/user_import.html:14 +#, python-format +msgid "Your user import is complete." +msgstr "" + +#: bookwyrm/templates/notifications/notifications_page.html:19 +msgid "Delete notifications" +msgstr "" + +#: bookwyrm/templates/notifications/notifications_page.html:31 +msgid "All" +msgstr "" + +#: bookwyrm/templates/notifications/notifications_page.html:35 +msgid "Mentions" +msgstr "" + +#: bookwyrm/templates/notifications/notifications_page.html:47 +msgid "You're all caught up!" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:7 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:35 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "User handle to follow from:" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:44 +msgid "Follow!" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:15 +msgid "Follow on Fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:19 +msgid "This link opens in a pop-up window" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "" + +#: bookwyrm/templates/ostatus/success.html:6 +#: bookwyrm/templates/ostatus/success.html:32 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:4 +#: bookwyrm/templates/preferences/move_user.html:4 +#: bookwyrm/templates/preferences/move_user.html:7 +#: bookwyrm/templates/preferences/move_user.html:39 +msgid "Move Account" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:7 +#: bookwyrm/templates/preferences/alias_user.html:34 +msgid "Create Alias" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:12 +msgid "Add another account as an alias" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:16 +msgid "Marking another account as an alias is required if you want to move that account to this one." +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:19 +msgid "This is a reversable action and will not change the functionality of this account." +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:25 +msgid "Enter the username for the account you want to add as an alias e.g. user@example.com :" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:30 +#: bookwyrm/templates/preferences/move_user.html:35 +msgid "Confirm your password:" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:39 +#: bookwyrm/templates/preferences/layout.html:28 +msgid "Aliases" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:49 +msgid "Remove alias" +msgstr "" + +#: bookwyrm/templates/preferences/blocks.html:4 +#: bookwyrm/templates/preferences/blocks.html:7 +#: bookwyrm/templates/preferences/layout.html:62 +msgid "Blocked Users" +msgstr "" + +#: bookwyrm/templates/preferences/blocks.html:12 +msgid "No users currently blocked." +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:4 +#: bookwyrm/templates/preferences/change_password.html:7 +#: bookwyrm/templates/preferences/change_password.html:37 +#: bookwyrm/templates/preferences/layout.html:20 +msgid "Change Password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:4 +#: bookwyrm/templates/preferences/delete_user.html:7 +#: bookwyrm/templates/preferences/delete_user.html:41 +#: bookwyrm/templates/preferences/layout.html:36 +#: bookwyrm/templates/settings/users/delete_user_form.html:22 +msgid "Delete Account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:12 +msgid "Deactivate account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:15 +msgid "Your account will be hidden. You can log back in at any time to re-activate your account." +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:20 +msgid "Deactivate Account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:26 +msgid "Permanently delete account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:29 +msgid "Deleting your account cannot be undone. The username will not be available to register in the future." +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:36 +msgid "I understand that my account cannot be recovered:" +msgstr "" + +#: bookwyrm/templates/preferences/disable-2fa.html:4 +#: bookwyrm/templates/preferences/disable-2fa.html:7 +#: bookwyrm/templates/preferences/security.html:39 +msgid "Disable 2FA" +msgstr "" + +#: bookwyrm/templates/preferences/disable-2fa.html:12 +msgid "Disable Two Factor Authentication" +msgstr "" + +#: bookwyrm/templates/preferences/disable-2fa.html:14 +msgid "Disabling 2FA will allow anyone with your username and password to log in to your account." +msgstr "" + +#: bookwyrm/templates/preferences/disable-2fa.html:20 +msgid "Turn off 2FA" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:4 +#: bookwyrm/templates/preferences/edit_user.html:7 +#: bookwyrm/templates/preferences/layout.html:15 +msgid "Edit Profile" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:12 +#: bookwyrm/templates/preferences/edit_user.html:25 +#: bookwyrm/templates/settings/users/user_info.html:8 +#: bookwyrm/templates/user_menu.html:29 +msgid "Profile" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:13 +#: bookwyrm/templates/preferences/edit_user.html:64 +#: bookwyrm/templates/settings/site.html:11 +#: bookwyrm/templates/settings/site.html:89 +#: bookwyrm/templates/setup/config.html:85 +msgid "Display" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:14 +#: bookwyrm/templates/preferences/edit_user.html:118 +msgid "Privacy" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:69 +msgid "Show reading goal prompt in feed" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:75 +msgid "Show ratings" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:81 +msgid "Show suggested users" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:87 +msgid "Show this account in suggested users" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:91 +#, python-format +msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:95 +msgid "Preferred Timezone: " +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:107 +msgid "Theme:" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:123 +msgid "Manually approve followers" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:129 +msgid "Hide followers and following on profile" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:134 +msgid "Default post privacy:" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:142 +#, python-format +msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to Your Books, pick a shelf from the tab bar, and click \"Edit shelf.\"" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:6 +#: bookwyrm/templates/preferences/export-user.html:9 +#: bookwyrm/templates/preferences/layout.html:55 +msgid "Export BookWyrm Account" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:15 +msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:19 +msgid "Your file will include:" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:22 +msgid "Most user settings" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:28 +msgid "Your own lists and saved lists" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:29 +msgid "Which users you follow and block" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:33 +msgid "Your file will not include:" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:35 +msgid "Direct messages" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:36 +msgid "Replies to your statuses" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:38 +msgid "Favorites" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:42 +msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:45 +msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an alias of this one, or move this account to the new account, before you import your user data." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:50 +msgid "New user exports are currently disabled." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:54 +#, python-format +msgid "User exports settings can be changed from the Imports page in the Admin dashboard." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:61 +#, python-format +msgid "You will be able to create a new export file at %(next_available)s" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:72 +#, python-format +msgid "On average, recent exports have taken %(hours)s hours." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:76 +#, python-format +msgid "On average, recent exports have taken %(minutes)s minutes." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:88 +msgid "Create user export file" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:95 +msgid "Recent Exports" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:97 +msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file." +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:100 +#, python-format +msgid "Export files will be deleted after %(expiry_hours)s hour." +msgid_plural "Export files will be deleted after %(expiry_hours)s hours." +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/preferences/export-user.html:110 +#: bookwyrm/templates/preferences/security.html:126 +#: bookwyrm/templates/settings/files.html:136 +#: bookwyrm/templates/settings/files.html:318 +msgid "Date" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:116 +msgid "Size" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:160 +msgid "Download your export" +msgstr "" + +#: bookwyrm/templates/preferences/export-user.html:164 +msgid "Archive is no longer available" +msgstr "" + +#: bookwyrm/templates/preferences/export.html:4 +#: bookwyrm/templates/preferences/export.html:7 +#: bookwyrm/templates/preferences/layout.html:47 +msgid "Export Book List" +msgstr "" + +#: bookwyrm/templates/preferences/export.html:13 +msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." +msgstr "" + +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + +#: bookwyrm/templates/preferences/layout.html:11 +msgid "Account" +msgstr "" + +#: bookwyrm/templates/preferences/layout.html:24 +msgid "Security Settings" +msgstr "" + +#: bookwyrm/templates/preferences/layout.html:32 +msgid "Move Account" +msgstr "" + +#: bookwyrm/templates/preferences/layout.html:39 +msgid "Data" +msgstr "" + +#: bookwyrm/templates/preferences/layout.html:58 +msgid "Relationships" +msgstr "" + +#: bookwyrm/templates/preferences/move_user.html:12 +msgid "Migrate account to another server" +msgstr "" + +#: bookwyrm/templates/preferences/move_user.html:16 +msgid "Moving your account will notify all your followers and direct them to follow the new account." +msgstr "" + +#: bookwyrm/templates/preferences/move_user.html:19 +#, python-format +msgid "\n" +" %(user)s will be marked as moved and will not be discoverable or usable unless you undo the move.\n" +" " +msgstr "" + +#: bookwyrm/templates/preferences/move_user.html:25 +msgid "Remember to add this user as an alias of the target account before you try to move." +msgstr "" + +#: bookwyrm/templates/preferences/move_user.html:30 +msgid "Enter the username for the account you want to move to e.g. user@example.com :" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:4 +#: bookwyrm/templates/preferences/security.html:7 +msgid "Account Security" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:13 +msgid "Two Factor Authentication" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:19 +msgid "Successfully updated 2FA settings" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:27 +msgid "Write down or copy and paste these codes somewhere safe." +msgstr "" + +#: bookwyrm/templates/preferences/security.html:28 +msgid "You must use them in order, and they will not be displayed again." +msgstr "" + +#: bookwyrm/templates/preferences/security.html:38 +msgid "Two Factor Authentication is active on your account." +msgstr "" + +#: bookwyrm/templates/preferences/security.html:42 +msgid "You can generate backup codes to use in case you do not have access to your authentication app. If you generate new codes, any backup codes previously generated will no longer work." +msgstr "" + +#: bookwyrm/templates/preferences/security.html:43 +msgid "Generate backup codes" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:48 +msgid "Scan the QR code with your authentication app and then enter the code from your app below to confirm your app is set up." +msgstr "" + +#: bookwyrm/templates/preferences/security.html:55 +msgid "Use setup key" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:61 +msgid "Account name:" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:68 +msgid "Code:" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:76 +msgid "Enter the code from your app:" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:86 +msgid "You can make your account more secure by using Two Factor Authentication (2FA). This will require you to enter a one-time code using a phone app like Authy, Google Authenticator or Microsoft Authenticator each time you log in." +msgstr "" + +#: bookwyrm/templates/preferences/security.html:88 +msgid "Confirm your password to begin setting up 2FA." +msgstr "" + +#: bookwyrm/templates/preferences/security.html:98 +#: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:37 +msgid "Set up 2FA" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:111 +msgid "Sessions" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:114 +msgid "Some legacy sessions may not be displayed." +msgstr "" + +#: bookwyrm/templates/preferences/security.html:119 +msgid "You are logged in to the following sessions:" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:126 +msgid "Date first logged in" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:127 +msgid "IP address" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:127 +msgid "IP" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:128 +msgid "Operating System" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:128 +msgid "OS" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:129 +msgid "Web Browser" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:129 +msgid "Browser" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:143 +msgid "You" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:147 +msgid "Log Out" +msgstr "" + +#: bookwyrm/templates/preferences/security.html:161 +msgid "Currently your logged-in sessions are unable to be displayed." +msgstr "" + +#: bookwyrm/templates/reading_progress/finish.html:5 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/reading_progress/start.html:5 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/reading_progress/stop.html:5 +#, python-format +msgid "Stop Reading \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/reading_progress/want.html:5 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:4 +msgid "Delete these read dates?" +msgstr "" + +#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:8 +#, python-format +msgid "You are deleting this readthrough and its %(count)s associated progress updates." +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough.html:6 +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_form.html:10 +#: bookwyrm/templates/readthrough/readthrough_modal.html:38 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:24 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:21 +#: bookwyrm/templates/snippets/reading_modals/stop_reading_modal.html:24 +msgid "Started reading" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_form.html:18 +#: bookwyrm/templates/readthrough/readthrough_modal.html:56 +#: bookwyrm/templates/settings/files.html:139 +msgid "Progress" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_form.html:25 +#: bookwyrm/templates/readthrough/readthrough_modal.html:63 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:32 +msgid "Finished reading" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_list.html:9 +msgid "Progress Updates:" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_list.html:14 +msgid "finished" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_list.html:16 +msgid "stopped" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_list.html:27 +msgid "Show all updates" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_list.html:43 +msgid "Delete this progress update" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_list.html:55 +msgid "started" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_list.html:62 +msgid "Edit read dates" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_list.html:70 +msgid "Delete these read dates" +msgstr "" + +#: bookwyrm/templates/readthrough/readthrough_modal.html:12 +#, python-format +msgid "Add read dates for \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/report.html:5 +#: bookwyrm/templates/snippets/report_button.html:13 +msgid "Report" +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:5 +msgid "\n" +" Scan Barcode\n" +" " +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:21 +msgid "Requesting camera..." +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:22 +msgid "Grant access to the camera to scan a book's barcode." +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:27 +msgid "Could not access camera" +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:31 +msgctxt "barcode scanner" +msgid "Scanning..." +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:32 +msgid "Align your book's barcode with the camera." +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:36 +msgctxt "barcode scanner" +msgid "ISBN scanned" +msgstr "" + +#: bookwyrm/templates/search/barcode_modal.html:37 +msgctxt "followed by ISBN" +msgid "Searching for book:" +msgstr "" + +#: bookwyrm/templates/search/book.html:25 +#, python-format +msgid "%(formatted_review_count)s review" +msgid_plural "%(formatted_review_count)s reviews" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/search/book.html:34 +#, python-format +msgid "(published %(pub_year)s)" +msgstr "" + +#: bookwyrm/templates/search/book.html:50 +msgid "Results from" +msgstr "" + +#: bookwyrm/templates/search/book.html:89 +msgid "Import book" +msgstr "" + +#: bookwyrm/templates/search/book.html:113 +msgid "Load results from other catalogues" +msgstr "" + +#: bookwyrm/templates/search/book.html:117 +msgid "Manually add book" +msgstr "" + +#: bookwyrm/templates/search/book.html:122 +msgid "Log in to import or add books." +msgstr "" + +#: bookwyrm/templates/search/layout.html:17 +msgid "Search query" +msgstr "" + +#: bookwyrm/templates/search/layout.html:20 +msgid "Search type" +msgstr "" + +#: bookwyrm/templates/search/layout.html:25 +#: bookwyrm/templates/search/layout.html:51 +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:27 +#: bookwyrm/templates/settings/federation/instance_list.html:52 +#: bookwyrm/templates/settings/layout.html:36 +#: bookwyrm/templates/settings/users/user.html:13 +#: bookwyrm/templates/settings/users/user_admin.html:5 +#: bookwyrm/templates/settings/users/user_admin.html:12 +msgid "Users" +msgstr "" + +#: bookwyrm/templates/search/layout.html:63 +#, python-format +msgid "No results found for \"%(query)s\"" +msgstr "" + +#: bookwyrm/templates/search/layout.html:65 +#, python-format +msgid "%(result_count)s result found" +msgid_plural "%(result_count)s results found" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/settings/announcements/announcement.html:5 +#: bookwyrm/templates/settings/announcements/announcement.html:8 +msgid "Announcement" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcement.html:16 +#: bookwyrm/templates/settings/federation/instance.html:93 +#: bookwyrm/templates/snippets/status/status_options.html:25 +msgid "Edit" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcement.html:32 +#: bookwyrm/templates/settings/announcements/announcements.html:3 +#: bookwyrm/templates/settings/announcements/announcements.html:5 +#: bookwyrm/templates/settings/announcements/edit_announcement.html:15 +#: bookwyrm/templates/settings/layout.html:117 +msgid "Announcements" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcement.html:45 +msgid "Visible:" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcement.html:49 +msgid "True" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcement.html:51 +msgid "False" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcement.html:57 +#: bookwyrm/templates/settings/announcements/edit_announcement.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +msgid "Start date:" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcement.html:62 +#: bookwyrm/templates/settings/announcements/edit_announcement.html:89 +#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +msgid "End date:" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcement.html:66 +#: bookwyrm/templates/settings/announcements/edit_announcement.html:109 +msgid "Active:" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcements.html:9 +#: bookwyrm/templates/settings/announcements/edit_announcement.html:8 +msgid "Create Announcement" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcements.html:21 +#: bookwyrm/templates/settings/federation/instance_list.html:40 +msgid "Date added" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcements.html:25 +msgid "Preview" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcements.html:29 +msgid "Start date" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcements.html:33 +msgid "End date" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcements.html:50 +msgid "active" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcements.html:50 +msgid "inactive" +msgstr "" + +#: bookwyrm/templates/settings/announcements/announcements.html:63 +msgid "No announcements found" +msgstr "" + +#: bookwyrm/templates/settings/announcements/edit_announcement.html:6 +msgid "Edit Announcement" +msgstr "" + +#: bookwyrm/templates/settings/announcements/edit_announcement.html:45 +msgid "Announcement content" +msgstr "" + +#: bookwyrm/templates/settings/announcements/edit_announcement.html:57 +msgid "Details:" +msgstr "" + +#: bookwyrm/templates/settings/announcements/edit_announcement.html:65 +msgid "Event date:" +msgstr "" + +#: bookwyrm/templates/settings/announcements/edit_announcement.html:73 +msgid "Display settings" +msgstr "" + +#: bookwyrm/templates/settings/announcements/edit_announcement.html:98 +msgid "Color:" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:7 +#: bookwyrm/templates/settings/automod/rules.html:11 +msgid "Auto-moderation rules" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:18 +msgid "Auto-moderation rules will create reports for any local user or status with fields matching the provided string." +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:19 +msgid "Users or statuses that have already been reported (regardless of whether the report was resolved) will not be flagged." +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:26 +#: bookwyrm/templates/settings/files.html:28 +#: bookwyrm/templates/settings/files.html:221 +msgid "Schedule:" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:33 +#: bookwyrm/templates/settings/files.html:35 +#: bookwyrm/templates/settings/files.html:228 +msgid "Last run:" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:40 +#: bookwyrm/templates/settings/files.html:42 +#: bookwyrm/templates/settings/files.html:235 +msgid "Total run count:" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:47 +#: bookwyrm/templates/settings/files.html:49 +#: bookwyrm/templates/settings/files.html:242 +msgid "Enabled:" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:59 +#: bookwyrm/templates/settings/files.html:61 +#: bookwyrm/templates/settings/files.html:254 +msgid "Delete schedule" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:63 +#: bookwyrm/templates/settings/files.html:65 +#: bookwyrm/templates/settings/files.html:258 +#: bookwyrm/templates/settings/files.html:305 +msgid "Run now" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:64 +#: bookwyrm/templates/settings/files.html:66 +#: bookwyrm/templates/settings/files.html:259 +msgid "Last run date will not be updated" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:69 +#: bookwyrm/templates/settings/automod/rules.html:92 +#: bookwyrm/templates/settings/files.html:96 +#: bookwyrm/templates/settings/files.html:290 +msgid "Schedule scan" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:101 +msgid "Successfully added rule" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:107 +msgid "Add Rule" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:116 +#: bookwyrm/templates/settings/automod/rules.html:160 +msgid "String match" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:126 +#: bookwyrm/templates/settings/automod/rules.html:163 +msgid "Flag users" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:133 +#: bookwyrm/templates/settings/automod/rules.html:166 +msgid "Flag statuses" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:140 +msgid "Add rule" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:147 +msgid "Current Rules" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:151 +msgid "Show rules" +msgstr "" + +#: bookwyrm/templates/settings/automod/rules.html:188 +msgid "Remove rule" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:6 +#: bookwyrm/templates/settings/celery.html:8 +#: bookwyrm/templates/settings/layout.html:92 +msgid "Celery Status" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:14 +msgid "You can set up monitoring to check if Celery is running by querying:" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:22 +msgid "Queues" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:26 +msgid "Streams" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:32 +msgid "Broadcast" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:38 +msgid "Inbox" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:51 +msgid "Import triggered" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:57 +#: bookwyrm/templates/settings/layout.html:104 +msgid "Connectors" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:64 +#: bookwyrm/templates/settings/site.html:91 +msgid "Images" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:70 +msgid "Suggested Users" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:83 +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:43 +#: bookwyrm/templates/settings/users/email_filter.html:5 +msgid "Email" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:89 +msgid "Misc" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:96 +msgid "Low priority" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:102 +msgid "Medium priority" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:108 +msgid "High priority" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:118 +msgid "Could not connect to Redis broker" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:126 +msgid "Active Tasks" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:131 +#: bookwyrm/templates/settings/imports/imports.html:195 +#: bookwyrm/templates/settings/imports/imports.html:285 +#: bookwyrm/templates/settings/schedules.html:95 +msgid "ID" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:132 +msgid "Task name" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:133 +msgid "Run time" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:134 +#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/update.html:21 +msgid "Priority" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:139 +msgid "No active tasks" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:157 +msgid "Workers" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:162 +msgid "Uptime:" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:172 +msgid "Could not connect to Celery" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:178 +#: bookwyrm/templates/settings/celery.html:201 +msgid "Clear Queues" +msgstr "" + +#: bookwyrm/templates/settings/celery.html:182 +msgid "Clearing queues can cause serious problems including data loss! Only play with this if you really know what you're doing. You must shut down the Celery worker before you do this." +msgstr "" + +#: bookwyrm/templates/settings/celery.html:208 +msgid "Errors" +msgstr "" + +#: bookwyrm/templates/settings/connectors/available.html:15 +msgid "Finna.fi is a search service that collects material from hundreds of Finnish organisations under one roof." +msgstr "" + +#: bookwyrm/templates/settings/connectors/available.html:28 +msgid "Create new connector" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/update.html:33 +#: bookwyrm/templates/settings/users/user_info.html:87 +msgid "Deactivation reason:" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:50 +#: bookwyrm/templates/settings/connectors/update.html:47 +msgid "Deactivate" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/update.html:58 +msgid "Activate" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connectors.html:4 +#: bookwyrm/templates/settings/connectors/connectors.html:6 +msgid "Connector Settings" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connectors.html:11 +msgid "Connectors are sources of data about books and authors." +msgstr "" + +#: bookwyrm/templates/settings/connectors/connectors.html:12 +msgid "The priority determines the order in which search results appear. The highest priority is 1. The default priority is 2." +msgstr "" + +#: bookwyrm/templates/settings/connectors/connectors.html:14 +msgid "Connector settings only determine whether a connector will be used to deliver search results. To manage more interactions with other federated servers, including domain blocks, see" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connectors.html:14 +#: bookwyrm/templates/settings/federation/edit_instance.html:12 +#: bookwyrm/templates/settings/federation/instance.html:24 +#: bookwyrm/templates/settings/federation/instance_blocklist.html:12 +#: bookwyrm/templates/settings/federation/instance_list.html:3 +#: bookwyrm/templates/settings/federation/instance_list.html:5 +#: bookwyrm/templates/settings/layout.html:47 +msgid "Federated Instances" +msgstr "" + +#: bookwyrm/templates/settings/connectors/update.html:66 +msgid "should be updated. Check recent release notes for more information." +msgstr "" + +#: bookwyrm/templates/settings/connectors/update.html:76 +#: bookwyrm/templates/snippets/create_status/post_options_block.html:19 +msgid "Update" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:6 +#: bookwyrm/templates/settings/dashboard/dashboard.html:8 +#: bookwyrm/templates/settings/layout.html:28 +msgid "Dashboard" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:15 +#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +msgid "Total users" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:21 +#: bookwyrm/templates/settings/dashboard/user_chart.html:16 +msgid "Active this month" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:33 +#: bookwyrm/templates/settings/dashboard/works_chart.html:11 +msgid "Works" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +msgid "Instance Activity" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +msgid "Interval:" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +msgid "Days" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +msgid "Weeks" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +msgid "User signup activity" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +msgid "Status activity" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +msgid "Works created" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/registration_chart.html:10 +msgid "Registrations" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/status_chart.html:11 +msgid "Statuses posted" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html:12 +msgid "Would you like to automatically check for new BookWyrm releases? (recommended)" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/check_for_updates.html:20 +msgid "Schedule checks" +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "" + +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 +msgid "Add domain" +msgstr "" + +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:11 +msgid "Domain:" +msgstr "" + +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:5 +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:7 +#: bookwyrm/templates/settings/layout.html:71 +msgid "Email Blocklist" +msgstr "" + +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:18 +msgid "When someone tries to register with an email from this domain, no account will be created. The registration process will appear to have worked." +msgstr "" + +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:29 +#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:27 +msgid "Options" +msgstr "" + +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:38 +#, python-format +msgid "%(display_count)s user" +msgid_plural "%(display_count)s users" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:59 +msgid "No email domains currently blocked" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:6 +#: bookwyrm/templates/settings/email_config.html:8 +#: bookwyrm/templates/settings/layout.html:100 +msgid "Email Configuration" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:16 +msgid "Error sending test email:" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:24 +msgid "Successfully sent test email." +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:32 +#: bookwyrm/templates/setup/config.html:96 +msgid "Email sender:" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:39 +msgid "Email backend:" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:46 +msgid "Host:" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:53 +msgid "Host user:" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:60 +msgid "Port:" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:67 +msgid "Use TLS:" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:74 +msgid "Use SSL:" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:83 +#, python-format +msgid "Send test email to %(email)s" +msgstr "" + +#: bookwyrm/templates/settings/email_config.html:90 +msgid "Send test email" +msgstr "" + +#: bookwyrm/templates/settings/federation/edit_instance.html:3 +#: bookwyrm/templates/settings/federation/edit_instance.html:6 +#: bookwyrm/templates/settings/federation/edit_instance.html:15 +#: bookwyrm/templates/settings/federation/edit_instance.html:32 +#: bookwyrm/templates/settings/federation/instance_blocklist.html:3 +#: bookwyrm/templates/settings/federation/instance_blocklist.html:32 +#: bookwyrm/templates/settings/federation/instance_list.html:9 +#: bookwyrm/templates/settings/federation/instance_list.html:10 +msgid "Add instance" +msgstr "" + +#: bookwyrm/templates/settings/federation/edit_instance.html:28 +#: bookwyrm/templates/settings/federation/instance_blocklist.html:28 +msgid "Import block list" +msgstr "" + +#: bookwyrm/templates/settings/federation/edit_instance.html:43 +msgid "Instance:" +msgstr "" + +#: bookwyrm/templates/settings/federation/edit_instance.html:52 +#: bookwyrm/templates/settings/federation/instance.html:46 +#: bookwyrm/templates/settings/users/user_info.html:113 +msgid "Status:" +msgstr "" + +#: bookwyrm/templates/settings/federation/edit_instance.html:66 +#: bookwyrm/templates/settings/federation/instance.html:40 +#: bookwyrm/templates/settings/users/user_info.html:107 +msgid "Software:" +msgstr "" + +#: bookwyrm/templates/settings/federation/edit_instance.html:76 +#: bookwyrm/templates/settings/federation/instance.html:43 +#: bookwyrm/templates/settings/users/user_info.html:110 +msgid "Version:" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:17 +msgid "Refresh data" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:37 +msgid "Details" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:53 +#: bookwyrm/templates/user/layout.html:79 +msgid "Activity" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:56 +msgid "Users:" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:59 +#: bookwyrm/templates/settings/federation/instance.html:65 +msgid "View all" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:62 +#: bookwyrm/templates/settings/users/user_info.html:60 +msgid "Reports:" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:68 +msgid "Followed by us:" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:73 +msgid "Followed by them:" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:78 +msgid "Blocked by us:" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:90 +#: bookwyrm/templates/settings/users/user_info.html:117 +msgid "Notes" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:97 +msgid "No notes" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:117 +msgid "All users from this instance will be deactivated." +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:122 +#: bookwyrm/templates/snippets/block_button.html:10 +msgid "Un-block" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance.html:123 +msgid "All users from this instance will be re-activated." +msgstr "" + +#: bookwyrm/templates/settings/federation/instance_blocklist.html:6 +#: bookwyrm/templates/settings/federation/instance_blocklist.html:15 +msgid "Import Blocklist" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance_blocklist.html:38 +msgid "Success!" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance_blocklist.html:42 +msgid "Successfully blocked:" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance_blocklist.html:44 +msgid "Failed:" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance_blocklist.html:62 +msgid "Expects a json file in the format provided by FediBlock, with a list of entries that have instance and url fields. For example:" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance_list.html:36 +#: bookwyrm/templates/settings/users/server_filter.html:5 +msgid "Instance name" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance_list.html:44 +msgid "Last updated" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance_list.html:48 +#: bookwyrm/templates/settings/federation/software_filter.html:5 +msgid "Software" +msgstr "" + +#: bookwyrm/templates/settings/federation/instance_list.html:70 +msgid "No instances found" +msgstr "" + +#: bookwyrm/templates/settings/files.html:7 +#: bookwyrm/templates/settings/files.html:11 +msgid "Files maintenance" +msgstr "" + +#: bookwyrm/templates/settings/files.html:17 +msgid "Schedule file deletion" +msgstr "" + +#: bookwyrm/templates/settings/files.html:21 +msgid "This job deletes uploaded user export and import files that have reached the expiry age." +msgstr "" + +#: bookwyrm/templates/settings/files.html:102 +msgid "Export file expiration" +msgstr "" + +#: bookwyrm/templates/settings/files.html:109 +msgid "Maximum age of export files, in hours" +msgstr "" + +#: bookwyrm/templates/settings/files.html:122 +msgid "Files older than this will be deleted." +msgstr "" + +#: bookwyrm/templates/settings/files.html:125 +msgid "Set expiry hours" +msgstr "" + +#: bookwyrm/templates/settings/files.html:138 +msgid "Expired files" +msgstr "" + +#: bookwyrm/templates/settings/files.html:186 +#: bookwyrm/templates/settings/imports/imports.html:184 +#: bookwyrm/templates/settings/imports/imports.html:274 +msgid "Completed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:206 +msgid "Find book covers from connectors" +msgstr "" + +#: bookwyrm/templates/settings/files.html:209 +msgid "These jobs find cover images where they are missing or have incorrect filepaths." +msgstr "" + +#: bookwyrm/templates/settings/files.html:212 +msgid "Find missing covers" +msgstr "" + +#: bookwyrm/templates/settings/files.html:215 +msgid "Schedule a regular scan to find cover images for editions without them. This can be resource intensive so the recommended schedule is no less than every seven days." +msgstr "" + +#: bookwyrm/templates/settings/files.html:296 +msgid "Fix broken book cover filepaths" +msgstr "" + +#: bookwyrm/templates/settings/files.html:299 +msgid "If you have lost your cover image files (e.g. due to server migration failure) the scheduled job above will not replace them. Run this job instead to attempt to find covers for books where the current cover filepath does not resolve to a file." +msgstr "" + +#: bookwyrm/templates/settings/files.html:306 +msgid "This job cannot be scheduled to run regularly" +msgstr "" + +#: bookwyrm/templates/settings/files.html:320 +msgid "Editions checked" +msgstr "" + +#: bookwyrm/templates/settings/files.html:321 +msgid "Covers fixed" +msgstr "" + +#: bookwyrm/templates/settings/files.html:371 +msgid "Successfully updated expiry time" +msgstr "" + +#: bookwyrm/templates/settings/imports/complete_import_modal.html:4 +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4 +msgid "Stop import?" +msgstr "" + +#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7 +msgid "This action will stop the user import before it is complete and cannot be un-done" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:19 +msgid "Disable starting new imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:30 +msgid "This is only intended to be used when things have gone very wrong with imports and you need to pause the feature while addressing issues." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:31 +msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:32 +msgid "This setting prevents both book imports and user imports." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:37 +msgid "Disable imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:51 +msgid "Users are currently unable to start new imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:56 +msgid "Enable imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:64 +msgid "Limit the amount of imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:75 +msgid "Some users might try to import a large number of books, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:76 +#: bookwyrm/templates/settings/imports/imports.html:135 +msgid "Set the value to 0 to not enforce any limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:79 +msgid "Set import limit to" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:81 +msgid "books every" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:83 +msgid "days." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:87 +msgid "Set limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:98 +msgid "Disable starting new user exports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:109 +msgid "This is only intended to be used when things have gone very wrong with exports and you need to pause the feature while addressing issues." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:110 +msgid "While exports are disabled, users will not be allowed to start new user exports, but existing exports will not be affected." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:115 +msgid "Disable user exports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:123 +msgid "Limit how often users can import and export" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:134 +msgid "Some users might try to run user imports or exports very frequently, which you want to limit." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:138 +msgid "Limit how often users can import and export user data" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:140 +msgid "hours" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:144 +msgid "Change limit" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:159 +msgid "Users are currently unable to start new user exports. This is the default setting." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:161 +msgid "It is not currently possible to provide user exports when using Azure storage." +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:167 +msgid "Enable user exports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:174 +msgid "Book Imports" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:198 +#: bookwyrm/templates/settings/imports/imports.html:288 +msgid "User" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:207 +#: bookwyrm/templates/settings/imports/imports.html:297 +msgid "Date Updated" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:214 +msgid "Pending items" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:217 +msgid "Successful items" +msgstr "" + +#: bookwyrm/templates/settings/imports/imports.html:252 +#: bookwyrm/templates/settings/imports/imports.html:344 +msgid "No matching imports found." +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:4 +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:11 +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:25 +#: bookwyrm/templates/settings/invites/manage_invites.html:11 +msgid "Invite Requests" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:15 +#: bookwyrm/templates/settings/invites/manage_invites.html:3 +#: bookwyrm/templates/settings/invites/manage_invites.html:15 +#: bookwyrm/templates/settings/layout.html:42 +#: bookwyrm/templates/user_menu.html:55 +msgid "Invites" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:23 +msgid "Ignored Invite Requests" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:36 +msgid "Date requested" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:40 +msgid "Date accepted" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:45 +msgid "Answer" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:51 +msgid "Action" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:54 +msgid "No requests" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:66 +#: bookwyrm/templates/settings/invites/status_filter.html:16 +msgid "Accepted" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:68 +#: bookwyrm/templates/settings/invites/status_filter.html:12 +msgid "Sent" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:70 +#: bookwyrm/templates/settings/invites/status_filter.html:8 +msgid "Requested" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:80 +msgid "Send invite" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:82 +msgid "Re-send invite" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:102 +msgid "Ignore" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:104 +msgid "Un-ignore" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:116 +msgid "Back to pending requests" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invite_requests.html:118 +msgid "View ignored requests" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invites.html:21 +msgid "Generate New Invite" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invites.html:27 +msgid "Expiry:" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invites.html:33 +msgid "Use limit:" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invites.html:40 +msgid "Create Invite" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invites.html:48 +msgid "Expires" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invites.html:49 +msgid "Max uses" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invites.html:50 +msgid "Times used" +msgstr "" + +#: bookwyrm/templates/settings/invites/manage_invites.html:53 +msgid "No active invites" +msgstr "" + +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:5 +#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:10 +msgid "Add IP address" +msgstr "" + +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:11 +msgid "Use IP address blocks with caution, and consider using blocks only temporarily, as IP addresses are often shared or change hands. If you block your own IP, you will not be able to access this page." +msgstr "" + +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:18 +msgid "IP Address:" +msgstr "" + +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:24 +msgid "You can block IP ranges using CIDR syntax." +msgstr "" + +#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:5 +#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:7 +#: bookwyrm/templates/settings/layout.html:75 +msgid "IP Address Blocklist" +msgstr "" + +#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:18 +msgid "Any traffic from this IP address will get a 404 response when trying to access any part of the application." +msgstr "" + +#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:24 +msgid "Address" +msgstr "" + +#: bookwyrm/templates/settings/ip_blocklist/ip_blocklist.html:46 +msgid "No IP addresses currently blocked" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:4 +msgid "Administration" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:31 +msgid "Manage Users" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:53 +#: bookwyrm/templates/settings/users/force_password_reset.html:7 +#: bookwyrm/templates/settings/users/force_password_reset.html:11 +msgid "Force Password Reset" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:59 +msgid "Moderation" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:63 +#: bookwyrm/templates/settings/reports/reports.html:8 +#: bookwyrm/templates/settings/reports/reports.html:17 +msgid "Reports" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:67 +msgid "Auto-Moderation Rules" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:79 +#: bookwyrm/templates/settings/link_domains/link_domains.html:5 +#: bookwyrm/templates/settings/link_domains/link_domains.html:7 +msgid "Link Domains" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:84 +msgid "System" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:96 +msgid "Scheduled Tasks" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:108 +msgid "Files Maintenance" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:113 +msgid "Instance Settings" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:121 +#: bookwyrm/templates/settings/site.html:4 +#: bookwyrm/templates/settings/site.html:6 +msgid "Site Settings" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:127 +#: bookwyrm/templates/settings/layout.html:130 +#: bookwyrm/templates/settings/registration.html:4 +#: bookwyrm/templates/settings/registration.html:6 +#: bookwyrm/templates/settings/registration_limited.html:4 +#: bookwyrm/templates/settings/registration_limited.html:6 +msgid "Registration" +msgstr "" + +#: bookwyrm/templates/settings/layout.html:136 +#: bookwyrm/templates/settings/site.html:107 +#: bookwyrm/templates/settings/themes.html:4 +#: bookwyrm/templates/settings/themes.html:6 +msgid "Themes" +msgstr "" + +#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:5 +#, python-format +msgid "Set display name for %(url)s" +msgstr "" + +#: bookwyrm/templates/settings/link_domains/link_domains.html:11 +msgid "Link domains must be approved before they are shown on book pages. Please make sure that the domains are not hosting spam, malicious code, or deceptive links before approving." +msgstr "" + +#: bookwyrm/templates/settings/link_domains/link_domains.html:45 +msgid "Set display name" +msgstr "" + +#: bookwyrm/templates/settings/link_domains/link_domains.html:53 +msgid "View links" +msgstr "" + +#: bookwyrm/templates/settings/link_domains/link_domains.html:96 +msgid "No domains currently approved" +msgstr "" + +#: bookwyrm/templates/settings/link_domains/link_domains.html:98 +msgid "No domains currently pending" +msgstr "" + +#: bookwyrm/templates/settings/link_domains/link_domains.html:100 +msgid "No domains currently blocked" +msgstr "" + +#: bookwyrm/templates/settings/link_domains/link_table.html:43 +msgid "No links available for this domain." +msgstr "" + +#: bookwyrm/templates/settings/registration.html:13 +#: bookwyrm/templates/settings/registration_limited.html:13 +#: bookwyrm/templates/settings/site.html:21 +msgid "Settings saved" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:22 +#: bookwyrm/templates/settings/registration_limited.html:22 +#: bookwyrm/templates/settings/site.html:30 +msgid "Unable to save settings" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:38 +msgid "Allow registration" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:43 +msgid "Default access level:" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:61 +msgid "Require users to confirm email address" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:63 +msgid "(Recommended if registration is open)" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:68 +msgid "Allow invite requests" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:72 +#: bookwyrm/templates/settings/registration_limited.html:42 +msgid "Invite request text:" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:80 +#: bookwyrm/templates/settings/registration_limited.html:50 +msgid "Set a question for invite requests" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:85 +#: bookwyrm/templates/settings/registration_limited.html:55 +msgid "Question:" +msgstr "" + +#: bookwyrm/templates/settings/registration.html:90 +#: bookwyrm/templates/settings/registration_limited.html:67 +msgid "Registration closed text:" +msgstr "" + +#: bookwyrm/templates/settings/registration_limited.html:29 +msgid "Registration is enabled on this instance" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:13 +msgid "Back to reports" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:25 +msgid "Message reporter" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:29 +msgid "Update on your report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:37 +msgid "Reported status" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:39 +msgid "Status has been deleted" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:48 +msgid "Reported links" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:66 +msgid "Moderation Activity" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:73 +#, python-format +msgid "%(user)s opened this report" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:86 +#, python-format +msgid "%(user)s commented on this report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:90 +#, python-format +msgid "%(user)s took an action on this report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_header.html:6 +#, python-format +msgid "Report #%(report_id)s: Status posted by @%(username)s" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_header.html:13 +#, python-format +msgid "Report #%(report_id)s: Link added by @%(username)s" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_header.html:17 +#, python-format +msgid "Report #%(report_id)s: Link domain" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_header.html:24 +#, python-format +msgid "Report #%(report_id)s: User @%(username)s" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_links_table.html:19 +msgid "Approve domain" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_links_table.html:26 +msgid "Block domain" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_preview.html:17 +msgid "No notes provided" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_preview.html:24 +#, python-format +msgid "Reported by @%(username)s" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_preview.html:34 +msgid "Re-open" +msgstr "" + +#: bookwyrm/templates/settings/reports/report_preview.html:36 +msgid "Resolve" +msgstr "" + +#: bookwyrm/templates/settings/reports/reports.html:6 +#, python-format +msgid "Reports: %(instance_name)s" +msgstr "" + +#: bookwyrm/templates/settings/reports/reports.html:14 +#, python-format +msgid "Reports: %(instance_name)s" +msgstr "" + +#: bookwyrm/templates/settings/reports/reports.html:25 +msgid "Open" +msgstr "" + +#: bookwyrm/templates/settings/reports/reports.html:28 +msgid "Resolved" +msgstr "" + +#: bookwyrm/templates/settings/reports/reports.html:37 +msgid "No reports found." +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:7 +#: bookwyrm/templates/settings/schedules.html:11 +msgid "Scheduled tasks" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:17 +#: bookwyrm/templates/settings/schedules.html:101 +msgid "Tasks" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:25 +msgid "Celery task" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:28 +msgid "Date changed" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:31 +msgid "Last run at" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:34 +#: bookwyrm/templates/settings/schedules.html:98 +msgid "Schedule" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:37 +msgid "Schedule ID" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:40 +msgid "Enabled" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:73 +msgid "Un-schedule" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:81 +msgid "No scheduled tasks" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:90 +msgid "Schedules" +msgstr "" + +#: bookwyrm/templates/settings/schedules.html:119 +msgid "No schedules found" +msgstr "" + +#: bookwyrm/templates/settings/site.html:10 +#: bookwyrm/templates/settings/site.html:43 +msgid "Instance Info" +msgstr "" + +#: bookwyrm/templates/settings/site.html:12 +#: bookwyrm/templates/settings/site.html:122 +msgid "Footer Content" +msgstr "" + +#: bookwyrm/templates/settings/site.html:46 +msgid "Instance Name:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:50 +msgid "Tagline:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:54 +msgid "Instance description:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:58 +msgid "Short description:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:59 +msgid "Used when the instance is previewed on joinbookwyrm.com. Does not support HTML or Markdown." +msgstr "" + +#: bookwyrm/templates/settings/site.html:63 +msgid "Code of conduct:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:67 +msgid "Privacy Policy:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:72 +msgid "Impressum:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:77 +msgid "Include impressum:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:94 +msgid "Logo:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:98 +msgid "Logo small:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:102 +msgid "Favicon:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:110 +msgid "Default theme:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:125 +msgid "Support link:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:129 +msgid "Support title:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:133 +msgid "Admin email:" +msgstr "" + +#: bookwyrm/templates/settings/site.html:137 +msgid "Additional info:" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:10 +msgid "Set instance default theme" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:19 +msgid "One of your themes appears to be broken. Selecting this theme will make the application unusable." +msgstr "" + +#: bookwyrm/templates/settings/themes.html:28 +msgid "Successfully added theme" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:35 +msgid "How to add a theme" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:38 +msgid "Copy the theme file into the bookwyrm/static/css/themes directory on your server from the command line." +msgstr "" + +#: bookwyrm/templates/settings/themes.html:41 +msgid "Run ./bw-dev compile_themes and ./bw-dev collectstatic." +msgstr "" + +#: bookwyrm/templates/settings/themes.html:44 +msgid "Add the file name using the form below to make it available in the application interface." +msgstr "" + +#: bookwyrm/templates/settings/themes.html:51 +#: bookwyrm/templates/settings/themes.html:91 +msgid "Add theme" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:57 +msgid "Unable to save theme" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:72 +#: bookwyrm/templates/settings/themes.html:102 +msgid "Theme name" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:82 +msgid "Theme filename" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:97 +msgid "Available Themes" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:105 +msgid "File" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:123 +msgid "Remove theme" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:134 +msgid "Test theme" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:143 +msgid "Broken theme" +msgstr "" + +#: bookwyrm/templates/settings/themes.html:152 +msgid "Loaded successfully" +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:5 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:52 +msgid "Permanently delete user" +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:12 +#, python-format +msgid "Are you sure you want to delete %(username)s's account? This action cannot be undone." +msgstr "" + +#: bookwyrm/templates/settings/users/delete_user_form.html:18 +msgid "I understand that this is a permanent action:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:17 +msgid "All users in the selected category will be logged out and required to set a new password to log back in." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:18 +msgid "If your account is in the group, you will be logged out out after submitting." +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:22 +msgid "Users given password resets:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:35 +msgid "All users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:39 +msgid "users" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:43 +msgid "Force password reset" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:48 +msgid "Number of users that will be effected:" +msgstr "" + +#: bookwyrm/templates/settings/users/force_password_reset.html:53 +msgid "Are you sure you want to force password reset for these users:" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:9 +#, python-format +msgid "Users: %(instance_name)s" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/username_filter.html:5 +msgid "Username" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:48 +msgid "Date Added" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:52 +msgid "Last Active" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:61 +msgid "Remote instance" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:84 +#: bookwyrm/templates/settings/users/user_info.html:127 +msgid "Not set" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:20 +msgid "This account is the instance actor for signing HTTP requests." +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:24 +msgid "View user profile" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:30 +msgid "Go to user admin" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:40 +msgid "Local" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:42 +msgid "Remote" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:51 +msgid "User details" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:55 +msgid "Email:" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:65 +msgid "(View reports)" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:71 +msgid "Blocked by count:" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:74 +msgid "Date added:" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:77 +msgid "Last active date:" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:80 +msgid "Manually approved followers:" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:83 +msgid "Discoverable:" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:102 +msgid "Instance details" +msgstr "" + +#: bookwyrm/templates/settings/users/user_info.html:124 +msgid "View instance" +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:6 +msgid "Permanently deleted" +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:9 +msgid "User Actions" +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:15 +msgid "This is the instance admin actor" +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:18 +msgid "You must not delete or disable this account as it is critical to the functioning of your server. This actor signs outgoing GET requests to smooth interaction with secure ActivityPub servers." +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:19 +msgid "This account is not discoverable by ordinary users and does not have a profile page." +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:35 +msgid "Activate user" +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:41 +msgid "Suspend user" +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:46 +msgid "Un-suspend user" +msgstr "" + +#: bookwyrm/templates/settings/users/user_moderation_actions.html:68 +msgid "Access level:" +msgstr "" + +#: bookwyrm/templates/setup/admin.html:5 +msgid "Set up BookWyrm" +msgstr "" + +#: bookwyrm/templates/setup/admin.html:7 +msgid "Your account as a user and an admin" +msgstr "" + +#: bookwyrm/templates/setup/admin.html:13 +msgid "Create your account" +msgstr "" + +#: bookwyrm/templates/setup/admin.html:20 +msgid "Admin key:" +msgstr "" + +#: bookwyrm/templates/setup/admin.html:32 +msgid "An admin key was created when you installed BookWyrm. You can get your admin key by running ./bw-dev admin_code from the command line on your server." +msgstr "" + +#: bookwyrm/templates/setup/admin.html:45 +msgid "As an admin, you'll be able to configure the instance name and information, and moderate your instance. This means you will have access to private information about your users, and are responsible for responding to reports of bad behavior or spam." +msgstr "" + +#: bookwyrm/templates/setup/admin.html:51 +msgid "Once the instance is set up, you can promote other users to moderator or admin roles from the admin panel." +msgstr "" + +#: bookwyrm/templates/setup/admin.html:55 +msgid "Learn more about moderation" +msgstr "" + +#: bookwyrm/templates/setup/config.html:5 +msgid "Instance Configuration" +msgstr "" + +#: bookwyrm/templates/setup/config.html:7 +msgid "Make sure everything looks right before proceeding" +msgstr "" + +#: bookwyrm/templates/setup/config.html:18 +msgid "You are running BookWyrm in debug mode. This should never be used in a production environment." +msgstr "" + +#: bookwyrm/templates/setup/config.html:30 +msgid "Your domain appears to be misconfigured. It should not include protocol or slashes." +msgstr "" + +#: bookwyrm/templates/setup/config.html:42 +msgid "You are running BookWyrm with localhost. This should never be used in a production environment." +msgstr "" + +#: bookwyrm/templates/setup/config.html:52 bookwyrm/templates/user_menu.html:44 +msgid "Settings" +msgstr "" + +#: bookwyrm/templates/setup/config.html:56 +msgid "Instance domain:" +msgstr "" + +#: bookwyrm/templates/setup/config.html:62 +msgid "Instance base URL:" +msgstr "" + +#: bookwyrm/templates/setup/config.html:75 +msgid "Using S3:" +msgstr "" + +#: bookwyrm/templates/setup/config.html:89 +msgid "Default interface language:" +msgstr "" + +#: bookwyrm/templates/setup/config.html:103 +msgid "Enable preview images:" +msgstr "" + +#: bookwyrm/templates/setup/config.html:110 +msgid "Enable image thumbnails:" +msgstr "" + +#: bookwyrm/templates/setup/config.html:122 +msgid "Does everything look right?" +msgstr "" + +#: bookwyrm/templates/setup/config.html:125 +msgid "This is your last chance to set your domain and protocol." +msgstr "" + +#: bookwyrm/templates/setup/config.html:139 +msgid "You can change your instance settings in the .env file on your server." +msgstr "" + +#: bookwyrm/templates/setup/config.html:143 +msgid "View installation instructions" +msgstr "" + +#: bookwyrm/templates/setup/layout.html:5 +msgid "Instance Setup" +msgstr "" + +#: bookwyrm/templates/setup/layout.html:21 +msgid "Installing BookWyrm" +msgstr "" + +#: bookwyrm/templates/setup/layout.html:24 +msgid "Need help?" +msgstr "" + +#: bookwyrm/templates/shelf/create_shelf_form.html:5 +#: bookwyrm/templates/shelf/shelf.html:79 +msgid "Create shelf" +msgstr "" + +#: bookwyrm/templates/shelf/edit_shelf_form.html:5 +msgid "Edit Shelf" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:46 +#: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:61 +msgid "All books" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:71 +msgid "Import Books" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:104 +#, python-format +msgid "%(formatted_count)s book" +msgid_plural "%(formatted_count)s books" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/shelf/shelf.html:110 +#, python-format +msgid "(showing %(start)s-%(end)s)" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:124 +msgid "Edit shelf" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:132 +msgid "Delete shelf" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:160 +#: bookwyrm/templates/shelf/shelf.html:186 +msgid "Shelved" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:161 +#: bookwyrm/templates/shelf/shelf.html:189 +msgid "Started" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:162 +#: bookwyrm/templates/shelf/shelf.html:192 +msgid "Finished" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:162 +#: bookwyrm/templates/shelf/shelf.html:192 +msgid "Until" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:221 +#, python-format +msgid "We couldn't find any books that matched %(shelves_filter_query)s" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:225 +msgid "This shelf is empty." +msgstr "" + +#: bookwyrm/templates/shelf/shelves_filter_field.html:6 +msgid "Filter by keyword" +msgstr "" + +#: bookwyrm/templates/shelf/shelves_filter_field.html:7 +msgid "Enter text here" +msgstr "" + +#: bookwyrm/templates/snippets/add_to_group_button.html:16 +msgid "Invite" +msgstr "" + +#: bookwyrm/templates/snippets/add_to_group_button.html:25 +msgid "Uninvite" +msgstr "" + +#: bookwyrm/templates/snippets/add_to_group_button.html:29 +#, python-format +msgid "Remove @%(username)s" +msgstr "" + +#: bookwyrm/templates/snippets/announcement.html:28 +#, python-format +msgid "Posted by %(username)s" +msgstr "" + +#: bookwyrm/templates/snippets/authors.html:22 +#: bookwyrm/templates/snippets/trimmed_list.html:14 +#, python-format +msgid "and %(remainder_count_display)s other" +msgid_plural "and %(remainder_count_display)s others" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/book_cover.html:63 +msgid "No cover" +msgstr "" + +#: bookwyrm/templates/snippets/book_titleby.html:11 +#, python-format +msgid "%(title)s by" +msgstr "" + +#: bookwyrm/templates/snippets/boost_button.html:20 +#: bookwyrm/templates/snippets/boost_button.html:21 +msgid "Boost" +msgstr "" + +#: bookwyrm/templates/snippets/boost_button.html:33 +#: bookwyrm/templates/snippets/boost_button.html:34 +msgid "Un-boost" +msgstr "" + +#: bookwyrm/templates/snippets/create_status.html:36 +msgid "Quote" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/comment.html:15 +msgid "Some thoughts on the book" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/comment.html:27 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:18 +msgid "Progress:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/comment.html:53 +#: bookwyrm/templates/snippets/progress_field.html:18 +msgid "pages" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/comment.html:59 +#: bookwyrm/templates/snippets/progress_field.html:23 +msgid "percent" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/comment.html:66 +#, python-format +msgid "of %(pages)s pages" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/status/layout.html:34 +#: bookwyrm/templates/snippets/status/layout.html:53 +#: bookwyrm/templates/snippets/status/layout.html:54 +msgid "Reply" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_field.html:18 +msgid "Content" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9 +msgid "Include spoiler alert" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18 +msgid "Spoilers/content warnings:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27 +msgid "Spoilers ahead!" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/layout.html:45 +#: bookwyrm/templates/snippets/reading_modals/form.html:7 +msgid "Comment:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/post_options_block.html:21 +msgid "Post" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/quotation.html:16 +msgid "Quote:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/quotation.html:24 +#, python-format +msgid "An excerpt from '%(book_title)s'" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/quotation.html:44 +msgid "On page:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/quotation.html:50 +msgid "At percent:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/quotation.html:68 +msgid "to" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/review.html:24 +#, python-format +msgid "Your review of '%(book_title)s'" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/review.html:39 +msgid "Review:" +msgstr "" + +#: bookwyrm/templates/snippets/fav_button.html:16 +#: bookwyrm/templates/snippets/fav_button.html:17 +msgid "Like" +msgstr "" + +#: bookwyrm/templates/snippets/fav_button.html:30 +#: bookwyrm/templates/snippets/fav_button.html:31 +msgid "Un-like" +msgstr "" + +#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:5 +msgid "Filters" +msgstr "" + +#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:10 +#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:17 +msgid "Filters are applied" +msgstr "" + +#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:20 +msgid "Clear filters" +msgstr "" + +#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:43 +msgid "Apply filters" +msgstr "" + +#: bookwyrm/templates/snippets/follow_button.html:20 +#, python-format +msgid "Follow @%(username)s" +msgstr "" + +#: bookwyrm/templates/snippets/follow_button.html:31 +msgid "Undo follow request" +msgstr "" + +#: bookwyrm/templates/snippets/follow_button.html:36 +#, python-format +msgid "Unfollow @%(username)s" +msgstr "" + +#: bookwyrm/templates/snippets/follow_button.html:38 +msgid "Unfollow" +msgstr "" + +#: bookwyrm/templates/snippets/follow_request_buttons.html:7 +#: bookwyrm/templates/snippets/join_invitation_buttons.html:9 +msgid "Accept" +msgstr "" + +#: bookwyrm/templates/snippets/footer.html:16 +msgid "Documentation" +msgstr "" + +#: bookwyrm/templates/snippets/footer.html:42 +#, python-format +msgid "Support %(site_name)s on %(support_title)s" +msgstr "" + +#: bookwyrm/templates/snippets/footer.html:49 +msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub." +msgstr "" + +#: bookwyrm/templates/snippets/form_rate_stars.html:20 +#: bookwyrm/templates/snippets/stars.html:38 +msgid "No rating" +msgstr "" + +#: bookwyrm/templates/snippets/form_rate_stars.html:28 +#, python-format +msgid "%(half_rating)s star" +msgid_plural "%(half_rating)s stars" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/form_rate_stars.html:64 +#: bookwyrm/templates/snippets/stars.html:20 +#, python-format +msgid "%(rating)s star" +msgid_plural "%(rating)s stars" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/generated_status/goal.html:2 +#, python-format +msgid "set a goal to read %(counter)s book in %(year)s" +msgid_plural "set a goal to read %(counter)s books in %(year)s" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/generated_status/rating.html:3 +#, python-format +msgid "rated %(title)s: %(display_rating)s star" +msgid_plural "rated %(title)s: %(display_rating)s stars" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 +#, python-format +msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" +msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/snippets/generated_status/review_pure_name.html:12 +#, python-format +msgid "Review of \"%(book_title)s\": %(review_title)s" +msgstr "" + +#: bookwyrm/templates/snippets/goal_form.html:4 +#, python-format +msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year." +msgstr "" + +#: bookwyrm/templates/snippets/goal_form.html:16 +msgid "Reading goal:" +msgstr "" + +#: bookwyrm/templates/snippets/goal_form.html:21 +msgid "books" +msgstr "" + +#: bookwyrm/templates/snippets/goal_form.html:26 +msgid "Goal privacy:" +msgstr "" + +#: bookwyrm/templates/snippets/goal_form.html:33 +#: bookwyrm/templates/snippets/reading_modals/layout.html:13 +msgid "Post to feed" +msgstr "" + +#: bookwyrm/templates/snippets/goal_form.html:37 +msgid "Set goal" +msgstr "" + +#: bookwyrm/templates/snippets/goal_progress.html:7 +msgctxt "Goal successfully completed" +msgid "Success!" +msgstr "" + +#: bookwyrm/templates/snippets/goal_progress.html:9 +#, python-format +msgid "%(percent)s%% complete!" +msgstr "" + +#: bookwyrm/templates/snippets/goal_progress.html:12 +#, python-format +msgid "You've read %(read_count)s of %(goal_count)s books." +msgstr "" + +#: bookwyrm/templates/snippets/goal_progress.html:14 +#, python-format +msgid "%(username)s has read %(read_count)s of %(goal_count)s books." +msgstr "" + +#: bookwyrm/templates/snippets/move_user_buttons.html:10 +msgid "Follow at new account" +msgstr "" + +#: bookwyrm/templates/snippets/moved_user_notice.html:7 +#, python-format +msgid "%(user)s has moved to %(moved_to_name)s" +msgstr "" + +#: bookwyrm/templates/snippets/page_text.html:8 +#, python-format +msgid "page %(page)s of %(total_pages)s" +msgstr "" + +#: bookwyrm/templates/snippets/page_text.html:14 +#, python-format +msgid "page %(page)s" +msgstr "" + +#: bookwyrm/templates/snippets/pagination.html:13 +msgid "Newer" +msgstr "" + +#: bookwyrm/templates/snippets/pagination.html:15 +msgid "Previous" +msgstr "" + +#: bookwyrm/templates/snippets/pagination.html:28 +msgid "Older" +msgstr "" + +#: bookwyrm/templates/snippets/privacy-icons.html:12 +msgid "Followers-only" +msgstr "" + +#: bookwyrm/templates/snippets/rate_action.html:5 +msgid "Leave a rating" +msgstr "" + +#: bookwyrm/templates/snippets/rate_action.html:20 +msgid "Rate" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/form.html:9 +msgid "(Optional)" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:6 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:61 +msgid "Update progress" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/stop_reading_modal.html:6 +#, python-format +msgid "Stop Reading \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/stop_reading_modal.html:32 +#: bookwyrm/templates/snippets/shelf_selector.html:53 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21 +msgid "Stopped reading" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/snippets/register_form.html:18 +msgid "Choose wisely! Your username cannot be changed." +msgstr "" + +#: bookwyrm/templates/snippets/register_form.html:66 +msgid "Sign Up" +msgstr "" + +#: bookwyrm/templates/snippets/report_modal.html:8 +#, python-format +msgid "Report @%(username)s's status" +msgstr "" + +#: bookwyrm/templates/snippets/report_modal.html:10 +#, python-format +msgid "Report %(domain)s link" +msgstr "" + +#: bookwyrm/templates/snippets/report_modal.html:12 +#, python-format +msgid "Report @%(username)s" +msgstr "" + +#: bookwyrm/templates/snippets/report_modal.html:34 +#, python-format +msgid "This report will be sent to %(site_name)s's moderators for review." +msgstr "" + +#: bookwyrm/templates/snippets/report_modal.html:36 +msgid "Links from this domain will be removed until your report has been reviewed." +msgstr "" + +#: bookwyrm/templates/snippets/report_modal.html:41 +msgid "More info about this report:" +msgstr "" + +#: bookwyrm/templates/snippets/shelf_selector.html:7 +msgid "Move book" +msgstr "" + +#: bookwyrm/templates/snippets/shelf_selector.html:38 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33 +msgid "Start reading" +msgstr "" + +#: bookwyrm/templates/snippets/shelf_selector.html:60 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:38 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:55 +msgid "Want to read" +msgstr "" + +#: bookwyrm/templates/snippets/shelf_selector.html:81 +#: bookwyrm/templates/snippets/shelf_selector.html:95 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:73 +#, python-format +msgid "Remove from %(name)s" +msgstr "" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 +msgid "More shelves" +msgstr "" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:31 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48 +msgid "Stop reading" +msgstr "" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:40 +msgid "Finish reading" +msgstr "" + +#: bookwyrm/templates/snippets/stars.html:13 +msgid "Show rating" +msgstr "" + +#: bookwyrm/templates/snippets/status/content_status.html:69 +msgid "Show status" +msgstr "" + +#: bookwyrm/templates/snippets/status/content_status.html:91 +#, python-format +msgid "(Page %(page)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/content_status.html:91 +#, python-format +msgid "%(endpage)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/content_status.html:93 +#, python-format +msgid "(%(percent)s%%" +msgstr "" + +#: bookwyrm/templates/snippets/status/content_status.html:93 +#, python-format +msgid " - %(endpercent)s%%" +msgstr "" + +#: bookwyrm/templates/snippets/status/content_status.html:116 +msgid "Open image in new window" +msgstr "" + +#: bookwyrm/templates/snippets/status/content_status.html:137 +msgid "Hide status" +msgstr "" + +#: bookwyrm/templates/snippets/status/header.html:45 +#, python-format +msgid "edited %(date)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/comment.html:8 +#, python-format +msgid "commented on %(book)s by %(author_name)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/comment.html:15 +#, python-format +msgid "commented on %(book)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/note.html:8 +#, python-format +msgid "replied to %(username)s's status" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/quotation.html:8 +#, python-format +msgid "quoted %(book)s by %(author_name)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/quotation.html:15 +#, python-format +msgid "quoted %(book)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/rating.html:3 +#, python-format +msgid "rated %(book)s:" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/read.html:10 +#, python-format +msgid "finished reading %(book)s by %(author_name)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/read.html:17 +#, python-format +msgid "finished reading %(book)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/reading.html:10 +#, python-format +msgid "started reading %(book)s by %(author_name)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/reading.html:17 +#, python-format +msgid "started reading %(book)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/review.html:8 +#, python-format +msgid "reviewed %(book)s by %(author_name)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/review.html:15 +#, python-format +msgid "reviewed %(book)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 +#, python-format +msgid "stopped reading %(book)s by %(author_name)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/stopped_reading.html:17 +#, python-format +msgid "stopped reading %(book)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/to_read.html:10 +#, python-format +msgid "wants to read %(book)s by %(author_name)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/headers/to_read.html:17 +#, python-format +msgid "wants to read %(book)s" +msgstr "" + +#: bookwyrm/templates/snippets/status/layout.html:24 +#: bookwyrm/templates/snippets/status/status_options.html:17 +msgid "Delete status" +msgstr "" + +#: bookwyrm/templates/snippets/status/layout.html:57 +#: bookwyrm/templates/snippets/status/layout.html:58 +msgid "Boost status" +msgstr "" + +#: bookwyrm/templates/snippets/status/layout.html:61 +#: bookwyrm/templates/snippets/status/layout.html:62 +msgid "Like status" +msgstr "" + +#: bookwyrm/templates/snippets/status/status.html:10 +msgid "boosted" +msgstr "" + +#: bookwyrm/templates/snippets/status/status_options.html:7 +#: bookwyrm/templates/snippets/user_options.html:7 +msgid "More options" +msgstr "" + +#: bookwyrm/templates/snippets/switch_edition_button.html:5 +msgid "Switch to this edition" +msgstr "" + +#: bookwyrm/templates/snippets/table-sort-header.html:6 +msgid "Sorted ascending" +msgstr "" + +#: bookwyrm/templates/snippets/table-sort-header.html:10 +msgid "Sorted descending" +msgstr "" + +#: bookwyrm/templates/snippets/trimmed_text.html:17 +msgid "Show more" +msgstr "" + +#: bookwyrm/templates/snippets/trimmed_text.html:35 +msgid "Show less" +msgstr "" + +#: bookwyrm/templates/snippets/user_active_tag.html:5 +msgid "Moved" +msgstr "" + +#: bookwyrm/templates/snippets/user_active_tag.html:12 +msgid "Deleted" +msgstr "" + +#: bookwyrm/templates/snippets/user_active_tag.html:15 +msgid "Inactive" +msgstr "" + +#: bookwyrm/templates/two_factor_auth/two_factor_login.html:29 +msgid "2FA check" +msgstr "" + +#: bookwyrm/templates/two_factor_auth/two_factor_login.html:37 +msgid "Enter the code from your authenticator app:" +msgstr "" + +#: bookwyrm/templates/two_factor_auth/two_factor_login.html:41 +msgid "Confirm and Log In" +msgstr "" + +#: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:29 +msgid "2FA is available" +msgstr "" + +#: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:34 +msgid "You can secure your account by setting up two factor authentication in your user preferences. This will require a one-time code from your phone in addition to your password each time you log in." +msgstr "" + +#: bookwyrm/templates/user/books_header.html:9 +#, python-format +msgid "%(username)s's books" +msgstr "" + +#: bookwyrm/templates/user/goal.html:12 +#, python-format +msgid "%(year)s Reading Progress" +msgstr "" + +#: bookwyrm/templates/user/goal.html:16 +msgid "Edit Goal" +msgstr "" + +#: bookwyrm/templates/user/goal.html:32 +#, python-format +msgid "%(name)s hasn't set a reading goal for %(year)s." +msgstr "" + +#: bookwyrm/templates/user/goal.html:44 +#, python-format +msgid "Your %(year)s Books" +msgstr "" + +#: bookwyrm/templates/user/goal.html:46 +#, python-format +msgid "%(username)s's %(year)s Books" +msgstr "" + +#: bookwyrm/templates/user/groups.html:14 +msgid "Your Groups" +msgstr "" + +#: bookwyrm/templates/user/groups.html:16 +#, python-format +msgid "Groups: %(username)s" +msgstr "" + +#: bookwyrm/templates/user/layout.html:59 +msgid "Follow Requests" +msgstr "" + +#: bookwyrm/templates/user/layout.html:83 +#: bookwyrm/templates/user/reviews_comments.html:6 +#: bookwyrm/templates/user/reviews_comments.html:12 +msgid "Reviews and Comments" +msgstr "" + +#: bookwyrm/templates/user/lists.html:16 +#, python-format +msgid "Lists: %(username)s" +msgstr "" + +#: bookwyrm/templates/user/lists.html:22 bookwyrm/templates/user/lists.html:34 +msgid "Create list" +msgstr "" + +#: bookwyrm/templates/user/moved.html:25 +#: bookwyrm/templates/user/user_preview.html:22 +#, python-format +msgid "Joined %(date)s" +msgstr "" + +#: bookwyrm/templates/user/relationships/followers.html:36 +#, python-format +msgid "%(username)s has no followers" +msgstr "" + +#: bookwyrm/templates/user/relationships/following.html:6 +#: bookwyrm/templates/user/relationships/following.html:11 +#: bookwyrm/templates/user/relationships/following.html:21 +#: bookwyrm/templates/user/relationships/layout.html:15 +msgid "Following" +msgstr "" + +#: bookwyrm/templates/user/relationships/following.html:30 +#, python-format +msgid "%(username)s isn't following any users" +msgstr "" + +#: bookwyrm/templates/user/reviews_comments.html:26 +msgid "No reviews or comments yet!" +msgstr "" + +#: bookwyrm/templates/user/user.html:20 +msgid "Edit profile" +msgstr "" + +#: bookwyrm/templates/user/user.html:42 +#, python-format +msgid "View all %(size)s" +msgstr "" + +#: bookwyrm/templates/user/user.html:61 +msgid "View all books" +msgstr "" + +#: bookwyrm/templates/user/user.html:69 +#, python-format +msgid "%(current_year)s Reading Goal" +msgstr "" + +#: bookwyrm/templates/user/user.html:76 +msgid "User Activity" +msgstr "" + +#: bookwyrm/templates/user/user.html:82 +msgid "Show RSS Options" +msgstr "" + +#: bookwyrm/templates/user/user.html:88 +msgid "RSS feed" +msgstr "" + +#: bookwyrm/templates/user/user.html:104 +msgid "Complete feed" +msgstr "" + +#: bookwyrm/templates/user/user.html:109 +msgid "Reviews only" +msgstr "" + +#: bookwyrm/templates/user/user.html:114 +msgid "Quotes only" +msgstr "" + +#: bookwyrm/templates/user/user.html:119 +msgid "Comments only" +msgstr "" + +#: bookwyrm/templates/user/user.html:135 +msgid "No activities yet!" +msgstr "" + +#: bookwyrm/templates/user/user_preview.html:26 +#, python-format +msgid "%(display_count)s follower" +msgid_plural "%(display_count)s followers" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/user/user_preview.html:31 +#, python-format +msgid "%(counter)s following" +msgstr "" + +#: bookwyrm/templates/user/user_preview.html:45 +#, python-format +msgid "%(mutuals_display)s follower you follow" +msgid_plural "%(mutuals_display)s followers you follow" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/user/user_preview.html:49 +msgid "No followers you follow" +msgstr "" + +#: bookwyrm/templates/user_menu.html:7 +msgid "View profile and more" +msgstr "" + +#: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28 +#, python-format +msgid "File exceeds maximum size: %(max_size)sMB" +msgstr "" + +#: bookwyrm/templatetags/list_page_tags.py:14 +#, python-format +msgid "Book List: %(name)s" +msgstr "" + +#: bookwyrm/templatetags/list_page_tags.py:22 +#, python-format +msgid "%(num)d book - by %(user)s" +msgid_plural "%(num)d books - by %(user)s" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templatetags/utilities.py:49 +#, python-format +msgid "%(title)s: %(subtitle)s" +msgstr "" + +#: bookwyrm/templatetags/utilities.py:133 +msgid "a new user account" +msgstr "" + +#: bookwyrm/views/updates.py:45 +#, python-format +msgid "Load %(count)d unread status" +msgid_plural "Load %(count)d unread statuses" +msgstr[0] "" +msgstr[1] "" + From f1bc5d235cd515511e5c35c89ef7abc87525e72f Mon Sep 17 00:00:00 2001 From: babastienne <16348048+babastienne@users.noreply.github.com> Date: Tue, 16 Dec 2025 23:02:55 +0100 Subject: [PATCH 210/962] =?UTF-8?q?[=E2=9C=A8=20Features]=20Add=20possibli?= =?UTF-8?q?ty=20to=20create=20new=20list=20from=20book=20page=20#3633?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When onto a book page, it is now possible to directly add a new list. Inside the list dorpdown the last entry is "+ Create new list...". If the user select this option, a modal is displayed and the user can directly create the list before confirming. After validation the user is redirected onto the list page where he can see it's book. --- bookwyrm/static/js/bookwyrm.js | 37 +++++++++++++++++++ bookwyrm/templates/book/book.html | 4 +- .../templates/lists/create_list_modal.html | 20 ++++++++++ bookwyrm/views/books/books.py | 1 + bookwyrm/views/list/lists.py | 14 ++++++- 5 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 bookwyrm/templates/lists/create_list_modal.html diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 3088165d6f..767a9b6bae 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -60,6 +60,12 @@ let BookWyrm = new (class { .forEach((form) => form.addEventListener("submit", (e) => this.setPreferredTimezone(e, form)) ); + + document + .querySelectorAll("button[name='button-book-list']") + .forEach((button) => + button.addEventListener("click", this.checkListSelection.bind(this)) + ); } /** @@ -862,4 +868,35 @@ let BookWyrm = new (class { this.toggleFocus(passwordElementId); } + + /** + * When user want to add book to list, it checks if the list needs + * to be created and if so open a modal to do it. Otherwise it submit + * the form to add the book to the selected list. + * + * @param {Event} event - The click event from the button + * @returns {undefined} + */ + checkListSelection(event) { + const selectElement = document.getElementById("id_list"); + const formElement = document.querySelector("form[name='list-add']"); + const modalElement = document.getElementById("modal-create-list-with-book"); + + if (!selectElement || !formElement) { + console.error("List management elements not found. Check your HTML IDs."); + + return; + } + + if (selectElement.value === "NEW_LIST_CREATION") { + if (modalElement) { + event.currentTarget.dataset.modalOpen = "modal-create-list-with-book"; + this.handleModalButton(event); + } else { + console.error("Modal element not found with ID: modal-create-list-with-book"); + } + } else { + formElement.submit(); + } + } })(); diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 001a5f5bb0..84d31eb1b4 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -428,13 +428,15 @@

    {% trans "Lists" %}

    {% for list in list_options %} {% endfor %} +
    - +
    + {% include "lists/create_list_modal.html" with id="modal-create-list-with-book" %} {% endif %} {% endif %} diff --git a/bookwyrm/templates/lists/create_list_modal.html b/bookwyrm/templates/lists/create_list_modal.html new file mode 100644 index 0000000000..2160638341 --- /dev/null +++ b/bookwyrm/templates/lists/create_list_modal.html @@ -0,0 +1,20 @@ +{% extends 'components/modal.html' %} +{% load i18n %} +{% load static %} + +{% block modal-title %} +{% trans "Create new list" %} +{% endblock %} + +{% block modal-form-open %} +
    +{% endblock %} + +{% block modal-body %} +{% csrf_token %} + + +{% include 'lists/form.html' with curation_group=group %} +{% endblock %} + +{% block modal-form-close %}
    {% endblock %} diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 8b5cb042db..9315fe0196 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -106,6 +106,7 @@ def get(self, request, book_id, **kwargs): if request.user.is_authenticated: data["list_options"] = request.user.list_set.exclude(id__in=data["lists"]) + data["list_form"] = forms.ListForm() data["file_link_form"] = forms.FileLinkForm() readthroughs = models.ReadThrough.objects.filter( user=request.user, diff --git a/bookwyrm/views/list/lists.py b/bookwyrm/views/list/lists.py index 64598435b4..f88fb56d9d 100644 --- a/bookwyrm/views/list/lists.py +++ b/bookwyrm/views/list/lists.py @@ -1,5 +1,7 @@ """book list views""" +import logging + from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator from django.shortcuts import redirect @@ -10,8 +12,7 @@ from bookwyrm import forms, models from bookwyrm.lists_stream import ListsStream from bookwyrm.views.helpers import get_user_from_username - -import logging +from bookwyrm.views.list.list import add_book logger = logging.getLogger(__name__) @@ -46,6 +47,15 @@ def post(self, request): book_list.group = None book_list.save() + book_id = request.POST.get('book') + if book_id: + # We want to add a book to the new list directly after it's creation + updated_post = request.POST.copy() + updated_post['book_list'] = book_list.id + updated_post['book'] = book_id + request.POST = updated_post + return add_book(request) + return redirect(book_list.local_path) From bc02241bf33d2c478ce1d6ce20b5ed4183c07ec5 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 16 Dec 2025 17:17:22 -0800 Subject: [PATCH 211/962] New translations django.po (Yiddish) --- locale/yi_DE/LC_MESSAGES/django.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/yi_DE/LC_MESSAGES/django.po b/locale/yi_DE/LC_MESSAGES/django.po index 9c51fa6558..aa85472fae 100644 --- a/locale/yi_DE/LC_MESSAGES/django.po +++ b/locale/yi_DE/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-12-16 18:25\n" +"PO-Revision-Date: 2025-12-17 01:17\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Yiddish\n" "Language: yi\n" @@ -19,15 +19,15 @@ msgstr "" #: bookwyrm/forms/admin.py:42 msgid "One Day" -msgstr "" +msgstr "אײן טאָג" #: bookwyrm/forms/admin.py:43 msgid "One Week" -msgstr "" +msgstr "אײן װאָך" #: bookwyrm/forms/admin.py:44 msgid "One Month" -msgstr "" +msgstr "אײן חודש" #: bookwyrm/forms/admin.py:45 msgid "Does Not Expire" From 5ab0e3e6834494dbe3b25e613fd7c23c869a7021 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 16 Dec 2025 19:02:26 -0800 Subject: [PATCH 212/962] New translations django.po (Yiddish) --- locale/yi_DE/LC_MESSAGES/django.po | 154 ++++++++++++++--------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/locale/yi_DE/LC_MESSAGES/django.po b/locale/yi_DE/LC_MESSAGES/django.po index aa85472fae..61348e4def 100644 --- a/locale/yi_DE/LC_MESSAGES/django.po +++ b/locale/yi_DE/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-12-17 01:17\n" +"PO-Revision-Date: 2025-12-17 03:02\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Yiddish\n" "Language: yi\n" @@ -31,169 +31,169 @@ msgstr "אײן חודש" #: bookwyrm/forms/admin.py:45 msgid "Does Not Expire" -msgstr "" +msgstr "גײט נישט אױס" #: bookwyrm/forms/admin.py:50 msgid "Unlimited" -msgstr "" +msgstr "אָן אַ שיעור" #: bookwyrm/forms/edit_user.py:99 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" -msgstr "" +msgstr "פֿאַלשער פּאַראָל" #: bookwyrm/forms/edit_user.py:106 bookwyrm/forms/landing.py:93 msgid "Password does not match" -msgstr "" +msgstr "פּאַראָל פּאַסט נישט" #: bookwyrm/forms/edit_user.py:129 msgid "Incorrect Password" -msgstr "" +msgstr "פֿאַלשער פּאַראָל" #: bookwyrm/forms/forms.py:59 msgid "Reading finish date cannot be before start date." -msgstr "" +msgstr "סוף־דאַטע פֿון לײנען טאָר נישט זײן אײדער דער אָנהײב־דאַטע." #: bookwyrm/forms/forms.py:64 msgid "Reading stopped date cannot be before start date." -msgstr "" +msgstr "אױפֿהער־דאַטע פֿון לײנען טאָר נישט זײן אײדער דער אָנהײב־דאַטע." #: bookwyrm/forms/forms.py:72 msgid "Reading stopped date cannot be in the future." -msgstr "" +msgstr "אױפֿהער־דאַטע פֿון לײנען טאָר נישט זײן אין דער צוקונפֿט." #: bookwyrm/forms/forms.py:79 msgid "Reading finished date cannot be in the future." -msgstr "" +msgstr "סוף־דאַטע פֿון לײנען טאָר נישט זײן אין דער צוקונפֿט." #: bookwyrm/forms/landing.py:37 msgid "Username or password are incorrect" -msgstr "" +msgstr "ניצער־נאָמען אָדער פּאַראָל זענען פֿאַלש" #: bookwyrm/forms/landing.py:56 msgid "User with this username already exists" -msgstr "" +msgstr "עס איז שױן דאָ אַ ניצער מיט דעם ניצער־נאָמען" #: bookwyrm/forms/landing.py:65 msgid "A user with this email already exists." -msgstr "" +msgstr "עס איז שױן דאָ אַ ניצער מיט דעם בליצאַדרעס." #: bookwyrm/forms/landing.py:69 msgid "This email address cannot be registered." -msgstr "" +msgstr "מע קען נישט פֿאַרשרײַבן דעם בליצאַדרעס." #: bookwyrm/forms/landing.py:114 msgid "Password cannot be the same as your current password" -msgstr "" +msgstr "פּאַראָל קען ניזט זײן דער זעלבער װי דער איצטיקער" #: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" -msgstr "" +msgstr "פֿאַלשער קאָד" #: bookwyrm/forms/links.py:36 msgid "This domain is blocked. Please contact your administrator if you think this is an error." -msgstr "" +msgstr "דאָס װעבזײַטל איז גערלײגט אין חרם. אױב איר מײנט אַז דאָס איז אַ טעות, פֿאַרבינט זיך מיט אײַער אַדמיניסטראַטאָר." #: bookwyrm/forms/links.py:51 msgid "This link with file type has already been added for this book. If it is not visible, the domain is still pending." -msgstr "" +msgstr "דאָס לינק מיט טעקע מין האָט מען שױן צוגעגעבן פֿאַר דעם בוך. אױב עס זעט זיך נישט אָן, הענגט נאָך דער שטח." #: bookwyrm/forms/lists.py:26 msgid "List Order" -msgstr "" +msgstr "רשימה־סדר" #: bookwyrm/forms/lists.py:27 msgid "Book Title" -msgstr "" +msgstr "בוכטיטל" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 #: bookwyrm/templates/snippets/create_status/review.html:32 msgid "Rating" -msgstr "" +msgstr "שאַצונג" #: bookwyrm/forms/lists.py:30 bookwyrm/templates/lists/list.html:185 msgid "Sort By" -msgstr "" +msgstr "סאָרטירן לױט" #: bookwyrm/forms/lists.py:34 msgid "Ascending" -msgstr "" +msgstr "אַרױף" #: bookwyrm/forms/lists.py:35 msgid "Descending" -msgstr "" +msgstr "אַראָפּ" #: bookwyrm/models/announcement.py:11 msgid "Primary" -msgstr "" +msgstr "ערשטיק" #: bookwyrm/models/announcement.py:12 msgid "Success" -msgstr "" +msgstr "הצלחה" #: bookwyrm/models/announcement.py:13 #: bookwyrm/templates/settings/invites/manage_invites.html:47 msgid "Link" -msgstr "" +msgstr "לינק" #: bookwyrm/models/announcement.py:14 msgid "Warning" -msgstr "" +msgstr "װאָרענונג" #: bookwyrm/models/announcement.py:15 msgid "Danger" -msgstr "" +msgstr "סכּנה" #: bookwyrm/models/antispam.py:113 bookwyrm/models/antispam.py:147 msgid "Automatically generated report" -msgstr "" +msgstr "אױטאָמאַטיש גענערירט באַריך" #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:49 #: bookwyrm/models/job.py:18 bookwyrm/models/link.py:76 #: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" -msgstr "" +msgstr "הענגענדיק" #: bookwyrm/models/base_model.py:19 msgid "Self deletion" -msgstr "" +msgstr "זיך־אָפּמעקונג" #: bookwyrm/models/base_model.py:20 msgid "Self deactivation" -msgstr "" +msgstr "זיך־דעאַקטיװירונג" #: bookwyrm/models/base_model.py:21 msgid "Moderator suspension" -msgstr "" +msgstr "שליש שליסענונג" #: bookwyrm/models/base_model.py:22 msgid "Moderator deletion" -msgstr "" +msgstr "שליש אָפּמעקונג" #: bookwyrm/models/base_model.py:23 msgid "Domain block" -msgstr "" +msgstr "שטח־חרם" #: bookwyrm/models/book.py:473 msgid "Audiobook" -msgstr "" +msgstr "אױדיאָבוך" #: bookwyrm/models/book.py:474 msgid "eBook" -msgstr "" +msgstr "ע־בוך" #: bookwyrm/models/book.py:475 msgid "Graphic novel" -msgstr "" +msgstr "גראַפֿישער ראָמאַן" #: bookwyrm/models/book.py:476 msgid "Hardcover" -msgstr "" +msgstr "באַטאָװלט" #: bookwyrm/models/book.py:477 msgid "Paperback" -msgstr "" +msgstr "בראָשירט" #: bookwyrm/models/book.py:486 bookwyrm/models/book.py:493 #: bookwyrm/models/book.py:499 bookwyrm/models/book.py:504 @@ -201,72 +201,72 @@ msgstr "" #: bookwyrm/models/book.py:533 bookwyrm/models/book.py:538 #, python-format msgid "%(value)s doesn't look like an ISBN" -msgstr "" +msgstr "%(value)s זעט נישט אױס װי אַן ISBN" #: bookwyrm/models/book.py:515 bookwyrm/models/book.py:555 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" -msgstr "" +msgstr "%(value)s האָט נישט דער ריכטיקער ISBN טשעקסום, האָבם מיר דערװאַרטן אױף %(check_version)s" #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:84 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 msgid "Comment" -msgstr "" +msgstr "באַמערקן" #: bookwyrm/models/bookwyrm_import_job.py:152 #: bookwyrm/templates/import/import_status.html:127 #: bookwyrm/templates/import/manual_review.html:13 #: bookwyrm/templates/snippets/create_status.html:16 msgid "Review" -msgstr "" +msgstr "רעצענזיע" #: bookwyrm/models/bookwyrm_import_job.py:153 msgid "Quotation" -msgstr "" +msgstr "ציטאַט" #: bookwyrm/models/bookwyrm_import_job.py:181 #: bookwyrm/templates/snippets/follow_button.html:22 msgid "Follow" -msgstr "" +msgstr "אַבאָנירן" #: bookwyrm/models/bookwyrm_import_job.py:182 #: bookwyrm/templates/settings/federation/instance.html:116 #: bookwyrm/templates/settings/link_domains/link_domains.html:87 #: bookwyrm/templates/snippets/block_button.html:5 msgid "Block" -msgstr "" +msgstr "לײגן אין חרם" #: bookwyrm/models/bookwyrm_import_job.py:398 msgid "Unknown error importing book" -msgstr "" +msgstr "אומבאַקאַנטער טעוס מיטן אַרײַנפֿירן דעם בוך" #: bookwyrm/models/bookwyrm_import_job.py:496 msgid "unauthorized" -msgstr "" +msgstr "נישט־אױטאָריזירט" #: bookwyrm/models/bookwyrm_import_job.py:502 msgid "Unknown error importing book status" -msgstr "" +msgstr "אומבאַקאַנטער טעוס מיטן אַרײַנפֿירן דעם בוך־מצבֿ" #: bookwyrm/models/bookwyrm_import_job.py:696 #: bookwyrm/models/bookwyrm_import_job.py:722 msgid "connection_error" -msgstr "" +msgstr "פֿאַרבינדונג_טעות" #: bookwyrm/models/bookwyrm_import_job.py:732 msgid "invalid_relationship" -msgstr "" +msgstr "פּסולע באַציונג" #: bookwyrm/models/bookwyrm_import_job.py:740 msgid "Unkown error importing relationship" -msgstr "" +msgstr "אומבאַקאַנטער טעוס מיטן אַרײַנפֿירן די באַציונג" #: bookwyrm/models/federated_server.py:11 #: bookwyrm/templates/settings/federation/edit_instance.html:55 #: bookwyrm/templates/settings/federation/instance_list.html:22 msgid "Federated" -msgstr "" +msgstr "פֿעדערירט" #: bookwyrm/models/federated_server.py:12 bookwyrm/models/link.py:75 #: bookwyrm/templates/settings/federation/edit_instance.html:56 @@ -274,26 +274,26 @@ msgstr "" #: bookwyrm/templates/settings/federation/instance_list.html:26 #: bookwyrm/templates/settings/link_domains/link_domains.html:27 msgid "Blocked" -msgstr "" +msgstr "געלײגט אין חרם" #: bookwyrm/models/fields.py:35 #, python-format msgid "%(value)s is not a valid remote_id" -msgstr "" +msgstr "%(value)s איז נישט קײן גילטיק remote_id" #: bookwyrm/models/fields.py:44 bookwyrm/models/fields.py:53 #, python-format msgid "%(value)s is not a valid username" -msgstr "" +msgstr "%(value)s איז נישט קײן גילטיקער ניצער־נאָמען" #: bookwyrm/models/fields.py:201 bookwyrm/templates/layout.html:129 #: bookwyrm/templates/ostatus/error.html:29 msgid "username" -msgstr "" +msgstr "נניצער־נאָמען" #: bookwyrm/models/fields.py:206 msgid "A user with that username already exists." -msgstr "" +msgstr "עס איז שױן דאָ אַ ניצער מיט דער ניצער־נאָמען." #: bookwyrm/models/fields.py:225 #: bookwyrm/templates/snippets/privacy-icons.html:3 @@ -301,7 +301,7 @@ msgstr "" #: bookwyrm/templates/snippets/privacy_select.html:11 #: bookwyrm/templates/snippets/privacy_select_no_followers.html:11 msgid "Public" -msgstr "" +msgstr "עפֿנטלעך" #: bookwyrm/models/fields.py:226 #: bookwyrm/templates/snippets/privacy-icons.html:7 @@ -309,7 +309,7 @@ msgstr "" #: bookwyrm/templates/snippets/privacy_select.html:14 #: bookwyrm/templates/snippets/privacy_select_no_followers.html:14 msgid "Unlisted" -msgstr "" +msgstr "נישט אַרײַן־געשריבן" #: bookwyrm/models/fields.py:227 #: bookwyrm/templates/snippets/privacy_select.html:17 @@ -318,7 +318,7 @@ msgstr "" #: bookwyrm/templates/user/relationships/followers.html:21 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" -msgstr "" +msgstr "אַבאָנירערעס" #: bookwyrm/models/fields.py:228 #: bookwyrm/templates/snippets/create_status/post_options_block.html:6 @@ -327,15 +327,15 @@ msgstr "" #: bookwyrm/templates/snippets/privacy_select.html:20 #: bookwyrm/templates/snippets/privacy_select_no_followers.html:17 msgid "Private" -msgstr "" +msgstr "פּריװאַט" #: bookwyrm/models/housekeeping.py:116 msgid "Missing" -msgstr "" +msgstr "פֿעלנדיק" #: bookwyrm/models/housekeeping.py:117 msgid "Wrong Path" -msgstr "" +msgstr "פֿאַלשער װעג" #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 @@ -348,7 +348,7 @@ msgstr "" #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" -msgstr "" +msgstr "אַקטיװ" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:20 #: bookwyrm/templates/import/import.html:182 @@ -358,45 +358,45 @@ msgstr "" #: bookwyrm/templates/settings/files.html:160 #: bookwyrm/templates/settings/files.html:342 msgid "Complete" -msgstr "" +msgstr "פֿאַרענדיקט" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:21 msgid "Stopped" -msgstr "" +msgstr "אױפֿגעהערט" #: bookwyrm/models/import_job.py:86 bookwyrm/models/import_job.py:94 msgid "Import stopped" -msgstr "" +msgstr "אַרײַנשרײַבן אױפֿגעהערט" #: bookwyrm/models/import_job.py:378 bookwyrm/models/import_job.py:403 msgid "Error loading book" -msgstr "" +msgstr "טעות מיטן אַרײַנשרײַבן בוך" #: bookwyrm/models/import_job.py:387 msgid "Could not find a match for book" -msgstr "" +msgstr "אַקעגנער בוך נישט געפֿונען" #: bookwyrm/models/job.py:22 #: bookwyrm/templates/import/user_import_status.html:69 msgid "Failed" -msgstr "" +msgstr "נישט־געראָטן" #: bookwyrm/models/link.py:55 msgid "Free" -msgstr "" +msgstr "בחינמדיק" #: bookwyrm/models/link.py:56 msgid "Purchasable" -msgstr "" +msgstr "צום קױפֿן" #: bookwyrm/models/link.py:57 msgid "Available for loan" -msgstr "" +msgstr "אױף באָרג" #: bookwyrm/models/link.py:74 #: bookwyrm/templates/settings/link_domains/link_domains.html:23 msgid "Approved" -msgstr "" +msgstr "באַשטעטיקט" #: bookwyrm/models/report.py:85 msgid "Resolved report" From 5da9c48d68f76a467ad1629be3b2da9b0c024d5a Mon Sep 17 00:00:00 2001 From: Martynas Sklizmantas Date: Thu, 18 Dec 2025 00:32:37 +0100 Subject: [PATCH 213/962] Fix IntegrityError when resolve_remote_id returns None Fixes #3739 When `resolve_remote_id` fails to fetch a remote resource (connection error, 404, timeout, etc.), it returns `None`. The code was appending this `None` directly to the items list, which later causes an IntegrityError when Django tries to create the many-to-many relationship with a null foreign key. This affects both `ManyToManyField.field_from_activity()` and `TagField.field_from_activity()`. The fix checks for `None` before appending to the items list. --- bookwyrm/models/fields.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index ecc1976db6..d4812f1faa 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -355,13 +355,13 @@ def field_from_activity(self, value, allow_external_connections=True, trigger=No validate_remote_id(remote_id) except ValidationError: continue - items.append( - activitypub.resolve_remote_id( - remote_id, - model=self.related_model, - allow_external_connections=allow_external_connections, - ) + item = activitypub.resolve_remote_id( + remote_id, + model=self.related_model, + allow_external_connections=allow_external_connections, ) + if item is not None: + items.append(item) return items @@ -419,13 +419,13 @@ def field_from_activity(self, value, allow_external_connections=True, trigger=No items.append(hashtag) else: # for other tag types we fetch them remotely - items.append( - activitypub.resolve_remote_id( - link.href, - model=self.related_model, - allow_external_connections=allow_external_connections, - ) + item = activitypub.resolve_remote_id( + link.href, + model=self.related_model, + allow_external_connections=allow_external_connections, ) + if item is not None: + items.append(item) return items From 1d7c19cfe737d885471f00d659c61d73b9fe215b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 18 Dec 2025 16:17:31 -0800 Subject: [PATCH 214/962] New translations django.po (Spanish) --- locale/es_ES/LC_MESSAGES/django.po | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po index 3420a408bc..f5ad1aab6f 100644 --- a/locale/es_ES/LC_MESSAGES/django.po +++ b/locale/es_ES/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-11-16 19:34\n" +"PO-Revision-Date: 2025-12-19 00:17\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -83,7 +83,7 @@ msgstr "No se puede registrar esta dirección de correo electrónico." #: bookwyrm/forms/landing.py:114 msgid "Password cannot be the same as your current password" -msgstr "" +msgstr "La contraseña no puede ser la misma que la contraseña actual" #: bookwyrm/forms/landing.py:145 bookwyrm/forms/landing.py:153 msgid "Incorrect code" @@ -243,7 +243,7 @@ msgstr "Error desconocido al importar el libro" #: bookwyrm/models/bookwyrm_import_job.py:496 msgid "unauthorized" -msgstr "" +msgstr "no_autorizado" #: bookwyrm/models/bookwyrm_import_job.py:502 msgid "Unknown error importing book status" @@ -252,15 +252,15 @@ msgstr "Error desconocido al importar el estado del libro" #: bookwyrm/models/bookwyrm_import_job.py:696 #: bookwyrm/models/bookwyrm_import_job.py:722 msgid "connection_error" -msgstr "" +msgstr "error_de_conexión" #: bookwyrm/models/bookwyrm_import_job.py:732 msgid "invalid_relationship" -msgstr "" +msgstr "relación_inválida" #: bookwyrm/models/bookwyrm_import_job.py:740 msgid "Unkown error importing relationship" -msgstr "" +msgstr "Error desconocido importando la relación" #: bookwyrm/models/federated_server.py:11 #: bookwyrm/templates/settings/federation/edit_instance.html:55 @@ -331,11 +331,11 @@ msgstr "Privado" #: bookwyrm/models/housekeeping.py:116 msgid "Missing" -msgstr "" +msgstr "Ausente" #: bookwyrm/models/housekeeping.py:117 msgid "Wrong Path" -msgstr "" +msgstr "Ruta equivocada" #: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 @@ -444,7 +444,7 @@ msgstr "Elemento eliminado" #: bookwyrm/models/session.py:42 msgid "Unknown" -msgstr "" +msgstr "Desconocido" #: bookwyrm/models/status.py:192 #, python-format @@ -459,7 +459,7 @@ msgstr "Comentario de %(display_name)s sobre %(book_title)s" #: bookwyrm/models/status.py:418 #, python-format msgid "%(display_name)s's quote from %(book_title)s" -msgstr "" +msgstr "Cita de %(display_name)sde %(book_title)s" #: bookwyrm/models/status.py:454 #, python-format @@ -470,8 +470,8 @@ msgstr "Reseña de %(display_name)sde %(book_title)s" #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(display_name)s calificó %(book_title)s: %(display_rating).1f estrella" +msgstr[1] "%(display_name)s calificó %(book_title)s: %(display_rating).1f estrellas" #: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" @@ -633,7 +633,7 @@ msgstr "El archivo que estás subiendo es demasiado grande." #: bookwyrm/templates/413.html:11 msgid "You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting." -msgstr "" +msgstr "Puede intentar usar un archivo más pequeño, o preguntarle a su administrador del servidor que aumente el ajuste DATA_UPLOAD_MAX_MEMORY_SIZE." #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -920,7 +920,7 @@ msgstr "Wikipedia" #: bookwyrm/templates/author/author.html:79 msgid "View on Wikidata" -msgstr "" +msgstr "Ver en Wikidata" #: bookwyrm/templates/author/author.html:87 msgid "Website" @@ -1012,7 +1012,7 @@ msgstr "Enlace de Wikipedia:" #: bookwyrm/templates/author/edit_author.html:58 msgid "Wikidata:" -msgstr "" +msgstr "Wikidata:" #: bookwyrm/templates/author/edit_author.html:62 msgid "Website:" @@ -1146,7 +1146,7 @@ msgstr "Haz clic para ampliar" #: bookwyrm/templates/book/book.html:190 msgid "View on Finna" -msgstr "" +msgstr "Ver en Finna" #: bookwyrm/templates/book/book.html:222 #, python-format @@ -1287,7 +1287,7 @@ msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 #: bookwyrm/templates/book/edit/edit_book_form.html:390 msgid "Finna ID:" -msgstr "" +msgstr "ID de Finna:" #: bookwyrm/templates/book/cover_add_modal.html:5 msgid "Add cover" @@ -2010,7 +2010,7 @@ msgstr "Hola," #: bookwyrm/templates/email/html_layout.html:21 #, python-format msgid "BookWyrm hosted on %(site_name)s" -msgstr "" +msgstr "BookWyrm alojado en %(site_name)s" #: bookwyrm/templates/email/html_layout.html:23 msgid "Email preference" @@ -3063,7 +3063,7 @@ msgstr "OpenLibrary (CSV)" #: bookwyrm/templates/import/import.html:70 msgid "OpenReads (CSV)" -msgstr "" +msgstr "OpenReads (CSV)" #: bookwyrm/templates/import/import.html:73 msgid "Calibre (CSV)" @@ -3071,7 +3071,7 @@ msgstr "Calibre (CSV)" #: bookwyrm/templates/import/import.html:76 msgid "BookWyrm (CSV)" -msgstr "" +msgstr "BookWyrm (CSV)" #: bookwyrm/templates/import/import.html:82 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." @@ -3088,11 +3088,11 @@ msgstr "Incluir reseñas" #: bookwyrm/templates/import/import.html:104 msgid "Create new shelves if they do not exist" -msgstr "" +msgstr "Crear nuevos estantes si no existen" #: bookwyrm/templates/import/import.html:109 msgid "Privacy setting for imported reviews and shelves:" -msgstr "" +msgstr "Configuración de privacidad para estantes y evaluaciones importados:" #: bookwyrm/templates/import/import.html:116 #: bookwyrm/templates/import/import.html:118 @@ -3294,12 +3294,12 @@ msgstr "Si deseas migrar otros elementos (comentarios, reseñas o citas), debes #: bookwyrm/templates/import/import_user.html:32 #, python-format msgid "Currently you are allowed to import one user every %(hours)s hours." -msgstr "" +msgstr "Actualmente se le permite importar un usuario cada %(hours)s horas." #: bookwyrm/templates/import/import_user.html:33 #, python-format msgid "You will next be able to import a user file at %(next_time)s" -msgstr "" +msgstr "Podrá importar un archivo de usuario de nuevo a las %(next_time)s" #: bookwyrm/templates/import/import_user.html:56 msgid "Step 1:" From 24805e51e60db97d69e35afaa234b180f4e7d319 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 19 Dec 2025 19:52:31 -0800 Subject: [PATCH 215/962] New translations django.po (Spanish) --- locale/es_ES/LC_MESSAGES/django.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po index f5ad1aab6f..2b564a1784 100644 --- a/locale/es_ES/LC_MESSAGES/django.po +++ b/locale/es_ES/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-12-19 00:17\n" +"PO-Revision-Date: 2025-12-20 03:52\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -3467,11 +3467,11 @@ msgstr "Póngase en contacto con su administrador o {\n if (step.isOpen()) {\n const targetIsEl = step.el && event.currentTarget === step.el;\n const targetIsSelector =\n !isUndefined(selector) && event.currentTarget.matches(selector);\n\n if (targetIsSelector || targetIsEl) {\n step.tour.next();\n }\n }\n };\n}\n\n/**\n * Bind the event handler for advanceOn\n * @param {Step} step The step instance\n */\nexport function bindAdvance(step) {\n // An empty selector matches the step element\n const { event, selector } = step.options.advanceOn || {};\n if (event) {\n const handler = _setupAdvanceOnHandler(selector, step);\n\n // TODO: this should also bind/unbind on show/hide\n let el;\n try {\n el = document.querySelector(selector);\n } catch (e) {\n // TODO\n }\n if (!isUndefined(selector) && !el) {\n return console.error(\n `No element was found for the selector supplied to advanceOn: ${selector}`\n );\n } else if (el) {\n el.addEventListener(event, handler);\n step.on('destroy', () => {\n return el.removeEventListener(event, handler);\n });\n } else {\n document.body.addEventListener(event, handler, true);\n step.on('destroy', () => {\n return document.body.removeEventListener(event, handler, true);\n });\n }\n } else {\n return console.error(\n 'advanceOn was defined, but no event name was passed.'\n );\n }\n}\n","export default function getNodeName(element) {\n return element ? (element.nodeName || '').toLowerCase() : null;\n}","export default function getWindow(node) {\n if (node == null) {\n return window;\n }\n\n if (node.toString() !== '[object Window]') {\n var ownerDocument = node.ownerDocument;\n return ownerDocument ? ownerDocument.defaultView || window : window;\n }\n\n return node;\n}","import getWindow from \"./getWindow.js\";\n\nfunction isElement(node) {\n var OwnElement = getWindow(node).Element;\n return node instanceof OwnElement || node instanceof Element;\n}\n\nfunction isHTMLElement(node) {\n var OwnElement = getWindow(node).HTMLElement;\n return node instanceof OwnElement || node instanceof HTMLElement;\n}\n\nfunction isShadowRoot(node) {\n // IE 11 has no ShadowRoot\n if (typeof ShadowRoot === 'undefined') {\n return false;\n }\n\n var OwnElement = getWindow(node).ShadowRoot;\n return node instanceof OwnElement || node instanceof ShadowRoot;\n}\n\nexport { isElement, isHTMLElement, isShadowRoot };","import { auto } from \"../enums.js\";\nexport default function getBasePlacement(placement) {\n return placement.split('-')[0];\n}","import { isHTMLElement } from \"./instanceOf.js\";\nimport { round } from \"../utils/math.js\";\nexport default function getBoundingClientRect(element, includeScale) {\n if (includeScale === void 0) {\n includeScale = false;\n }\n\n var rect = element.getBoundingClientRect();\n var scaleX = 1;\n var scaleY = 1;\n\n if (isHTMLElement(element) && includeScale) {\n var offsetHeight = element.offsetHeight;\n var offsetWidth = element.offsetWidth; // Do not attempt to divide by 0, otherwise we get `Infinity` as scale\n // Fallback to 1 in case both values are `0`\n\n if (offsetWidth > 0) {\n scaleX = round(rect.width) / offsetWidth || 1;\n }\n\n if (offsetHeight > 0) {\n scaleY = round(rect.height) / offsetHeight || 1;\n }\n }\n\n return {\n width: rect.width / scaleX,\n height: rect.height / scaleY,\n top: rect.top / scaleY,\n right: rect.right / scaleX,\n bottom: rect.bottom / scaleY,\n left: rect.left / scaleX,\n x: rect.left / scaleX,\n y: rect.top / scaleY\n };\n}","import getBoundingClientRect from \"./getBoundingClientRect.js\"; // Returns the layout rect of an element relative to its offsetParent. Layout\n// means it doesn't take into account transforms.\n\nexport default function getLayoutRect(element) {\n var clientRect = getBoundingClientRect(element); // Use the clientRect sizes if it's not been transformed.\n // Fixes https://github.com/popperjs/popper-core/issues/1223\n\n var width = element.offsetWidth;\n var height = element.offsetHeight;\n\n if (Math.abs(clientRect.width - width) <= 1) {\n width = clientRect.width;\n }\n\n if (Math.abs(clientRect.height - height) <= 1) {\n height = clientRect.height;\n }\n\n return {\n x: element.offsetLeft,\n y: element.offsetTop,\n width: width,\n height: height\n };\n}","import { isShadowRoot } from \"./instanceOf.js\";\nexport default function contains(parent, child) {\n var rootNode = child.getRootNode && child.getRootNode(); // First, attempt with faster native method\n\n if (parent.contains(child)) {\n return true;\n } // then fallback to custom implementation with Shadow DOM support\n else if (rootNode && isShadowRoot(rootNode)) {\n var next = child;\n\n do {\n if (next && parent.isSameNode(next)) {\n return true;\n } // $FlowFixMe[prop-missing]: need a better way to handle this...\n\n\n next = next.parentNode || next.host;\n } while (next);\n } // Give up, the result is false\n\n\n return false;\n}","import getWindow from \"./getWindow.js\";\nexport default function getComputedStyle(element) {\n return getWindow(element).getComputedStyle(element);\n}","import { isElement } from \"./instanceOf.js\";\nexport default function getDocumentElement(element) {\n // $FlowFixMe[incompatible-return]: assume body is always available\n return ((isElement(element) ? element.ownerDocument : // $FlowFixMe[prop-missing]\n element.document) || window.document).documentElement;\n}","import getNodeName from \"./getNodeName.js\";\nimport getDocumentElement from \"./getDocumentElement.js\";\nimport { isShadowRoot } from \"./instanceOf.js\";\nexport default function getParentNode(element) {\n if (getNodeName(element) === 'html') {\n return element;\n }\n\n return (// this is a quicker (but less type safe) way to save quite some bytes from the bundle\n // $FlowFixMe[incompatible-return]\n // $FlowFixMe[prop-missing]\n element.assignedSlot || // step into the shadow DOM of the parent of a slotted node\n element.parentNode || ( // DOM Element detected\n isShadowRoot(element) ? element.host : null) || // ShadowRoot detected\n // $FlowFixMe[incompatible-call]: HTMLElement is a Node\n getDocumentElement(element) // fallback\n\n );\n}","import getWindow from \"./getWindow.js\";\nimport getNodeName from \"./getNodeName.js\";\nimport getComputedStyle from \"./getComputedStyle.js\";\nimport { isHTMLElement, isShadowRoot } from \"./instanceOf.js\";\nimport isTableElement from \"./isTableElement.js\";\nimport getParentNode from \"./getParentNode.js\";\n\nfunction getTrueOffsetParent(element) {\n if (!isHTMLElement(element) || // https://github.com/popperjs/popper-core/issues/837\n getComputedStyle(element).position === 'fixed') {\n return null;\n }\n\n return element.offsetParent;\n} // `.offsetParent` reports `null` for fixed elements, while absolute elements\n// return the containing block\n\n\nfunction getContainingBlock(element) {\n var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') !== -1;\n var isIE = navigator.userAgent.indexOf('Trident') !== -1;\n\n if (isIE && isHTMLElement(element)) {\n // In IE 9, 10 and 11 fixed elements containing block is always established by the viewport\n var elementCss = getComputedStyle(element);\n\n if (elementCss.position === 'fixed') {\n return null;\n }\n }\n\n var currentNode = getParentNode(element);\n\n if (isShadowRoot(currentNode)) {\n currentNode = currentNode.host;\n }\n\n while (isHTMLElement(currentNode) && ['html', 'body'].indexOf(getNodeName(currentNode)) < 0) {\n var css = getComputedStyle(currentNode); // This is non-exhaustive but covers the most common CSS properties that\n // create a containing block.\n // https://developer.mozilla.org/en-US/docs/Web/CSS/Containing_block#identifying_the_containing_block\n\n if (css.transform !== 'none' || css.perspective !== 'none' || css.contain === 'paint' || ['transform', 'perspective'].indexOf(css.willChange) !== -1 || isFirefox && css.willChange === 'filter' || isFirefox && css.filter && css.filter !== 'none') {\n return currentNode;\n } else {\n currentNode = currentNode.parentNode;\n }\n }\n\n return null;\n} // Gets the closest ancestor positioned element. Handles some edge cases,\n// such as table ancestors and cross browser bugs.\n\n\nexport default function getOffsetParent(element) {\n var window = getWindow(element);\n var offsetParent = getTrueOffsetParent(element);\n\n while (offsetParent && isTableElement(offsetParent) && getComputedStyle(offsetParent).position === 'static') {\n offsetParent = getTrueOffsetParent(offsetParent);\n }\n\n if (offsetParent && (getNodeName(offsetParent) === 'html' || getNodeName(offsetParent) === 'body' && getComputedStyle(offsetParent).position === 'static')) {\n return window;\n }\n\n return offsetParent || getContainingBlock(element) || window;\n}","import getNodeName from \"./getNodeName.js\";\nexport default function isTableElement(element) {\n return ['table', 'td', 'th'].indexOf(getNodeName(element)) >= 0;\n}","export default function getMainAxisFromPlacement(placement) {\n return ['top', 'bottom'].indexOf(placement) >= 0 ? 'x' : 'y';\n}","import getFreshSideObject from \"./getFreshSideObject.js\";\nexport default function mergePaddingObject(paddingObject) {\n return Object.assign({}, getFreshSideObject(), paddingObject);\n}","export default function getFreshSideObject() {\n return {\n top: 0,\n right: 0,\n bottom: 0,\n left: 0\n };\n}","export default function expandToHashMap(value, keys) {\n return keys.reduce(function (hashMap, key) {\n hashMap[key] = value;\n return hashMap;\n }, {});\n}","export default function getVariation(placement) {\n return placement.split('-')[1];\n}","import { top, left, right, bottom, end } from \"../enums.js\";\nimport getOffsetParent from \"../dom-utils/getOffsetParent.js\";\nimport getWindow from \"../dom-utils/getWindow.js\";\nimport getDocumentElement from \"../dom-utils/getDocumentElement.js\";\nimport getComputedStyle from \"../dom-utils/getComputedStyle.js\";\nimport getBasePlacement from \"../utils/getBasePlacement.js\";\nimport getVariation from \"../utils/getVariation.js\";\nimport { round } from \"../utils/math.js\"; // eslint-disable-next-line import/no-unused-modules\n\nvar unsetSides = {\n top: 'auto',\n right: 'auto',\n bottom: 'auto',\n left: 'auto'\n}; // Round the offsets to the nearest suitable subpixel based on the DPR.\n// Zooming can change the DPR, but it seems to report a value that will\n// cleanly divide the values into the appropriate subpixels.\n\nfunction roundOffsetsByDPR(_ref) {\n var x = _ref.x,\n y = _ref.y;\n var win = window;\n var dpr = win.devicePixelRatio || 1;\n return {\n x: round(x * dpr) / dpr || 0,\n y: round(y * dpr) / dpr || 0\n };\n}\n\nexport function mapToStyles(_ref2) {\n var _Object$assign2;\n\n var popper = _ref2.popper,\n popperRect = _ref2.popperRect,\n placement = _ref2.placement,\n variation = _ref2.variation,\n offsets = _ref2.offsets,\n position = _ref2.position,\n gpuAcceleration = _ref2.gpuAcceleration,\n adaptive = _ref2.adaptive,\n roundOffsets = _ref2.roundOffsets,\n isFixed = _ref2.isFixed;\n var _offsets$x = offsets.x,\n x = _offsets$x === void 0 ? 0 : _offsets$x,\n _offsets$y = offsets.y,\n y = _offsets$y === void 0 ? 0 : _offsets$y;\n\n var _ref3 = typeof roundOffsets === 'function' ? roundOffsets({\n x: x,\n y: y\n }) : {\n x: x,\n y: y\n };\n\n x = _ref3.x;\n y = _ref3.y;\n var hasX = offsets.hasOwnProperty('x');\n var hasY = offsets.hasOwnProperty('y');\n var sideX = left;\n var sideY = top;\n var win = window;\n\n if (adaptive) {\n var offsetParent = getOffsetParent(popper);\n var heightProp = 'clientHeight';\n var widthProp = 'clientWidth';\n\n if (offsetParent === getWindow(popper)) {\n offsetParent = getDocumentElement(popper);\n\n if (getComputedStyle(offsetParent).position !== 'static' && position === 'absolute') {\n heightProp = 'scrollHeight';\n widthProp = 'scrollWidth';\n }\n } // $FlowFixMe[incompatible-cast]: force type refinement, we compare offsetParent with window above, but Flow doesn't detect it\n\n\n offsetParent = offsetParent;\n\n if (placement === top || (placement === left || placement === right) && variation === end) {\n sideY = bottom;\n var offsetY = isFixed && offsetParent === win && win.visualViewport ? win.visualViewport.height : // $FlowFixMe[prop-missing]\n offsetParent[heightProp];\n y -= offsetY - popperRect.height;\n y *= gpuAcceleration ? 1 : -1;\n }\n\n if (placement === left || (placement === top || placement === bottom) && variation === end) {\n sideX = right;\n var offsetX = isFixed && offsetParent === win && win.visualViewport ? win.visualViewport.width : // $FlowFixMe[prop-missing]\n offsetParent[widthProp];\n x -= offsetX - popperRect.width;\n x *= gpuAcceleration ? 1 : -1;\n }\n }\n\n var commonStyles = Object.assign({\n position: position\n }, adaptive && unsetSides);\n\n var _ref4 = roundOffsets === true ? roundOffsetsByDPR({\n x: x,\n y: y\n }) : {\n x: x,\n y: y\n };\n\n x = _ref4.x;\n y = _ref4.y;\n\n if (gpuAcceleration) {\n var _Object$assign;\n\n return Object.assign({}, commonStyles, (_Object$assign = {}, _Object$assign[sideY] = hasY ? '0' : '', _Object$assign[sideX] = hasX ? '0' : '', _Object$assign.transform = (win.devicePixelRatio || 1) <= 1 ? \"translate(\" + x + \"px, \" + y + \"px)\" : \"translate3d(\" + x + \"px, \" + y + \"px, 0)\", _Object$assign));\n }\n\n return Object.assign({}, commonStyles, (_Object$assign2 = {}, _Object$assign2[sideY] = hasY ? y + \"px\" : '', _Object$assign2[sideX] = hasX ? x + \"px\" : '', _Object$assign2.transform = '', _Object$assign2));\n}\n\nfunction computeStyles(_ref5) {\n var state = _ref5.state,\n options = _ref5.options;\n var _options$gpuAccelerat = options.gpuAcceleration,\n gpuAcceleration = _options$gpuAccelerat === void 0 ? true : _options$gpuAccelerat,\n _options$adaptive = options.adaptive,\n adaptive = _options$adaptive === void 0 ? true : _options$adaptive,\n _options$roundOffsets = options.roundOffsets,\n roundOffsets = _options$roundOffsets === void 0 ? true : _options$roundOffsets;\n\n if (process.env.NODE_ENV !== \"production\") {\n var transitionProperty = getComputedStyle(state.elements.popper).transitionProperty || '';\n\n if (adaptive && ['transform', 'top', 'right', 'bottom', 'left'].some(function (property) {\n return transitionProperty.indexOf(property) >= 0;\n })) {\n console.warn(['Popper: Detected CSS transitions on at least one of the following', 'CSS properties: \"transform\", \"top\", \"right\", \"bottom\", \"left\".', '\\n\\n', 'Disable the \"computeStyles\" modifier\\'s `adaptive` option to allow', 'for smooth transitions, or remove these properties from the CSS', 'transition declaration on the popper element if only transitioning', 'opacity or background-color for example.', '\\n\\n', 'We recommend using the popper element as a wrapper around an inner', 'element that can have any CSS property transitioned for animations.'].join(' '));\n }\n }\n\n var commonStyles = {\n placement: getBasePlacement(state.placement),\n variation: getVariation(state.placement),\n popper: state.elements.popper,\n popperRect: state.rects.popper,\n gpuAcceleration: gpuAcceleration,\n isFixed: state.options.strategy === 'fixed'\n };\n\n if (state.modifiersData.popperOffsets != null) {\n state.styles.popper = Object.assign({}, state.styles.popper, mapToStyles(Object.assign({}, commonStyles, {\n offsets: state.modifiersData.popperOffsets,\n position: state.options.strategy,\n adaptive: adaptive,\n roundOffsets: roundOffsets\n })));\n }\n\n if (state.modifiersData.arrow != null) {\n state.styles.arrow = Object.assign({}, state.styles.arrow, mapToStyles(Object.assign({}, commonStyles, {\n offsets: state.modifiersData.arrow,\n position: 'absolute',\n adaptive: false,\n roundOffsets: roundOffsets\n })));\n }\n\n state.attributes.popper = Object.assign({}, state.attributes.popper, {\n 'data-popper-placement': state.placement\n });\n} // eslint-disable-next-line import/no-unused-modules\n\n\nexport default {\n name: 'computeStyles',\n enabled: true,\n phase: 'beforeWrite',\n fn: computeStyles,\n data: {}\n};","export var top = 'top';\nexport var bottom = 'bottom';\nexport var right = 'right';\nexport var left = 'left';\nexport var auto = 'auto';\nexport var basePlacements = [top, bottom, right, left];\nexport var start = 'start';\nexport var end = 'end';\nexport var clippingParents = 'clippingParents';\nexport var viewport = 'viewport';\nexport var popper = 'popper';\nexport var reference = 'reference';\nexport var variationPlacements = /*#__PURE__*/basePlacements.reduce(function (acc, placement) {\n return acc.concat([placement + \"-\" + start, placement + \"-\" + end]);\n}, []);\nexport var placements = /*#__PURE__*/[].concat(basePlacements, [auto]).reduce(function (acc, placement) {\n return acc.concat([placement, placement + \"-\" + start, placement + \"-\" + end]);\n}, []); // modifiers that need to read the DOM\n\nexport var beforeRead = 'beforeRead';\nexport var read = 'read';\nexport var afterRead = 'afterRead'; // pure-logic modifiers\n\nexport var beforeMain = 'beforeMain';\nexport var main = 'main';\nexport var afterMain = 'afterMain'; // modifier with the purpose to write to the DOM (or write into a framework state)\n\nexport var beforeWrite = 'beforeWrite';\nexport var write = 'write';\nexport var afterWrite = 'afterWrite';\nexport var modifierPhases = [beforeRead, read, afterRead, beforeMain, main, afterMain, beforeWrite, write, afterWrite];","var hash = {\n left: 'right',\n right: 'left',\n bottom: 'top',\n top: 'bottom'\n};\nexport default function getOppositePlacement(placement) {\n return placement.replace(/left|right|bottom|top/g, function (matched) {\n return hash[matched];\n });\n}","var hash = {\n start: 'end',\n end: 'start'\n};\nexport default function getOppositeVariationPlacement(placement) {\n return placement.replace(/start|end/g, function (matched) {\n return hash[matched];\n });\n}","import getWindow from \"./getWindow.js\";\nexport default function getWindowScroll(node) {\n var win = getWindow(node);\n var scrollLeft = win.pageXOffset;\n var scrollTop = win.pageYOffset;\n return {\n scrollLeft: scrollLeft,\n scrollTop: scrollTop\n };\n}","import getBoundingClientRect from \"./getBoundingClientRect.js\";\nimport getDocumentElement from \"./getDocumentElement.js\";\nimport getWindowScroll from \"./getWindowScroll.js\";\nexport default function getWindowScrollBarX(element) {\n // If has a CSS width greater than the viewport, then this will be\n // incorrect for RTL.\n // Popper 1 is broken in this case and never had a bug report so let's assume\n // it's not an issue. I don't think anyone ever specifies width on \n // anyway.\n // Browsers where the left scrollbar doesn't cause an issue report `0` for\n // this (e.g. Edge 2019, IE11, Safari)\n return getBoundingClientRect(getDocumentElement(element)).left + getWindowScroll(element).scrollLeft;\n}","import getComputedStyle from \"./getComputedStyle.js\";\nexport default function isScrollParent(element) {\n // Firefox wants us to check `-x` and `-y` variations as well\n var _getComputedStyle = getComputedStyle(element),\n overflow = _getComputedStyle.overflow,\n overflowX = _getComputedStyle.overflowX,\n overflowY = _getComputedStyle.overflowY;\n\n return /auto|scroll|overlay|hidden/.test(overflow + overflowY + overflowX);\n}","import getParentNode from \"./getParentNode.js\";\nimport isScrollParent from \"./isScrollParent.js\";\nimport getNodeName from \"./getNodeName.js\";\nimport { isHTMLElement } from \"./instanceOf.js\";\nexport default function getScrollParent(node) {\n if (['html', 'body', '#document'].indexOf(getNodeName(node)) >= 0) {\n // $FlowFixMe[incompatible-return]: assume body is always available\n return node.ownerDocument.body;\n }\n\n if (isHTMLElement(node) && isScrollParent(node)) {\n return node;\n }\n\n return getScrollParent(getParentNode(node));\n}","import getScrollParent from \"./getScrollParent.js\";\nimport getParentNode from \"./getParentNode.js\";\nimport getWindow from \"./getWindow.js\";\nimport isScrollParent from \"./isScrollParent.js\";\n/*\ngiven a DOM element, return the list of all scroll parents, up the list of ancesors\nuntil we get to the top window object. This list is what we attach scroll listeners\nto, because if any of these parent elements scroll, we'll need to re-calculate the\nreference element's position.\n*/\n\nexport default function listScrollParents(element, list) {\n var _element$ownerDocumen;\n\n if (list === void 0) {\n list = [];\n }\n\n var scrollParent = getScrollParent(element);\n var isBody = scrollParent === ((_element$ownerDocumen = element.ownerDocument) == null ? void 0 : _element$ownerDocumen.body);\n var win = getWindow(scrollParent);\n var target = isBody ? [win].concat(win.visualViewport || [], isScrollParent(scrollParent) ? scrollParent : []) : scrollParent;\n var updatedList = list.concat(target);\n return isBody ? updatedList : // $FlowFixMe[incompatible-call]: isBody tells us target will be an HTMLElement here\n updatedList.concat(listScrollParents(getParentNode(target)));\n}","export default function rectToClientRect(rect) {\n return Object.assign({}, rect, {\n left: rect.x,\n top: rect.y,\n right: rect.x + rect.width,\n bottom: rect.y + rect.height\n });\n}","import { viewport } from \"../enums.js\";\nimport getViewportRect from \"./getViewportRect.js\";\nimport getDocumentRect from \"./getDocumentRect.js\";\nimport listScrollParents from \"./listScrollParents.js\";\nimport getOffsetParent from \"./getOffsetParent.js\";\nimport getDocumentElement from \"./getDocumentElement.js\";\nimport getComputedStyle from \"./getComputedStyle.js\";\nimport { isElement, isHTMLElement } from \"./instanceOf.js\";\nimport getBoundingClientRect from \"./getBoundingClientRect.js\";\nimport getParentNode from \"./getParentNode.js\";\nimport contains from \"./contains.js\";\nimport getNodeName from \"./getNodeName.js\";\nimport rectToClientRect from \"../utils/rectToClientRect.js\";\nimport { max, min } from \"../utils/math.js\";\n\nfunction getInnerBoundingClientRect(element) {\n var rect = getBoundingClientRect(element);\n rect.top = rect.top + element.clientTop;\n rect.left = rect.left + element.clientLeft;\n rect.bottom = rect.top + element.clientHeight;\n rect.right = rect.left + element.clientWidth;\n rect.width = element.clientWidth;\n rect.height = element.clientHeight;\n rect.x = rect.left;\n rect.y = rect.top;\n return rect;\n}\n\nfunction getClientRectFromMixedType(element, clippingParent) {\n return clippingParent === viewport ? rectToClientRect(getViewportRect(element)) : isElement(clippingParent) ? getInnerBoundingClientRect(clippingParent) : rectToClientRect(getDocumentRect(getDocumentElement(element)));\n} // A \"clipping parent\" is an overflowable container with the characteristic of\n// clipping (or hiding) overflowing elements with a position different from\n// `initial`\n\n\nfunction getClippingParents(element) {\n var clippingParents = listScrollParents(getParentNode(element));\n var canEscapeClipping = ['absolute', 'fixed'].indexOf(getComputedStyle(element).position) >= 0;\n var clipperElement = canEscapeClipping && isHTMLElement(element) ? getOffsetParent(element) : element;\n\n if (!isElement(clipperElement)) {\n return [];\n } // $FlowFixMe[incompatible-return]: https://github.com/facebook/flow/issues/1414\n\n\n return clippingParents.filter(function (clippingParent) {\n return isElement(clippingParent) && contains(clippingParent, clipperElement) && getNodeName(clippingParent) !== 'body';\n });\n} // Gets the maximum area that the element is visible in due to any number of\n// clipping parents\n\n\nexport default function getClippingRect(element, boundary, rootBoundary) {\n var mainClippingParents = boundary === 'clippingParents' ? getClippingParents(element) : [].concat(boundary);\n var clippingParents = [].concat(mainClippingParents, [rootBoundary]);\n var firstClippingParent = clippingParents[0];\n var clippingRect = clippingParents.reduce(function (accRect, clippingParent) {\n var rect = getClientRectFromMixedType(element, clippingParent);\n accRect.top = max(rect.top, accRect.top);\n accRect.right = min(rect.right, accRect.right);\n accRect.bottom = min(rect.bottom, accRect.bottom);\n accRect.left = max(rect.left, accRect.left);\n return accRect;\n }, getClientRectFromMixedType(element, firstClippingParent));\n clippingRect.width = clippingRect.right - clippingRect.left;\n clippingRect.height = clippingRect.bottom - clippingRect.top;\n clippingRect.x = clippingRect.left;\n clippingRect.y = clippingRect.top;\n return clippingRect;\n}","import getWindow from \"./getWindow.js\";\nimport getDocumentElement from \"./getDocumentElement.js\";\nimport getWindowScrollBarX from \"./getWindowScrollBarX.js\";\nexport default function getViewportRect(element) {\n var win = getWindow(element);\n var html = getDocumentElement(element);\n var visualViewport = win.visualViewport;\n var width = html.clientWidth;\n var height = html.clientHeight;\n var x = 0;\n var y = 0; // NB: This isn't supported on iOS <= 12. If the keyboard is open, the popper\n // can be obscured underneath it.\n // Also, `html.clientHeight` adds the bottom bar height in Safari iOS, even\n // if it isn't open, so if this isn't available, the popper will be detected\n // to overflow the bottom of the screen too early.\n\n if (visualViewport) {\n width = visualViewport.width;\n height = visualViewport.height; // Uses Layout Viewport (like Chrome; Safari does not currently)\n // In Chrome, it returns a value very close to 0 (+/-) but contains rounding\n // errors due to floating point numbers, so we need to check precision.\n // Safari returns a number <= 0, usually < -1 when pinch-zoomed\n // Feature detection fails in mobile emulation mode in Chrome.\n // Math.abs(win.innerWidth / visualViewport.scale - visualViewport.width) <\n // 0.001\n // Fallback here: \"Not Safari\" userAgent\n\n if (!/^((?!chrome|android).)*safari/i.test(navigator.userAgent)) {\n x = visualViewport.offsetLeft;\n y = visualViewport.offsetTop;\n }\n }\n\n return {\n width: width,\n height: height,\n x: x + getWindowScrollBarX(element),\n y: y\n };\n}","import getDocumentElement from \"./getDocumentElement.js\";\nimport getComputedStyle from \"./getComputedStyle.js\";\nimport getWindowScrollBarX from \"./getWindowScrollBarX.js\";\nimport getWindowScroll from \"./getWindowScroll.js\";\nimport { max } from \"../utils/math.js\"; // Gets the entire size of the scrollable document area, even extending outside\n// of the `` and `` rect bounds if horizontally scrollable\n\nexport default function getDocumentRect(element) {\n var _element$ownerDocumen;\n\n var html = getDocumentElement(element);\n var winScroll = getWindowScroll(element);\n var body = (_element$ownerDocumen = element.ownerDocument) == null ? void 0 : _element$ownerDocumen.body;\n var width = max(html.scrollWidth, html.clientWidth, body ? body.scrollWidth : 0, body ? body.clientWidth : 0);\n var height = max(html.scrollHeight, html.clientHeight, body ? body.scrollHeight : 0, body ? body.clientHeight : 0);\n var x = -winScroll.scrollLeft + getWindowScrollBarX(element);\n var y = -winScroll.scrollTop;\n\n if (getComputedStyle(body || html).direction === 'rtl') {\n x += max(html.clientWidth, body ? body.clientWidth : 0) - width;\n }\n\n return {\n width: width,\n height: height,\n x: x,\n y: y\n };\n}","import getBasePlacement from \"./getBasePlacement.js\";\nimport getVariation from \"./getVariation.js\";\nimport getMainAxisFromPlacement from \"./getMainAxisFromPlacement.js\";\nimport { top, right, bottom, left, start, end } from \"../enums.js\";\nexport default function computeOffsets(_ref) {\n var reference = _ref.reference,\n element = _ref.element,\n placement = _ref.placement;\n var basePlacement = placement ? getBasePlacement(placement) : null;\n var variation = placement ? getVariation(placement) : null;\n var commonX = reference.x + reference.width / 2 - element.width / 2;\n var commonY = reference.y + reference.height / 2 - element.height / 2;\n var offsets;\n\n switch (basePlacement) {\n case top:\n offsets = {\n x: commonX,\n y: reference.y - element.height\n };\n break;\n\n case bottom:\n offsets = {\n x: commonX,\n y: reference.y + reference.height\n };\n break;\n\n case right:\n offsets = {\n x: reference.x + reference.width,\n y: commonY\n };\n break;\n\n case left:\n offsets = {\n x: reference.x - element.width,\n y: commonY\n };\n break;\n\n default:\n offsets = {\n x: reference.x,\n y: reference.y\n };\n }\n\n var mainAxis = basePlacement ? getMainAxisFromPlacement(basePlacement) : null;\n\n if (mainAxis != null) {\n var len = mainAxis === 'y' ? 'height' : 'width';\n\n switch (variation) {\n case start:\n offsets[mainAxis] = offsets[mainAxis] - (reference[len] / 2 - element[len] / 2);\n break;\n\n case end:\n offsets[mainAxis] = offsets[mainAxis] + (reference[len] / 2 - element[len] / 2);\n break;\n\n default:\n }\n }\n\n return offsets;\n}","import getClippingRect from \"../dom-utils/getClippingRect.js\";\nimport getDocumentElement from \"../dom-utils/getDocumentElement.js\";\nimport getBoundingClientRect from \"../dom-utils/getBoundingClientRect.js\";\nimport computeOffsets from \"./computeOffsets.js\";\nimport rectToClientRect from \"./rectToClientRect.js\";\nimport { clippingParents, reference, popper, bottom, top, right, basePlacements, viewport } from \"../enums.js\";\nimport { isElement } from \"../dom-utils/instanceOf.js\";\nimport mergePaddingObject from \"./mergePaddingObject.js\";\nimport expandToHashMap from \"./expandToHashMap.js\"; // eslint-disable-next-line import/no-unused-modules\n\nexport default function detectOverflow(state, options) {\n if (options === void 0) {\n options = {};\n }\n\n var _options = options,\n _options$placement = _options.placement,\n placement = _options$placement === void 0 ? state.placement : _options$placement,\n _options$boundary = _options.boundary,\n boundary = _options$boundary === void 0 ? clippingParents : _options$boundary,\n _options$rootBoundary = _options.rootBoundary,\n rootBoundary = _options$rootBoundary === void 0 ? viewport : _options$rootBoundary,\n _options$elementConte = _options.elementContext,\n elementContext = _options$elementConte === void 0 ? popper : _options$elementConte,\n _options$altBoundary = _options.altBoundary,\n altBoundary = _options$altBoundary === void 0 ? false : _options$altBoundary,\n _options$padding = _options.padding,\n padding = _options$padding === void 0 ? 0 : _options$padding;\n var paddingObject = mergePaddingObject(typeof padding !== 'number' ? padding : expandToHashMap(padding, basePlacements));\n var altContext = elementContext === popper ? reference : popper;\n var popperRect = state.rects.popper;\n var element = state.elements[altBoundary ? altContext : elementContext];\n var clippingClientRect = getClippingRect(isElement(element) ? element : element.contextElement || getDocumentElement(state.elements.popper), boundary, rootBoundary);\n var referenceClientRect = getBoundingClientRect(state.elements.reference);\n var popperOffsets = computeOffsets({\n reference: referenceClientRect,\n element: popperRect,\n strategy: 'absolute',\n placement: placement\n });\n var popperClientRect = rectToClientRect(Object.assign({}, popperRect, popperOffsets));\n var elementClientRect = elementContext === popper ? popperClientRect : referenceClientRect; // positive = overflowing the clipping rect\n // 0 or negative = within the clipping rect\n\n var overflowOffsets = {\n top: clippingClientRect.top - elementClientRect.top + paddingObject.top,\n bottom: elementClientRect.bottom - clippingClientRect.bottom + paddingObject.bottom,\n left: clippingClientRect.left - elementClientRect.left + paddingObject.left,\n right: elementClientRect.right - clippingClientRect.right + paddingObject.right\n };\n var offsetData = state.modifiersData.offset; // Offsets can be applied only to the popper element\n\n if (elementContext === popper && offsetData) {\n var offset = offsetData[placement];\n Object.keys(overflowOffsets).forEach(function (key) {\n var multiply = [right, bottom].indexOf(key) >= 0 ? 1 : -1;\n var axis = [top, bottom].indexOf(key) >= 0 ? 'y' : 'x';\n overflowOffsets[key] += offset[axis] * multiply;\n });\n }\n\n return overflowOffsets;\n}","import getVariation from \"./getVariation.js\";\nimport { variationPlacements, basePlacements, placements as allPlacements } from \"../enums.js\";\nimport detectOverflow from \"./detectOverflow.js\";\nimport getBasePlacement from \"./getBasePlacement.js\";\nexport default function computeAutoPlacement(state, options) {\n if (options === void 0) {\n options = {};\n }\n\n var _options = options,\n placement = _options.placement,\n boundary = _options.boundary,\n rootBoundary = _options.rootBoundary,\n padding = _options.padding,\n flipVariations = _options.flipVariations,\n _options$allowedAutoP = _options.allowedAutoPlacements,\n allowedAutoPlacements = _options$allowedAutoP === void 0 ? allPlacements : _options$allowedAutoP;\n var variation = getVariation(placement);\n var placements = variation ? flipVariations ? variationPlacements : variationPlacements.filter(function (placement) {\n return getVariation(placement) === variation;\n }) : basePlacements;\n var allowedPlacements = placements.filter(function (placement) {\n return allowedAutoPlacements.indexOf(placement) >= 0;\n });\n\n if (allowedPlacements.length === 0) {\n allowedPlacements = placements;\n\n if (process.env.NODE_ENV !== \"production\") {\n console.error(['Popper: The `allowedAutoPlacements` option did not allow any', 'placements. Ensure the `placement` option matches the variation', 'of the allowed placements.', 'For example, \"auto\" cannot be used to allow \"bottom-start\".', 'Use \"auto-start\" instead.'].join(' '));\n }\n } // $FlowFixMe[incompatible-type]: Flow seems to have problems with two array unions...\n\n\n var overflows = allowedPlacements.reduce(function (acc, placement) {\n acc[placement] = detectOverflow(state, {\n placement: placement,\n boundary: boundary,\n rootBoundary: rootBoundary,\n padding: padding\n })[getBasePlacement(placement)];\n return acc;\n }, {});\n return Object.keys(overflows).sort(function (a, b) {\n return overflows[a] - overflows[b];\n });\n}","import getOppositePlacement from \"../utils/getOppositePlacement.js\";\nimport getBasePlacement from \"../utils/getBasePlacement.js\";\nimport getOppositeVariationPlacement from \"../utils/getOppositeVariationPlacement.js\";\nimport detectOverflow from \"../utils/detectOverflow.js\";\nimport computeAutoPlacement from \"../utils/computeAutoPlacement.js\";\nimport { bottom, top, start, right, left, auto } from \"../enums.js\";\nimport getVariation from \"../utils/getVariation.js\"; // eslint-disable-next-line import/no-unused-modules\n\nfunction getExpandedFallbackPlacements(placement) {\n if (getBasePlacement(placement) === auto) {\n return [];\n }\n\n var oppositePlacement = getOppositePlacement(placement);\n return [getOppositeVariationPlacement(placement), oppositePlacement, getOppositeVariationPlacement(oppositePlacement)];\n}\n\nfunction flip(_ref) {\n var state = _ref.state,\n options = _ref.options,\n name = _ref.name;\n\n if (state.modifiersData[name]._skip) {\n return;\n }\n\n var _options$mainAxis = options.mainAxis,\n checkMainAxis = _options$mainAxis === void 0 ? true : _options$mainAxis,\n _options$altAxis = options.altAxis,\n checkAltAxis = _options$altAxis === void 0 ? true : _options$altAxis,\n specifiedFallbackPlacements = options.fallbackPlacements,\n padding = options.padding,\n boundary = options.boundary,\n rootBoundary = options.rootBoundary,\n altBoundary = options.altBoundary,\n _options$flipVariatio = options.flipVariations,\n flipVariations = _options$flipVariatio === void 0 ? true : _options$flipVariatio,\n allowedAutoPlacements = options.allowedAutoPlacements;\n var preferredPlacement = state.options.placement;\n var basePlacement = getBasePlacement(preferredPlacement);\n var isBasePlacement = basePlacement === preferredPlacement;\n var fallbackPlacements = specifiedFallbackPlacements || (isBasePlacement || !flipVariations ? [getOppositePlacement(preferredPlacement)] : getExpandedFallbackPlacements(preferredPlacement));\n var placements = [preferredPlacement].concat(fallbackPlacements).reduce(function (acc, placement) {\n return acc.concat(getBasePlacement(placement) === auto ? computeAutoPlacement(state, {\n placement: placement,\n boundary: boundary,\n rootBoundary: rootBoundary,\n padding: padding,\n flipVariations: flipVariations,\n allowedAutoPlacements: allowedAutoPlacements\n }) : placement);\n }, []);\n var referenceRect = state.rects.reference;\n var popperRect = state.rects.popper;\n var checksMap = new Map();\n var makeFallbackChecks = true;\n var firstFittingPlacement = placements[0];\n\n for (var i = 0; i < placements.length; i++) {\n var placement = placements[i];\n\n var _basePlacement = getBasePlacement(placement);\n\n var isStartVariation = getVariation(placement) === start;\n var isVertical = [top, bottom].indexOf(_basePlacement) >= 0;\n var len = isVertical ? 'width' : 'height';\n var overflow = detectOverflow(state, {\n placement: placement,\n boundary: boundary,\n rootBoundary: rootBoundary,\n altBoundary: altBoundary,\n padding: padding\n });\n var mainVariationSide = isVertical ? isStartVariation ? right : left : isStartVariation ? bottom : top;\n\n if (referenceRect[len] > popperRect[len]) {\n mainVariationSide = getOppositePlacement(mainVariationSide);\n }\n\n var altVariationSide = getOppositePlacement(mainVariationSide);\n var checks = [];\n\n if (checkMainAxis) {\n checks.push(overflow[_basePlacement] <= 0);\n }\n\n if (checkAltAxis) {\n checks.push(overflow[mainVariationSide] <= 0, overflow[altVariationSide] <= 0);\n }\n\n if (checks.every(function (check) {\n return check;\n })) {\n firstFittingPlacement = placement;\n makeFallbackChecks = false;\n break;\n }\n\n checksMap.set(placement, checks);\n }\n\n if (makeFallbackChecks) {\n // `2` may be desired in some cases – research later\n var numberOfChecks = flipVariations ? 3 : 1;\n\n var _loop = function _loop(_i) {\n var fittingPlacement = placements.find(function (placement) {\n var checks = checksMap.get(placement);\n\n if (checks) {\n return checks.slice(0, _i).every(function (check) {\n return check;\n });\n }\n });\n\n if (fittingPlacement) {\n firstFittingPlacement = fittingPlacement;\n return \"break\";\n }\n };\n\n for (var _i = numberOfChecks; _i > 0; _i--) {\n var _ret = _loop(_i);\n\n if (_ret === \"break\") break;\n }\n }\n\n if (state.placement !== firstFittingPlacement) {\n state.modifiersData[name]._skip = true;\n state.placement = firstFittingPlacement;\n state.reset = true;\n }\n} // eslint-disable-next-line import/no-unused-modules\n\n\nexport default {\n name: 'flip',\n enabled: true,\n phase: 'main',\n fn: flip,\n requiresIfExists: ['offset'],\n data: {\n _skip: false\n }\n};","import { top, bottom, left, right } from \"../enums.js\";\nimport detectOverflow from \"../utils/detectOverflow.js\";\n\nfunction getSideOffsets(overflow, rect, preventedOffsets) {\n if (preventedOffsets === void 0) {\n preventedOffsets = {\n x: 0,\n y: 0\n };\n }\n\n return {\n top: overflow.top - rect.height - preventedOffsets.y,\n right: overflow.right - rect.width + preventedOffsets.x,\n bottom: overflow.bottom - rect.height + preventedOffsets.y,\n left: overflow.left - rect.width - preventedOffsets.x\n };\n}\n\nfunction isAnySideFullyClipped(overflow) {\n return [top, right, bottom, left].some(function (side) {\n return overflow[side] >= 0;\n });\n}\n\nfunction hide(_ref) {\n var state = _ref.state,\n name = _ref.name;\n var referenceRect = state.rects.reference;\n var popperRect = state.rects.popper;\n var preventedOffsets = state.modifiersData.preventOverflow;\n var referenceOverflow = detectOverflow(state, {\n elementContext: 'reference'\n });\n var popperAltOverflow = detectOverflow(state, {\n altBoundary: true\n });\n var referenceClippingOffsets = getSideOffsets(referenceOverflow, referenceRect);\n var popperEscapeOffsets = getSideOffsets(popperAltOverflow, popperRect, preventedOffsets);\n var isReferenceHidden = isAnySideFullyClipped(referenceClippingOffsets);\n var hasPopperEscaped = isAnySideFullyClipped(popperEscapeOffsets);\n state.modifiersData[name] = {\n referenceClippingOffsets: referenceClippingOffsets,\n popperEscapeOffsets: popperEscapeOffsets,\n isReferenceHidden: isReferenceHidden,\n hasPopperEscaped: hasPopperEscaped\n };\n state.attributes.popper = Object.assign({}, state.attributes.popper, {\n 'data-popper-reference-hidden': isReferenceHidden,\n 'data-popper-escaped': hasPopperEscaped\n });\n} // eslint-disable-next-line import/no-unused-modules\n\n\nexport default {\n name: 'hide',\n enabled: true,\n phase: 'main',\n requiresIfExists: ['preventOverflow'],\n fn: hide\n};","import getBoundingClientRect from \"./getBoundingClientRect.js\";\nimport getNodeScroll from \"./getNodeScroll.js\";\nimport getNodeName from \"./getNodeName.js\";\nimport { isHTMLElement } from \"./instanceOf.js\";\nimport getWindowScrollBarX from \"./getWindowScrollBarX.js\";\nimport getDocumentElement from \"./getDocumentElement.js\";\nimport isScrollParent from \"./isScrollParent.js\";\nimport { round } from \"../utils/math.js\";\n\nfunction isElementScaled(element) {\n var rect = element.getBoundingClientRect();\n var scaleX = round(rect.width) / element.offsetWidth || 1;\n var scaleY = round(rect.height) / element.offsetHeight || 1;\n return scaleX !== 1 || scaleY !== 1;\n} // Returns the composite rect of an element relative to its offsetParent.\n// Composite means it takes into account transforms as well as layout.\n\n\nexport default function getCompositeRect(elementOrVirtualElement, offsetParent, isFixed) {\n if (isFixed === void 0) {\n isFixed = false;\n }\n\n var isOffsetParentAnElement = isHTMLElement(offsetParent);\n var offsetParentIsScaled = isHTMLElement(offsetParent) && isElementScaled(offsetParent);\n var documentElement = getDocumentElement(offsetParent);\n var rect = getBoundingClientRect(elementOrVirtualElement, offsetParentIsScaled);\n var scroll = {\n scrollLeft: 0,\n scrollTop: 0\n };\n var offsets = {\n x: 0,\n y: 0\n };\n\n if (isOffsetParentAnElement || !isOffsetParentAnElement && !isFixed) {\n if (getNodeName(offsetParent) !== 'body' || // https://github.com/popperjs/popper-core/issues/1078\n isScrollParent(documentElement)) {\n scroll = getNodeScroll(offsetParent);\n }\n\n if (isHTMLElement(offsetParent)) {\n offsets = getBoundingClientRect(offsetParent, true);\n offsets.x += offsetParent.clientLeft;\n offsets.y += offsetParent.clientTop;\n } else if (documentElement) {\n offsets.x = getWindowScrollBarX(documentElement);\n }\n }\n\n return {\n x: rect.left + scroll.scrollLeft - offsets.x,\n y: rect.top + scroll.scrollTop - offsets.y,\n width: rect.width,\n height: rect.height\n };\n}","import getWindowScroll from \"./getWindowScroll.js\";\nimport getWindow from \"./getWindow.js\";\nimport { isHTMLElement } from \"./instanceOf.js\";\nimport getHTMLElementScroll from \"./getHTMLElementScroll.js\";\nexport default function getNodeScroll(node) {\n if (node === getWindow(node) || !isHTMLElement(node)) {\n return getWindowScroll(node);\n } else {\n return getHTMLElementScroll(node);\n }\n}","export default function getHTMLElementScroll(element) {\n return {\n scrollLeft: element.scrollLeft,\n scrollTop: element.scrollTop\n };\n}","import { modifierPhases } from \"../enums.js\"; // source: https://stackoverflow.com/questions/49875255\n\nfunction order(modifiers) {\n var map = new Map();\n var visited = new Set();\n var result = [];\n modifiers.forEach(function (modifier) {\n map.set(modifier.name, modifier);\n }); // On visiting object, check for its dependencies and visit them recursively\n\n function sort(modifier) {\n visited.add(modifier.name);\n var requires = [].concat(modifier.requires || [], modifier.requiresIfExists || []);\n requires.forEach(function (dep) {\n if (!visited.has(dep)) {\n var depModifier = map.get(dep);\n\n if (depModifier) {\n sort(depModifier);\n }\n }\n });\n result.push(modifier);\n }\n\n modifiers.forEach(function (modifier) {\n if (!visited.has(modifier.name)) {\n // check for visited object\n sort(modifier);\n }\n });\n return result;\n}\n\nexport default function orderModifiers(modifiers) {\n // order based on dependencies\n var orderedModifiers = order(modifiers); // order based on phase\n\n return modifierPhases.reduce(function (acc, phase) {\n return acc.concat(orderedModifiers.filter(function (modifier) {\n return modifier.phase === phase;\n }));\n }, []);\n}","export default function debounce(fn) {\n var pending;\n return function () {\n if (!pending) {\n pending = new Promise(function (resolve) {\n Promise.resolve().then(function () {\n pending = undefined;\n resolve(fn());\n });\n });\n }\n\n return pending;\n };\n}","export default function mergeByName(modifiers) {\n var merged = modifiers.reduce(function (merged, current) {\n var existing = merged[current.name];\n merged[current.name] = existing ? Object.assign({}, existing, current, {\n options: Object.assign({}, existing.options, current.options),\n data: Object.assign({}, existing.data, current.data)\n }) : current;\n return merged;\n }, {}); // IE11 does not support Object.values\n\n return Object.keys(merged).map(function (key) {\n return merged[key];\n });\n}","import getCompositeRect from \"./dom-utils/getCompositeRect.js\";\nimport getLayoutRect from \"./dom-utils/getLayoutRect.js\";\nimport listScrollParents from \"./dom-utils/listScrollParents.js\";\nimport getOffsetParent from \"./dom-utils/getOffsetParent.js\";\nimport getComputedStyle from \"./dom-utils/getComputedStyle.js\";\nimport orderModifiers from \"./utils/orderModifiers.js\";\nimport debounce from \"./utils/debounce.js\";\nimport validateModifiers from \"./utils/validateModifiers.js\";\nimport uniqueBy from \"./utils/uniqueBy.js\";\nimport getBasePlacement from \"./utils/getBasePlacement.js\";\nimport mergeByName from \"./utils/mergeByName.js\";\nimport detectOverflow from \"./utils/detectOverflow.js\";\nimport { isElement } from \"./dom-utils/instanceOf.js\";\nimport { auto } from \"./enums.js\";\nvar INVALID_ELEMENT_ERROR = 'Popper: Invalid reference or popper argument provided. They must be either a DOM element or virtual element.';\nvar INFINITE_LOOP_ERROR = 'Popper: An infinite loop in the modifiers cycle has been detected! The cycle has been interrupted to prevent a browser crash.';\nvar DEFAULT_OPTIONS = {\n placement: 'bottom',\n modifiers: [],\n strategy: 'absolute'\n};\n\nfunction areValidElements() {\n for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {\n args[_key] = arguments[_key];\n }\n\n return !args.some(function (element) {\n return !(element && typeof element.getBoundingClientRect === 'function');\n });\n}\n\nexport function popperGenerator(generatorOptions) {\n if (generatorOptions === void 0) {\n generatorOptions = {};\n }\n\n var _generatorOptions = generatorOptions,\n _generatorOptions$def = _generatorOptions.defaultModifiers,\n defaultModifiers = _generatorOptions$def === void 0 ? [] : _generatorOptions$def,\n _generatorOptions$def2 = _generatorOptions.defaultOptions,\n defaultOptions = _generatorOptions$def2 === void 0 ? DEFAULT_OPTIONS : _generatorOptions$def2;\n return function createPopper(reference, popper, options) {\n if (options === void 0) {\n options = defaultOptions;\n }\n\n var state = {\n placement: 'bottom',\n orderedModifiers: [],\n options: Object.assign({}, DEFAULT_OPTIONS, defaultOptions),\n modifiersData: {},\n elements: {\n reference: reference,\n popper: popper\n },\n attributes: {},\n styles: {}\n };\n var effectCleanupFns = [];\n var isDestroyed = false;\n var instance = {\n state: state,\n setOptions: function setOptions(setOptionsAction) {\n var options = typeof setOptionsAction === 'function' ? setOptionsAction(state.options) : setOptionsAction;\n cleanupModifierEffects();\n state.options = Object.assign({}, defaultOptions, state.options, options);\n state.scrollParents = {\n reference: isElement(reference) ? listScrollParents(reference) : reference.contextElement ? listScrollParents(reference.contextElement) : [],\n popper: listScrollParents(popper)\n }; // Orders the modifiers based on their dependencies and `phase`\n // properties\n\n var orderedModifiers = orderModifiers(mergeByName([].concat(defaultModifiers, state.options.modifiers))); // Strip out disabled modifiers\n\n state.orderedModifiers = orderedModifiers.filter(function (m) {\n return m.enabled;\n }); // Validate the provided modifiers so that the consumer will get warned\n // if one of the modifiers is invalid for any reason\n\n if (process.env.NODE_ENV !== \"production\") {\n var modifiers = uniqueBy([].concat(orderedModifiers, state.options.modifiers), function (_ref) {\n var name = _ref.name;\n return name;\n });\n validateModifiers(modifiers);\n\n if (getBasePlacement(state.options.placement) === auto) {\n var flipModifier = state.orderedModifiers.find(function (_ref2) {\n var name = _ref2.name;\n return name === 'flip';\n });\n\n if (!flipModifier) {\n console.error(['Popper: \"auto\" placements require the \"flip\" modifier be', 'present and enabled to work.'].join(' '));\n }\n }\n\n var _getComputedStyle = getComputedStyle(popper),\n marginTop = _getComputedStyle.marginTop,\n marginRight = _getComputedStyle.marginRight,\n marginBottom = _getComputedStyle.marginBottom,\n marginLeft = _getComputedStyle.marginLeft; // We no longer take into account `margins` on the popper, and it can\n // cause bugs with positioning, so we'll warn the consumer\n\n\n if ([marginTop, marginRight, marginBottom, marginLeft].some(function (margin) {\n return parseFloat(margin);\n })) {\n console.warn(['Popper: CSS \"margin\" styles cannot be used to apply padding', 'between the popper and its reference element or boundary.', 'To replicate margin, use the `offset` modifier, as well as', 'the `padding` option in the `preventOverflow` and `flip`', 'modifiers.'].join(' '));\n }\n }\n\n runModifierEffects();\n return instance.update();\n },\n // Sync update – it will always be executed, even if not necessary. This\n // is useful for low frequency updates where sync behavior simplifies the\n // logic.\n // For high frequency updates (e.g. `resize` and `scroll` events), always\n // prefer the async Popper#update method\n forceUpdate: function forceUpdate() {\n if (isDestroyed) {\n return;\n }\n\n var _state$elements = state.elements,\n reference = _state$elements.reference,\n popper = _state$elements.popper; // Don't proceed if `reference` or `popper` are not valid elements\n // anymore\n\n if (!areValidElements(reference, popper)) {\n if (process.env.NODE_ENV !== \"production\") {\n console.error(INVALID_ELEMENT_ERROR);\n }\n\n return;\n } // Store the reference and popper rects to be read by modifiers\n\n\n state.rects = {\n reference: getCompositeRect(reference, getOffsetParent(popper), state.options.strategy === 'fixed'),\n popper: getLayoutRect(popper)\n }; // Modifiers have the ability to reset the current update cycle. The\n // most common use case for this is the `flip` modifier changing the\n // placement, which then needs to re-run all the modifiers, because the\n // logic was previously ran for the previous placement and is therefore\n // stale/incorrect\n\n state.reset = false;\n state.placement = state.options.placement; // On each update cycle, the `modifiersData` property for each modifier\n // is filled with the initial data specified by the modifier. This means\n // it doesn't persist and is fresh on each update.\n // To ensure persistent data, use `${name}#persistent`\n\n state.orderedModifiers.forEach(function (modifier) {\n return state.modifiersData[modifier.name] = Object.assign({}, modifier.data);\n });\n var __debug_loops__ = 0;\n\n for (var index = 0; index < state.orderedModifiers.length; index++) {\n if (process.env.NODE_ENV !== \"production\") {\n __debug_loops__ += 1;\n\n if (__debug_loops__ > 100) {\n console.error(INFINITE_LOOP_ERROR);\n break;\n }\n }\n\n if (state.reset === true) {\n state.reset = false;\n index = -1;\n continue;\n }\n\n var _state$orderedModifie = state.orderedModifiers[index],\n fn = _state$orderedModifie.fn,\n _state$orderedModifie2 = _state$orderedModifie.options,\n _options = _state$orderedModifie2 === void 0 ? {} : _state$orderedModifie2,\n name = _state$orderedModifie.name;\n\n if (typeof fn === 'function') {\n state = fn({\n state: state,\n options: _options,\n name: name,\n instance: instance\n }) || state;\n }\n }\n },\n // Async and optimistically optimized update – it will not be executed if\n // not necessary (debounced to run at most once-per-tick)\n update: debounce(function () {\n return new Promise(function (resolve) {\n instance.forceUpdate();\n resolve(state);\n });\n }),\n destroy: function destroy() {\n cleanupModifierEffects();\n isDestroyed = true;\n }\n };\n\n if (!areValidElements(reference, popper)) {\n if (process.env.NODE_ENV !== \"production\") {\n console.error(INVALID_ELEMENT_ERROR);\n }\n\n return instance;\n }\n\n instance.setOptions(options).then(function (state) {\n if (!isDestroyed && options.onFirstUpdate) {\n options.onFirstUpdate(state);\n }\n }); // Modifiers have the ability to execute arbitrary code before the first\n // update cycle runs. They will be executed in the same order as the update\n // cycle. This is useful when a modifier adds some persistent data that\n // other modifiers need to use, but the modifier is run after the dependent\n // one.\n\n function runModifierEffects() {\n state.orderedModifiers.forEach(function (_ref3) {\n var name = _ref3.name,\n _ref3$options = _ref3.options,\n options = _ref3$options === void 0 ? {} : _ref3$options,\n effect = _ref3.effect;\n\n if (typeof effect === 'function') {\n var cleanupFn = effect({\n state: state,\n name: name,\n instance: instance,\n options: options\n });\n\n var noopFn = function noopFn() {};\n\n effectCleanupFns.push(cleanupFn || noopFn);\n }\n });\n }\n\n function cleanupModifierEffects() {\n effectCleanupFns.forEach(function (fn) {\n return fn();\n });\n effectCleanupFns = [];\n }\n\n return instance;\n };\n}\nexport var createPopper = /*#__PURE__*/popperGenerator(); // eslint-disable-next-line import/no-unused-modules\n\nexport { detectOverflow };","function _getCenteredStylePopperModifier() {\n return [\n {\n name: 'applyStyles',\n fn({ state }) {\n Object.keys(state.elements).forEach((name) => {\n if (name !== 'popper') {\n return;\n }\n const style = {\n position: 'fixed',\n left: '50%',\n top: '50%',\n transform: 'translate(-50%, -50%)'\n };\n\n const attributes = state.attributes[name] || {};\n const element = state.elements[name];\n\n Object.assign(element.style, style);\n Object.keys(attributes).forEach((name) => {\n const value = attributes[name];\n if (value === false) {\n element.removeAttribute(name);\n } else {\n element.setAttribute(name, value === true ? '' : value);\n }\n });\n });\n }\n },\n {\n name: 'computeStyles',\n options: {\n adaptive: false\n }\n }\n ];\n}\n\n/**\n * Generates the array of options for a tooltip that doesn't have a\n * target element in the DOM -- and thus is positioned in the center\n * of the view\n *\n * @param {Step} step The step instance\n * @return {Object} The final Popper options object\n */\nexport function makeCenteredPopper(step) {\n const centeredStylePopperModifier = _getCenteredStylePopperModifier();\n\n let popperOptions = {\n placement: 'top',\n strategy: 'fixed',\n modifiers: [\n {\n name: 'focusAfterRender',\n enabled: true,\n phase: 'afterWrite',\n fn() {\n setTimeout(() => {\n if (step.el) {\n step.el.focus();\n }\n }, 300);\n }\n }\n ]\n };\n\n popperOptions = {\n ...popperOptions,\n modifiers: Array.from(\n new Set([...popperOptions.modifiers, ...centeredStylePopperModifier])\n )\n };\n\n return popperOptions;\n}\n","import { createPopper } from '@popperjs/core';\nimport { isFunction, isString } from './type-check';\nimport { makeCenteredPopper } from './popper-options';\n\n/**\n * Ensure class prefix ends in `-`\n * @param {string} prefix The prefix to prepend to the class names generated by nano-css\n * @return {string} The prefix ending in `-`\n */\nexport function normalizePrefix(prefix) {\n if (!isString(prefix) || prefix === '') {\n return '';\n }\n\n return prefix.charAt(prefix.length - 1) !== '-' ? `${prefix}-` : prefix;\n}\n\n/**\n * Resolves attachTo options, converting element option value to a qualified HTMLElement.\n * @param {Step} step The step instance\n * @returns {{}|{element, on}}\n * `element` is a qualified HTML Element\n * `on` is a string position value\n */\nexport function parseAttachTo(step) {\n const options = step.options.attachTo || {};\n const returnOpts = Object.assign({}, options);\n\n if (isFunction(returnOpts.element)) {\n // Bind the callback to step so that it has access to the object, to enable running additional logic\n returnOpts.element = returnOpts.element.call(step);\n }\n\n if (isString(returnOpts.element)) {\n // Can't override the element in user opts reference because we can't\n // guarantee that the element will exist in the future.\n try {\n returnOpts.element = document.querySelector(returnOpts.element);\n } catch (e) {\n // TODO\n }\n if (!returnOpts.element) {\n console.error(\n `The element for this Shepherd step was not found ${options.element}`\n );\n }\n }\n\n return returnOpts;\n}\n\n/**\n * Checks if the step should be centered or not. Does not trigger attachTo.element evaluation, making it a pure\n * alternative for the deprecated step.isCentered() method.\n * @param resolvedAttachToOptions\n * @returns {boolean}\n */\nexport function shouldCenterStep(resolvedAttachToOptions) {\n if (resolvedAttachToOptions === undefined || resolvedAttachToOptions === null) {\n return true\n }\n \n return !resolvedAttachToOptions.element || !resolvedAttachToOptions.on;\n}\n\n/**\n * Determines options for the tooltip and initializes\n * `step.tooltip` as a Popper instance.\n * @param {Step} step The step instance\n */\nexport function setupTooltip(step) {\n if (step.tooltip) {\n step.tooltip.destroy();\n }\n\n const attachToOptions = step._getResolvedAttachToOptions();\n\n let target = attachToOptions.element;\n const popperOptions = getPopperOptions(attachToOptions, step);\n\n if (shouldCenterStep(attachToOptions)) {\n target = document.body;\n const content = step.shepherdElementComponent.getElement();\n content.classList.add('shepherd-centered');\n }\n\n step.tooltip = createPopper(target, step.el, popperOptions);\n step.target = attachToOptions.element;\n\n return popperOptions;\n}\n\n/**\n * Create a unique id for steps, tours, modals, etc\n * @return {string}\n */\nexport function uuid() {\n let d = Date.now();\n return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {\n const r = (d + Math.random() * 16) % 16 | 0;\n d = Math.floor(d / 16);\n return (c == 'x' ? r : (r & 0x3) | 0x8).toString(16);\n });\n}\n\n/**\n * Gets the `Popper` options from a set of base `attachTo` options\n * @param attachToOptions\n * @param {Step} step The step instance\n * @return {Object}\n * @private\n */\nexport function getPopperOptions(attachToOptions, step) {\n let popperOptions = {\n modifiers: [\n {\n name: 'preventOverflow',\n options: {\n altAxis: true,\n tether: false\n }\n },\n {\n name: 'focusAfterRender',\n enabled: true,\n phase: 'afterWrite',\n fn() {\n setTimeout(() => {\n if (step.el) {\n step.el.focus();\n }\n }, 300);\n }\n }\n ],\n strategy: 'absolute'\n };\n\n if (shouldCenterStep(attachToOptions)) {\n popperOptions = makeCenteredPopper(step);\n } else {\n popperOptions.placement = attachToOptions.on;\n }\n\n const defaultStepOptions =\n step.tour && step.tour.options && step.tour.options.defaultStepOptions;\n\n if (defaultStepOptions) {\n popperOptions = _mergeModifiers(defaultStepOptions, popperOptions);\n }\n\n popperOptions = _mergeModifiers(step.options, popperOptions);\n\n return popperOptions;\n}\n\nfunction _mergeModifiers(stepOptions, popperOptions) {\n if (stepOptions.popperOptions) {\n let mergedPopperOptions = Object.assign(\n {},\n popperOptions,\n stepOptions.popperOptions\n );\n\n if (\n stepOptions.popperOptions.modifiers &&\n stepOptions.popperOptions.modifiers.length > 0\n ) {\n const names = stepOptions.popperOptions.modifiers.map((mod) => mod.name);\n const filteredModifiers = popperOptions.modifiers.filter(\n (mod) => !names.includes(mod.name)\n );\n\n mergedPopperOptions.modifiers = Array.from(\n new Set([...filteredModifiers, ...stepOptions.popperOptions.modifiers])\n );\n }\n\n return mergedPopperOptions;\n }\n\n return popperOptions;\n}\n","function noop() { }\nconst identity = x => x;\nfunction assign(tar, src) {\n // @ts-ignore\n for (const k in src)\n tar[k] = src[k];\n return tar;\n}\nfunction is_promise(value) {\n return value && typeof value === 'object' && typeof value.then === 'function';\n}\nfunction add_location(element, file, line, column, char) {\n element.__svelte_meta = {\n loc: { file, line, column, char }\n };\n}\nfunction run(fn) {\n return fn();\n}\nfunction blank_object() {\n return Object.create(null);\n}\nfunction run_all(fns) {\n fns.forEach(run);\n}\nfunction is_function(thing) {\n return typeof thing === 'function';\n}\nfunction safe_not_equal(a, b) {\n return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');\n}\nlet src_url_equal_anchor;\nfunction src_url_equal(element_src, url) {\n if (!src_url_equal_anchor) {\n src_url_equal_anchor = document.createElement('a');\n }\n src_url_equal_anchor.href = url;\n return element_src === src_url_equal_anchor.href;\n}\nfunction not_equal(a, b) {\n return a != a ? b == b : a !== b;\n}\nfunction is_empty(obj) {\n return Object.keys(obj).length === 0;\n}\nfunction validate_store(store, name) {\n if (store != null && typeof store.subscribe !== 'function') {\n throw new Error(`'${name}' is not a store with a 'subscribe' method`);\n }\n}\nfunction subscribe(store, ...callbacks) {\n if (store == null) {\n return noop;\n }\n const unsub = store.subscribe(...callbacks);\n return unsub.unsubscribe ? () => unsub.unsubscribe() : unsub;\n}\nfunction get_store_value(store) {\n let value;\n subscribe(store, _ => value = _)();\n return value;\n}\nfunction component_subscribe(component, store, callback) {\n component.$$.on_destroy.push(subscribe(store, callback));\n}\nfunction create_slot(definition, ctx, $$scope, fn) {\n if (definition) {\n const slot_ctx = get_slot_context(definition, ctx, $$scope, fn);\n return definition[0](slot_ctx);\n }\n}\nfunction get_slot_context(definition, ctx, $$scope, fn) {\n return definition[1] && fn\n ? assign($$scope.ctx.slice(), definition[1](fn(ctx)))\n : $$scope.ctx;\n}\nfunction get_slot_changes(definition, $$scope, dirty, fn) {\n if (definition[2] && fn) {\n const lets = definition[2](fn(dirty));\n if ($$scope.dirty === undefined) {\n return lets;\n }\n if (typeof lets === 'object') {\n const merged = [];\n const len = Math.max($$scope.dirty.length, lets.length);\n for (let i = 0; i < len; i += 1) {\n merged[i] = $$scope.dirty[i] | lets[i];\n }\n return merged;\n }\n return $$scope.dirty | lets;\n }\n return $$scope.dirty;\n}\nfunction update_slot_base(slot, slot_definition, ctx, $$scope, slot_changes, get_slot_context_fn) {\n if (slot_changes) {\n const slot_context = get_slot_context(slot_definition, ctx, $$scope, get_slot_context_fn);\n slot.p(slot_context, slot_changes);\n }\n}\nfunction update_slot(slot, slot_definition, ctx, $$scope, dirty, get_slot_changes_fn, get_slot_context_fn) {\n const slot_changes = get_slot_changes(slot_definition, $$scope, dirty, get_slot_changes_fn);\n update_slot_base(slot, slot_definition, ctx, $$scope, slot_changes, get_slot_context_fn);\n}\nfunction get_all_dirty_from_scope($$scope) {\n if ($$scope.ctx.length > 32) {\n const dirty = [];\n const length = $$scope.ctx.length / 32;\n for (let i = 0; i < length; i++) {\n dirty[i] = -1;\n }\n return dirty;\n }\n return -1;\n}\nfunction exclude_internal_props(props) {\n const result = {};\n for (const k in props)\n if (k[0] !== '$')\n result[k] = props[k];\n return result;\n}\nfunction compute_rest_props(props, keys) {\n const rest = {};\n keys = new Set(keys);\n for (const k in props)\n if (!keys.has(k) && k[0] !== '$')\n rest[k] = props[k];\n return rest;\n}\nfunction compute_slots(slots) {\n const result = {};\n for (const key in slots) {\n result[key] = true;\n }\n return result;\n}\nfunction once(fn) {\n let ran = false;\n return function (...args) {\n if (ran)\n return;\n ran = true;\n fn.call(this, ...args);\n };\n}\nfunction null_to_empty(value) {\n return value == null ? '' : value;\n}\nfunction set_store_value(store, ret, value) {\n store.set(value);\n return ret;\n}\nconst has_prop = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);\nfunction action_destroyer(action_result) {\n return action_result && is_function(action_result.destroy) ? action_result.destroy : noop;\n}\n\nconst is_client = typeof window !== 'undefined';\nlet now = is_client\n ? () => window.performance.now()\n : () => Date.now();\nlet raf = is_client ? cb => requestAnimationFrame(cb) : noop;\n// used internally for testing\nfunction set_now(fn) {\n now = fn;\n}\nfunction set_raf(fn) {\n raf = fn;\n}\n\nconst tasks = new Set();\nfunction run_tasks(now) {\n tasks.forEach(task => {\n if (!task.c(now)) {\n tasks.delete(task);\n task.f();\n }\n });\n if (tasks.size !== 0)\n raf(run_tasks);\n}\n/**\n * For testing purposes only!\n */\nfunction clear_loops() {\n tasks.clear();\n}\n/**\n * Creates a new task that runs on each raf frame\n * until it returns a falsy value or is aborted\n */\nfunction loop(callback) {\n let task;\n if (tasks.size === 0)\n raf(run_tasks);\n return {\n promise: new Promise(fulfill => {\n tasks.add(task = { c: callback, f: fulfill });\n }),\n abort() {\n tasks.delete(task);\n }\n };\n}\n\n// Track which nodes are claimed during hydration. Unclaimed nodes can then be removed from the DOM\n// at the end of hydration without touching the remaining nodes.\nlet is_hydrating = false;\nfunction start_hydrating() {\n is_hydrating = true;\n}\nfunction end_hydrating() {\n is_hydrating = false;\n}\nfunction upper_bound(low, high, key, value) {\n // Return first index of value larger than input value in the range [low, high)\n while (low < high) {\n const mid = low + ((high - low) >> 1);\n if (key(mid) <= value) {\n low = mid + 1;\n }\n else {\n high = mid;\n }\n }\n return low;\n}\nfunction init_hydrate(target) {\n if (target.hydrate_init)\n return;\n target.hydrate_init = true;\n // We know that all children have claim_order values since the unclaimed have been detached if target is not \n let children = target.childNodes;\n // If target is , there may be children without claim_order\n if (target.nodeName === 'HEAD') {\n const myChildren = [];\n for (let i = 0; i < children.length; i++) {\n const node = children[i];\n if (node.claim_order !== undefined) {\n myChildren.push(node);\n }\n }\n children = myChildren;\n }\n /*\n * Reorder claimed children optimally.\n * We can reorder claimed children optimally by finding the longest subsequence of\n * nodes that are already claimed in order and only moving the rest. The longest\n * subsequence subsequence of nodes that are claimed in order can be found by\n * computing the longest increasing subsequence of .claim_order values.\n *\n * This algorithm is optimal in generating the least amount of reorder operations\n * possible.\n *\n * Proof:\n * We know that, given a set of reordering operations, the nodes that do not move\n * always form an increasing subsequence, since they do not move among each other\n * meaning that they must be already ordered among each other. Thus, the maximal\n * set of nodes that do not move form a longest increasing subsequence.\n */\n // Compute longest increasing subsequence\n // m: subsequence length j => index k of smallest value that ends an increasing subsequence of length j\n const m = new Int32Array(children.length + 1);\n // Predecessor indices + 1\n const p = new Int32Array(children.length);\n m[0] = -1;\n let longest = 0;\n for (let i = 0; i < children.length; i++) {\n const current = children[i].claim_order;\n // Find the largest subsequence length such that it ends in a value less than our current value\n // upper_bound returns first greater value, so we subtract one\n // with fast path for when we are on the current longest subsequence\n const seqLen = ((longest > 0 && children[m[longest]].claim_order <= current) ? longest + 1 : upper_bound(1, longest, idx => children[m[idx]].claim_order, current)) - 1;\n p[i] = m[seqLen] + 1;\n const newLen = seqLen + 1;\n // We can guarantee that current is the smallest value. Otherwise, we would have generated a longer sequence.\n m[newLen] = i;\n longest = Math.max(newLen, longest);\n }\n // The longest increasing subsequence of nodes (initially reversed)\n const lis = [];\n // The rest of the nodes, nodes that will be moved\n const toMove = [];\n let last = children.length - 1;\n for (let cur = m[longest] + 1; cur != 0; cur = p[cur - 1]) {\n lis.push(children[cur - 1]);\n for (; last >= cur; last--) {\n toMove.push(children[last]);\n }\n last--;\n }\n for (; last >= 0; last--) {\n toMove.push(children[last]);\n }\n lis.reverse();\n // We sort the nodes being moved to guarantee that their insertion order matches the claim order\n toMove.sort((a, b) => a.claim_order - b.claim_order);\n // Finally, we move the nodes\n for (let i = 0, j = 0; i < toMove.length; i++) {\n while (j < lis.length && toMove[i].claim_order >= lis[j].claim_order) {\n j++;\n }\n const anchor = j < lis.length ? lis[j] : null;\n target.insertBefore(toMove[i], anchor);\n }\n}\nfunction append(target, node) {\n target.appendChild(node);\n}\nfunction append_styles(target, style_sheet_id, styles) {\n const append_styles_to = get_root_for_style(target);\n if (!append_styles_to.getElementById(style_sheet_id)) {\n const style = element('style');\n style.id = style_sheet_id;\n style.textContent = styles;\n append_stylesheet(append_styles_to, style);\n }\n}\nfunction get_root_for_style(node) {\n if (!node)\n return document;\n const root = node.getRootNode ? node.getRootNode() : node.ownerDocument;\n if (root && root.host) {\n return root;\n }\n return node.ownerDocument;\n}\nfunction append_empty_stylesheet(node) {\n const style_element = element('style');\n append_stylesheet(get_root_for_style(node), style_element);\n return style_element.sheet;\n}\nfunction append_stylesheet(node, style) {\n append(node.head || node, style);\n}\nfunction append_hydration(target, node) {\n if (is_hydrating) {\n init_hydrate(target);\n if ((target.actual_end_child === undefined) || ((target.actual_end_child !== null) && (target.actual_end_child.parentElement !== target))) {\n target.actual_end_child = target.firstChild;\n }\n // Skip nodes of undefined ordering\n while ((target.actual_end_child !== null) && (target.actual_end_child.claim_order === undefined)) {\n target.actual_end_child = target.actual_end_child.nextSibling;\n }\n if (node !== target.actual_end_child) {\n // We only insert if the ordering of this node should be modified or the parent node is not target\n if (node.claim_order !== undefined || node.parentNode !== target) {\n target.insertBefore(node, target.actual_end_child);\n }\n }\n else {\n target.actual_end_child = node.nextSibling;\n }\n }\n else if (node.parentNode !== target || node.nextSibling !== null) {\n target.appendChild(node);\n }\n}\nfunction insert(target, node, anchor) {\n target.insertBefore(node, anchor || null);\n}\nfunction insert_hydration(target, node, anchor) {\n if (is_hydrating && !anchor) {\n append_hydration(target, node);\n }\n else if (node.parentNode !== target || node.nextSibling != anchor) {\n target.insertBefore(node, anchor || null);\n }\n}\nfunction detach(node) {\n node.parentNode.removeChild(node);\n}\nfunction destroy_each(iterations, detaching) {\n for (let i = 0; i < iterations.length; i += 1) {\n if (iterations[i])\n iterations[i].d(detaching);\n }\n}\nfunction element(name) {\n return document.createElement(name);\n}\nfunction element_is(name, is) {\n return document.createElement(name, { is });\n}\nfunction object_without_properties(obj, exclude) {\n const target = {};\n for (const k in obj) {\n if (has_prop(obj, k)\n // @ts-ignore\n && exclude.indexOf(k) === -1) {\n // @ts-ignore\n target[k] = obj[k];\n }\n }\n return target;\n}\nfunction svg_element(name) {\n return document.createElementNS('http://www.w3.org/2000/svg', name);\n}\nfunction text(data) {\n return document.createTextNode(data);\n}\nfunction space() {\n return text(' ');\n}\nfunction empty() {\n return text('');\n}\nfunction listen(node, event, handler, options) {\n node.addEventListener(event, handler, options);\n return () => node.removeEventListener(event, handler, options);\n}\nfunction prevent_default(fn) {\n return function (event) {\n event.preventDefault();\n // @ts-ignore\n return fn.call(this, event);\n };\n}\nfunction stop_propagation(fn) {\n return function (event) {\n event.stopPropagation();\n // @ts-ignore\n return fn.call(this, event);\n };\n}\nfunction self(fn) {\n return function (event) {\n // @ts-ignore\n if (event.target === this)\n fn.call(this, event);\n };\n}\nfunction trusted(fn) {\n return function (event) {\n // @ts-ignore\n if (event.isTrusted)\n fn.call(this, event);\n };\n}\nfunction attr(node, attribute, value) {\n if (value == null)\n node.removeAttribute(attribute);\n else if (node.getAttribute(attribute) !== value)\n node.setAttribute(attribute, value);\n}\nfunction set_attributes(node, attributes) {\n // @ts-ignore\n const descriptors = Object.getOwnPropertyDescriptors(node.__proto__);\n for (const key in attributes) {\n if (attributes[key] == null) {\n node.removeAttribute(key);\n }\n else if (key === 'style') {\n node.style.cssText = attributes[key];\n }\n else if (key === '__value') {\n node.value = node[key] = attributes[key];\n }\n else if (descriptors[key] && descriptors[key].set) {\n node[key] = attributes[key];\n }\n else {\n attr(node, key, attributes[key]);\n }\n }\n}\nfunction set_svg_attributes(node, attributes) {\n for (const key in attributes) {\n attr(node, key, attributes[key]);\n }\n}\nfunction set_custom_element_data(node, prop, value) {\n if (prop in node) {\n node[prop] = typeof node[prop] === 'boolean' && value === '' ? true : value;\n }\n else {\n attr(node, prop, value);\n }\n}\nfunction xlink_attr(node, attribute, value) {\n node.setAttributeNS('http://www.w3.org/1999/xlink', attribute, value);\n}\nfunction get_binding_group_value(group, __value, checked) {\n const value = new Set();\n for (let i = 0; i < group.length; i += 1) {\n if (group[i].checked)\n value.add(group[i].__value);\n }\n if (!checked) {\n value.delete(__value);\n }\n return Array.from(value);\n}\nfunction to_number(value) {\n return value === '' ? null : +value;\n}\nfunction time_ranges_to_array(ranges) {\n const array = [];\n for (let i = 0; i < ranges.length; i += 1) {\n array.push({ start: ranges.start(i), end: ranges.end(i) });\n }\n return array;\n}\nfunction children(element) {\n return Array.from(element.childNodes);\n}\nfunction init_claim_info(nodes) {\n if (nodes.claim_info === undefined) {\n nodes.claim_info = { last_index: 0, total_claimed: 0 };\n }\n}\nfunction claim_node(nodes, predicate, processNode, createNode, dontUpdateLastIndex = false) {\n // Try to find nodes in an order such that we lengthen the longest increasing subsequence\n init_claim_info(nodes);\n const resultNode = (() => {\n // We first try to find an element after the previous one\n for (let i = nodes.claim_info.last_index; i < nodes.length; i++) {\n const node = nodes[i];\n if (predicate(node)) {\n const replacement = processNode(node);\n if (replacement === undefined) {\n nodes.splice(i, 1);\n }\n else {\n nodes[i] = replacement;\n }\n if (!dontUpdateLastIndex) {\n nodes.claim_info.last_index = i;\n }\n return node;\n }\n }\n // Otherwise, we try to find one before\n // We iterate in reverse so that we don't go too far back\n for (let i = nodes.claim_info.last_index - 1; i >= 0; i--) {\n const node = nodes[i];\n if (predicate(node)) {\n const replacement = processNode(node);\n if (replacement === undefined) {\n nodes.splice(i, 1);\n }\n else {\n nodes[i] = replacement;\n }\n if (!dontUpdateLastIndex) {\n nodes.claim_info.last_index = i;\n }\n else if (replacement === undefined) {\n // Since we spliced before the last_index, we decrease it\n nodes.claim_info.last_index--;\n }\n return node;\n }\n }\n // If we can't find any matching node, we create a new one\n return createNode();\n })();\n resultNode.claim_order = nodes.claim_info.total_claimed;\n nodes.claim_info.total_claimed += 1;\n return resultNode;\n}\nfunction claim_element_base(nodes, name, attributes, create_element) {\n return claim_node(nodes, (node) => node.nodeName === name, (node) => {\n const remove = [];\n for (let j = 0; j < node.attributes.length; j++) {\n const attribute = node.attributes[j];\n if (!attributes[attribute.name]) {\n remove.push(attribute.name);\n }\n }\n remove.forEach(v => node.removeAttribute(v));\n return undefined;\n }, () => create_element(name));\n}\nfunction claim_element(nodes, name, attributes) {\n return claim_element_base(nodes, name, attributes, element);\n}\nfunction claim_svg_element(nodes, name, attributes) {\n return claim_element_base(nodes, name, attributes, svg_element);\n}\nfunction claim_text(nodes, data) {\n return claim_node(nodes, (node) => node.nodeType === 3, (node) => {\n const dataStr = '' + data;\n if (node.data.startsWith(dataStr)) {\n if (node.data.length !== dataStr.length) {\n return node.splitText(dataStr.length);\n }\n }\n else {\n node.data = dataStr;\n }\n }, () => text(data), true // Text nodes should not update last index since it is likely not worth it to eliminate an increasing subsequence of actual elements\n );\n}\nfunction claim_space(nodes) {\n return claim_text(nodes, ' ');\n}\nfunction find_comment(nodes, text, start) {\n for (let i = start; i < nodes.length; i += 1) {\n const node = nodes[i];\n if (node.nodeType === 8 /* comment node */ && node.textContent.trim() === text) {\n return i;\n }\n }\n return nodes.length;\n}\nfunction claim_html_tag(nodes, is_svg) {\n // find html opening tag\n const start_index = find_comment(nodes, 'HTML_TAG_START', 0);\n const end_index = find_comment(nodes, 'HTML_TAG_END', start_index);\n if (start_index === end_index) {\n return new HtmlTagHydration(undefined, is_svg);\n }\n init_claim_info(nodes);\n const html_tag_nodes = nodes.splice(start_index, end_index - start_index + 1);\n detach(html_tag_nodes[0]);\n detach(html_tag_nodes[html_tag_nodes.length - 1]);\n const claimed_nodes = html_tag_nodes.slice(1, html_tag_nodes.length - 1);\n for (const n of claimed_nodes) {\n n.claim_order = nodes.claim_info.total_claimed;\n nodes.claim_info.total_claimed += 1;\n }\n return new HtmlTagHydration(claimed_nodes, is_svg);\n}\nfunction set_data(text, data) {\n data = '' + data;\n if (text.wholeText !== data)\n text.data = data;\n}\nfunction set_input_value(input, value) {\n input.value = value == null ? '' : value;\n}\nfunction set_input_type(input, type) {\n try {\n input.type = type;\n }\n catch (e) {\n // do nothing\n }\n}\nfunction set_style(node, key, value, important) {\n if (value === null) {\n node.style.removeProperty(key);\n }\n else {\n node.style.setProperty(key, value, important ? 'important' : '');\n }\n}\nfunction select_option(select, value) {\n for (let i = 0; i < select.options.length; i += 1) {\n const option = select.options[i];\n if (option.__value === value) {\n option.selected = true;\n return;\n }\n }\n select.selectedIndex = -1; // no option should be selected\n}\nfunction select_options(select, value) {\n for (let i = 0; i < select.options.length; i += 1) {\n const option = select.options[i];\n option.selected = ~value.indexOf(option.__value);\n }\n}\nfunction select_value(select) {\n const selected_option = select.querySelector(':checked') || select.options[0];\n return selected_option && selected_option.__value;\n}\nfunction select_multiple_value(select) {\n return [].map.call(select.querySelectorAll(':checked'), option => option.__value);\n}\n// unfortunately this can't be a constant as that wouldn't be tree-shakeable\n// so we cache the result instead\nlet crossorigin;\nfunction is_crossorigin() {\n if (crossorigin === undefined) {\n crossorigin = false;\n try {\n if (typeof window !== 'undefined' && window.parent) {\n void window.parent.document;\n }\n }\n catch (error) {\n crossorigin = true;\n }\n }\n return crossorigin;\n}\nfunction add_resize_listener(node, fn) {\n const computed_style = getComputedStyle(node);\n if (computed_style.position === 'static') {\n node.style.position = 'relative';\n }\n const iframe = element('iframe');\n iframe.setAttribute('style', 'display: block; position: absolute; top: 0; left: 0; width: 100%; height: 100%; ' +\n 'overflow: hidden; border: 0; opacity: 0; pointer-events: none; z-index: -1;');\n iframe.setAttribute('aria-hidden', 'true');\n iframe.tabIndex = -1;\n const crossorigin = is_crossorigin();\n let unsubscribe;\n if (crossorigin) {\n iframe.src = \"data:text/html,\";\n unsubscribe = listen(window, 'message', (event) => {\n if (event.source === iframe.contentWindow)\n fn();\n });\n }\n else {\n iframe.src = 'about:blank';\n iframe.onload = () => {\n unsubscribe = listen(iframe.contentWindow, 'resize', fn);\n };\n }\n append(node, iframe);\n return () => {\n if (crossorigin) {\n unsubscribe();\n }\n else if (unsubscribe && iframe.contentWindow) {\n unsubscribe();\n }\n detach(iframe);\n };\n}\nfunction toggle_class(element, name, toggle) {\n element.classList[toggle ? 'add' : 'remove'](name);\n}\nfunction custom_event(type, detail, { bubbles = false, cancelable = false } = {}) {\n const e = document.createEvent('CustomEvent');\n e.initCustomEvent(type, bubbles, cancelable, detail);\n return e;\n}\nfunction query_selector_all(selector, parent = document.body) {\n return Array.from(parent.querySelectorAll(selector));\n}\nclass HtmlTag {\n constructor(is_svg = false) {\n this.is_svg = false;\n this.is_svg = is_svg;\n this.e = this.n = null;\n }\n c(html) {\n this.h(html);\n }\n m(html, target, anchor = null) {\n if (!this.e) {\n if (this.is_svg)\n this.e = svg_element(target.nodeName);\n else\n this.e = element(target.nodeName);\n this.t = target;\n this.c(html);\n }\n this.i(anchor);\n }\n h(html) {\n this.e.innerHTML = html;\n this.n = Array.from(this.e.childNodes);\n }\n i(anchor) {\n for (let i = 0; i < this.n.length; i += 1) {\n insert(this.t, this.n[i], anchor);\n }\n }\n p(html) {\n this.d();\n this.h(html);\n this.i(this.a);\n }\n d() {\n this.n.forEach(detach);\n }\n}\nclass HtmlTagHydration extends HtmlTag {\n constructor(claimed_nodes, is_svg = false) {\n super(is_svg);\n this.e = this.n = null;\n this.l = claimed_nodes;\n }\n c(html) {\n if (this.l) {\n this.n = this.l;\n }\n else {\n super.c(html);\n }\n }\n i(anchor) {\n for (let i = 0; i < this.n.length; i += 1) {\n insert_hydration(this.t, this.n[i], anchor);\n }\n }\n}\nfunction attribute_to_object(attributes) {\n const result = {};\n for (const attribute of attributes) {\n result[attribute.name] = attribute.value;\n }\n return result;\n}\nfunction get_custom_elements_slots(element) {\n const result = {};\n element.childNodes.forEach((node) => {\n result[node.slot || 'default'] = true;\n });\n return result;\n}\n\n// we need to store the information for multiple documents because a Svelte application could also contain iframes\n// https://github.com/sveltejs/svelte/issues/3624\nconst managed_styles = new Map();\nlet active = 0;\n// https://github.com/darkskyapp/string-hash/blob/master/index.js\nfunction hash(str) {\n let hash = 5381;\n let i = str.length;\n while (i--)\n hash = ((hash << 5) - hash) ^ str.charCodeAt(i);\n return hash >>> 0;\n}\nfunction create_style_information(doc, node) {\n const info = { stylesheet: append_empty_stylesheet(node), rules: {} };\n managed_styles.set(doc, info);\n return info;\n}\nfunction create_rule(node, a, b, duration, delay, ease, fn, uid = 0) {\n const step = 16.666 / duration;\n let keyframes = '{\\n';\n for (let p = 0; p <= 1; p += step) {\n const t = a + (b - a) * ease(p);\n keyframes += p * 100 + `%{${fn(t, 1 - t)}}\\n`;\n }\n const rule = keyframes + `100% {${fn(b, 1 - b)}}\\n}`;\n const name = `__svelte_${hash(rule)}_${uid}`;\n const doc = get_root_for_style(node);\n const { stylesheet, rules } = managed_styles.get(doc) || create_style_information(doc, node);\n if (!rules[name]) {\n rules[name] = true;\n stylesheet.insertRule(`@keyframes ${name} ${rule}`, stylesheet.cssRules.length);\n }\n const animation = node.style.animation || '';\n node.style.animation = `${animation ? `${animation}, ` : ''}${name} ${duration}ms linear ${delay}ms 1 both`;\n active += 1;\n return name;\n}\nfunction delete_rule(node, name) {\n const previous = (node.style.animation || '').split(', ');\n const next = previous.filter(name\n ? anim => anim.indexOf(name) < 0 // remove specific animation\n : anim => anim.indexOf('__svelte') === -1 // remove all Svelte animations\n );\n const deleted = previous.length - next.length;\n if (deleted) {\n node.style.animation = next.join(', ');\n active -= deleted;\n if (!active)\n clear_rules();\n }\n}\nfunction clear_rules() {\n raf(() => {\n if (active)\n return;\n managed_styles.forEach(info => {\n const { stylesheet } = info;\n let i = stylesheet.cssRules.length;\n while (i--)\n stylesheet.deleteRule(i);\n info.rules = {};\n });\n managed_styles.clear();\n });\n}\n\nfunction create_animation(node, from, fn, params) {\n if (!from)\n return noop;\n const to = node.getBoundingClientRect();\n if (from.left === to.left && from.right === to.right && from.top === to.top && from.bottom === to.bottom)\n return noop;\n const { delay = 0, duration = 300, easing = identity, \n // @ts-ignore todo: should this be separated from destructuring? Or start/end added to public api and documentation?\n start: start_time = now() + delay, \n // @ts-ignore todo:\n end = start_time + duration, tick = noop, css } = fn(node, { from, to }, params);\n let running = true;\n let started = false;\n let name;\n function start() {\n if (css) {\n name = create_rule(node, 0, 1, duration, delay, easing, css);\n }\n if (!delay) {\n started = true;\n }\n }\n function stop() {\n if (css)\n delete_rule(node, name);\n running = false;\n }\n loop(now => {\n if (!started && now >= start_time) {\n started = true;\n }\n if (started && now >= end) {\n tick(1, 0);\n stop();\n }\n if (!running) {\n return false;\n }\n if (started) {\n const p = now - start_time;\n const t = 0 + 1 * easing(p / duration);\n tick(t, 1 - t);\n }\n return true;\n });\n start();\n tick(0, 1);\n return stop;\n}\nfunction fix_position(node) {\n const style = getComputedStyle(node);\n if (style.position !== 'absolute' && style.position !== 'fixed') {\n const { width, height } = style;\n const a = node.getBoundingClientRect();\n node.style.position = 'absolute';\n node.style.width = width;\n node.style.height = height;\n add_transform(node, a);\n }\n}\nfunction add_transform(node, a) {\n const b = node.getBoundingClientRect();\n if (a.left !== b.left || a.top !== b.top) {\n const style = getComputedStyle(node);\n const transform = style.transform === 'none' ? '' : style.transform;\n node.style.transform = `${transform} translate(${a.left - b.left}px, ${a.top - b.top}px)`;\n }\n}\n\nlet current_component;\nfunction set_current_component(component) {\n current_component = component;\n}\nfunction get_current_component() {\n if (!current_component)\n throw new Error('Function called outside component initialization');\n return current_component;\n}\nfunction beforeUpdate(fn) {\n get_current_component().$$.before_update.push(fn);\n}\nfunction onMount(fn) {\n get_current_component().$$.on_mount.push(fn);\n}\nfunction afterUpdate(fn) {\n get_current_component().$$.after_update.push(fn);\n}\nfunction onDestroy(fn) {\n get_current_component().$$.on_destroy.push(fn);\n}\nfunction createEventDispatcher() {\n const component = get_current_component();\n return (type, detail, { cancelable = false } = {}) => {\n const callbacks = component.$$.callbacks[type];\n if (callbacks) {\n // TODO are there situations where events could be dispatched\n // in a server (non-DOM) environment?\n const event = custom_event(type, detail, { cancelable });\n callbacks.slice().forEach(fn => {\n fn.call(component, event);\n });\n return !event.defaultPrevented;\n }\n return true;\n };\n}\nfunction setContext(key, context) {\n get_current_component().$$.context.set(key, context);\n return context;\n}\nfunction getContext(key) {\n return get_current_component().$$.context.get(key);\n}\nfunction getAllContexts() {\n return get_current_component().$$.context;\n}\nfunction hasContext(key) {\n return get_current_component().$$.context.has(key);\n}\n// TODO figure out if we still want to support\n// shorthand events, or if we want to implement\n// a real bubbling mechanism\nfunction bubble(component, event) {\n const callbacks = component.$$.callbacks[event.type];\n if (callbacks) {\n // @ts-ignore\n callbacks.slice().forEach(fn => fn.call(this, event));\n }\n}\n\nconst dirty_components = [];\nconst intros = { enabled: false };\nconst binding_callbacks = [];\nconst render_callbacks = [];\nconst flush_callbacks = [];\nconst resolved_promise = Promise.resolve();\nlet update_scheduled = false;\nfunction schedule_update() {\n if (!update_scheduled) {\n update_scheduled = true;\n resolved_promise.then(flush);\n }\n}\nfunction tick() {\n schedule_update();\n return resolved_promise;\n}\nfunction add_render_callback(fn) {\n render_callbacks.push(fn);\n}\nfunction add_flush_callback(fn) {\n flush_callbacks.push(fn);\n}\n// flush() calls callbacks in this order:\n// 1. All beforeUpdate callbacks, in order: parents before children\n// 2. All bind:this callbacks, in reverse order: children before parents.\n// 3. All afterUpdate callbacks, in order: parents before children. EXCEPT\n// for afterUpdates called during the initial onMount, which are called in\n// reverse order: children before parents.\n// Since callbacks might update component values, which could trigger another\n// call to flush(), the following steps guard against this:\n// 1. During beforeUpdate, any updated components will be added to the\n// dirty_components array and will cause a reentrant call to flush(). Because\n// the flush index is kept outside the function, the reentrant call will pick\n// up where the earlier call left off and go through all dirty components. The\n// current_component value is saved and restored so that the reentrant call will\n// not interfere with the \"parent\" flush() call.\n// 2. bind:this callbacks cannot trigger new flush() calls.\n// 3. During afterUpdate, any updated components will NOT have their afterUpdate\n// callback called a second time; the seen_callbacks set, outside the flush()\n// function, guarantees this behavior.\nconst seen_callbacks = new Set();\nlet flushidx = 0; // Do *not* move this inside the flush() function\nfunction flush() {\n const saved_component = current_component;\n do {\n // first, call beforeUpdate functions\n // and update components\n while (flushidx < dirty_components.length) {\n const component = dirty_components[flushidx];\n flushidx++;\n set_current_component(component);\n update(component.$$);\n }\n set_current_component(null);\n dirty_components.length = 0;\n flushidx = 0;\n while (binding_callbacks.length)\n binding_callbacks.pop()();\n // then, once components are updated, call\n // afterUpdate functions. This may cause\n // subsequent updates...\n for (let i = 0; i < render_callbacks.length; i += 1) {\n const callback = render_callbacks[i];\n if (!seen_callbacks.has(callback)) {\n // ...so guard against infinite loops\n seen_callbacks.add(callback);\n callback();\n }\n }\n render_callbacks.length = 0;\n } while (dirty_components.length);\n while (flush_callbacks.length) {\n flush_callbacks.pop()();\n }\n update_scheduled = false;\n seen_callbacks.clear();\n set_current_component(saved_component);\n}\nfunction update($$) {\n if ($$.fragment !== null) {\n $$.update();\n run_all($$.before_update);\n const dirty = $$.dirty;\n $$.dirty = [-1];\n $$.fragment && $$.fragment.p($$.ctx, dirty);\n $$.after_update.forEach(add_render_callback);\n }\n}\n\nlet promise;\nfunction wait() {\n if (!promise) {\n promise = Promise.resolve();\n promise.then(() => {\n promise = null;\n });\n }\n return promise;\n}\nfunction dispatch(node, direction, kind) {\n node.dispatchEvent(custom_event(`${direction ? 'intro' : 'outro'}${kind}`));\n}\nconst outroing = new Set();\nlet outros;\nfunction group_outros() {\n outros = {\n r: 0,\n c: [],\n p: outros // parent group\n };\n}\nfunction check_outros() {\n if (!outros.r) {\n run_all(outros.c);\n }\n outros = outros.p;\n}\nfunction transition_in(block, local) {\n if (block && block.i) {\n outroing.delete(block);\n block.i(local);\n }\n}\nfunction transition_out(block, local, detach, callback) {\n if (block && block.o) {\n if (outroing.has(block))\n return;\n outroing.add(block);\n outros.c.push(() => {\n outroing.delete(block);\n if (callback) {\n if (detach)\n block.d(1);\n callback();\n }\n });\n block.o(local);\n }\n}\nconst null_transition = { duration: 0 };\nfunction create_in_transition(node, fn, params) {\n let config = fn(node, params);\n let running = false;\n let animation_name;\n let task;\n let uid = 0;\n function cleanup() {\n if (animation_name)\n delete_rule(node, animation_name);\n }\n function go() {\n const { delay = 0, duration = 300, easing = identity, tick = noop, css } = config || null_transition;\n if (css)\n animation_name = create_rule(node, 0, 1, duration, delay, easing, css, uid++);\n tick(0, 1);\n const start_time = now() + delay;\n const end_time = start_time + duration;\n if (task)\n task.abort();\n running = true;\n add_render_callback(() => dispatch(node, true, 'start'));\n task = loop(now => {\n if (running) {\n if (now >= end_time) {\n tick(1, 0);\n dispatch(node, true, 'end');\n cleanup();\n return running = false;\n }\n if (now >= start_time) {\n const t = easing((now - start_time) / duration);\n tick(t, 1 - t);\n }\n }\n return running;\n });\n }\n let started = false;\n return {\n start() {\n if (started)\n return;\n started = true;\n delete_rule(node);\n if (is_function(config)) {\n config = config();\n wait().then(go);\n }\n else {\n go();\n }\n },\n invalidate() {\n started = false;\n },\n end() {\n if (running) {\n cleanup();\n running = false;\n }\n }\n };\n}\nfunction create_out_transition(node, fn, params) {\n let config = fn(node, params);\n let running = true;\n let animation_name;\n const group = outros;\n group.r += 1;\n function go() {\n const { delay = 0, duration = 300, easing = identity, tick = noop, css } = config || null_transition;\n if (css)\n animation_name = create_rule(node, 1, 0, duration, delay, easing, css);\n const start_time = now() + delay;\n const end_time = start_time + duration;\n add_render_callback(() => dispatch(node, false, 'start'));\n loop(now => {\n if (running) {\n if (now >= end_time) {\n tick(0, 1);\n dispatch(node, false, 'end');\n if (!--group.r) {\n // this will result in `end()` being called,\n // so we don't need to clean up here\n run_all(group.c);\n }\n return false;\n }\n if (now >= start_time) {\n const t = easing((now - start_time) / duration);\n tick(1 - t, t);\n }\n }\n return running;\n });\n }\n if (is_function(config)) {\n wait().then(() => {\n // @ts-ignore\n config = config();\n go();\n });\n }\n else {\n go();\n }\n return {\n end(reset) {\n if (reset && config.tick) {\n config.tick(1, 0);\n }\n if (running) {\n if (animation_name)\n delete_rule(node, animation_name);\n running = false;\n }\n }\n };\n}\nfunction create_bidirectional_transition(node, fn, params, intro) {\n let config = fn(node, params);\n let t = intro ? 0 : 1;\n let running_program = null;\n let pending_program = null;\n let animation_name = null;\n function clear_animation() {\n if (animation_name)\n delete_rule(node, animation_name);\n }\n function init(program, duration) {\n const d = (program.b - t);\n duration *= Math.abs(d);\n return {\n a: t,\n b: program.b,\n d,\n duration,\n start: program.start,\n end: program.start + duration,\n group: program.group\n };\n }\n function go(b) {\n const { delay = 0, duration = 300, easing = identity, tick = noop, css } = config || null_transition;\n const program = {\n start: now() + delay,\n b\n };\n if (!b) {\n // @ts-ignore todo: improve typings\n program.group = outros;\n outros.r += 1;\n }\n if (running_program || pending_program) {\n pending_program = program;\n }\n else {\n // if this is an intro, and there's a delay, we need to do\n // an initial tick and/or apply CSS animation immediately\n if (css) {\n clear_animation();\n animation_name = create_rule(node, t, b, duration, delay, easing, css);\n }\n if (b)\n tick(0, 1);\n running_program = init(program, duration);\n add_render_callback(() => dispatch(node, b, 'start'));\n loop(now => {\n if (pending_program && now > pending_program.start) {\n running_program = init(pending_program, duration);\n pending_program = null;\n dispatch(node, running_program.b, 'start');\n if (css) {\n clear_animation();\n animation_name = create_rule(node, t, running_program.b, running_program.duration, 0, easing, config.css);\n }\n }\n if (running_program) {\n if (now >= running_program.end) {\n tick(t = running_program.b, 1 - t);\n dispatch(node, running_program.b, 'end');\n if (!pending_program) {\n // we're done\n if (running_program.b) {\n // intro — we can tidy up immediately\n clear_animation();\n }\n else {\n // outro — needs to be coordinated\n if (!--running_program.group.r)\n run_all(running_program.group.c);\n }\n }\n running_program = null;\n }\n else if (now >= running_program.start) {\n const p = now - running_program.start;\n t = running_program.a + running_program.d * easing(p / running_program.duration);\n tick(t, 1 - t);\n }\n }\n return !!(running_program || pending_program);\n });\n }\n }\n return {\n run(b) {\n if (is_function(config)) {\n wait().then(() => {\n // @ts-ignore\n config = config();\n go(b);\n });\n }\n else {\n go(b);\n }\n },\n end() {\n clear_animation();\n running_program = pending_program = null;\n }\n };\n}\n\nfunction handle_promise(promise, info) {\n const token = info.token = {};\n function update(type, index, key, value) {\n if (info.token !== token)\n return;\n info.resolved = value;\n let child_ctx = info.ctx;\n if (key !== undefined) {\n child_ctx = child_ctx.slice();\n child_ctx[key] = value;\n }\n const block = type && (info.current = type)(child_ctx);\n let needs_flush = false;\n if (info.block) {\n if (info.blocks) {\n info.blocks.forEach((block, i) => {\n if (i !== index && block) {\n group_outros();\n transition_out(block, 1, 1, () => {\n if (info.blocks[i] === block) {\n info.blocks[i] = null;\n }\n });\n check_outros();\n }\n });\n }\n else {\n info.block.d(1);\n }\n block.c();\n transition_in(block, 1);\n block.m(info.mount(), info.anchor);\n needs_flush = true;\n }\n info.block = block;\n if (info.blocks)\n info.blocks[index] = block;\n if (needs_flush) {\n flush();\n }\n }\n if (is_promise(promise)) {\n const current_component = get_current_component();\n promise.then(value => {\n set_current_component(current_component);\n update(info.then, 1, info.value, value);\n set_current_component(null);\n }, error => {\n set_current_component(current_component);\n update(info.catch, 2, info.error, error);\n set_current_component(null);\n if (!info.hasCatch) {\n throw error;\n }\n });\n // if we previously had a then/catch block, destroy it\n if (info.current !== info.pending) {\n update(info.pending, 0);\n return true;\n }\n }\n else {\n if (info.current !== info.then) {\n update(info.then, 1, info.value, promise);\n return true;\n }\n info.resolved = promise;\n }\n}\nfunction update_await_block_branch(info, ctx, dirty) {\n const child_ctx = ctx.slice();\n const { resolved } = info;\n if (info.current === info.then) {\n child_ctx[info.value] = resolved;\n }\n if (info.current === info.catch) {\n child_ctx[info.error] = resolved;\n }\n info.block.p(child_ctx, dirty);\n}\n\nconst globals = (typeof window !== 'undefined'\n ? window\n : typeof globalThis !== 'undefined'\n ? globalThis\n : global);\n\nfunction destroy_block(block, lookup) {\n block.d(1);\n lookup.delete(block.key);\n}\nfunction outro_and_destroy_block(block, lookup) {\n transition_out(block, 1, 1, () => {\n lookup.delete(block.key);\n });\n}\nfunction fix_and_destroy_block(block, lookup) {\n block.f();\n destroy_block(block, lookup);\n}\nfunction fix_and_outro_and_destroy_block(block, lookup) {\n block.f();\n outro_and_destroy_block(block, lookup);\n}\nfunction update_keyed_each(old_blocks, dirty, get_key, dynamic, ctx, list, lookup, node, destroy, create_each_block, next, get_context) {\n let o = old_blocks.length;\n let n = list.length;\n let i = o;\n const old_indexes = {};\n while (i--)\n old_indexes[old_blocks[i].key] = i;\n const new_blocks = [];\n const new_lookup = new Map();\n const deltas = new Map();\n i = n;\n while (i--) {\n const child_ctx = get_context(ctx, list, i);\n const key = get_key(child_ctx);\n let block = lookup.get(key);\n if (!block) {\n block = create_each_block(key, child_ctx);\n block.c();\n }\n else if (dynamic) {\n block.p(child_ctx, dirty);\n }\n new_lookup.set(key, new_blocks[i] = block);\n if (key in old_indexes)\n deltas.set(key, Math.abs(i - old_indexes[key]));\n }\n const will_move = new Set();\n const did_move = new Set();\n function insert(block) {\n transition_in(block, 1);\n block.m(node, next);\n lookup.set(block.key, block);\n next = block.first;\n n--;\n }\n while (o && n) {\n const new_block = new_blocks[n - 1];\n const old_block = old_blocks[o - 1];\n const new_key = new_block.key;\n const old_key = old_block.key;\n if (new_block === old_block) {\n // do nothing\n next = new_block.first;\n o--;\n n--;\n }\n else if (!new_lookup.has(old_key)) {\n // remove old block\n destroy(old_block, lookup);\n o--;\n }\n else if (!lookup.has(new_key) || will_move.has(new_key)) {\n insert(new_block);\n }\n else if (did_move.has(old_key)) {\n o--;\n }\n else if (deltas.get(new_key) > deltas.get(old_key)) {\n did_move.add(new_key);\n insert(new_block);\n }\n else {\n will_move.add(old_key);\n o--;\n }\n }\n while (o--) {\n const old_block = old_blocks[o];\n if (!new_lookup.has(old_block.key))\n destroy(old_block, lookup);\n }\n while (n)\n insert(new_blocks[n - 1]);\n return new_blocks;\n}\nfunction validate_each_keys(ctx, list, get_context, get_key) {\n const keys = new Set();\n for (let i = 0; i < list.length; i++) {\n const key = get_key(get_context(ctx, list, i));\n if (keys.has(key)) {\n throw new Error('Cannot have duplicate keys in a keyed each');\n }\n keys.add(key);\n }\n}\n\nfunction get_spread_update(levels, updates) {\n const update = {};\n const to_null_out = {};\n const accounted_for = { $$scope: 1 };\n let i = levels.length;\n while (i--) {\n const o = levels[i];\n const n = updates[i];\n if (n) {\n for (const key in o) {\n if (!(key in n))\n to_null_out[key] = 1;\n }\n for (const key in n) {\n if (!accounted_for[key]) {\n update[key] = n[key];\n accounted_for[key] = 1;\n }\n }\n levels[i] = n;\n }\n else {\n for (const key in o) {\n accounted_for[key] = 1;\n }\n }\n }\n for (const key in to_null_out) {\n if (!(key in update))\n update[key] = undefined;\n }\n return update;\n}\nfunction get_spread_object(spread_props) {\n return typeof spread_props === 'object' && spread_props !== null ? spread_props : {};\n}\n\n// source: https://html.spec.whatwg.org/multipage/indices.html\nconst boolean_attributes = new Set([\n 'allowfullscreen',\n 'allowpaymentrequest',\n 'async',\n 'autofocus',\n 'autoplay',\n 'checked',\n 'controls',\n 'default',\n 'defer',\n 'disabled',\n 'formnovalidate',\n 'hidden',\n 'ismap',\n 'loop',\n 'multiple',\n 'muted',\n 'nomodule',\n 'novalidate',\n 'open',\n 'playsinline',\n 'readonly',\n 'required',\n 'reversed',\n 'selected'\n]);\n\nconst void_element_names = /^(?:area|base|br|col|command|embed|hr|img|input|keygen|link|meta|param|source|track|wbr)$/;\nfunction is_void(name) {\n return void_element_names.test(name) || name.toLowerCase() === '!doctype';\n}\n\nconst invalid_attribute_name_character = /[\\s'\">/=\\u{FDD0}-\\u{FDEF}\\u{FFFE}\\u{FFFF}\\u{1FFFE}\\u{1FFFF}\\u{2FFFE}\\u{2FFFF}\\u{3FFFE}\\u{3FFFF}\\u{4FFFE}\\u{4FFFF}\\u{5FFFE}\\u{5FFFF}\\u{6FFFE}\\u{6FFFF}\\u{7FFFE}\\u{7FFFF}\\u{8FFFE}\\u{8FFFF}\\u{9FFFE}\\u{9FFFF}\\u{AFFFE}\\u{AFFFF}\\u{BFFFE}\\u{BFFFF}\\u{CFFFE}\\u{CFFFF}\\u{DFFFE}\\u{DFFFF}\\u{EFFFE}\\u{EFFFF}\\u{FFFFE}\\u{FFFFF}\\u{10FFFE}\\u{10FFFF}]/u;\n// https://html.spec.whatwg.org/multipage/syntax.html#attributes-2\n// https://infra.spec.whatwg.org/#noncharacter\nfunction spread(args, attrs_to_add) {\n const attributes = Object.assign({}, ...args);\n if (attrs_to_add) {\n const classes_to_add = attrs_to_add.classes;\n const styles_to_add = attrs_to_add.styles;\n if (classes_to_add) {\n if (attributes.class == null) {\n attributes.class = classes_to_add;\n }\n else {\n attributes.class += ' ' + classes_to_add;\n }\n }\n if (styles_to_add) {\n if (attributes.style == null) {\n attributes.style = style_object_to_string(styles_to_add);\n }\n else {\n attributes.style = style_object_to_string(merge_ssr_styles(attributes.style, styles_to_add));\n }\n }\n }\n let str = '';\n Object.keys(attributes).forEach(name => {\n if (invalid_attribute_name_character.test(name))\n return;\n const value = attributes[name];\n if (value === true)\n str += ' ' + name;\n else if (boolean_attributes.has(name.toLowerCase())) {\n if (value)\n str += ' ' + name;\n }\n else if (value != null) {\n str += ` ${name}=\"${value}\"`;\n }\n });\n return str;\n}\nfunction merge_ssr_styles(style_attribute, style_directive) {\n const style_object = {};\n for (const individual_style of style_attribute.split(';')) {\n const colon_index = individual_style.indexOf(':');\n const name = individual_style.slice(0, colon_index).trim();\n const value = individual_style.slice(colon_index + 1).trim();\n if (!name)\n continue;\n style_object[name] = value;\n }\n for (const name in style_directive) {\n const value = style_directive[name];\n if (value) {\n style_object[name] = value;\n }\n else {\n delete style_object[name];\n }\n }\n return style_object;\n}\nconst escaped = {\n '\"': '"',\n \"'\": ''',\n '&': '&',\n '<': '<',\n '>': '>'\n};\nfunction escape(html) {\n return String(html).replace(/[\"'&<>]/g, match => escaped[match]);\n}\nfunction escape_attribute_value(value) {\n return typeof value === 'string' ? escape(value) : value;\n}\nfunction escape_object(obj) {\n const result = {};\n for (const key in obj) {\n result[key] = escape_attribute_value(obj[key]);\n }\n return result;\n}\nfunction each(items, fn) {\n let str = '';\n for (let i = 0; i < items.length; i += 1) {\n str += fn(items[i], i);\n }\n return str;\n}\nconst missing_component = {\n $$render: () => ''\n};\nfunction validate_component(component, name) {\n if (!component || !component.$$render) {\n if (name === 'svelte:component')\n name += ' this={...}';\n throw new Error(`<${name}> is not a valid SSR component. You may need to review your build config to ensure that dependencies are compiled, rather than imported as pre-compiled modules`);\n }\n return component;\n}\nfunction debug(file, line, column, values) {\n console.log(`{@debug} ${file ? file + ' ' : ''}(${line}:${column})`); // eslint-disable-line no-console\n console.log(values); // eslint-disable-line no-console\n return '';\n}\nlet on_destroy;\nfunction create_ssr_component(fn) {\n function $$render(result, props, bindings, slots, context) {\n const parent_component = current_component;\n const $$ = {\n on_destroy,\n context: new Map(context || (parent_component ? parent_component.$$.context : [])),\n // these will be immediately discarded\n on_mount: [],\n before_update: [],\n after_update: [],\n callbacks: blank_object()\n };\n set_current_component({ $$ });\n const html = fn(result, props, bindings, slots);\n set_current_component(parent_component);\n return html;\n }\n return {\n render: (props = {}, { $$slots = {}, context = new Map() } = {}) => {\n on_destroy = [];\n const result = { title: '', head: '', css: new Set() };\n const html = $$render(result, props, {}, $$slots, context);\n run_all(on_destroy);\n return {\n html,\n css: {\n code: Array.from(result.css).map(css => css.code).join('\\n'),\n map: null // TODO\n },\n head: result.title + result.head\n };\n },\n $$render\n };\n}\nfunction add_attribute(name, value, boolean) {\n if (value == null || (boolean && !value))\n return '';\n const assignment = (boolean && value === true) ? '' : `=\"${escape_attribute_value(value.toString())}\"`;\n return ` ${name}${assignment}`;\n}\nfunction add_classes(classes) {\n return classes ? ` class=\"${classes}\"` : '';\n}\nfunction style_object_to_string(style_object) {\n return Object.keys(style_object)\n .filter(key => style_object[key])\n .map(key => `${key}: ${style_object[key]};`)\n .join(' ');\n}\nfunction add_styles(style_object) {\n const styles = style_object_to_string(style_object);\n return styles ? ` style=\"${styles}\"` : '';\n}\n\nfunction bind(component, name, callback) {\n const index = component.$$.props[name];\n if (index !== undefined) {\n component.$$.bound[index] = callback;\n callback(component.$$.ctx[index]);\n }\n}\nfunction create_component(block) {\n block && block.c();\n}\nfunction claim_component(block, parent_nodes) {\n block && block.l(parent_nodes);\n}\nfunction mount_component(component, target, anchor, customElement) {\n const { fragment, on_mount, on_destroy, after_update } = component.$$;\n fragment && fragment.m(target, anchor);\n if (!customElement) {\n // onMount happens before the initial afterUpdate\n add_render_callback(() => {\n const new_on_destroy = on_mount.map(run).filter(is_function);\n if (on_destroy) {\n on_destroy.push(...new_on_destroy);\n }\n else {\n // Edge case - component was destroyed immediately,\n // most likely as a result of a binding initialising\n run_all(new_on_destroy);\n }\n component.$$.on_mount = [];\n });\n }\n after_update.forEach(add_render_callback);\n}\nfunction destroy_component(component, detaching) {\n const $$ = component.$$;\n if ($$.fragment !== null) {\n run_all($$.on_destroy);\n $$.fragment && $$.fragment.d(detaching);\n // TODO null out other refs, including component.$$ (but need to\n // preserve final state?)\n $$.on_destroy = $$.fragment = null;\n $$.ctx = [];\n }\n}\nfunction make_dirty(component, i) {\n if (component.$$.dirty[0] === -1) {\n dirty_components.push(component);\n schedule_update();\n component.$$.dirty.fill(0);\n }\n component.$$.dirty[(i / 31) | 0] |= (1 << (i % 31));\n}\nfunction init(component, options, instance, create_fragment, not_equal, props, append_styles, dirty = [-1]) {\n const parent_component = current_component;\n set_current_component(component);\n const $$ = component.$$ = {\n fragment: null,\n ctx: null,\n // state\n props,\n update: noop,\n not_equal,\n bound: blank_object(),\n // lifecycle\n on_mount: [],\n on_destroy: [],\n on_disconnect: [],\n before_update: [],\n after_update: [],\n context: new Map(options.context || (parent_component ? parent_component.$$.context : [])),\n // everything else\n callbacks: blank_object(),\n dirty,\n skip_bound: false,\n root: options.target || parent_component.$$.root\n };\n append_styles && append_styles($$.root);\n let ready = false;\n $$.ctx = instance\n ? instance(component, options.props || {}, (i, ret, ...rest) => {\n const value = rest.length ? rest[0] : ret;\n if ($$.ctx && not_equal($$.ctx[i], $$.ctx[i] = value)) {\n if (!$$.skip_bound && $$.bound[i])\n $$.bound[i](value);\n if (ready)\n make_dirty(component, i);\n }\n return ret;\n })\n : [];\n $$.update();\n ready = true;\n run_all($$.before_update);\n // `false` as a special case of no DOM component\n $$.fragment = create_fragment ? create_fragment($$.ctx) : false;\n if (options.target) {\n if (options.hydrate) {\n start_hydrating();\n const nodes = children(options.target);\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n $$.fragment && $$.fragment.l(nodes);\n nodes.forEach(detach);\n }\n else {\n // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n $$.fragment && $$.fragment.c();\n }\n if (options.intro)\n transition_in(component.$$.fragment);\n mount_component(component, options.target, options.anchor, options.customElement);\n end_hydrating();\n flush();\n }\n set_current_component(parent_component);\n}\nlet SvelteElement;\nif (typeof HTMLElement === 'function') {\n SvelteElement = class extends HTMLElement {\n constructor() {\n super();\n this.attachShadow({ mode: 'open' });\n }\n connectedCallback() {\n const { on_mount } = this.$$;\n this.$$.on_disconnect = on_mount.map(run).filter(is_function);\n // @ts-ignore todo: improve typings\n for (const key in this.$$.slotted) {\n // @ts-ignore todo: improve typings\n this.appendChild(this.$$.slotted[key]);\n }\n }\n attributeChangedCallback(attr, _oldValue, newValue) {\n this[attr] = newValue;\n }\n disconnectedCallback() {\n run_all(this.$$.on_disconnect);\n }\n $destroy() {\n destroy_component(this, 1);\n this.$destroy = noop;\n }\n $on(type, callback) {\n // TODO should this delegate to addEventListener?\n const callbacks = (this.$$.callbacks[type] || (this.$$.callbacks[type] = []));\n callbacks.push(callback);\n return () => {\n const index = callbacks.indexOf(callback);\n if (index !== -1)\n callbacks.splice(index, 1);\n };\n }\n $set($$props) {\n if (this.$$set && !is_empty($$props)) {\n this.$$.skip_bound = true;\n this.$$set($$props);\n this.$$.skip_bound = false;\n }\n }\n };\n}\n/**\n * Base class for Svelte components. Used when dev=false.\n */\nclass SvelteComponent {\n $destroy() {\n destroy_component(this, 1);\n this.$destroy = noop;\n }\n $on(type, callback) {\n const callbacks = (this.$$.callbacks[type] || (this.$$.callbacks[type] = []));\n callbacks.push(callback);\n return () => {\n const index = callbacks.indexOf(callback);\n if (index !== -1)\n callbacks.splice(index, 1);\n };\n }\n $set($$props) {\n if (this.$$set && !is_empty($$props)) {\n this.$$.skip_bound = true;\n this.$$set($$props);\n this.$$.skip_bound = false;\n }\n }\n}\n\nfunction dispatch_dev(type, detail) {\n document.dispatchEvent(custom_event(type, Object.assign({ version: '3.48.0' }, detail), { bubbles: true }));\n}\nfunction append_dev(target, node) {\n dispatch_dev('SvelteDOMInsert', { target, node });\n append(target, node);\n}\nfunction append_hydration_dev(target, node) {\n dispatch_dev('SvelteDOMInsert', { target, node });\n append_hydration(target, node);\n}\nfunction insert_dev(target, node, anchor) {\n dispatch_dev('SvelteDOMInsert', { target, node, anchor });\n insert(target, node, anchor);\n}\nfunction insert_hydration_dev(target, node, anchor) {\n dispatch_dev('SvelteDOMInsert', { target, node, anchor });\n insert_hydration(target, node, anchor);\n}\nfunction detach_dev(node) {\n dispatch_dev('SvelteDOMRemove', { node });\n detach(node);\n}\nfunction detach_between_dev(before, after) {\n while (before.nextSibling && before.nextSibling !== after) {\n detach_dev(before.nextSibling);\n }\n}\nfunction detach_before_dev(after) {\n while (after.previousSibling) {\n detach_dev(after.previousSibling);\n }\n}\nfunction detach_after_dev(before) {\n while (before.nextSibling) {\n detach_dev(before.nextSibling);\n }\n}\nfunction listen_dev(node, event, handler, options, has_prevent_default, has_stop_propagation) {\n const modifiers = options === true ? ['capture'] : options ? Array.from(Object.keys(options)) : [];\n if (has_prevent_default)\n modifiers.push('preventDefault');\n if (has_stop_propagation)\n modifiers.push('stopPropagation');\n dispatch_dev('SvelteDOMAddEventListener', { node, event, handler, modifiers });\n const dispose = listen(node, event, handler, options);\n return () => {\n dispatch_dev('SvelteDOMRemoveEventListener', { node, event, handler, modifiers });\n dispose();\n };\n}\nfunction attr_dev(node, attribute, value) {\n attr(node, attribute, value);\n if (value == null)\n dispatch_dev('SvelteDOMRemoveAttribute', { node, attribute });\n else\n dispatch_dev('SvelteDOMSetAttribute', { node, attribute, value });\n}\nfunction prop_dev(node, property, value) {\n node[property] = value;\n dispatch_dev('SvelteDOMSetProperty', { node, property, value });\n}\nfunction dataset_dev(node, property, value) {\n node.dataset[property] = value;\n dispatch_dev('SvelteDOMSetDataset', { node, property, value });\n}\nfunction set_data_dev(text, data) {\n data = '' + data;\n if (text.wholeText === data)\n return;\n dispatch_dev('SvelteDOMSetData', { node: text, data });\n text.data = data;\n}\nfunction validate_each_argument(arg) {\n if (typeof arg !== 'string' && !(arg && typeof arg === 'object' && 'length' in arg)) {\n let msg = '{#each} only iterates over array-like objects.';\n if (typeof Symbol === 'function' && arg && Symbol.iterator in arg) {\n msg += ' You can use a spread to convert this iterable into an array.';\n }\n throw new Error(msg);\n }\n}\nfunction validate_slots(name, slot, keys) {\n for (const slot_key of Object.keys(slot)) {\n if (!~keys.indexOf(slot_key)) {\n console.warn(`<${name}> received an unexpected slot \"${slot_key}\".`);\n }\n }\n}\nfunction validate_dynamic_element(tag) {\n const is_string = typeof tag === 'string';\n if (tag && !is_string) {\n throw new Error(' expects \"this\" attribute to be a string.');\n }\n}\nfunction validate_void_dynamic_element(tag) {\n if (tag && is_void(tag)) {\n throw new Error(` is self-closing and cannot have content.`);\n }\n}\n/**\n * Base class for Svelte components with some minor dev-enhancements. Used when dev=true.\n */\nclass SvelteComponentDev extends SvelteComponent {\n constructor(options) {\n if (!options || (!options.target && !options.$$inline)) {\n throw new Error(\"'target' is a required option\");\n }\n super();\n }\n $destroy() {\n super.$destroy();\n this.$destroy = () => {\n console.warn('Component was already destroyed'); // eslint-disable-line no-console\n };\n }\n $capture_state() { }\n $inject_state() { }\n}\n/**\n * Base class to create strongly typed Svelte components.\n * This only exists for typing purposes and should be used in `.d.ts` files.\n *\n * ### Example:\n *\n * You have component library on npm called `component-library`, from which\n * you export a component called `MyComponent`. For Svelte+TypeScript users,\n * you want to provide typings. Therefore you create a `index.d.ts`:\n * ```ts\n * import { SvelteComponentTyped } from \"svelte\";\n * export class MyComponent extends SvelteComponentTyped<{foo: string}> {}\n * ```\n * Typing this makes it possible for IDEs like VS Code with the Svelte extension\n * to provide intellisense and to use the component like this in a Svelte file\n * with TypeScript:\n * ```svelte\n * \n * \n * ```\n *\n * #### Why not make this part of `SvelteComponent(Dev)`?\n * Because\n * ```ts\n * class ASubclassOfSvelteComponent extends SvelteComponent<{foo: string}> {}\n * const component: typeof SvelteComponent = ASubclassOfSvelteComponent;\n * ```\n * will throw a type error, so we need to separate the more strictly typed class.\n */\nclass SvelteComponentTyped extends SvelteComponentDev {\n constructor(options) {\n super(options);\n }\n}\nfunction loop_guard(timeout) {\n const start = Date.now();\n return () => {\n if (Date.now() - start > timeout) {\n throw new Error('Infinite loop detected');\n }\n };\n}\n\nexport { HtmlTag, HtmlTagHydration, SvelteComponent, SvelteComponentDev, SvelteComponentTyped, SvelteElement, action_destroyer, add_attribute, add_classes, add_flush_callback, add_location, add_render_callback, add_resize_listener, add_styles, add_transform, afterUpdate, append, append_dev, append_empty_stylesheet, append_hydration, append_hydration_dev, append_styles, assign, attr, attr_dev, attribute_to_object, beforeUpdate, bind, binding_callbacks, blank_object, bubble, check_outros, children, claim_component, claim_element, claim_html_tag, claim_space, claim_svg_element, claim_text, clear_loops, component_subscribe, compute_rest_props, compute_slots, createEventDispatcher, create_animation, create_bidirectional_transition, create_component, create_in_transition, create_out_transition, create_slot, create_ssr_component, current_component, custom_event, dataset_dev, debug, destroy_block, destroy_component, destroy_each, detach, detach_after_dev, detach_before_dev, detach_between_dev, detach_dev, dirty_components, dispatch_dev, each, element, element_is, empty, end_hydrating, escape, escape_attribute_value, escape_object, escaped, exclude_internal_props, fix_and_destroy_block, fix_and_outro_and_destroy_block, fix_position, flush, getAllContexts, getContext, get_all_dirty_from_scope, get_binding_group_value, get_current_component, get_custom_elements_slots, get_root_for_style, get_slot_changes, get_spread_object, get_spread_update, get_store_value, globals, group_outros, handle_promise, hasContext, has_prop, identity, init, insert, insert_dev, insert_hydration, insert_hydration_dev, intros, invalid_attribute_name_character, is_client, is_crossorigin, is_empty, is_function, is_promise, is_void, listen, listen_dev, loop, loop_guard, merge_ssr_styles, missing_component, mount_component, noop, not_equal, now, null_to_empty, object_without_properties, onDestroy, onMount, once, outro_and_destroy_block, prevent_default, prop_dev, query_selector_all, raf, run, run_all, safe_not_equal, schedule_update, select_multiple_value, select_option, select_options, select_value, self, setContext, set_attributes, set_current_component, set_custom_element_data, set_data, set_data_dev, set_input_type, set_input_value, set_now, set_raf, set_store_value, set_style, set_svg_attributes, space, spread, src_url_equal, start_hydrating, stop_propagation, subscribe, svg_element, text, tick, time_ranges_to_array, to_number, toggle_class, transition_in, transition_out, trusted, update_await_block_branch, update_keyed_each, update_slot, update_slot_base, validate_component, validate_dynamic_element, validate_each_argument, validate_each_keys, validate_slots, validate_store, validate_void_dynamic_element, xlink_attr };\n","\n\n\n\n\n {@html text}\n\n","\n\n\n\n
    \n {#if buttons}\n {#each buttons as config}\n \n {/each}\n {/if}\n
    \n","\n\n\n\n\n ×\n\n","\n\n\n\n\n

    \n","\n\n\n\n
    \n {#if title}\n \n {/if}\n\n {#if cancelIcon && cancelIcon.enabled}\n \n {/if}\n
    \n","\n\n\n\n\n\n\n","\n\n\n\n\n {#if !isUndefined(step.options.title) || (step.options.cancelIcon && step.options.cancelIcon.enabled)}\n \n {/if}\n\n {#if !isUndefined(step.options.text)}\n \n {/if}\n\n {#if Array.isArray(step.options.buttons) && step.options.buttons.length}\n \n {/if}\n\n","\n\n\n\n\n {#if step.options.arrow && step.options.attachTo && step.options.attachTo.element && step.options.attachTo.on}\n
    \n {/if}\n \n\n","/**\n * Cleanup the steps and set pointerEvents back to 'auto'\n * @param tour The tour object\n */\nexport function cleanupSteps(tour) {\n if (tour) {\n const { steps } = tour;\n\n steps.forEach((step) => {\n if (\n step.options &&\n step.options.canClickTarget === false &&\n step.options.attachTo\n ) {\n if (step.target instanceof HTMLElement) {\n step.target.classList.remove('shepherd-target-click-disabled');\n }\n }\n });\n }\n}\n","\n\n\n \n\n\n\n","/**\n * Generates the svg path data for a rounded rectangle overlay\n * @param {Object} dimension - Dimensions of rectangle.\n * @param {number} width - Width.\n * @param {number} height - Height.\n * @param {number} [x=0] - Offset from top left corner in x axis. default 0.\n * @param {number} [y=0] - Offset from top left corner in y axis. default 0.\n * @param {number} [r=0] - Corner Radius. Keep this smaller than half of width or height.\n * @returns {string} - Rounded rectangle overlay path data.\n */\nexport function makeOverlayPath({ width, height, x = 0, y = 0, r = 0 }) {\n const { innerWidth: w, innerHeight: h } = window;\n\n return `M${w},${h}\\\nH0\\\nV0\\\nH${w}\\\nV${h}\\\nZ\\\nM${x + r},${y}\\\na${r},${r},0,0,0-${r},${r}\\\nV${height + y - r}\\\na${r},${r},0,0,0,${r},${r}\\\nH${width + x - r}\\\na${r},${r},0,0,0,${r}-${r}\\\nV${y + r}\\\na${r},${r},0,0,0-${r}-${r}\\\nZ`;\n}\n","import { isUndefined } from './utils/type-check';\n\nexport class Evented {\n on(event, handler, ctx, once = false) {\n if (isUndefined(this.bindings)) {\n this.bindings = {};\n }\n if (isUndefined(this.bindings[event])) {\n this.bindings[event] = [];\n }\n this.bindings[event].push({ handler, ctx, once });\n\n return this;\n }\n\n once(event, handler, ctx) {\n return this.on(event, handler, ctx, true);\n }\n\n off(event, handler) {\n if (isUndefined(this.bindings) || isUndefined(this.bindings[event])) {\n return this;\n }\n\n if (isUndefined(handler)) {\n delete this.bindings[event];\n } else {\n this.bindings[event].forEach((binding, index) => {\n if (binding.handler === handler) {\n this.bindings[event].splice(index, 1);\n }\n });\n }\n\n return this;\n }\n\n trigger(event, ...args) {\n if (!isUndefined(this.bindings) && this.bindings[event]) {\n this.bindings[event].forEach((binding, index) => {\n const { ctx, handler, once } = binding;\n\n const context = ctx || this;\n\n handler.apply(context, args);\n\n if (once) {\n this.bindings[event].splice(index, 1);\n }\n });\n }\n\n return this;\n }\n}\n","export var max = Math.max;\nexport var min = Math.min;\nexport var round = Math.round;","import getWindow from \"../dom-utils/getWindow.js\"; // eslint-disable-next-line import/no-unused-modules\n\nvar passive = {\n passive: true\n};\n\nfunction effect(_ref) {\n var state = _ref.state,\n instance = _ref.instance,\n options = _ref.options;\n var _options$scroll = options.scroll,\n scroll = _options$scroll === void 0 ? true : _options$scroll,\n _options$resize = options.resize,\n resize = _options$resize === void 0 ? true : _options$resize;\n var window = getWindow(state.elements.popper);\n var scrollParents = [].concat(state.scrollParents.reference, state.scrollParents.popper);\n\n if (scroll) {\n scrollParents.forEach(function (scrollParent) {\n scrollParent.addEventListener('scroll', instance.update, passive);\n });\n }\n\n if (resize) {\n window.addEventListener('resize', instance.update, passive);\n }\n\n return function () {\n if (scroll) {\n scrollParents.forEach(function (scrollParent) {\n scrollParent.removeEventListener('scroll', instance.update, passive);\n });\n }\n\n if (resize) {\n window.removeEventListener('resize', instance.update, passive);\n }\n };\n} // eslint-disable-next-line import/no-unused-modules\n\n\nexport default {\n name: 'eventListeners',\n enabled: true,\n phase: 'write',\n fn: function fn() {},\n effect: effect,\n data: {}\n};","import { popperGenerator, detectOverflow } from \"./createPopper.js\";\nimport eventListeners from \"./modifiers/eventListeners.js\";\nimport popperOffsets from \"./modifiers/popperOffsets.js\";\nimport computeStyles from \"./modifiers/computeStyles.js\";\nimport applyStyles from \"./modifiers/applyStyles.js\";\nimport offset from \"./modifiers/offset.js\";\nimport flip from \"./modifiers/flip.js\";\nimport preventOverflow from \"./modifiers/preventOverflow.js\";\nimport arrow from \"./modifiers/arrow.js\";\nimport hide from \"./modifiers/hide.js\";\nvar defaultModifiers = [eventListeners, popperOffsets, computeStyles, applyStyles, offset, flip, preventOverflow, arrow, hide];\nvar createPopper = /*#__PURE__*/popperGenerator({\n defaultModifiers: defaultModifiers\n}); // eslint-disable-next-line import/no-unused-modules\n\nexport { createPopper, popperGenerator, defaultModifiers, detectOverflow }; // eslint-disable-next-line import/no-unused-modules\n\nexport { createPopper as createPopperLite } from \"./popper-lite.js\"; // eslint-disable-next-line import/no-unused-modules\n\nexport * from \"./modifiers/index.js\";","import computeOffsets from \"../utils/computeOffsets.js\";\n\nfunction popperOffsets(_ref) {\n var state = _ref.state,\n name = _ref.name;\n // Offsets are the actual position the popper needs to have to be\n // properly positioned near its reference element\n // This is the most basic placement, and will be adjusted by\n // the modifiers in the next step\n state.modifiersData[name] = computeOffsets({\n reference: state.rects.reference,\n element: state.rects.popper,\n strategy: 'absolute',\n placement: state.placement\n });\n} // eslint-disable-next-line import/no-unused-modules\n\n\nexport default {\n name: 'popperOffsets',\n enabled: true,\n phase: 'read',\n fn: popperOffsets,\n data: {}\n};","import getNodeName from \"../dom-utils/getNodeName.js\";\nimport { isHTMLElement } from \"../dom-utils/instanceOf.js\"; // This modifier takes the styles prepared by the `computeStyles` modifier\n// and applies them to the HTMLElements such as popper and arrow\n\nfunction applyStyles(_ref) {\n var state = _ref.state;\n Object.keys(state.elements).forEach(function (name) {\n var style = state.styles[name] || {};\n var attributes = state.attributes[name] || {};\n var element = state.elements[name]; // arrow is optional + virtual elements\n\n if (!isHTMLElement(element) || !getNodeName(element)) {\n return;\n } // Flow doesn't support to extend this property, but it's the most\n // effective way to apply styles to an HTMLElement\n // $FlowFixMe[cannot-write]\n\n\n Object.assign(element.style, style);\n Object.keys(attributes).forEach(function (name) {\n var value = attributes[name];\n\n if (value === false) {\n element.removeAttribute(name);\n } else {\n element.setAttribute(name, value === true ? '' : value);\n }\n });\n });\n}\n\nfunction effect(_ref2) {\n var state = _ref2.state;\n var initialStyles = {\n popper: {\n position: state.options.strategy,\n left: '0',\n top: '0',\n margin: '0'\n },\n arrow: {\n position: 'absolute'\n },\n reference: {}\n };\n Object.assign(state.elements.popper.style, initialStyles.popper);\n state.styles = initialStyles;\n\n if (state.elements.arrow) {\n Object.assign(state.elements.arrow.style, initialStyles.arrow);\n }\n\n return function () {\n Object.keys(state.elements).forEach(function (name) {\n var element = state.elements[name];\n var attributes = state.attributes[name] || {};\n var styleProperties = Object.keys(state.styles.hasOwnProperty(name) ? state.styles[name] : initialStyles[name]); // Set all values to an empty string to unset them\n\n var style = styleProperties.reduce(function (style, property) {\n style[property] = '';\n return style;\n }, {}); // arrow is optional + virtual elements\n\n if (!isHTMLElement(element) || !getNodeName(element)) {\n return;\n }\n\n Object.assign(element.style, style);\n Object.keys(attributes).forEach(function (attribute) {\n element.removeAttribute(attribute);\n });\n });\n };\n} // eslint-disable-next-line import/no-unused-modules\n\n\nexport default {\n name: 'applyStyles',\n enabled: true,\n phase: 'write',\n fn: applyStyles,\n effect: effect,\n requires: ['computeStyles']\n};","import getBasePlacement from \"../utils/getBasePlacement.js\";\nimport { top, left, right, placements } from \"../enums.js\"; // eslint-disable-next-line import/no-unused-modules\n\nexport function distanceAndSkiddingToXY(placement, rects, offset) {\n var basePlacement = getBasePlacement(placement);\n var invertDistance = [left, top].indexOf(basePlacement) >= 0 ? -1 : 1;\n\n var _ref = typeof offset === 'function' ? offset(Object.assign({}, rects, {\n placement: placement\n })) : offset,\n skidding = _ref[0],\n distance = _ref[1];\n\n skidding = skidding || 0;\n distance = (distance || 0) * invertDistance;\n return [left, right].indexOf(basePlacement) >= 0 ? {\n x: distance,\n y: skidding\n } : {\n x: skidding,\n y: distance\n };\n}\n\nfunction offset(_ref2) {\n var state = _ref2.state,\n options = _ref2.options,\n name = _ref2.name;\n var _options$offset = options.offset,\n offset = _options$offset === void 0 ? [0, 0] : _options$offset;\n var data = placements.reduce(function (acc, placement) {\n acc[placement] = distanceAndSkiddingToXY(placement, state.rects, offset);\n return acc;\n }, {});\n var _data$state$placement = data[state.placement],\n x = _data$state$placement.x,\n y = _data$state$placement.y;\n\n if (state.modifiersData.popperOffsets != null) {\n state.modifiersData.popperOffsets.x += x;\n state.modifiersData.popperOffsets.y += y;\n }\n\n state.modifiersData[name] = data;\n} // eslint-disable-next-line import/no-unused-modules\n\n\nexport default {\n name: 'offset',\n enabled: true,\n phase: 'main',\n requires: ['popperOffsets'],\n fn: offset\n};","import { top, left, right, bottom, start } from \"../enums.js\";\nimport getBasePlacement from \"../utils/getBasePlacement.js\";\nimport getMainAxisFromPlacement from \"../utils/getMainAxisFromPlacement.js\";\nimport getAltAxis from \"../utils/getAltAxis.js\";\nimport { within, withinMaxClamp } from \"../utils/within.js\";\nimport getLayoutRect from \"../dom-utils/getLayoutRect.js\";\nimport getOffsetParent from \"../dom-utils/getOffsetParent.js\";\nimport detectOverflow from \"../utils/detectOverflow.js\";\nimport getVariation from \"../utils/getVariation.js\";\nimport getFreshSideObject from \"../utils/getFreshSideObject.js\";\nimport { min as mathMin, max as mathMax } from \"../utils/math.js\";\n\nfunction preventOverflow(_ref) {\n var state = _ref.state,\n options = _ref.options,\n name = _ref.name;\n var _options$mainAxis = options.mainAxis,\n checkMainAxis = _options$mainAxis === void 0 ? true : _options$mainAxis,\n _options$altAxis = options.altAxis,\n checkAltAxis = _options$altAxis === void 0 ? false : _options$altAxis,\n boundary = options.boundary,\n rootBoundary = options.rootBoundary,\n altBoundary = options.altBoundary,\n padding = options.padding,\n _options$tether = options.tether,\n tether = _options$tether === void 0 ? true : _options$tether,\n _options$tetherOffset = options.tetherOffset,\n tetherOffset = _options$tetherOffset === void 0 ? 0 : _options$tetherOffset;\n var overflow = detectOverflow(state, {\n boundary: boundary,\n rootBoundary: rootBoundary,\n padding: padding,\n altBoundary: altBoundary\n });\n var basePlacement = getBasePlacement(state.placement);\n var variation = getVariation(state.placement);\n var isBasePlacement = !variation;\n var mainAxis = getMainAxisFromPlacement(basePlacement);\n var altAxis = getAltAxis(mainAxis);\n var popperOffsets = state.modifiersData.popperOffsets;\n var referenceRect = state.rects.reference;\n var popperRect = state.rects.popper;\n var tetherOffsetValue = typeof tetherOffset === 'function' ? tetherOffset(Object.assign({}, state.rects, {\n placement: state.placement\n })) : tetherOffset;\n var normalizedTetherOffsetValue = typeof tetherOffsetValue === 'number' ? {\n mainAxis: tetherOffsetValue,\n altAxis: tetherOffsetValue\n } : Object.assign({\n mainAxis: 0,\n altAxis: 0\n }, tetherOffsetValue);\n var offsetModifierState = state.modifiersData.offset ? state.modifiersData.offset[state.placement] : null;\n var data = {\n x: 0,\n y: 0\n };\n\n if (!popperOffsets) {\n return;\n }\n\n if (checkMainAxis) {\n var _offsetModifierState$;\n\n var mainSide = mainAxis === 'y' ? top : left;\n var altSide = mainAxis === 'y' ? bottom : right;\n var len = mainAxis === 'y' ? 'height' : 'width';\n var offset = popperOffsets[mainAxis];\n var min = offset + overflow[mainSide];\n var max = offset - overflow[altSide];\n var additive = tether ? -popperRect[len] / 2 : 0;\n var minLen = variation === start ? referenceRect[len] : popperRect[len];\n var maxLen = variation === start ? -popperRect[len] : -referenceRect[len]; // We need to include the arrow in the calculation so the arrow doesn't go\n // outside the reference bounds\n\n var arrowElement = state.elements.arrow;\n var arrowRect = tether && arrowElement ? getLayoutRect(arrowElement) : {\n width: 0,\n height: 0\n };\n var arrowPaddingObject = state.modifiersData['arrow#persistent'] ? state.modifiersData['arrow#persistent'].padding : getFreshSideObject();\n var arrowPaddingMin = arrowPaddingObject[mainSide];\n var arrowPaddingMax = arrowPaddingObject[altSide]; // If the reference length is smaller than the arrow length, we don't want\n // to include its full size in the calculation. If the reference is small\n // and near the edge of a boundary, the popper can overflow even if the\n // reference is not overflowing as well (e.g. virtual elements with no\n // width or height)\n\n var arrowLen = within(0, referenceRect[len], arrowRect[len]);\n var minOffset = isBasePlacement ? referenceRect[len] / 2 - additive - arrowLen - arrowPaddingMin - normalizedTetherOffsetValue.mainAxis : minLen - arrowLen - arrowPaddingMin - normalizedTetherOffsetValue.mainAxis;\n var maxOffset = isBasePlacement ? -referenceRect[len] / 2 + additive + arrowLen + arrowPaddingMax + normalizedTetherOffsetValue.mainAxis : maxLen + arrowLen + arrowPaddingMax + normalizedTetherOffsetValue.mainAxis;\n var arrowOffsetParent = state.elements.arrow && getOffsetParent(state.elements.arrow);\n var clientOffset = arrowOffsetParent ? mainAxis === 'y' ? arrowOffsetParent.clientTop || 0 : arrowOffsetParent.clientLeft || 0 : 0;\n var offsetModifierValue = (_offsetModifierState$ = offsetModifierState == null ? void 0 : offsetModifierState[mainAxis]) != null ? _offsetModifierState$ : 0;\n var tetherMin = offset + minOffset - offsetModifierValue - clientOffset;\n var tetherMax = offset + maxOffset - offsetModifierValue;\n var preventedOffset = within(tether ? mathMin(min, tetherMin) : min, offset, tether ? mathMax(max, tetherMax) : max);\n popperOffsets[mainAxis] = preventedOffset;\n data[mainAxis] = preventedOffset - offset;\n }\n\n if (checkAltAxis) {\n var _offsetModifierState$2;\n\n var _mainSide = mainAxis === 'x' ? top : left;\n\n var _altSide = mainAxis === 'x' ? bottom : right;\n\n var _offset = popperOffsets[altAxis];\n\n var _len = altAxis === 'y' ? 'height' : 'width';\n\n var _min = _offset + overflow[_mainSide];\n\n var _max = _offset - overflow[_altSide];\n\n var isOriginSide = [top, left].indexOf(basePlacement) !== -1;\n\n var _offsetModifierValue = (_offsetModifierState$2 = offsetModifierState == null ? void 0 : offsetModifierState[altAxis]) != null ? _offsetModifierState$2 : 0;\n\n var _tetherMin = isOriginSide ? _min : _offset - referenceRect[_len] - popperRect[_len] - _offsetModifierValue + normalizedTetherOffsetValue.altAxis;\n\n var _tetherMax = isOriginSide ? _offset + referenceRect[_len] + popperRect[_len] - _offsetModifierValue - normalizedTetherOffsetValue.altAxis : _max;\n\n var _preventedOffset = tether && isOriginSide ? withinMaxClamp(_tetherMin, _offset, _tetherMax) : within(tether ? _tetherMin : _min, _offset, tether ? _tetherMax : _max);\n\n popperOffsets[altAxis] = _preventedOffset;\n data[altAxis] = _preventedOffset - _offset;\n }\n\n state.modifiersData[name] = data;\n} // eslint-disable-next-line import/no-unused-modules\n\n\nexport default {\n name: 'preventOverflow',\n enabled: true,\n phase: 'main',\n fn: preventOverflow,\n requiresIfExists: ['offset']\n};","export default function getAltAxis(axis) {\n return axis === 'x' ? 'y' : 'x';\n}","import { max as mathMax, min as mathMin } from \"./math.js\";\nexport function within(min, value, max) {\n return mathMax(min, mathMin(value, max));\n}\nexport function withinMaxClamp(min, value, max) {\n var v = within(min, value, max);\n return v > max ? max : v;\n}","import getBasePlacement from \"../utils/getBasePlacement.js\";\nimport getLayoutRect from \"../dom-utils/getLayoutRect.js\";\nimport contains from \"../dom-utils/contains.js\";\nimport getOffsetParent from \"../dom-utils/getOffsetParent.js\";\nimport getMainAxisFromPlacement from \"../utils/getMainAxisFromPlacement.js\";\nimport { within } from \"../utils/within.js\";\nimport mergePaddingObject from \"../utils/mergePaddingObject.js\";\nimport expandToHashMap from \"../utils/expandToHashMap.js\";\nimport { left, right, basePlacements, top, bottom } from \"../enums.js\";\nimport { isHTMLElement } from \"../dom-utils/instanceOf.js\"; // eslint-disable-next-line import/no-unused-modules\n\nvar toPaddingObject = function toPaddingObject(padding, state) {\n padding = typeof padding === 'function' ? padding(Object.assign({}, state.rects, {\n placement: state.placement\n })) : padding;\n return mergePaddingObject(typeof padding !== 'number' ? padding : expandToHashMap(padding, basePlacements));\n};\n\nfunction arrow(_ref) {\n var _state$modifiersData$;\n\n var state = _ref.state,\n name = _ref.name,\n options = _ref.options;\n var arrowElement = state.elements.arrow;\n var popperOffsets = state.modifiersData.popperOffsets;\n var basePlacement = getBasePlacement(state.placement);\n var axis = getMainAxisFromPlacement(basePlacement);\n var isVertical = [left, right].indexOf(basePlacement) >= 0;\n var len = isVertical ? 'height' : 'width';\n\n if (!arrowElement || !popperOffsets) {\n return;\n }\n\n var paddingObject = toPaddingObject(options.padding, state);\n var arrowRect = getLayoutRect(arrowElement);\n var minProp = axis === 'y' ? top : left;\n var maxProp = axis === 'y' ? bottom : right;\n var endDiff = state.rects.reference[len] + state.rects.reference[axis] - popperOffsets[axis] - state.rects.popper[len];\n var startDiff = popperOffsets[axis] - state.rects.reference[axis];\n var arrowOffsetParent = getOffsetParent(arrowElement);\n var clientSize = arrowOffsetParent ? axis === 'y' ? arrowOffsetParent.clientHeight || 0 : arrowOffsetParent.clientWidth || 0 : 0;\n var centerToReference = endDiff / 2 - startDiff / 2; // Make sure the arrow doesn't overflow the popper if the center point is\n // outside of the popper bounds\n\n var min = paddingObject[minProp];\n var max = clientSize - arrowRect[len] - paddingObject[maxProp];\n var center = clientSize / 2 - arrowRect[len] / 2 + centerToReference;\n var offset = within(min, center, max); // Prevents breaking syntax highlighting...\n\n var axisProp = axis;\n state.modifiersData[name] = (_state$modifiersData$ = {}, _state$modifiersData$[axisProp] = offset, _state$modifiersData$.centerOffset = offset - center, _state$modifiersData$);\n}\n\nfunction effect(_ref2) {\n var state = _ref2.state,\n options = _ref2.options;\n var _options$element = options.element,\n arrowElement = _options$element === void 0 ? '[data-popper-arrow]' : _options$element;\n\n if (arrowElement == null) {\n return;\n } // CSS selector\n\n\n if (typeof arrowElement === 'string') {\n arrowElement = state.elements.popper.querySelector(arrowElement);\n\n if (!arrowElement) {\n return;\n }\n }\n\n if (process.env.NODE_ENV !== \"production\") {\n if (!isHTMLElement(arrowElement)) {\n console.error(['Popper: \"arrow\" element must be an HTMLElement (not an SVGElement).', 'To use an SVG arrow, wrap it in an HTMLElement that will be used as', 'the arrow.'].join(' '));\n }\n }\n\n if (!contains(state.elements.popper, arrowElement)) {\n if (process.env.NODE_ENV !== \"production\") {\n console.error(['Popper: \"arrow\" modifier\\'s `element` must be a child of the popper', 'element.'].join(' '));\n }\n\n return;\n }\n\n state.elements.arrow = arrowElement;\n} // eslint-disable-next-line import/no-unused-modules\n\n\nexport default {\n name: 'arrow',\n enabled: true,\n phase: 'main',\n fn: arrow,\n effect: effect,\n requires: ['popperOffsets'],\n requiresIfExists: ['preventOverflow']\n};","/* smoothscroll v0.4.4 - 2019 - Dustan Kasten, Jeremias Menichelli - MIT License */\n(function () {\n 'use strict';\n\n // polyfill\n function polyfill() {\n // aliases\n var w = window;\n var d = document;\n\n // return if scroll behavior is supported and polyfill is not forced\n if (\n 'scrollBehavior' in d.documentElement.style &&\n w.__forceSmoothScrollPolyfill__ !== true\n ) {\n return;\n }\n\n // globals\n var Element = w.HTMLElement || w.Element;\n var SCROLL_TIME = 468;\n\n // object gathering original scroll methods\n var original = {\n scroll: w.scroll || w.scrollTo,\n scrollBy: w.scrollBy,\n elementScroll: Element.prototype.scroll || scrollElement,\n scrollIntoView: Element.prototype.scrollIntoView\n };\n\n // define timing method\n var now =\n w.performance && w.performance.now\n ? w.performance.now.bind(w.performance)\n : Date.now;\n\n /**\n * indicates if a the current browser is made by Microsoft\n * @method isMicrosoftBrowser\n * @param {String} userAgent\n * @returns {Boolean}\n */\n function isMicrosoftBrowser(userAgent) {\n var userAgentPatterns = ['MSIE ', 'Trident/', 'Edge/'];\n\n return new RegExp(userAgentPatterns.join('|')).test(userAgent);\n }\n\n /*\n * IE has rounding bug rounding down clientHeight and clientWidth and\n * rounding up scrollHeight and scrollWidth causing false positives\n * on hasScrollableSpace\n */\n var ROUNDING_TOLERANCE = isMicrosoftBrowser(w.navigator.userAgent) ? 1 : 0;\n\n /**\n * changes scroll position inside an element\n * @method scrollElement\n * @param {Number} x\n * @param {Number} y\n * @returns {undefined}\n */\n function scrollElement(x, y) {\n this.scrollLeft = x;\n this.scrollTop = y;\n }\n\n /**\n * returns result of applying ease math function to a number\n * @method ease\n * @param {Number} k\n * @returns {Number}\n */\n function ease(k) {\n return 0.5 * (1 - Math.cos(Math.PI * k));\n }\n\n /**\n * indicates if a smooth behavior should be applied\n * @method shouldBailOut\n * @param {Number|Object} firstArg\n * @returns {Boolean}\n */\n function shouldBailOut(firstArg) {\n if (\n firstArg === null ||\n typeof firstArg !== 'object' ||\n firstArg.behavior === undefined ||\n firstArg.behavior === 'auto' ||\n firstArg.behavior === 'instant'\n ) {\n // first argument is not an object/null\n // or behavior is auto, instant or undefined\n return true;\n }\n\n if (typeof firstArg === 'object' && firstArg.behavior === 'smooth') {\n // first argument is an object and behavior is smooth\n return false;\n }\n\n // throw error when behavior is not supported\n throw new TypeError(\n 'behavior member of ScrollOptions ' +\n firstArg.behavior +\n ' is not a valid value for enumeration ScrollBehavior.'\n );\n }\n\n /**\n * indicates if an element has scrollable space in the provided axis\n * @method hasScrollableSpace\n * @param {Node} el\n * @param {String} axis\n * @returns {Boolean}\n */\n function hasScrollableSpace(el, axis) {\n if (axis === 'Y') {\n return el.clientHeight + ROUNDING_TOLERANCE < el.scrollHeight;\n }\n\n if (axis === 'X') {\n return el.clientWidth + ROUNDING_TOLERANCE < el.scrollWidth;\n }\n }\n\n /**\n * indicates if an element has a scrollable overflow property in the axis\n * @method canOverflow\n * @param {Node} el\n * @param {String} axis\n * @returns {Boolean}\n */\n function canOverflow(el, axis) {\n var overflowValue = w.getComputedStyle(el, null)['overflow' + axis];\n\n return overflowValue === 'auto' || overflowValue === 'scroll';\n }\n\n /**\n * indicates if an element can be scrolled in either axis\n * @method isScrollable\n * @param {Node} el\n * @param {String} axis\n * @returns {Boolean}\n */\n function isScrollable(el) {\n var isScrollableY = hasScrollableSpace(el, 'Y') && canOverflow(el, 'Y');\n var isScrollableX = hasScrollableSpace(el, 'X') && canOverflow(el, 'X');\n\n return isScrollableY || isScrollableX;\n }\n\n /**\n * finds scrollable parent of an element\n * @method findScrollableParent\n * @param {Node} el\n * @returns {Node} el\n */\n function findScrollableParent(el) {\n while (el !== d.body && isScrollable(el) === false) {\n el = el.parentNode || el.host;\n }\n\n return el;\n }\n\n /**\n * self invoked function that, given a context, steps through scrolling\n * @method step\n * @param {Object} context\n * @returns {undefined}\n */\n function step(context) {\n var time = now();\n var value;\n var currentX;\n var currentY;\n var elapsed = (time - context.startTime) / SCROLL_TIME;\n\n // avoid elapsed times higher than one\n elapsed = elapsed > 1 ? 1 : elapsed;\n\n // apply easing to elapsed time\n value = ease(elapsed);\n\n currentX = context.startX + (context.x - context.startX) * value;\n currentY = context.startY + (context.y - context.startY) * value;\n\n context.method.call(context.scrollable, currentX, currentY);\n\n // scroll more if we have not reached our destination\n if (currentX !== context.x || currentY !== context.y) {\n w.requestAnimationFrame(step.bind(w, context));\n }\n }\n\n /**\n * scrolls window or element with a smooth behavior\n * @method smoothScroll\n * @param {Object|Node} el\n * @param {Number} x\n * @param {Number} y\n * @returns {undefined}\n */\n function smoothScroll(el, x, y) {\n var scrollable;\n var startX;\n var startY;\n var method;\n var startTime = now();\n\n // define scroll context\n if (el === d.body) {\n scrollable = w;\n startX = w.scrollX || w.pageXOffset;\n startY = w.scrollY || w.pageYOffset;\n method = original.scroll;\n } else {\n scrollable = el;\n startX = el.scrollLeft;\n startY = el.scrollTop;\n method = scrollElement;\n }\n\n // scroll looping over a frame\n step({\n scrollable: scrollable,\n method: method,\n startTime: startTime,\n startX: startX,\n startY: startY,\n x: x,\n y: y\n });\n }\n\n // ORIGINAL METHODS OVERRIDES\n // w.scroll and w.scrollTo\n w.scroll = w.scrollTo = function() {\n // avoid action when no arguments are passed\n if (arguments[0] === undefined) {\n return;\n }\n\n // avoid smooth behavior if not required\n if (shouldBailOut(arguments[0]) === true) {\n original.scroll.call(\n w,\n arguments[0].left !== undefined\n ? arguments[0].left\n : typeof arguments[0] !== 'object'\n ? arguments[0]\n : w.scrollX || w.pageXOffset,\n // use top prop, second argument if present or fallback to scrollY\n arguments[0].top !== undefined\n ? arguments[0].top\n : arguments[1] !== undefined\n ? arguments[1]\n : w.scrollY || w.pageYOffset\n );\n\n return;\n }\n\n // LET THE SMOOTHNESS BEGIN!\n smoothScroll.call(\n w,\n d.body,\n arguments[0].left !== undefined\n ? ~~arguments[0].left\n : w.scrollX || w.pageXOffset,\n arguments[0].top !== undefined\n ? ~~arguments[0].top\n : w.scrollY || w.pageYOffset\n );\n };\n\n // w.scrollBy\n w.scrollBy = function() {\n // avoid action when no arguments are passed\n if (arguments[0] === undefined) {\n return;\n }\n\n // avoid smooth behavior if not required\n if (shouldBailOut(arguments[0])) {\n original.scrollBy.call(\n w,\n arguments[0].left !== undefined\n ? arguments[0].left\n : typeof arguments[0] !== 'object' ? arguments[0] : 0,\n arguments[0].top !== undefined\n ? arguments[0].top\n : arguments[1] !== undefined ? arguments[1] : 0\n );\n\n return;\n }\n\n // LET THE SMOOTHNESS BEGIN!\n smoothScroll.call(\n w,\n d.body,\n ~~arguments[0].left + (w.scrollX || w.pageXOffset),\n ~~arguments[0].top + (w.scrollY || w.pageYOffset)\n );\n };\n\n // Element.prototype.scroll and Element.prototype.scrollTo\n Element.prototype.scroll = Element.prototype.scrollTo = function() {\n // avoid action when no arguments are passed\n if (arguments[0] === undefined) {\n return;\n }\n\n // avoid smooth behavior if not required\n if (shouldBailOut(arguments[0]) === true) {\n // if one number is passed, throw error to match Firefox implementation\n if (typeof arguments[0] === 'number' && arguments[1] === undefined) {\n throw new SyntaxError('Value could not be converted');\n }\n\n original.elementScroll.call(\n this,\n // use left prop, first number argument or fallback to scrollLeft\n arguments[0].left !== undefined\n ? ~~arguments[0].left\n : typeof arguments[0] !== 'object' ? ~~arguments[0] : this.scrollLeft,\n // use top prop, second argument or fallback to scrollTop\n arguments[0].top !== undefined\n ? ~~arguments[0].top\n : arguments[1] !== undefined ? ~~arguments[1] : this.scrollTop\n );\n\n return;\n }\n\n var left = arguments[0].left;\n var top = arguments[0].top;\n\n // LET THE SMOOTHNESS BEGIN!\n smoothScroll.call(\n this,\n this,\n typeof left === 'undefined' ? this.scrollLeft : ~~left,\n typeof top === 'undefined' ? this.scrollTop : ~~top\n );\n };\n\n // Element.prototype.scrollBy\n Element.prototype.scrollBy = function() {\n // avoid action when no arguments are passed\n if (arguments[0] === undefined) {\n return;\n }\n\n // avoid smooth behavior if not required\n if (shouldBailOut(arguments[0]) === true) {\n original.elementScroll.call(\n this,\n arguments[0].left !== undefined\n ? ~~arguments[0].left + this.scrollLeft\n : ~~arguments[0] + this.scrollLeft,\n arguments[0].top !== undefined\n ? ~~arguments[0].top + this.scrollTop\n : ~~arguments[1] + this.scrollTop\n );\n\n return;\n }\n\n this.scroll({\n left: ~~arguments[0].left + this.scrollLeft,\n top: ~~arguments[0].top + this.scrollTop,\n behavior: arguments[0].behavior\n });\n };\n\n // Element.prototype.scrollIntoView\n Element.prototype.scrollIntoView = function() {\n // avoid smooth behavior if not required\n if (shouldBailOut(arguments[0]) === true) {\n original.scrollIntoView.call(\n this,\n arguments[0] === undefined ? true : arguments[0]\n );\n\n return;\n }\n\n // LET THE SMOOTHNESS BEGIN!\n var scrollableParent = findScrollableParent(this);\n var parentRects = scrollableParent.getBoundingClientRect();\n var clientRects = this.getBoundingClientRect();\n\n if (scrollableParent !== d.body) {\n // reveal element inside parent\n smoothScroll.call(\n this,\n scrollableParent,\n scrollableParent.scrollLeft + clientRects.left - parentRects.left,\n scrollableParent.scrollTop + clientRects.top - parentRects.top\n );\n\n // reveal parent in viewport unless is fixed\n if (w.getComputedStyle(scrollableParent).position !== 'fixed') {\n w.scrollBy({\n left: parentRects.left,\n top: parentRects.top,\n behavior: 'smooth'\n });\n }\n } else {\n // reveal element in viewport\n w.scrollBy({\n left: clientRects.left,\n top: clientRects.top,\n behavior: 'smooth'\n });\n }\n };\n }\n\n if (typeof exports === 'object' && typeof module !== 'undefined') {\n // commonjs\n module.exports = { polyfill: polyfill };\n } else {\n // global\n polyfill();\n }\n\n}());\n","import merge from 'deepmerge';\nimport { Evented } from './evented.js';\nimport autoBind from './utils/auto-bind.js';\nimport {\n isElement,\n isHTMLElement,\n isFunction,\n isUndefined\n} from './utils/type-check.js';\nimport { bindAdvance } from './utils/bind.js';\nimport {\n setupTooltip,\n parseAttachTo,\n normalizePrefix,\n uuid\n} from './utils/general.js';\nimport ShepherdElement from './components/shepherd-element.svelte';\n\n// Polyfills\nimport smoothscroll from 'smoothscroll-polyfill';\nsmoothscroll.polyfill();\n\n/**\n * A class representing steps to be added to a tour.\n * @extends {Evented}\n */\nexport class Step extends Evented {\n /**\n * Create a step\n * @param {Tour} tour The tour for the step\n * @param {object} options The options for the step\n * @param {boolean} options.arrow Whether to display the arrow for the tooltip or not. Defaults to `true`.\n * @param {object} options.attachTo The element the step should be attached to on the page.\n * An object with properties `element` and `on`.\n *\n * ```js\n * const step = new Step(tour, {\n * attachTo: { element: '.some .selector-path', on: 'left' },\n * ...moreOptions\n * });\n * ```\n *\n * If you don’t specify an `attachTo` the element will appear in the middle of the screen. The same will happen if your `attachTo.element` callback returns `null`, `undefined`, or a selector that does not exist in the DOM.\n * If you omit the `on` portion of `attachTo`, the element will still be highlighted, but the tooltip will appear\n * in the middle of the screen, without an arrow pointing to the target.\n * If the element to highlight does not yet exist while instantiating tour steps, you may use lazy evaluation by supplying a function to `attachTo.element`. The function will be called in the `before-show` phase.\n * @param {string|HTMLElement|function} options.attachTo.element An element selector string, DOM element, or a function (returning a selector, a DOM element, `null` or `undefined`).\n * @param {string} options.attachTo.on The optional direction to place the Popper tooltip relative to the element.\n * - Possible string values: 'auto', 'auto-start', 'auto-end', 'top', 'top-start', 'top-end', 'bottom', 'bottom-start', 'bottom-end', 'right', 'right-start', 'right-end', 'left', 'left-start', 'left-end'\n * @param {Object} options.advanceOn An action on the page which should advance shepherd to the next step.\n * It should be an object with a string `selector` and an `event` name\n * ```js\n * const step = new Step(tour, {\n * advanceOn: { selector: '.some .selector-path', event: 'click' },\n * ...moreOptions\n * });\n * ```\n * `event` doesn’t have to be an event inside the tour, it can be any event fired on any element on the page.\n * You can also always manually advance the Tour by calling `myTour.next()`.\n * @param {function} options.beforeShowPromise A function that returns a promise.\n * When the promise resolves, the rest of the `show` code for the step will execute.\n * @param {Object[]} options.buttons An array of buttons to add to the step. These will be rendered in a\n * footer below the main body text.\n * @param {function} options.buttons.button.action A function executed when the button is clicked on.\n * It is automatically bound to the `tour` the step is associated with, so things like `this.next` will\n * work inside the action.\n * You can use action to skip steps or navigate to specific steps, with something like:\n * ```js\n * action() {\n * return this.show('some_step_name');\n * }\n * ```\n * @param {string} options.buttons.button.classes Extra classes to apply to the `    `\n * @param {boolean} options.buttons.button.disabled Should the button be disabled?\n * @param {string} options.buttons.button.label The aria-label text of the button\n * @param {boolean} options.buttons.button.secondary If true, a shepherd-button-secondary class is applied to the button\n * @param {string} options.buttons.button.text The HTML text of the button\n * @param {boolean} options.canClickTarget A boolean, that when set to false, will set `pointer-events: none` on the target\n * @param {object} options.cancelIcon Options for the cancel icon\n * @param {boolean} options.cancelIcon.enabled Should a cancel “✕” be shown in the header of the step?\n * @param {string} options.cancelIcon.label The label to add for `aria-label`\n * @param {string} options.classes A string of extra classes to add to the step's content element.\n * @param {string} options.highlightClass An extra class to apply to the `attachTo` element when it is\n * highlighted (that is, when its step is active). You can then target that selector in your CSS.\n * @param {string} options.id The string to use as the `id` for the step.\n * @param {number} options.modalOverlayOpeningPadding An amount of padding to add around the modal overlay opening\n * @param {number} options.modalOverlayOpeningRadius An amount of border radius to add around the modal overlay opening\n * @param {object} options.popperOptions Extra options to pass to Popper\n * @param {boolean|Object} options.scrollTo Should the element be scrolled to when this step is shown? If true, uses the default `scrollIntoView`,\n * if an object, passes that object as the params to `scrollIntoView` i.e. `{behavior: 'smooth', block: 'center'}`\n * @param {function} options.scrollToHandler A function that lets you override the default scrollTo behavior and\n * define a custom action to do the scrolling, and possibly other logic.\n * @param {function} options.showOn A function that, when it returns `true`, will show the step.\n * If it returns false, the step will be skipped.\n * @param {string} options.text The text in the body of the step. It can be one of three types:\n * ```\n * - HTML string\n * - `HTMLElement` object\n * - `Function` to be executed when the step is built. It must return one the two options above.\n * ```\n * @param {string} options.title The step's title. It becomes an `h3` at the top of the step. It can be one of two types:\n * ```\n * - HTML string\n * - `Function` to be executed when the step is built. It must return HTML string.\n * ```\n * @param {object} options.when You can define `show`, `hide`, etc events inside `when`. For example:\n * ```js\n * when: {\n * show: function() {\n * window.scrollTo(0, 0);\n * }\n * }\n * ```\n * @return {Step} The newly created Step instance\n */\n constructor(tour, options = {}) {\n super(tour, options);\n this.tour = tour;\n this.classPrefix = this.tour.options\n ? normalizePrefix(this.tour.options.classPrefix)\n : '';\n this.styles = tour.styles;\n\n /**\n * Resolved attachTo options. Due to lazy evaluation, we only resolve the options during `before-show` phase.\n * Do not use this directly, use the _getResolvedAttachToOptions method instead.\n * @type {null|{}|{element, to}}\n * @private\n */\n this._resolvedAttachTo = null;\n\n autoBind(this);\n\n this._setOptions(options);\n\n return this;\n }\n\n /**\n * Cancel the tour\n * Triggers the `cancel` event\n */\n cancel() {\n this.tour.cancel();\n this.trigger('cancel');\n }\n\n /**\n * Complete the tour\n * Triggers the `complete` event\n */\n complete() {\n this.tour.complete();\n this.trigger('complete');\n }\n\n /**\n * Remove the step, delete the step's element, and destroy the Popper instance for the step.\n * Triggers `destroy` event\n */\n destroy() {\n if (this.tooltip) {\n this.tooltip.destroy();\n this.tooltip = null;\n }\n\n if (isHTMLElement(this.el) && this.el.parentNode) {\n this.el.parentNode.removeChild(this.el);\n this.el = null;\n }\n\n this._updateStepTargetOnHide();\n\n this.trigger('destroy');\n }\n\n /**\n * Returns the tour for the step\n * @return {Tour} The tour instance\n */\n getTour() {\n return this.tour;\n }\n\n /**\n * Hide the step\n */\n hide() {\n this.tour.modal.hide();\n\n this.trigger('before-hide');\n\n if (this.el) {\n this.el.hidden = true;\n }\n\n this._updateStepTargetOnHide();\n\n this.trigger('hide');\n }\n\n /**\n * Resolves attachTo options.\n * @returns {{}|{element, on}}\n * @private\n */\n _resolveAttachToOptions() {\n this._resolvedAttachTo = parseAttachTo(this);\n return this._resolvedAttachTo;\n }\n\n /**\n * A selector for resolved attachTo options.\n * @returns {{}|{element, on}}\n * @private\n */\n _getResolvedAttachToOptions() {\n if (this._resolvedAttachTo === null) {\n return this._resolveAttachToOptions();\n }\n\n return this._resolvedAttachTo;\n }\n\n /**\n * Check if the step is open and visible\n * @return {boolean} True if the step is open and visible\n */\n isOpen() {\n return Boolean(this.el && !this.el.hidden);\n }\n\n /**\n * Wraps `_show` and ensures `beforeShowPromise` resolves before calling show\n * @return {*|Promise}\n */\n show() {\n if (isFunction(this.options.beforeShowPromise)) {\n const beforeShowPromise = this.options.beforeShowPromise();\n if (!isUndefined(beforeShowPromise)) {\n return beforeShowPromise.then(() => this._show());\n }\n }\n this._show();\n }\n\n /**\n * Updates the options of the step.\n *\n * @param {Object} options The options for the step\n */\n updateStepOptions(options) {\n Object.assign(this.options, options);\n\n if (this.shepherdElementComponent) {\n this.shepherdElementComponent.$set({ step: this });\n }\n }\n\n /**\n * Returns the element for the step\n * @return {HTMLElement|null|undefined} The element instance. undefined if it has never been shown, null if it has been destroyed\n */\n getElement() {\n return this.el;\n }\n\n /**\n * Returns the target for the step\n * @return {HTMLElement|null|undefined} The element instance. undefined if it has never been shown, null if query string has not been found\n */\n getTarget() {\n return this.target;\n }\n\n /**\n * Creates Shepherd element for step based on options\n *\n * @return {Element} The DOM element for the step tooltip\n * @private\n */\n _createTooltipContent() {\n const descriptionId = `${this.id}-description`;\n const labelId = `${this.id}-label`;\n\n this.shepherdElementComponent = new ShepherdElement({\n target: this.tour.options.stepsContainer || document.body,\n props: {\n classPrefix: this.classPrefix,\n descriptionId,\n labelId,\n step: this,\n styles: this.styles\n }\n });\n\n return this.shepherdElementComponent.getElement();\n }\n\n /**\n * If a custom scrollToHandler is defined, call that, otherwise do the generic\n * scrollIntoView call.\n *\n * @param {boolean|Object} scrollToOptions If true, uses the default `scrollIntoView`,\n * if an object, passes that object as the params to `scrollIntoView` i.e. `{ behavior: 'smooth', block: 'center' }`\n * @private\n */\n _scrollTo(scrollToOptions) {\n const { element } = this._getResolvedAttachToOptions();\n\n if (isFunction(this.options.scrollToHandler)) {\n this.options.scrollToHandler(element);\n } else if (\n isElement(element) &&\n typeof element.scrollIntoView === 'function'\n ) {\n element.scrollIntoView(scrollToOptions);\n }\n }\n\n /**\n * _getClassOptions gets all possible classes for the step\n * @param {Object} stepOptions The step specific options\n * @returns {String} unique string from array of classes\n * @private\n */\n _getClassOptions(stepOptions) {\n const defaultStepOptions =\n this.tour && this.tour.options && this.tour.options.defaultStepOptions;\n const stepClasses = stepOptions.classes ? stepOptions.classes : '';\n const defaultStepOptionsClasses =\n defaultStepOptions && defaultStepOptions.classes\n ? defaultStepOptions.classes\n : '';\n const allClasses = [\n ...stepClasses.split(' '),\n ...defaultStepOptionsClasses.split(' ')\n ];\n const uniqClasses = new Set(allClasses);\n\n return Array.from(uniqClasses).join(' ').trim();\n }\n\n /**\n * Sets the options for the step, maps `when` to events, sets up buttons\n * @param {Object} options The options for the step\n * @private\n */\n _setOptions(options = {}) {\n let tourOptions =\n this.tour && this.tour.options && this.tour.options.defaultStepOptions;\n\n tourOptions = merge({}, tourOptions || {});\n\n this.options = Object.assign(\n {\n arrow: true\n },\n tourOptions,\n options\n );\n\n const { when } = this.options;\n\n this.options.classes = this._getClassOptions(options);\n\n this.destroy();\n this.id = this.options.id || `step-${uuid()}`;\n\n if (when) {\n Object.keys(when).forEach((event) => {\n this.on(event, when[event], this);\n });\n }\n }\n\n /**\n * Create the element and set up the Popper instance\n * @private\n */\n _setupElements() {\n if (!isUndefined(this.el)) {\n this.destroy();\n }\n\n this.el = this._createTooltipContent();\n\n if (this.options.advanceOn) {\n bindAdvance(this);\n }\n setupTooltip(this);\n }\n\n /**\n * Triggers `before-show`, generates the tooltip DOM content,\n * sets up a Popper instance for the tooltip, then triggers `show`.\n * @private\n */\n _show() {\n this.trigger('before-show');\n\n // Force resolve to make sure the options are updated on subsequent shows.\n this._resolveAttachToOptions();\n this._setupElements();\n\n if (!this.tour.modal) {\n this.tour._setupModal();\n }\n\n this.tour.modal.setupForStep(this);\n this._styleTargetElementForStep(this);\n this.el.hidden = false;\n\n // start scrolling to target before showing the step\n if (this.options.scrollTo) {\n setTimeout(() => {\n this._scrollTo(this.options.scrollTo);\n });\n }\n\n this.el.hidden = false;\n\n const content = this.shepherdElementComponent.getElement();\n const target = this.target || document.body;\n target.classList.add(`${this.classPrefix}shepherd-enabled`);\n target.classList.add(`${this.classPrefix}shepherd-target`);\n content.classList.add('shepherd-enabled');\n\n this.trigger('show');\n }\n\n /**\n * Modulates the styles of the passed step's target element, based on the step's options and\n * the tour's `modal` option, to visually emphasize the element\n *\n * @param step The step object that attaches to the element\n * @private\n */\n _styleTargetElementForStep(step) {\n const targetElement = step.target;\n\n if (!targetElement) {\n return;\n }\n\n if (step.options.highlightClass) {\n targetElement.classList.add(step.options.highlightClass);\n }\n\n targetElement.classList.remove('shepherd-target-click-disabled');\n\n if (step.options.canClickTarget === false) {\n targetElement.classList.add('shepherd-target-click-disabled');\n }\n }\n\n /**\n * When a step is hidden, remove the highlightClass and 'shepherd-enabled'\n * and 'shepherd-target' classes\n * @private\n */\n _updateStepTargetOnHide() {\n const target = this.target || document.body;\n\n if (this.options.highlightClass) {\n target.classList.remove(this.options.highlightClass);\n }\n\n target.classList.remove(\n 'shepherd-target-click-disabled',\n `${this.classPrefix}shepherd-enabled`,\n `${this.classPrefix}shepherd-target`\n );\n }\n}\n","import { Evented } from './evented.js';\nimport { Step } from './step.js';\nimport autoBind from './utils/auto-bind.js';\nimport {\n isHTMLElement,\n isFunction,\n isString,\n isUndefined\n} from './utils/type-check.js';\nimport { cleanupSteps } from './utils/cleanup.js';\nimport { normalizePrefix, uuid } from './utils/general.js';\nimport ShepherdModal from './components/shepherd-modal.svelte';\n\nconst Shepherd = new Evented();\n\n/**\n * Class representing the site tour\n * @extends {Evented}\n */\nexport class Tour extends Evented {\n /**\n * @param {Object} options The options for the tour\n * @param {boolean} options.confirmCancel If true, will issue a `window.confirm` before cancelling\n * @param {string} options.confirmCancelMessage The message to display in the confirm dialog\n * @param {string} options.classPrefix The prefix to add to the `shepherd-enabled` and `shepherd-target` class names as well as the `data-shepherd-step-id`.\n * @param {Object} options.defaultStepOptions Default options for Steps ({@link Step#constructor}), created through `addStep`\n * @param {boolean} options.exitOnEsc Exiting the tour with the escape key will be enabled unless this is explicitly\n * set to false.\n * @param {boolean} options.keyboardNavigation Navigating the tour via left and right arrow keys will be enabled\n * unless this is explicitly set to false.\n * @param {HTMLElement} options.stepsContainer An optional container element for the steps.\n * If not set, the steps will be appended to `document.body`.\n * @param {HTMLElement} options.modalContainer An optional container element for the modal.\n * If not set, the modal will be appended to `document.body`.\n * @param {object[] | Step[]} options.steps An array of step options objects or Step instances to initialize the tour with\n * @param {string} options.tourName An optional \"name\" for the tour. This will be appended to the the tour's\n * dynamically generated `id` property -- which is also set on the `body` element as the `data-shepherd-active-tour` attribute\n * whenever the tour becomes active.\n * @param {boolean} options.useModalOverlay Whether or not steps should be placed above a darkened\n * modal overlay. If true, the overlay will create an opening around the target element so that it\n * can remain interactive\n * @returns {Tour}\n */\n constructor(options = {}) {\n super(options);\n\n autoBind(this);\n\n const defaultTourOptions = {\n exitOnEsc: true,\n keyboardNavigation: true\n };\n\n this.options = Object.assign({}, defaultTourOptions, options);\n this.classPrefix = normalizePrefix(this.options.classPrefix);\n this.steps = [];\n this.addSteps(this.options.steps);\n\n // Pass these events onto the global Shepherd object\n const events = [\n 'active',\n 'cancel',\n 'complete',\n 'inactive',\n 'show',\n 'start'\n ];\n events.map((event) => {\n ((e) => {\n this.on(e, (opts) => {\n opts = opts || {};\n opts.tour = this;\n Shepherd.trigger(e, opts);\n });\n })(event);\n });\n\n this._setTourID();\n\n return this;\n }\n\n /**\n * Adds a new step to the tour\n * @param {Object|Step} options An object containing step options or a Step instance\n * @param {number} index The optional index to insert the step at. If undefined, the step\n * is added to the end of the array.\n * @return {Step} The newly added step\n */\n addStep(options, index) {\n let step = options;\n\n if (!(step instanceof Step)) {\n step = new Step(this, step);\n } else {\n step.tour = this;\n }\n\n if (!isUndefined(index)) {\n this.steps.splice(index, 0, step);\n } else {\n this.steps.push(step);\n }\n\n return step;\n }\n\n /**\n * Add multiple steps to the tour\n * @param {Array | Array} steps The steps to add to the tour\n */\n addSteps(steps) {\n if (Array.isArray(steps)) {\n steps.forEach((step) => {\n this.addStep(step);\n });\n }\n\n return this;\n }\n\n /**\n * Go to the previous step in the tour\n */\n back() {\n const index = this.steps.indexOf(this.currentStep);\n this.show(index - 1, false);\n }\n\n /**\n * Calls _done() triggering the 'cancel' event\n * If `confirmCancel` is true, will show a window.confirm before cancelling\n */\n cancel() {\n if (this.options.confirmCancel) {\n const cancelMessage =\n this.options.confirmCancelMessage ||\n 'Are you sure you want to stop the tour?';\n const stopTour = window.confirm(cancelMessage);\n if (stopTour) {\n this._done('cancel');\n }\n } else {\n this._done('cancel');\n }\n }\n\n /**\n * Calls _done() triggering the `complete` event\n */\n complete() {\n this._done('complete');\n }\n\n /**\n * Gets the step from a given id\n * @param {Number|String} id The id of the step to retrieve\n * @return {Step} The step corresponding to the `id`\n */\n getById(id) {\n return this.steps.find((step) => {\n return step.id === id;\n });\n }\n\n /**\n * Gets the current step\n * @returns {Step|null}\n */\n getCurrentStep() {\n return this.currentStep;\n }\n\n /**\n * Hide the current step\n */\n hide() {\n const currentStep = this.getCurrentStep();\n\n if (currentStep) {\n return currentStep.hide();\n }\n }\n\n /**\n * Check if the tour is active\n * @return {boolean}\n */\n isActive() {\n return Shepherd.activeTour === this;\n }\n\n /**\n * Go to the next step in the tour\n * If we are at the end, call `complete`\n */\n next() {\n const index = this.steps.indexOf(this.currentStep);\n\n if (index === this.steps.length - 1) {\n this.complete();\n } else {\n this.show(index + 1, true);\n }\n }\n\n /**\n * Removes the step from the tour\n * @param {String} name The id for the step to remove\n */\n removeStep(name) {\n const current = this.getCurrentStep();\n\n // Find the step, destroy it and remove it from this.steps\n this.steps.some((step, i) => {\n if (step.id === name) {\n if (step.isOpen()) {\n step.hide();\n }\n\n step.destroy();\n this.steps.splice(i, 1);\n\n return true;\n }\n });\n\n if (current && current.id === name) {\n this.currentStep = undefined;\n\n // If we have steps left, show the first one, otherwise just cancel the tour\n this.steps.length ? this.show(0) : this.cancel();\n }\n }\n\n /**\n * Show a specific step in the tour\n * @param {Number|String} key The key to look up the step by\n * @param {Boolean} forward True if we are going forward, false if backward\n */\n show(key = 0, forward = true) {\n const step = isString(key) ? this.getById(key) : this.steps[key];\n\n if (step) {\n this._updateStateBeforeShow();\n\n const shouldSkipStep =\n isFunction(step.options.showOn) && !step.options.showOn();\n\n // If `showOn` returns false, we want to skip the step, otherwise, show the step like normal\n if (shouldSkipStep) {\n this._skipStep(step, forward);\n } else {\n this.trigger('show', {\n step,\n previous: this.currentStep\n });\n\n this.currentStep = step;\n step.show();\n }\n }\n }\n\n /**\n * Start the tour\n */\n start() {\n this.trigger('start');\n\n // Save the focused element before the tour opens\n this.focusedElBeforeOpen = document.activeElement;\n\n this.currentStep = null;\n\n this._setupModal();\n\n this._setupActiveTour();\n this.next();\n }\n\n /**\n * Called whenever the tour is cancelled or completed, basically anytime we exit the tour\n * @param {String} event The event name to trigger\n * @private\n */\n _done(event) {\n const index = this.steps.indexOf(this.currentStep);\n if (Array.isArray(this.steps)) {\n this.steps.forEach((step) => step.destroy());\n }\n\n cleanupSteps(this);\n\n this.trigger(event, { index });\n\n Shepherd.activeTour = null;\n this.trigger('inactive', { tour: this });\n\n if (this.modal) {\n this.modal.hide();\n }\n\n if (event === 'cancel' || event === 'complete') {\n if (this.modal) {\n const modalContainer = document.querySelector(\n '.shepherd-modal-overlay-container'\n );\n\n if (modalContainer) {\n modalContainer.remove();\n }\n }\n }\n\n // Focus the element that was focused before the tour started\n if (isHTMLElement(this.focusedElBeforeOpen)) {\n this.focusedElBeforeOpen.focus();\n }\n }\n\n /**\n * Make this tour \"active\"\n * @private\n */\n _setupActiveTour() {\n this.trigger('active', { tour: this });\n\n Shepherd.activeTour = this;\n }\n\n /**\n * _setupModal create the modal container and instance\n * @private\n */\n _setupModal() {\n this.modal = new ShepherdModal({\n target: this.options.modalContainer || document.body,\n props: {\n classPrefix: this.classPrefix,\n styles: this.styles\n }\n });\n }\n\n /**\n * Called when `showOn` evaluates to false, to skip the step or complete the tour if it's the last step\n * @param {Step} step The step to skip\n * @param {Boolean} forward True if we are going forward, false if backward\n * @private\n */\n _skipStep(step, forward) {\n const index = this.steps.indexOf(step);\n\n if (index === this.steps.length - 1) {\n this.complete();\n } else {\n const nextIndex = forward ? index + 1 : index - 1;\n this.show(nextIndex, forward);\n }\n }\n\n /**\n * Before showing, hide the current step and if the tour is not\n * already active, call `this._setupActiveTour`.\n * @private\n */\n _updateStateBeforeShow() {\n if (this.currentStep) {\n this.currentStep.hide();\n }\n\n if (!this.isActive()) {\n this._setupActiveTour();\n }\n }\n\n /**\n * Sets this.id to `${tourName}--${uuid}`\n * @private\n */\n _setTourID() {\n const tourName = this.options.tourName || 'tour';\n\n this.id = `${tourName}--${uuid()}`;\n }\n}\n\nexport { Shepherd };\n","import { Step } from './step.js';\nimport { Shepherd, Tour } from './tour.js';\n\nObject.assign(Shepherd, { Tour, Step });\n\nexport default Shepherd;\n"],"names":["cloneUnlessOtherwiseSpecified","value","options","clone","isMergeableObject","deepmerge","Array","isArray","defaultArrayMerge","target","source","concat","map","element","getEnumerableOwnPropertySymbols","Object","getOwnPropertySymbols","filter","symbol","propertyIsEnumerable","getKeys","keys","propertyIsOnObject","object","property","_","mergeObject","destination","forEach","key","hasOwnProperty","call","customMerge","getMergeFunction","arrayMerge","sourceIsArray","targetIsArray","isFunction","isString","autoBind","self","getOwnPropertyNames","constructor","i","length","val","bind","_setupAdvanceOnHandler","selector","step","event","isOpen","targetIsEl","currentTarget","el","undefined","isUndefined","matches","tour","next","bindAdvance","advanceOn","handler","document","querySelector","e","addEventListener","on","removeEventListener","body","console","error","getNodeName","toLowerCase","nodeName","getWindow","node","window","toString","ownerDocument","defaultView","isElement","OwnElement","Element","isHTMLElement","HTMLElement","isShadowRoot","ShadowRoot","getBasePlacement","placement","split","getBoundingClientRect","includeScale","rect","scaleX","scaleY","offsetHeight","offsetWidth","round","width","height","top","right","bottom","left","x","y","getLayoutRect","clientRect","Math","abs","offsetLeft","offsetTop","contains","parent","child","rootNode","getRootNode","isSameNode","parentNode","host","getComputedStyle","getDocumentElement","documentElement","getParentNode","assignedSlot","getTrueOffsetParent","position","offsetParent","getOffsetParent","indexOf","isFirefox","navigator","userAgent","getContainingBlock","currentNode","css","transform","perspective","contain","willChange","getMainAxisFromPlacement","mergePaddingObject","paddingObject","assign","expandToHashMap","reduce","hashMap","getVariation","mapToStyles","_ref2","_Object$assign2","popper","popperRect","variation","offsets","gpuAcceleration","adaptive","roundOffsets","isFixed","_offsets$x","_offsets$y","_ref3","hasX","hasY","sideX","sideY","win","heightProp","widthProp","end","visualViewport","commonStyles","unsetSides","roundOffsetsByDPR","dpr","devicePixelRatio","_ref4","_Object$assign","getOppositePlacement","replace","matched","hash","getOppositeVariationPlacement","getWindowScroll","scrollLeft","pageXOffset","scrollTop","pageYOffset","getWindowScrollBarX","isScrollParent","_getComputedStyle","test","overflow","overflowY","overflowX","getScrollParent","listScrollParents","list","_element$ownerDocumen","scrollParent","isBody","updatedList","rectToClientRect","getClientRectFromMixedType","clippingParent","viewport","html","clientWidth","clientHeight","clientTop","clientLeft","winScroll","max","scrollWidth","scrollHeight","direction","getClippingParents","clippingParents","clipperElement","canEscapeClipping","getClippingRect","boundary","rootBoundary","mainClippingParents","clippingRect","accRect","min","computeOffsets","_ref","reference","basePlacement","commonX","commonY","mainAxis","len","start","detectOverflow","state","_options","_options$placement","_options$boundary","_options$rootBoundary","_options$elementConte","elementContext","_options$altBoundary","altBoundary","_options$padding","padding","basePlacements","rects","elements","clippingClientRect","contextElement","referenceClientRect","popperOffsets","strategy","popperClientRect","elementClientRect","overflowOffsets","offsetData","modifiersData","offset","multiply","axis","computeAutoPlacement","flipVariations","_options$allowedAutoP","allowedAutoPlacements","allPlacements","placements","variationPlacements","allowedPlacements","overflows","acc","sort","a","b","getExpandedFallbackPlacements","auto","oppositePlacement","getSideOffsets","preventedOffsets","isAnySideFullyClipped","some","side","getCompositeRect","elementOrVirtualElement","isOffsetParentAnElement","isElementScaled","offsetParentIsScaled","scroll","order","modifiers","modifier","visited","add","name","requires","requiresIfExists","dep","has","depModifier","get","result","push","Map","Set","set","orderModifiers","orderedModifiers","modifierPhases","phase","debounce","fn","pending","Promise","resolve","then","mergeByName","merged","current","existing","data","areValidElements","_len","arguments","args","_key","_getCenteredStylePopperModifier","attributes","style","removeAttribute","setAttribute","makeCenteredPopper","centeredStylePopperModifier","popperOptions","enabled","setTimeout","focus","from","normalizePrefix","prefix","charAt","uuid","d","Date","now","c","random","floor","r","getPopperOptions","attachToOptions","altAxis","tether","defaultStepOptions","_mergeModifiers","stepOptions","mergedPopperOptions","mod","filteredModifiers","names","noop","tar","src","k","run","is_function","thing","safe_not_equal","detach","removeChild","svg_element","createElementNS","listen","attr","attribute","getAttribute","set_attributes","descriptors","getOwnPropertyDescriptors","__proto__","cssText","toggle_class","toggle","classList","get_current_component","current_component","Error","add_render_callback","render_callbacks","flush","saved_component","flushidx","dirty_components","component","$$","fragment","update","before_update","fns","dirty","p","ctx","after_update","binding_callbacks","pop","seen_callbacks","callback","flush_callbacks","update_scheduled","clear","group_outros","outros","check_outros","transition_in","block","local","outroing","delete","transition_out","o","create_component","mount_component","anchor","customElement","on_mount","on_destroy","m","new_on_destroy","destroy_component","detaching","init","instance","create_fragment","not_equal","props","append_styles","parent_component","bound","create","on_disconnect","context","callbacks","skip_bound","root","ready","ret","resolved_promise","fill","hydrate","nodes","children","childNodes","l","intro","createElement","button","button_class_value","insertBefore","apply","getConfigOption","option","config","$$props","action","classes","disabled","label","secondary","text","$$invalidate","createTextNode","each_blocks","iterations","create_if_block","footer","buttons","button_aria_label_value","appendChild","span","cancelIcon","preventDefault","cancel","h3","labelId","title","innerHTML","$$value","create_if_block_1","header","div","descriptionId","show_if_2","show_if_1","show_if","arrow","attachTo","div_aria_describedby_value","to_null_out","accounted_for","$$scope","updates","n","levels","getClassesArray","className","classPrefix","firstFocusableElement","focusableElements","lastFocusableElement","dataStepId","hasCancelIcon","hasTitle","id","querySelectorAll","oldClasses","remove","newClasses","keyCode","KEY_TAB","shiftKey","activeElement","KEY_ESC","exitOnEsc","LEFT_ARROW","keyboardNavigation","back","RIGHT_ARROW","cleanupSteps","steps","canClickTarget","svg","path","_getScrollParent","parentElement","closeModalOpening","openingProperties","hide","modalIsVisible","_cleanupStepEventListeners","positionModal","modalOverlayOpeningPadding","modalOverlayOpeningRadius","targetElement","elementRect","scrollRect","scrollBottom","show","rafId","cancelAnimationFrame","_preventModalBodyTouch","passive","_styleForStep","rafLoop","requestAnimationFrame","pathDefinition","innerWidth","w","innerHeight","h","stopPropagation","setupForStep","useModalOverlay","isNonNullObject","stringValue","prototype","$$typeof","REACT_ELEMENT_TYPE","canUseSymbol","Symbol","for","all","deepmerge.all","array","prev","cjs","Evented","once","bindings","off","binding","index","splice","trigger","DEFAULT_OPTIONS","createPopper","popperGenerator","generatorOptions","_generatorOptions$def","_generatorOptions","defaultModifiers","_generatorOptions$def2","defaultOptions","runModifierEffects","_ref3$options","effect","cleanupFn","effectCleanupFns","noopFn","cleanupModifierEffects","styles","isDestroyed","setOptions","setOptionsAction","scrollParents","forceUpdate","_state$elements","reset","_state$orderedModifie","_state$orderedModifie2","destroy","onFirstUpdate","eventListeners","_options$scroll","_options$resize","resize","popperOffsets$1","computeStyles$1","computeStyles","_ref5","_options$gpuAccelerat","_options$adaptive","_options$roundOffsets","applyStyles$1","applyStyles","effect$2","initialStyles","margin","styleProperties","offset$1","_options$offset","distanceAndSkiddingToXY","invertDistance","skidding","distance","_data$state$placement","flip$1","flip","_skip","_options$mainAxis","checkMainAxis","_options$altAxis","checkAltAxis","specifiedFallbackPlacements","fallbackPlacements","_options$flipVariatio","preferredPlacement","isBasePlacement","referenceRect","checksMap","makeFallbackChecks","firstFittingPlacement","_basePlacement","isStartVariation","isVertical","mainVariationSide","altVariationSide","checks","every","check","_loop","_i","fittingPlacement","find","slice","preventOverflow$1","preventOverflow","_options$tether","_options$tetherOffset","tetherOffset","tetherOffsetValue","normalizedTetherOffsetValue","offsetModifierState","_offsetModifierState$","mainSide","altSide","additive","minLen","maxLen","arrowElement","arrowRect","arrowPaddingObject","arrowPaddingMin","arrowPaddingMax","arrowLen","mathMax","min$1","mathMin","minOffset","maxOffset","clientOffset","arrowOffsetParent","offsetModifierValue","tetherMax","preventedOffset","_offsetModifierState$2","_offset","_min","_max","isOriginSide","_offsetModifierValue","_tetherMin","_tetherMax","v","withinMaxClamp","within","_preventedOffset","arrow$1","_state$modifiersData$","minProp","maxProp","endDiff","startDiff","clientSize","center","centerOffset","effect$1","_options$element","hide$1","referenceOverflow","popperAltOverflow","referenceClippingOffsets","popperEscapeOffsets","isReferenceHidden","hasPopperEscaped","SvelteComponent","$destroy","$on","type","$set","$$set","module","polyfill","scrollElement","shouldBailOut","firstArg","behavior","TypeError","hasScrollableSpace","ROUNDING_TOLERANCE","canOverflow","overflowValue","isScrollable","isScrollableY","isScrollableX","elapsed","startTime","SCROLL_TIME","cos","PI","currentX","startX","currentY","startY","method","scrollable","smoothScroll","scrollX","scrollY","original","__forceSmoothScrollPolyfill__","scrollTo","scrollBy","elementScroll","scrollIntoView","performance","isMicrosoftBrowser","w.scrollTo","w.scrollBy","Element.prototype.scrollTo","SyntaxError","Element.prototype.scrollBy","Element.prototype.scrollIntoView","parentRects","scrollableParent","clientRects","smoothscroll","Step","_resolvedAttachTo","_setOptions","complete","tooltip","_updateStepTargetOnHide","getTour","modal","hidden","_resolveAttachToOptions","returnOpts","_getResolvedAttachToOptions","Boolean","beforeShowPromise","_show","updateStepOptions","shepherdElementComponent","getElement","getTarget","_createTooltipContent","ShepherdElement","stepsContainer","_scrollTo","scrollToOptions","scrollToHandler","_getClassOptions","defaultStepOptionsClasses","allClasses","uniqClasses","join","trim","tourOptions","merge","when","_setupElements","content","_setupModal","_styleTargetElementForStep","highlightClass","Shepherd","Tour","defaultTourOptions","addSteps","events","opts","_setTourID","addStep","currentStep","confirmCancel","_done","getById","getCurrentStep","isActive","activeTour","removeStep","forward","_updateStateBeforeShow","showOn","_skipStep","previous","focusedElBeforeOpen","_setupActiveTour","modalContainer","ShepherdModal"],"mappings":"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"} \ No newline at end of file From 98897932a502bf92ed070a77a348a867dc4af276 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Sat, 13 Dec 2025 23:36:46 -0600 Subject: [PATCH 217/962] Replace markdown library with mistune markdown.py had parsing errors that were throwing off img srcsets. --- bookwyrm/connectors/openlibrary.py | 6 +++--- bookwyrm/models/fields.py | 4 ++-- bookwyrm/views/status.py | 4 ++-- requirements.txt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index 032a86f580..55e3616fd4 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -3,7 +3,7 @@ import re from typing import Any, Optional, Union, Iterator, Iterable -from markdown import markdown +import mistune from bookwyrm import models from bookwyrm.book_search import SearchResult @@ -249,9 +249,9 @@ def ignore_edition(edition_data: JsonDict) -> bool: def get_description(description_blob: Union[JsonDict, str]) -> str: """descriptions can be a string or a dict""" if isinstance(description_blob, dict): - description = markdown(description_blob.get("value", "")) + description = mistune.html(description_blob.get("value", "")) else: - description = markdown(description_blob) + description = mistune.html(description_blob) if ( description.startswith("

    ") diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index ecc1976db6..787ad1dd9a 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -16,7 +16,7 @@ from django.utils import timezone from django.utils.translation import gettext_lazy as _ from django.utils.encoding import filepath_to_uri -from markdown import markdown +import mistune from bookwyrm import activitypub from bookwyrm.connectors import get_image @@ -605,7 +605,7 @@ def field_from_activity(self, value, allow_external_connections=True, trigger=No return clean(value) def field_to_activity(self, value): - return markdown(value) if value else value + return mistune.html(value) if value else value class ArrayField(ActivitypubFieldMixin, DjangoArrayField): diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index 2f698f04e0..cfa9736bee 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -16,7 +16,7 @@ from django.views import View from django.views.decorators.http import require_POST -from markdown import markdown +import mistune from bookwyrm import forms, models from bookwyrm.models.report import DELETE_ITEM from bookwyrm.utils import regex, sanitizer @@ -344,6 +344,6 @@ def _unwrap(text): def to_markdown(content): """catch links and convert to markdown""" content = format_links(content) - content = markdown(content) + content = mistune.html(content) # sanitize resulting html return sanitizer.clean(content) diff --git a/requirements.txt b/requirements.txt index 42dd578691..c5d500d3d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,7 @@ flower==2.0.1 gunicorn==23.0.0 hiredis==2.3.2 libsass==0.23.0 -Markdown==3.6 +mistune==3.1.2 opentelemetry-api==1.24.0 opentelemetry-exporter-otlp-proto-grpc==1.24.0 opentelemetry-instrumentation-celery==0.45b0 From 568fe739034af006450808a46234f5a177f39d5f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 20 Dec 2025 12:31:28 -0800 Subject: [PATCH 218/962] New translations django.po (Yiddish) --- locale/yi_DE/LC_MESSAGES/django.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/locale/yi_DE/LC_MESSAGES/django.po b/locale/yi_DE/LC_MESSAGES/django.po index 61348e4def..f6ff92768a 100644 --- a/locale/yi_DE/LC_MESSAGES/django.po +++ b/locale/yi_DE/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-12-17 03:02\n" +"PO-Revision-Date: 2025-12-20 20:31\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Yiddish\n" "Language: yi\n" @@ -400,31 +400,31 @@ msgstr "באַשטעטיקט" #: bookwyrm/models/report.py:85 msgid "Resolved report" -msgstr "" +msgstr "באַריך פֿאַרענטפֿערט" #: bookwyrm/models/report.py:86 msgid "Re-opened report" -msgstr "" +msgstr "באַריך איבערגעעפֿנט" #: bookwyrm/models/report.py:87 msgid "Messaged reporter" -msgstr "" +msgstr "געשיקט אַן אָנזאָג צום באַריכטער" #: bookwyrm/models/report.py:88 msgid "Messaged reported user" -msgstr "" +msgstr "געשיקט אַן אָנזאָג צום געקלאָגענער" #: bookwyrm/models/report.py:89 msgid "Suspended user" -msgstr "" +msgstr "ניצער אױסגעשלאָסן" #: bookwyrm/models/report.py:90 msgid "Un-suspended user" -msgstr "" +msgstr "נניצער אומגעשלאָסן" #: bookwyrm/models/report.py:91 msgid "Changed user permission level" -msgstr "" +msgstr "געביטן די רשות־מדרגה פֿון ניצער" #: bookwyrm/models/report.py:92 msgid "Deleted user account" From 6803dd71179b2c3c8d12138b6f82d7e3fb84045a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 20 Dec 2025 13:32:53 -0800 Subject: [PATCH 219/962] New translations django.po (Yiddish) --- locale/yi_DE/LC_MESSAGES/django.po | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/locale/yi_DE/LC_MESSAGES/django.po b/locale/yi_DE/LC_MESSAGES/django.po index f6ff92768a..53840c93f6 100644 --- a/locale/yi_DE/LC_MESSAGES/django.po +++ b/locale/yi_DE/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-12-20 20:31\n" +"PO-Revision-Date: 2025-12-20 21:32\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Yiddish\n" "Language: yi\n" @@ -428,78 +428,78 @@ msgstr "געביטן די רשות־מדרגה פֿון ניצער" #: bookwyrm/models/report.py:92 msgid "Deleted user account" -msgstr "" +msgstr "ניצער־קאָנטע אױסגעמעקט" #: bookwyrm/models/report.py:93 msgid "Blocked domain" -msgstr "" +msgstr "װעב־שטח געלײגט אױף חרם" #: bookwyrm/models/report.py:94 msgid "Approved domain" -msgstr "" +msgstr "װעב־שטח אַפּראָבירט" #: bookwyrm/models/report.py:95 msgid "Deleted item" -msgstr "" +msgstr "אײנס אױסגעמעקט" #: bookwyrm/models/session.py:42 msgid "Unknown" -msgstr "" +msgstr "אומבאַקאַנט" #: bookwyrm/models/status.py:192 #, python-format msgid "%(display_name)s's status" -msgstr "" +msgstr "%(display_name)sס מצבֿ" #: bookwyrm/models/status.py:367 #, python-format msgid "%(display_name)s's comment on %(book_title)s" -msgstr "" +msgstr "%(display_name)sס קאָמענטאַר װעגן %(book_title)s" #: bookwyrm/models/status.py:418 #, python-format msgid "%(display_name)s's quote from %(book_title)s" -msgstr "" +msgstr "%(display_name)sס ציטאַט פֿון %(book_title)s" #: bookwyrm/models/status.py:454 #, python-format msgid "%(display_name)s's review of %(book_title)s" -msgstr "" +msgstr "%(display_name)sס רעצענזיע פֿון %(book_title)s" #: bookwyrm/models/status.py:486 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(display_name)s האָט געשאַצט %(book_title)s: %(display_rating). 1f שטערן" +msgstr[1] "%(display_name)s האָט געשאַצט %(book_title)s: %(display_rating). 1f שטערן" #: bookwyrm/models/user.py:39 bookwyrm/templates/book/book.html:336 msgid "Reviews" -msgstr "" +msgstr "רעצענזיעס" #: bookwyrm/models/user.py:40 msgid "Comments" -msgstr "" +msgstr "קאָמענטאַרן" #: bookwyrm/models/user.py:41 bookwyrm/templates/import/import_user.html:154 msgid "Quotations" -msgstr "" +msgstr "ציטאַטן" #: bookwyrm/models/user.py:42 msgid "Everything else" -msgstr "" +msgstr "איבעריקע" #: bookwyrm/settings.py:238 msgid "Home Timeline" -msgstr "" +msgstr "הײם־כראָנאָלאָגיע" #: bookwyrm/settings.py:238 msgid "Home" -msgstr "" +msgstr "הײם" #: bookwyrm/settings.py:239 msgid "Books Timeline" -msgstr "" +msgstr "ביכער־כראָנאָלאָגיע" #: bookwyrm/settings.py:239 #: bookwyrm/templates/guided_tour/user_profile.html:101 @@ -508,7 +508,7 @@ msgstr "" #: bookwyrm/templates/search/layout.html:44 #: bookwyrm/templates/user/layout.html:107 msgid "Books" -msgstr "" +msgstr "ביכער" #: bookwyrm/settings.py:316 msgid "English" From c4c3a33a49e95180eb5b4db5af6af0808fc83248 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 20 Dec 2025 14:30:13 -0800 Subject: [PATCH 220/962] New translations django.po (Yiddish) --- locale/yi_DE/LC_MESSAGES/django.po | 248 ++++++++++++++--------------- 1 file changed, 124 insertions(+), 124 deletions(-) diff --git a/locale/yi_DE/LC_MESSAGES/django.po b/locale/yi_DE/LC_MESSAGES/django.po index 53840c93f6..2019f00e2e 100644 --- a/locale/yi_DE/LC_MESSAGES/django.po +++ b/locale/yi_DE/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-11-16 19:21+0000\n" -"PO-Revision-Date: 2025-12-20 21:32\n" +"PO-Revision-Date: 2025-12-20 22:30\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Yiddish\n" "Language: yi\n" @@ -512,329 +512,329 @@ msgstr "ביכער" #: bookwyrm/settings.py:316 msgid "English" -msgstr "" +msgstr "English (ענגליש)" #: bookwyrm/settings.py:317 msgid "Català (Catalan)" -msgstr "" +msgstr "Català (קאַטאַלאַניש)" #: bookwyrm/settings.py:318 msgid "Deutsch (German)" -msgstr "" +msgstr "Deutsch (דײַטש)" #: bookwyrm/settings.py:319 msgid "Esperanto (Esperanto)" -msgstr "" +msgstr "Esperanto (עספּעראַנטאָ)" #: bookwyrm/settings.py:320 msgid "Español (Spanish)" -msgstr "" +msgstr "Español (שפּאַניש)" #: bookwyrm/settings.py:321 msgid "Euskara (Basque)" -msgstr "" +msgstr "Euskara (באַסקיש)" #: bookwyrm/settings.py:322 msgid "Galego (Galician)" -msgstr "" +msgstr "Galego (גאַליסיש)" #: bookwyrm/settings.py:323 msgid "Italiano (Italian)" -msgstr "" +msgstr "Italiano (איטאַליעניש)" #: bookwyrm/settings.py:324 msgid "한국어 (Korean)" -msgstr "" +msgstr "한국어 (קאָרעניש)" #: bookwyrm/settings.py:325 msgid "Suomi (Finnish)" -msgstr "" +msgstr "Suomi (פֿיניש)" #: bookwyrm/settings.py:326 msgid "Français (French)" -msgstr "" +msgstr "Français (פֿראַנצײזיש)" #: bookwyrm/settings.py:327 msgid "Lietuvių (Lithuanian)" -msgstr "" +msgstr "Lietuvių (ליטװיש)" #: bookwyrm/settings.py:328 msgid "Nederlands (Dutch)" -msgstr "" +msgstr "Nederlands (האָלענדיש)" #: bookwyrm/settings.py:329 msgid "Norsk (Norwegian)" -msgstr "" +msgstr "Norsk (נאָרװעגיש)" #: bookwyrm/settings.py:330 msgid "Polski (Polish)" -msgstr "" +msgstr "Polski (פּױליש)" #: bookwyrm/settings.py:331 msgid "Português do Brasil (Brazilian Portuguese)" -msgstr "" +msgstr "Português do Brasil (בראַזיליאַנער פּאָרטוגעזיש)" #: bookwyrm/settings.py:332 msgid "Português Europeu (European Portuguese)" -msgstr "" +msgstr "Português Europeu (אײראָפּעיש פּאָרטוגעזיש)" #: bookwyrm/settings.py:333 msgid "Română (Romanian)" -msgstr "" +msgstr "Română (רומעניש)" #: bookwyrm/settings.py:334 msgid "Svenska (Swedish)" -msgstr "" +msgstr "Svenska (שװעדיש)" #: bookwyrm/settings.py:335 msgid "Українська (Ukrainian)" -msgstr "" +msgstr "Українська (אוקראַיִניש)" #: bookwyrm/settings.py:336 msgid "简体中文 (Simplified Chinese)" -msgstr "" +msgstr "简体中文 (פֿאַרפּשוטערן כינעזיש)" #: bookwyrm/settings.py:337 msgid "繁體中文 (Traditional Chinese)" -msgstr "" +msgstr "繁體中文 (טראַדיציאָנעל כינעזיש)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "אױ, װײ!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" -msgstr "" +msgstr "נישט צוגעלאָזט" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr " איר האָט נישט רשות צו זײן דעם בלאַט אָדער טאָן אַזאַ אַקציע. אײַער ניצער רשות־מדרגה איז %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "אױב איר מײנט אַז איר זאָלט האָבן צוטריט, זאָלט איר רעדן מיט אײַער BookWyrm צושטעלער־אַדמיניסטראַטאָר." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" -msgstr "" +msgstr "נישט געפֿונען" #: bookwyrm/templates/404.html:9 msgid "The page you requested doesn't seem to exist!" -msgstr "" +msgstr "דער בלאָט װאָס האָט געבאָטן איז, אַ פּנים, נישטאָ!" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "טעקע צו גרױס" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "די טעקע װאָס איר לאָדט אַרױף איז צו גרױס." #: bookwyrm/templates/413.html:11 msgid "You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting." -msgstr "" +msgstr "איר זאָלסט פּרוּװן אַ טעקע אַ קלענערע, אָדער בעטן אַז אײַער BookWyrm צושטעלער־אַדמיניסטראַטאָר זאָל פֿאַרגרעסערן די DATA_UPLOAD_MAX_MEMORY_SIZE פֿיקסירונג." #: bookwyrm/templates/500.html:4 msgid "Oops!" -msgstr "" +msgstr "אוף!" #: bookwyrm/templates/500.html:8 msgid "Server Error" -msgstr "" +msgstr "צושטעלער־טעות" #: bookwyrm/templates/500.html:9 msgid "Something went wrong! Sorry about that." -msgstr "" +msgstr "עפּעס איז קאַליע געװאָרן! זײַט מוחל." #: bookwyrm/templates/about/about.html:9 #: bookwyrm/templates/about/layout.html:35 msgid "About" -msgstr "" +msgstr "װעגן" #: bookwyrm/templates/about/about.html:22 #: bookwyrm/templates/get_started/layout.html:22 #, python-format msgid "Welcome to %(site_name)s!" -msgstr "" +msgstr "ברוך־⁠הבאָ אין %(site_name)s!" #: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." -msgstr "" +msgstr "%(site_name)s איז אַ טײל פֿון BookWyrm, אַ נעץ אומאָפּהענגיקע, אַלײן־געפֿירטע קהילות פֿאַר לײנדערס. איר קענט גלאַטיק האָבן אַן אינטעראַקציע מיט ניצערס װוּ עס זאָל נישט זײַן אין דער BookWyrm נעץ, איז דאָס קהילה אָבער אײנציק." #: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." -msgstr "" +msgstr "%(title)s איז %(site_name)sס באַליבסט בוך, מיט אַ שאַצונג־דורכשניט פֿון %(rating)s פֿון 5 שטערן." #: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." -msgstr "" +msgstr "עס זענען מער %(site_name)s ניצערס װאָס װילן לײנען %(title)s פֿון אַלע אַנדערע ביכער." #: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." -msgstr "" +msgstr "%(title)s האָט די שפּאַלטערישסטע שאַצונגען פֿון אַלע ביכער אױף %(site_name)s." #: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." -msgstr "" +msgstr "האַלט דעם חשבון פֿון אײַער לײנען, שמועסט װעגן ביכער, שרײַבט רעצענזיעס, און אַנטדעקט װאָס נאָך צו לײנען. אַלעמאָל אָן רעקלאַמען, אַנטי־קאָרפּאָראַטיװ, און קהילה־געװענדט, BookWyrm איז מענטש־פֿאַרנעמיק פּראָגראַמװאַרג, געצילעװעט צו בלײַבן קלײן און פּערזענלעך. אױב איר האָט מעלה־פֿאַרלאַנגען, דיבוק־רעפּאָרטן, אָדער גרױסע שטרעבונגען, זײַט מקרבֿ און מאַכט זיך געהערט." #: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" -msgstr "" +msgstr "באַקענען זיך מיט אײַערע אַדמינס" #: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." -msgstr "" +msgstr "%(site_name)sס שלישים און אַדמיניסטראַטאָרס האַלטן דעם זײט אױף, דורכפֿירן דעם אױפֿפֿיר־קאָדעקס, און ענטפֿערן אַז ניצערס באַריכטן מיסט און עבֿירות." #: bookwyrm/templates/about/about.html:124 msgid "Moderator" -msgstr "" +msgstr "שליש" #: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" -msgstr "" +msgstr "אַדמין" #: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 msgid "Send direct message" -msgstr "" +msgstr "שיקן אַ דירעקט־אָנזאָג" #: bookwyrm/templates/about/conduct.html:4 #: bookwyrm/templates/about/conduct.html:9 #: bookwyrm/templates/about/layout.html:41 #: bookwyrm/templates/snippets/footer.html:27 msgid "Code of Conduct" -msgstr "" +msgstr "אױפֿפֿיר־קאָדעקס" #: bookwyrm/templates/about/impressum.html:4 #: bookwyrm/templates/about/impressum.html:9 #: bookwyrm/templates/about/layout.html:54 #: bookwyrm/templates/snippets/footer.html:34 msgid "Impressum" -msgstr "" +msgstr "אימפּרעסום" #: bookwyrm/templates/about/layout.html:11 msgid "Active users:" -msgstr "" +msgstr "אַקטיװע ניצערס׃" #: bookwyrm/templates/about/layout.html:15 msgid "Statuses posted:" -msgstr "" +msgstr "מצבֿים געמאָלדן׃" #: bookwyrm/templates/about/layout.html:19 #: bookwyrm/templates/setup/config.html:68 msgid "Software version:" -msgstr "" +msgstr "פּראָגראַמװאַרג־װערסיע" #: bookwyrm/templates/about/layout.html:30 #: bookwyrm/templates/embed-layout.html:34 #: bookwyrm/templates/snippets/footer.html:8 #, python-format msgid "About %(site_name)s" -msgstr "" +msgstr "װעגן %(site_name)s" #: bookwyrm/templates/about/layout.html:47 #: bookwyrm/templates/about/privacy.html:4 #: bookwyrm/templates/about/privacy.html:9 #: bookwyrm/templates/snippets/footer.html:30 msgid "Privacy Policy" -msgstr "" +msgstr "דאַטנשיץ־פּאָליטיק" #: bookwyrm/templates/annual_summary/layout.html:7 #: bookwyrm/templates/feed/summary_card.html:8 #, python-format msgid "%(year)s in the books" -msgstr "" +msgstr "%(year)s אין די ביכער" #: bookwyrm/templates/annual_summary/layout.html:43 #, python-format msgid "%(year)s in the books" -msgstr "" +msgstr "%(year)s אין די ביכער" #: bookwyrm/templates/annual_summary/layout.html:47 #, python-format msgid "%(display_name)s’s year of reading" -msgstr "" +msgstr "%(display_name)sס לײעניאָר" #: bookwyrm/templates/annual_summary/layout.html:53 msgid "Share this page" -msgstr "" +msgstr "מעלדן דעם בלאַט" #: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" -msgstr "" +msgstr "קאָפּירן אַדרעס" #: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:277 msgid "Copied!" -msgstr "" +msgstr "קאָפּירט!" #: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" -msgstr "" +msgstr "װײַזן־מצבֿ; עפֿנטלעך מיט שליסל" #: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." -msgstr "" +msgstr "דען בלאַט קען יעדער אײנער זײן מיטן גאַנצן אַדרעס" #: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" -msgstr "" +msgstr "מאַכן בלאַט פּריװאַט" #: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" -msgstr "" +msgstr "װײַזן־מצבֿ׃ פּריװאַט" #: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." -msgstr "" +msgstr "דער בלאַט איז פּריװאַט, איר אַלײן קען עס זײן" #: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" -msgstr "" +msgstr "מאַכן בלאַט פּריװאַט" #: bookwyrm/templates/annual_summary/layout.html:99 msgid "When you make your page private, the old key won’t give access to the page anymore. A new key will be created if the page is once again made public." -msgstr "" +msgstr "אַז איר מאַכט דעם בלאַט פּריװאַט, גיט דער געװעזנער שליסל מער נישט צוטריט צום בלאַט. עס װעט מאַכן אַ נײַעם שליסל אױב דער בלאַט איז נאָך אַ מאָל עפֿנטלעך געמאַכט." #: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any books in %(year)s" -msgstr "" +msgstr "צום באַדױערן האָט %(display_name)s נאָשט אָפּגעלײנט קײן בוך אין %(year)s" #: bookwyrm/templates/annual_summary/layout.html:118 #, python-format msgid "In %(year)s, %(display_name)s read %(books_total)s book
    for a total of %(pages_total)s pages!" msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
    for a total of %(pages_total)s pages!" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "אין %(year)s האָט %(display_name)s אָפּגעלײנט %(books_total)s בוך
    %(pages_total)s בלעטער בסך־הכּל!" +msgstr[1] "אין %(year)s האָט %(display_name)s אָפּגעלײנט %(books_total)s ביכער
    %(pages_total)s בלעטער בסך־הכּל!" #: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" -msgstr "" +msgstr "אױסגעצײכנט!" #: bookwyrm/templates/annual_summary/layout.html:128 #, python-format msgid "That makes an average of %(pages)s pages per book." -msgstr "" +msgstr "דאָס איז אַ דורכשניץ פֿון %(pages)s בלעטער אַ בוך!" #: bookwyrm/templates/annual_summary/layout.html:134 #, python-format msgid "(No page data was available for %(no_page_number)s book)" msgid_plural "(No page data was available for %(no_page_number)s books)" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "(נישטאָ קײן בלאַט־אינפֿאָרמאַציע פֿאַר %(no_page_number)s בוך)" +msgstr[1] "(נישטאָ קײן בלאַט־אינפֿאָרמאַציע פֿאַר %(no_page_number)s ביכער)" #: bookwyrm/templates/annual_summary/layout.html:150 msgid "Their shortest read this year…" -msgstr "" +msgstr "דאָס קורצסטע לײנונג הײַיאָר…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 @@ -844,187 +844,187 @@ msgstr "" #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 msgid "by" -msgstr "" +msgstr "פֿון" #: bookwyrm/templates/annual_summary/layout.html:163 #: bookwyrm/templates/annual_summary/layout.html:184 #, python-format msgid "%(pages)s pages" -msgstr "" +msgstr "%(pages)s בלעטער" #: bookwyrm/templates/annual_summary/layout.html:171 msgid "…and the longest" -msgstr "" +msgstr "…און דאָס לאַנגסטע" #: bookwyrm/templates/annual_summary/layout.html:202 #, python-format msgid "%(display_name)s set a goal of reading %(goal)s book in %(year)s,
    and achieved %(goal_percent)s%% of that goal" msgid_plural "%(display_name)s set a goal of reading %(goal)s books in %(year)s,
    and achieved %(goal_percent)s%% of that goal" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(display_name)s האָט זיך געצילט צו לײנען אָפּ %(goal)s בוך אין %(year)s, און האָט דערגרײכט %(goal_percent)s%% פֿון דעם ציל!" +msgstr[1] "%(display_name)s האָט זיך געצילט צו לײנען אָפּ %(goal)s ביכער אין %(year)s, און האָט דערגרײכט %(goal_percent)s%% פֿון דעם ציל!" #: bookwyrm/templates/annual_summary/layout.html:211 msgid "Way to go!" -msgstr "" +msgstr "יישר־כּוח!" #: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "%(display_name)s left %(ratings_total)s rating,
    their average rating is %(rating_average)s" msgid_plural "%(display_name)s left %(ratings_total)s ratings,
    their average rating is %(rating_average)s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(display_name)s האָט געלאָזט %(ratings_total)s שאַצונג,
    %(rating_average)s אין דורכשניץ" +msgstr[1] "%(display_name)s האָט געלאָזט %(ratings_total)s שאַצונגען,
    %(rating_average)s אין דורכשניץ" #: bookwyrm/templates/annual_summary/layout.html:240 msgid "Their best rated review" -msgstr "" +msgstr "די בעסטע רעצענזיע׃" #: bookwyrm/templates/annual_summary/layout.html:253 #, python-format msgid "Their rating: %(rating)s" -msgstr "" +msgstr "זײער שאַצונג׃ %(rating)s" #: bookwyrm/templates/annual_summary/layout.html:270 #, python-format msgid "All the books %(display_name)s read in %(year)s" -msgstr "" +msgstr "די אַלע ביכער װאָס %(display_name)s האָט געלײנט אין %(year)s" #: bookwyrm/templates/author/author.html:19 #: bookwyrm/templates/author/author.html:20 msgid "Edit Author" -msgstr "" +msgstr "רעדאַקטירן מחבר" #: bookwyrm/templates/author/author.html:36 msgid "Author details" -msgstr "" +msgstr "מחבר־פּרטים" #: bookwyrm/templates/author/author.html:40 #: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" -msgstr "" +msgstr "אַליאַסן׃" #: bookwyrm/templates/author/author.html:49 msgid "Born:" -msgstr "" +msgstr "געבױרן׃" #: bookwyrm/templates/author/author.html:56 msgid "Died:" -msgstr "" +msgstr "געשטאָרבן׃" #: bookwyrm/templates/author/author.html:66 msgid "External links" -msgstr "" +msgstr "דרױסנדיקע פֿאַרבינדונגען" #: bookwyrm/templates/author/author.html:71 msgid "Wikipedia" -msgstr "" +msgstr "װיקיפּעדיע" #: bookwyrm/templates/author/author.html:79 msgid "View on Wikidata" -msgstr "" +msgstr "אָנקוקן אױפֿ װיקידאַטן" #: bookwyrm/templates/author/author.html:87 msgid "Website" -msgstr "" +msgstr "װעבזײַטל" #: bookwyrm/templates/author/author.html:95 msgid "View ISNI record" -msgstr "" +msgstr "אָנקוקן ISNI רעקאָרד" #: bookwyrm/templates/author/author.html:103 #: bookwyrm/templates/book/book.html:183 msgid "View on ISFDB" -msgstr "" +msgstr "אָנקוקן אױף ISFDB" #: bookwyrm/templates/author/author.html:108 #: bookwyrm/templates/author/sync_modal.html:5 #: bookwyrm/templates/book/book.html:150 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" -msgstr "" +msgstr "אַרײַנלאָדן דאַטן" #: bookwyrm/templates/author/author.html:112 #: bookwyrm/templates/book/book.html:154 msgid "View on OpenLibrary" -msgstr "" +msgstr "אָנקוקן אױף OpenLibrary" #: bookwyrm/templates/author/author.html:127 #: bookwyrm/templates/book/book.html:168 msgid "View on Inventaire" -msgstr "" +msgstr "אָנקוקן אױף Inventaire" #: bookwyrm/templates/author/author.html:143 msgid "View on LibraryThing" -msgstr "" +msgstr "אָנקוקן אױף LibraryThing" #: bookwyrm/templates/author/author.html:151 msgid "View on Goodreads" -msgstr "" +msgstr "אָנקוקן אױף Goodreads" #: bookwyrm/templates/author/author.html:166 #, python-format msgid "Books by %(name)s" -msgstr "" +msgstr "ביכער פֿון %(name)s" #: bookwyrm/templates/author/edit_author.html:5 msgid "Edit Author:" -msgstr "" +msgstr "רעדאַקטירן מחבר" #: bookwyrm/templates/author/edit_author.html:13 #: bookwyrm/templates/book/edit/edit_book.html:25 msgid "Added:" -msgstr "" +msgstr "צוגעגעבן" #: bookwyrm/templates/author/edit_author.html:14 #: bookwyrm/templates/book/edit/edit_book.html:28 msgid "Updated:" -msgstr "" +msgstr "דערהײַנטיקט׃" #: bookwyrm/templates/author/edit_author.html:16 #: bookwyrm/templates/book/edit/edit_book.html:32 msgid "Last edited by:" -msgstr "" +msgstr "פֿריער רעדאַקטירט פֿון׃" #: bookwyrm/templates/author/edit_author.html:33 #: bookwyrm/templates/book/edit/edit_book_form.html:21 msgid "Metadata" -msgstr "" +msgstr "מעטאַדאַטן׃" #: bookwyrm/templates/author/edit_author.html:35 #: bookwyrm/templates/lists/form.html:9 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:14 #: bookwyrm/templates/shelf/form.html:9 msgid "Name:" -msgstr "" +msgstr "נאָמען׃" #: bookwyrm/templates/author/edit_author.html:44 #: bookwyrm/templates/book/edit/edit_book_form.html:91 #: bookwyrm/templates/book/edit/edit_book_form.html:161 msgid "Separate multiple values with commas." -msgstr "" +msgstr "זונדערט אָפּ פֿאַרשידענע גרײסן מיט קאָמעס׃" #: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" -msgstr "" +msgstr "ביאָגראַפֿיע׃" #: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" -msgstr "" +msgstr "װיקיפּעדיע פֿאַרבינדונג׃" #: bookwyrm/templates/author/edit_author.html:58 msgid "Wikidata:" -msgstr "" +msgstr "װיקידאַטן׃" #: bookwyrm/templates/author/edit_author.html:62 msgid "Website:" -msgstr "" +msgstr "װעבזײַטל׃" #: bookwyrm/templates/author/edit_author.html:67 msgid "Birth date:" -msgstr "" +msgstr "געבױרן־טאָג׃" #: bookwyrm/templates/author/edit_author.html:74 msgid "Death date:" -msgstr "" +msgstr "געשטאָרבן־טאָג" #: bookwyrm/templates/author/edit_author.html:81 msgid "Author Identifiers" @@ -1032,29 +1032,29 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:83 msgid "Openlibrary key:" -msgstr "" +msgstr "Openlibrary שליסל׃" #: bookwyrm/templates/author/edit_author.html:90 #: bookwyrm/templates/book/edit/edit_book_form.html:336 msgid "Inventaire ID:" -msgstr "" +msgstr "Inventaire ID:" #: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" -msgstr "" +msgstr "Librarything שליסל׃" #: bookwyrm/templates/author/edit_author.html:104 #: bookwyrm/templates/book/edit/edit_book_form.html:345 msgid "Goodreads key:" -msgstr "" +msgstr "Goodreads שליסל׃" #: bookwyrm/templates/author/edit_author.html:111 msgid "ISFDB:" -msgstr "" +msgstr "ISFDB:" #: bookwyrm/templates/author/edit_author.html:118 msgid "ISNI:" -msgstr "" +msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 #: bookwyrm/templates/book/book.html:249 @@ -1077,7 +1077,7 @@ msgstr "" #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" -msgstr "" +msgstr "אױפֿהיטן" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 @@ -1103,7 +1103,7 @@ msgstr "" #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" -msgstr "" +msgstr "אַנולירן" #: bookwyrm/templates/author/sync_modal.html:15 #, python-format From 882228de8ebfa0789290888a96600bfc9374d219 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Sat, 20 Dec 2025 22:03:26 -0600 Subject: [PATCH 221/962] Strip newline from mistune output It doesn't hugely matter one way or another, but the existing tests all expect no newline, so why rock the boat. --- bookwyrm/connectors/openlibrary.py | 4 ++-- bookwyrm/models/fields.py | 2 +- bookwyrm/views/status.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index 55e3616fd4..fbe0907bb9 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -249,9 +249,9 @@ def ignore_edition(edition_data: JsonDict) -> bool: def get_description(description_blob: Union[JsonDict, str]) -> str: """descriptions can be a string or a dict""" if isinstance(description_blob, dict): - description = mistune.html(description_blob.get("value", "")) + description = mistune.html(description_blob.get("value", "")).rstrip() else: - description = mistune.html(description_blob) + description = mistune.html(description_blob).rstrip() if ( description.startswith("

    ") diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index 787ad1dd9a..bac1e028c4 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -605,7 +605,7 @@ def field_from_activity(self, value, allow_external_connections=True, trigger=No return clean(value) def field_to_activity(self, value): - return mistune.html(value) if value else value + return mistune.html(value).rstrip() if value else value class ArrayField(ActivitypubFieldMixin, DjangoArrayField): diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index cfa9736bee..fab7929e27 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -344,6 +344,6 @@ def _unwrap(text): def to_markdown(content): """catch links and convert to markdown""" content = format_links(content) - content = mistune.html(content) + content = mistune.html(content).rstrip() # sanitize resulting html return sanitizer.clean(content) From 74693247e8527852a3d9ebb63c823f3c76c03c68 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Sat, 20 Dec 2025 22:10:53 -0600 Subject: [PATCH 222/962] Update test to reflect conversion of quote character --- bookwyrm/tests/connectors/test_openlibrary_connector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 19df39599d..be5a0b92e0 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -329,7 +329,7 @@ def test_create_edition_markdown_from_data(self): result = self.connector.create_edition_from_data(work, self.edition_md_data) self.assertEqual( result.description, - '

    \n

    "She didn\'t choose her garden" opens this chapbook ' + '

    \n

    "She didn\'t choose her garden" opens this chapbook ' "exploring Black womanhood, mental and physical health, spirituality, and " "ancestral roots. It is an investigation of how to locate a self amidst " "complex racial history and how to forge an authentic way forward. There's " From 5a36fe8d9d7a9c5b3392139635b1e00001b55c17 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Sun, 31 Aug 2025 21:31:18 -0500 Subject: [PATCH 223/962] Whitelist img elements in statuses etc This is all that's needed to allow basic image insertion via markdown. --- bookwyrm/utils/sanitizer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/utils/sanitizer.py b/bookwyrm/utils/sanitizer.py index d5ac0daa6f..605939b02a 100644 --- a/bookwyrm/utils/sanitizer.py +++ b/bookwyrm/utils/sanitizer.py @@ -21,6 +21,7 @@ def clean(input_text: str) -> str: "ul", "ol", "li", + "img", }, attributes=["href", "rel", "src", "alt", "data-mention"], strip=True, From f9e7ead4c1b24811f50daf627c1400841b1ec223 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Sun, 7 Sep 2025 20:55:40 -0500 Subject: [PATCH 224/962] Drag-n-drop uploader stub --- bookwyrm/static/js/xhr_files.js | 62 +++++++++++++++++++ bookwyrm/templates/layout.html | 1 + .../snippets/create_status/content_field.html | 1 + 3 files changed, 64 insertions(+) create mode 100644 bookwyrm/static/js/xhr_files.js diff --git a/bookwyrm/static/js/xhr_files.js b/bookwyrm/static/js/xhr_files.js new file mode 100644 index 0000000000..567f165cf6 --- /dev/null +++ b/bookwyrm/static/js/xhr_files.js @@ -0,0 +1,62 @@ +/* exported XhrFiles */ +/* globals BookWyrm */ + +let XhrFiles = new (class { + constructor() { + this.initEventListeners(); + } + + initEventListeners() { + window.addEventListener("dragover", (e) => { e.preventDefault(); }); + + window.addEventListener("drop", (e) => { e.preventDefault(); }); + + document + .querySelectorAll("[data-droppable-textfield]") + .forEach((t) => t.addEventListener("drop", this.dropFile.bind(this))); + } + + /** + * Upload file when dropped in element + * + * @param {Event} event + * @return {undefined} + */ + dropFile(event) { + console.log(event); + event.preventDefault(); + + let result = ""; + // Use DataTransferItemList interface to access the file(s) + [...event.dataTransfer.items].forEach((item, i) => { + // If dropped items aren't files, reject them + if (item.kind === "file") { + const file = item.getAsFile(); + this.uploadFile(file); + result += `• file[${i}].name = ${file.name}\n`; + } + }); + console.log(result); + } + + uploadFile(file) { + var xhr = new XMLHttpRequest(); + (xhr.upload || xhr).addEventListener('progress', function(e) { + var done = e.position || e.loaded + var total = e.totalSize || e.total; + console.log('xhr progress: ' + Math.round(done/total*100) + '%'); + }); + xhr.addEventListener('load', function(e) { + if (this.status != 200) { + console.log(e); + return; + } + console.log(e); + }); + xhr.open('post', '/your-sever-url', true); + var fd = new FormData(); + fd.append("filename", file.name); + fd.append("file", file); + xhr.send(fd); + } +})(); diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index ced4e80061..ec203b59d6 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -207,6 +207,7 @@ + diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html index cc4205b2ce..7ae266d57a 100644 --- a/bookwyrm/templates/snippets/create_status/content_field.html +++ b/bookwyrm/templates/snippets/create_status/content_field.html @@ -12,6 +12,7 @@ + {% endblock %} diff --git a/bookwyrm/templates/lists/list_item.html b/bookwyrm/templates/lists/list_item.html index a6465d407a..3bff1a45f5 100644 --- a/bookwyrm/templates/lists/list_item.html +++ b/bookwyrm/templates/lists/list_item.html @@ -3,6 +3,7 @@ {% load book_display_tags %} {% load markdown %} {% load group_tags %} +{% load utilities %}

    {% with book=item.edition %} @@ -33,8 +34,8 @@

    - {% blocktrans trimmed with username=item.user.display_name user_path=item.user.local_path %} - Added by {{ username }} + {% blocktrans trimmed with username=item.user.display_name user_link=item.user|user_link %} + Added by {{ user_link }} {% endblocktrans %}

    diff --git a/bookwyrm/templates/lists/list_item_notes.html b/bookwyrm/templates/lists/list_item_notes.html index ca9ab576a3..0a9d39198d 100644 --- a/bookwyrm/templates/lists/list_item_notes.html +++ b/bookwyrm/templates/lists/list_item_notes.html @@ -9,8 +9,8 @@
    {% url 'user-feed' item.user|username as user_path %} - {% blocktrans trimmed with username=item.user.display_name %} - {{ username }} says: + {% blocktrans trimmed with user_link=item.user|user_link %} + {{ user_link }} says: {% endblocktrans %}
    diff --git a/bookwyrm/templates/lists/suggestion_list.html b/bookwyrm/templates/lists/suggestion_list.html new file mode 100644 index 0000000000..2ebe8d236b --- /dev/null +++ b/bookwyrm/templates/lists/suggestion_list.html @@ -0,0 +1,19 @@ +{% extends 'lists/list.html' %} +{% load i18n %} +{% load group_tags %} +{% load utilities %} + +{% block breadcrumbs %} + +{% endblock %} + +{% block emded_link %}{% endblock %} diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index be2ff24d6d..6c0859a37e 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -33,6 +33,17 @@ def get_user_identifier(user): return user.localname if user.localname else user.username +@register.filter(is_safe=True) +@register.filter(name="user_link") +def get_link_to_user(user): + """get a link to a user profile, or display if the user has been deleted""" + username = user.display_name + if user.is_active: + return mark_safe(f"{username}") + text = _("deactivated user") + return mark_safe(f"{text}") + + @register.filter(name="user_from_remote_id") def get_user_identifier_from_remote_id(remote_id): """get the local user id from their remote id""" @@ -95,7 +106,7 @@ def get_isni_bio(existing, author): return "" for value in existing: if hasattr(value, "bio") and auth_isni == re.sub(r"\D", "", str(value.isni)): - return mark_safe(f"Author of {value.bio}") + return mark_safe(_(f"Author of {value.bio}")) return "" diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py index 8e3fa97f1c..db8de4a4e3 100644 --- a/bookwyrm/views/suggestion_list.py +++ b/bookwyrm/views/suggestion_list.py @@ -83,7 +83,7 @@ def get( data["suggested_books"] = get_list_suggestions( book_list, request.user, query=query, ignore_book=book_list.suggests_for ) - return TemplateResponse(request, "lists/list.html", data) + return TemplateResponse(request, "lists/suggestion_list.html", data) @method_decorator(login_required, name="dispatch") def post( From f0a1ba629eaf66fbaaaff51aa5ec098f45bd6088 Mon Sep 17 00:00:00 2001 From: Leni Kadali Date: Fri, 22 May 2026 22:10:53 +0300 Subject: [PATCH 681/962] Redo migration as part of branch update Redid migration as part of updating the branch --- ...{0229_listitem_raw_notes.py => 0230_listitem_raw_notes.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename bookwyrm/migrations/{0229_listitem_raw_notes.py => 0230_listitem_raw_notes.py} (70%) diff --git a/bookwyrm/migrations/0229_listitem_raw_notes.py b/bookwyrm/migrations/0230_listitem_raw_notes.py similarity index 70% rename from bookwyrm/migrations/0229_listitem_raw_notes.py rename to bookwyrm/migrations/0230_listitem_raw_notes.py index 98b0656bab..6155fc749b 100644 --- a/bookwyrm/migrations/0229_listitem_raw_notes.py +++ b/bookwyrm/migrations/0230_listitem_raw_notes.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.14 on 2026-05-20 20:27 +# Generated by Django 5.2.14 on 2026-05-22 19:10 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0228_remove_user_bookwyrm_us_is_acti_972dc4_idx_and_more'), + ('bookwyrm', '0229_series_mergedseries_seriesbook'), ] operations = [ From ff62f472ce8a9a4ae57e8d3be804b745e36e0ccf Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 22 May 2026 13:38:06 -0700 Subject: [PATCH 682/962] Adds arbitrary dev command runner to bw-dev --- bw-dev | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bw-dev b/bw-dev index c28d914909..85e5a83203 100755 --- a/bw-dev +++ b/bw-dev @@ -128,6 +128,9 @@ case "$CMD" in down) $DOCKER_COMPOSE down ;; + devcommand) + $DOCKER_COMPOSE -f docker-compose.yml -f docker-compose.dev.yml --env-file .env --env-file .env.dev "$@" + ;; docker_cache_cleanup) echo "Showing current docker storage usage" docker system df From d1ffe75f29adc4dc0d6a9d7c4d66a796f8abfc9b Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 23 May 2026 07:08:55 +1000 Subject: [PATCH 683/962] add merge migration --- bookwyrm/migrations/0230_merge_20260522_2105.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 bookwyrm/migrations/0230_merge_20260522_2105.py diff --git a/bookwyrm/migrations/0230_merge_20260522_2105.py b/bookwyrm/migrations/0230_merge_20260522_2105.py new file mode 100644 index 0000000000..37c10e382c --- /dev/null +++ b/bookwyrm/migrations/0230_merge_20260522_2105.py @@ -0,0 +1,14 @@ +# Generated by Django 5.2.14 on 2026-05-22 21:05 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0229_alter_review_name'), + ('bookwyrm', '0229_series_mergedseries_seriesbook'), + ] + + operations = [ + ] From e79fc42b89a95cc2a6a0cbb0761b2f114b056fed Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 23 May 2026 08:57:56 +1000 Subject: [PATCH 684/962] minor improvements from review --- ..._blocked_books.py => 0231_user_blocked_books.py} | 4 ++-- bookwyrm/models/book.py | 13 ++++++------- bookwyrm/models/status.py | 10 ++++++++-- bookwyrm/tests/views/test_feed.py | 2 +- bookwyrm/views/feed.py | 2 +- bookwyrm/views/preferences/books.py | 1 - bookwyrm/views/shelf/shelf.py | 2 +- bookwyrm/views/user.py | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) rename bookwyrm/migrations/{0229_user_blocked_books.py => 0231_user_blocked_books.py} (71%) diff --git a/bookwyrm/migrations/0229_user_blocked_books.py b/bookwyrm/migrations/0231_user_blocked_books.py similarity index 71% rename from bookwyrm/migrations/0229_user_blocked_books.py rename to bookwyrm/migrations/0231_user_blocked_books.py index 1a82e1ce51..ebfbc77f5b 100644 --- a/bookwyrm/migrations/0229_user_blocked_books.py +++ b/bookwyrm/migrations/0231_user_blocked_books.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.9 on 2026-05-10 07:32 +# Generated by Django 5.2.14 on 2026-05-22 21:53 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0228_remove_user_bookwyrm_us_is_acti_972dc4_idx_and_more'), + ('bookwyrm', '0230_merge_20260522_2105'), ] operations = [ diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index c420d3add8..3d0c797c72 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -853,18 +853,17 @@ def repair(self): self.save(update_fields=["parent_work"], broadcast=False) @classmethod - def viewer_aware_objects(cls, viewer, check_blocked=False): - """annotate a book query with metadata related to the user""" + def viewer_aware_objects(cls, viewer): + """filter blocked books and annotate a book query with metadata related to the user""" queryset = cls.objects - if check_blocked and hasattr(viewer, "blocked_books"): - blocked = cls.objects.filter(parent_work__in=viewer.blocked_books.all()) - queryset = queryset.exclude(id__in=blocked) - # TODO: could this just be queryset = queryset.exclude(parent_work__in=viewer.blocked_books.all()) ? - if not viewer or not viewer.is_authenticated: return queryset + queryset = queryset.exclude( + parent_work__in=viewer.blocked_books.values_list("id", flat=True) + ) + queryset = queryset.prefetch_related( Prefetch( "shelfbook_set", diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 201b28b01f..6c3fd23b1e 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -277,9 +277,15 @@ def direct_filter(cls, queryset, viewer): ) @classmethod - def safety_filter(cls, viewer, privacy_levels=None): + def blocked_book_filter(cls, viewer, privacy_levels=None): + """filter out all statuses related to a book this user has blocked""" + queryset = super().privacy_filter(viewer, privacy_levels=privacy_levels) - blocked = viewer.blocked_books.all() if hasattr(viewer, "blocked_books") else [] + + if not viewer or not viewer.is_authenticated: + return queryset + + blocked = viewer.blocked_books.values_list("id", flat=True) book_comments = queryset.filter(comment__book__parent_work__in=blocked) book_quotations = queryset.filter(quotation__book__parent_work__in=blocked) diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index 9cc2a0d917..2ae3608307 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -233,7 +233,7 @@ def test_get_suggested_book_filters_blocked(self, *_): ) awful_book = models.Edition.objects.create( - parent_work=models.Work.objects.create(title="hi"), + parent_work=models.Work.objects.create(title="bad book"), title="This book is very bad", remote_id="https://example.com/book/99", ) diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index edb1f1f29a..da1c3048e5 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -275,7 +275,7 @@ def get_suggested_books(user, max_books=5): shelf_preview = { "name": shelf.name, "identifier": shelf.identifier, - "books": models.Edition.viewer_aware_objects(user, check_blocked=True) + "books": models.Edition.viewer_aware_objects(user) .filter( shelfbook__shelf=shelf, ) diff --git a/bookwyrm/views/preferences/books.py b/bookwyrm/views/preferences/books.py index 6ff8296bb3..12085793d7 100644 --- a/bookwyrm/views/preferences/books.py +++ b/bookwyrm/views/preferences/books.py @@ -1,5 +1,4 @@ from django.contrib.auth.decorators import login_required -from django.http import HttpResponse from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse from django.utils.decorators import method_decorator diff --git a/bookwyrm/views/shelf/shelf.py b/bookwyrm/views/shelf/shelf.py index 5eb9140d44..ec9c3c2c78 100644 --- a/bookwyrm/views/shelf/shelf.py +++ b/bookwyrm/views/shelf/shelf.py @@ -49,7 +49,7 @@ def get(self, request, username, shelf_identifier=None): ) books = ( - models.Edition.viewer_aware_objects(request.user, check_blocked=True) + models.Edition.viewer_aware_objects(request.user) .filter( # privacy is ensured because the shelves are already filtered above shelfbook__shelf__in=shelves diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index 5a052e1850..63c846e4c3 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -71,7 +71,7 @@ def get(self, request, username): # user's posts activities = ( - models.Status.safety_filter( + models.Status.blocked_book_filter( request.user, ) .filter(user=user) From e114e6e5f43e24a0e4dccbaa8f0e1a93e40eb7ca Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 23 May 2026 09:22:39 +1000 Subject: [PATCH 685/962] clean up view and filter logic for blocked books --- bookwyrm/templatetags/book_display_tags.py | 10 +++++----- bookwyrm/views/list/list.py | 22 +++++++++++----------- bookwyrm/views/user.py | 9 ++++----- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/bookwyrm/templatetags/book_display_tags.py b/bookwyrm/templatetags/book_display_tags.py index f6726bcedc..4455626bc8 100644 --- a/bookwyrm/templatetags/book_display_tags.py +++ b/bookwyrm/templatetags/book_display_tags.py @@ -39,9 +39,9 @@ def get_author_edition(book, author): @register.filter(name="blocked_book_filter") def blocked_book_filter(queryset, viewer): """filter out blocked books from querysets with editions as 'book'""" - blocked = ( - viewer.blocked_books.all().values_list("id", flat=True) - if hasattr(viewer, "blocked_books") - else [] - ) + + if not viewer or not viewer.is_authenticated: + return queryset + + blocked = viewer.blocked_books.all().values_list("id", flat=True) return queryset.exclude(book__parent_work__in=blocked) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 6a3d3780de..389dc7e031 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -45,17 +45,17 @@ def get(self, request, list_id, **kwargs): if redirect_option := maybe_redirect_local_path(request, book_list): return redirect_option - # do not use this exclude in decrement_order etc because it will mess up ordering - if hasattr(request.user, "blocked_books"): - items = ( - book_list.listitem_set.filter(approved=True) - .exclude(book__parent_work__in=request.user.blocked_books.all()) - .prefetch_related("user", "book", "book__authors") - ) - else: - items = book_list.listitem_set.filter(approved=True).prefetch_related( - "user", "book", "book__authors" - ) + # NOTE: do not use this exclude in decrement_order etc because it will mess up ordering + blocked = [] + if request.user.is_authenticated: + blocked = request.user.blocked_books.values_list("id", flat=True) + + items = ( + book_list.listitem_set.filter(approved=True) + .exclude(book__parent_work__in=blocked) + .prefetch_related("user", "book", "book__authors") + ) + items = sort_list(request, items) paginated = Paginator(items, PAGE_LENGTH) diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index 63c846e4c3..578d29e610 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -52,11 +52,10 @@ def get(self, request, username): else: shelves = user.shelf_set.filter(books__isnull=False).distinct() - blocked = ( - request.user.blocked_books.all() - if hasattr(request.user, "blocked_books") - else [] - ) + blocked = [] + if request.user.is_authenticated: + blocked = request.user.blocked_books.values_list("id", flat=True) + for user_shelf in shelves.all()[:3]: shelf_preview.append( { From 1d1c85f8edca71def447a190172091e05c2cb592 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 23 May 2026 09:45:39 +1000 Subject: [PATCH 686/962] tidy list exclude --- bookwyrm/views/list/list.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 389dc7e031..f4a7b32900 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -118,7 +118,9 @@ def get_list_suggestions(book_list, user, query=None, num_suggestions=5): ) # just suggest whatever books are nearby suggestions = ( - user.shelfbook_set.exclude(book__parent_work__in=user.blocked_books.all()) + user.shelfbook_set.exclude( + book__parent_work__in=user.blocked_books.values_list("id", flat=True) + ) .filter(~Q(book__in=book_list.books.all())) .distinct()[:num_suggestions] ) @@ -126,7 +128,9 @@ def get_list_suggestions(book_list, user, query=None, num_suggestions=5): if len(suggestions) < num_suggestions: others = [ s.default_edition - for s in models.Work.objects.exclude(id__in=user.blocked_books.all()) + for s in models.Work.objects.exclude( + id__in=user.blocked_books.values_list("id", flat=True) + ) .filter( ~Q(editions__in=book_list.books.all()), ) From 7f041ecce0afc6766bd71a481c7a645025a9c700 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 07:28:41 -0700 Subject: [PATCH 687/962] Fixes edit list item --- bookwyrm/templates/lists/edit_item_form.html | 3 ++- bookwyrm/views/list/list_item.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/lists/edit_item_form.html b/bookwyrm/templates/lists/edit_item_form.html index 2ef753e84e..0ede6212ab 100644 --- a/bookwyrm/templates/lists/edit_item_form.html +++ b/bookwyrm/templates/lists/edit_item_form.html @@ -5,7 +5,8 @@ action="{% url 'list-item' list.id item.id %}" > {% csrf_token %} - + + {% include "lists/item_notes_field.html" with form_id=item.id %} diff --git a/bookwyrm/views/list/list_item.py b/bookwyrm/views/list/list_item.py index 29b6bb7ec1..c771fd27b2 100644 --- a/bookwyrm/views/list/list_item.py +++ b/bookwyrm/views/list/list_item.py @@ -16,6 +16,8 @@ class ListItem(View): def post(self, request, list_id, list_item): """Edit a list item's notes""" list_item = get_object_or_404(models.ListItem, id=list_item, book_list=list_id) + list_item.raise_not_editable(request.user) + form = forms.ListItemForm(request.POST, instance=list_item) if form.is_valid(): item = form.save(request, commit=False) From db3d82fe39eb192368d257787f3072a2b7ae9f7e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 07:43:54 -0700 Subject: [PATCH 688/962] Only show "reader who liked..." message when books are present --- bookwyrm/templates/book/suggestion_list/list.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 2cb8c59725..fa0c62f9ac 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -11,14 +11,16 @@

    {% endif %}

    -

    - {% blocktrans trimmed with title=book.title %} - Readers who liked {{ title }} recommend giving these books a try: - {% endblocktrans %} -

    - {% if suggestion_list %} + {% if items|length > 0 %} +

    + {% blocktrans trimmed with title=book.title %} + Readers who liked {{ title }} recommend giving these books a try: + {% endblocktrans %} +

    + {% endif %} + {% if items|length == 0 %}
    From db3d9a1a3fbf0b235c217105ce4b3d61b00bdd82 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 08:23:40 -0700 Subject: [PATCH 689/962] Fixes editing list items --- bookwyrm/models/list.py | 12 +++++ bookwyrm/templates/lists/edit_item_form.html | 6 +-- bookwyrm/templates/lists/list_item_notes.html | 3 +- bookwyrm/urls.py | 5 ++ bookwyrm/views/__init__.py | 2 +- bookwyrm/views/list/list_item.py | 48 ++++++++++++++----- 6 files changed, 59 insertions(+), 17 deletions(-) diff --git a/bookwyrm/models/list.py b/bookwyrm/models/list.py index 2fe51b2fc8..df18402a91 100644 --- a/bookwyrm/models/list.py +++ b/bookwyrm/models/list.py @@ -273,8 +273,14 @@ class ListItem(AbstractListItem): @property def work(self): + """match the suggestion list model by producing a work""" return self.edition.parent_work + @property + def edit_path_name(self): + """the form submit link to edit this item""" + return "list-item" + @property def privacy(self): """inherit the privacy of the list, or direct if pending""" @@ -317,8 +323,14 @@ class SuggestionListItem(AbstractListItem): @property def edition(self): + """match the list model by producing an edition""" return self.work.default_edition + @property + def edit_path_name(self): + """the form submit link to edit this item""" + return "suggestion-list-item" + class Meta: """A book may only be placed into a list once, and each order in the list may be used only once""" diff --git a/bookwyrm/templates/lists/edit_item_form.html b/bookwyrm/templates/lists/edit_item_form.html index 0ede6212ab..b0768ec33f 100644 --- a/bookwyrm/templates/lists/edit_item_form.html +++ b/bookwyrm/templates/lists/edit_item_form.html @@ -2,11 +2,11 @@
    {% csrf_token %} - - + + {% include "lists/item_notes_field.html" with form_id=item.id %} diff --git a/bookwyrm/templates/lists/list_item_notes.html b/bookwyrm/templates/lists/list_item_notes.html index 0a9d39198d..784d797c86 100644 --- a/bookwyrm/templates/lists/list_item_notes.html +++ b/bookwyrm/templates/lists/list_item_notes.html @@ -27,7 +27,8 @@ - {% include "lists/edit_item_form.html" with edition=item.book %} + {% url item.edit_path_name list.id item.id as path %} + {% include "lists/edit_item_form.html" with item=item list=list path=path %}
    {% endif %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 508627bea7..dec1f59677 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -657,6 +657,11 @@ re_path( rf"^list/(?P\d+){regex.SLUG}/?$", views.List.as_view(), name="list" ), + re_path( + r"^suggestionlist/(?P\d+)/item/(?P\d+)/?$", + views.SuggestionListItem.as_view(), + name="suggestion-list-item", + ), re_path( r"^list/(?P\d+)/item/(?P\d+)/?$", views.ListItem.as_view(), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 0e15e5a72a..60633d949e 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -132,7 +132,7 @@ # lists from .list.curate import Curate from .list.embed import unsafe_embed_list -from .list.list_item import ListItem +from .list.list_item import ListItem, SuggestionListItem from .list.lists import Lists, SavedLists, UserLists from .list.list import ( List, diff --git a/bookwyrm/views/list/list_item.py b/bookwyrm/views/list/list_item.py index c771fd27b2..fa49654366 100644 --- a/bookwyrm/views/list/list_item.py +++ b/bookwyrm/views/list/list_item.py @@ -1,11 +1,12 @@ """book list views""" from django.contrib.auth.decorators import login_required -from django.shortcuts import get_object_or_404, redirect +from django.shortcuts import get_object_or_404 from django.utils.decorators import method_decorator from django.views import View from bookwyrm import forms, models +from bookwyrm.views.helpers import redirect_to_referer from bookwyrm.views.status import to_markdown @@ -15,14 +16,37 @@ class ListItem(View): def post(self, request, list_id, list_item): """Edit a list item's notes""" - list_item = get_object_or_404(models.ListItem, id=list_item, book_list=list_id) - list_item.raise_not_editable(request.user) - - form = forms.ListItemForm(request.POST, instance=list_item) - if form.is_valid(): - item = form.save(request, commit=False) - item.notes = to_markdown(item.notes) - item.save() - else: - raise Exception(form.errors) - return redirect("list", list_item.book_list.id) + return edit_list_item( + request, list_id, list_item, models.ListItem, forms.ListItemForm + ) + + +@method_decorator(login_required, name="dispatch") +class SuggestionListItem(View): + """book suggestion list page""" + + def post(self, request, list_id, list_item): + """Edit a suggestion list item's notes""" + return edit_list_item( + request, + list_id, + list_item, + models.SuggestionListItem, + forms.SuggestionListItemForm, + ) + + +def edit_list_item(request, list_id, list_item, item_model, form): + """edit a list or suggestion list item""" + list_item = get_object_or_404(item_model, id=list_item, book_list=list_id) + list_item.raise_not_editable(request.user) + + form = form(request.POST, instance=list_item) + if form.is_valid(): + item = form.save(request, commit=False) + item.notes = to_markdown(item.notes) + item.save() + else: + raise Exception(form.errors) + + return redirect_to_referer(request) From 30b59be50f4b2fdf8f8575a5013c4a26a6fae094 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 08:34:40 -0700 Subject: [PATCH 690/962] Use 6 instead of 5 results for add books to list --- bookwyrm/views/list/list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 2d0bbe83f4..8390342880 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -105,7 +105,7 @@ def post(self, request, list_id): def get_list_suggestions( - book_list, user, query=None, num_suggestions=5, ignore_book=None + book_list, user, query=None, num_suggestions=6, ignore_book=None ): """What books might a user want to add to a list""" if query: From 455e80425fd0bd198a1140c421fbef6e722871ca Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 08:39:35 -0700 Subject: [PATCH 691/962] Gets correct count of suggestion list items on book page --- bookwyrm/templates/book/suggestion_list/list.html | 2 +- bookwyrm/views/books/books.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index fa0c62f9ac..e18a2ba7ab 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -6,7 +6,7 @@

    {% trans "Suggestions" %} {% if suggestion_list and items|length > 0 %} - {% trans "View all suggestions" %} ({{ items|length }}) + {% trans "View all suggestions" %} ({{ item_count }}) {% endif %}

    diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 714a892278..9c6b1d8d47 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -145,6 +145,7 @@ def get(self, request, book_id, **kwargs): } if hasattr(book.parent_work, "suggestion_list"): data["suggestion_list"] = book.parent_work.suggestion_list + data["item_count"] = data["suggestion_list"].suggestionlistitem_set.count() data["items"] = ( data["suggestion_list"] .suggestionlistitem_set.prefetch_related( From b92e0243603f93d4c2637bc598a89f6e43647ec1 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 08:42:26 -0700 Subject: [PATCH 692/962] Don't allow saving suggestion lists --- bookwyrm/templates/lists/layout.html | 2 ++ bookwyrm/views/books/books.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/lists/layout.html b/bookwyrm/templates/lists/layout.html index c9003b3252..cbb1f1404d 100644 --- a/bookwyrm/templates/lists/layout.html +++ b/bookwyrm/templates/lists/layout.html @@ -26,9 +26,11 @@

    {{ list.name }} {% include 'snippets/pr {% include 'snippets/toggle/open_button.html' with text=button_text icon_with_text="pencil" controls_text="edit_list" focus="edit_list_header" %}

    {% endif %} + {% if list.suggests_for == None %}
    {% include "lists/bookmark_button.html" with list=list %}
    + {% endif %}
    diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 9c6b1d8d47..defdaacf2b 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -145,7 +145,9 @@ def get(self, request, book_id, **kwargs): } if hasattr(book.parent_work, "suggestion_list"): data["suggestion_list"] = book.parent_work.suggestion_list - data["item_count"] = data["suggestion_list"].suggestionlistitem_set.count() + data["item_count"] = data[ + "suggestion_list" + ].suggestionlistitem_set.count() data["items"] = ( data["suggestion_list"] .suggestionlistitem_set.prefetch_related( From eb19a6fd6cfa41c27b1a5f62f3ff2c5018d754b9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 09:05:27 -0700 Subject: [PATCH 693/962] Fixes editing notes from user suggestions page --- bookwyrm/templates/lists/edit_item_form.html | 3 +-- bookwyrm/templates/lists/list_item_notes.html | 3 +-- bookwyrm/templates/user/suggestions.html | 12 +++++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bookwyrm/templates/lists/edit_item_form.html b/bookwyrm/templates/lists/edit_item_form.html index b0768ec33f..686b1b7fe1 100644 --- a/bookwyrm/templates/lists/edit_item_form.html +++ b/bookwyrm/templates/lists/edit_item_form.html @@ -2,7 +2,7 @@ {% csrf_token %} @@ -18,4 +18,3 @@ - diff --git a/bookwyrm/templates/lists/list_item_notes.html b/bookwyrm/templates/lists/list_item_notes.html index 784d797c86..5a497266cb 100644 --- a/bookwyrm/templates/lists/list_item_notes.html +++ b/bookwyrm/templates/lists/list_item_notes.html @@ -27,8 +27,7 @@ - {% url item.edit_path_name list.id item.id as path %} - {% include "lists/edit_item_form.html" with item=item list=list path=path %} + {% include "lists/edit_item_form.html" with item=item list=list %} {% endif %} diff --git a/bookwyrm/templates/user/suggestions.html b/bookwyrm/templates/user/suggestions.html index a013de07aa..476f3101f6 100644 --- a/bookwyrm/templates/user/suggestions.html +++ b/bookwyrm/templates/user/suggestions.html @@ -19,19 +19,21 @@

    {% block panel %}
    -
      +
      {% for suggestion in suggestions %} -
    • +
      +

      {% blocktrans trimmed with list_name=suggestion.book_list.name url=suggestion.book_list.remote_id %} - From: {{ list_name }} + {{ list_name }} {% endblocktrans %}

      {% url 'book-remove-suggestion' suggestion.book_list.id as remove_book_url %} {% include "lists/list_item.html" with list=suggestion.book_list item=suggestion remove_book_url=remove_book_url %} -
      • +
      + {% endfor %} -
    +
    {% include 'snippets/pagination.html' with page=suggestions path=path %} From 3d553e3c0ac76dea581593b62fe99e3508f118f8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 09:09:56 -0700 Subject: [PATCH 694/962] Reorders migrations --- ...231_alter_list_options_alter_listitem_options_and_more.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename bookwyrm/migrations/{0230_alter_list_options_alter_listitem_options_and_more.py => 0231_alter_list_options_alter_listitem_options_and_more.py} (97%) diff --git a/bookwyrm/migrations/0230_alter_list_options_alter_listitem_options_and_more.py b/bookwyrm/migrations/0231_alter_list_options_alter_listitem_options_and_more.py similarity index 97% rename from bookwyrm/migrations/0230_alter_list_options_alter_listitem_options_and_more.py rename to bookwyrm/migrations/0231_alter_list_options_alter_listitem_options_and_more.py index afb97bc61b..c05beac76b 100644 --- a/bookwyrm/migrations/0230_alter_list_options_alter_listitem_options_and_more.py +++ b/bookwyrm/migrations/0231_alter_list_options_alter_listitem_options_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.14 on 2026-05-21 17:08 +# Generated by Django 5.2.14 on 2026-05-23 16:09 import bookwyrm.models.activitypub_mixin import bookwyrm.models.fields @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0229_series_mergedseries_seriesbook'), + ('bookwyrm', '0230_merge_20260522_2105'), ] operations = [ From 2a36c19fa9cae4be9479b87f1af098fd2c66c306 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 09:12:43 -0700 Subject: [PATCH 695/962] Small display fix on user suggestions view --- bookwyrm/templates/lists/list_item.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/lists/list_item.html b/bookwyrm/templates/lists/list_item.html index 3bff1a45f5..f76fbf3454 100644 --- a/bookwyrm/templates/lists/list_item.html +++ b/bookwyrm/templates/lists/list_item.html @@ -32,7 +32,7 @@
    -
    +

    {% blocktrans trimmed with username=item.user.display_name user_link=item.user|user_link %} Added by {{ user_link }} From 106a87889c87a8091b7715a274b7b241d9c72502 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 24 May 2026 04:38:44 +1000 Subject: [PATCH 696/962] add custom security middleware (#3906) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * initial work * add security middleware - tests - templates - bugfixes * fix search API blocking * fix migration files * add migration file * add mocks for /discover tests * oops, formatting * rework new settings and tests for clarity * account for key errors from viewing .json view in browser * Update test_search.py 🤦 * Allow reviews without titles/names There does not seem to be a strict requirement for Article ActivityPub activities to have a name. BookWyrm users have requested that they be able to post reviews without a title. This change: - allows users to publish reviews without titles (names) or content - changes what is displayed in the card header or pure_name if there is only a rating * fix formatting * add tests * oops reset .env.dev * remove testing print statements * fix final print statement * Use block rather than card css rule for card component This removes a lot of lines, shadows, and whitespace from statuses in the feed. * Makes hr line darker * Fixes close button on suggested books card display * Modify css card component instead of using block * Use the same border color throughout card components * Remove shading and button border from card elements * Removes unncessary override * Removes a few box shadows on the landing/about pages * Fixes display of goal card header * Adds force password reset view tests * Adds another utilties templatetags test * Adds a couple more files maintenance admin tests And removes a "print" statement * Adds more tests for site settings * Full test coverage for link domain admin view * add merge migration * fix linting errors --- bookwyrm/forms/admin.py | 12 + bookwyrm/middleware/__init__.py | 2 + bookwyrm/middleware/require_login.py | 56 ++++ bookwyrm/middleware/require_signed_get.py | 111 ++++++++ ...settings_block_incoming_search_and_more.py | 28 ++ bookwyrm/models/site.py | 5 + bookwyrm/settings.py | 2 + bookwyrm/signatures.py | 6 +- bookwyrm/templates/landing/landing.html | 5 +- .../settings/federation/settings.html | 35 ++- .../tests/middleware/test_get_signatures.py | 264 ++++++++++++++++++ .../tests/middleware/test_require_login.py | 128 +++++++++ bookwyrm/tests/views/test_search.py | 28 +- bookwyrm/views/landing/landing.py | 1 + bookwyrm/views/search.py | 2 + 15 files changed, 679 insertions(+), 6 deletions(-) create mode 100644 bookwyrm/middleware/require_login.py create mode 100644 bookwyrm/middleware/require_signed_get.py create mode 100644 bookwyrm/migrations/0231_sitesettings_block_incoming_search_and_more.py create mode 100644 bookwyrm/tests/middleware/test_get_signatures.py create mode 100644 bookwyrm/tests/middleware/test_require_login.py diff --git a/bookwyrm/forms/admin.py b/bookwyrm/forms/admin.py index 77aca86a6f..bcd871eb8b 100644 --- a/bookwyrm/forms/admin.py +++ b/bookwyrm/forms/admin.py @@ -182,12 +182,24 @@ class Meta: model = models.SiteSettings fields = [ "disable_federation", + "require_signed_get", + "require_login_nearly_everywhere", + "block_incoming_search", ] widgets = { "disable_federation": forms.CheckboxInput( attrs={"aria-describedby": "desc_disable_federation"} ), + "require_signed_get": forms.CheckboxInput( + attrs={"aria-describedby": "desc_require_signed_get"} + ), + "require_login_nearly_everywhere": forms.CheckboxInput( + attrs={"aria-describedby": "desc_require_login_everywhere"} + ), + "block_incoming_search": forms.CheckboxInput( + attrs={"aria-describedby": "desc_block_incoming_search"} + ), } diff --git a/bookwyrm/middleware/__init__.py b/bookwyrm/middleware/__init__.py index 2656a29f12..6d29d0fe17 100644 --- a/bookwyrm/middleware/__init__.py +++ b/bookwyrm/middleware/__init__.py @@ -4,3 +4,5 @@ from .ip_middleware import IPBlocklistMiddleware from .file_too_big import FileTooBig from .force_logout import ForceLogoutMiddleware +from .require_signed_get import RequireSignedGet +from .require_login import RequireLoginNearlyEverywhere diff --git a/bookwyrm/middleware/require_login.py b/bookwyrm/middleware/require_login.py new file mode 100644 index 0000000000..29e8e68b37 --- /dev/null +++ b/bookwyrm/middleware/require_login.py @@ -0,0 +1,56 @@ +"""require signed headers and user log in depending on site settings""" + +import re + +from django.contrib.auth.decorators import login_required + +from bookwyrm.models import SiteSettings +from bookwyrm.views.helpers import is_api_request + +allowed_views = [ + # basic web utility views + r"/robots.txt", + r"/manifest.json", + r"^/opensearch.xml$", + # site basics + r"^/?$", + r"^/about/?$", + r"^/privacy/?$", + r"^/conduct/?$", + # setup + r"^/setup/?$", + r"^/setup/admin/?$", + # login and register + r"^/login/?$", + r"^/login/(?Pconfirmed)/?$", + r"^/register/?$", + r"^/password-reset/?$", + r"/confirm-email/?$", + r"/confirm-email/(?P[A-Za-z0-9]+)/?$", + r"^/resend-link/?$", + r"^/invite/(?P[A-Za-z0-9]+)/?$", + r"^/2fa-check/?$", +] + + +class RequireLoginNearlyEverywhere: + """lock down access depending on site settings""" + + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + """run before next middleware or view""" + + if SiteSettings.get().require_login_nearly_everywhere and not is_api_request( + request + ): + # require login unless endpoint is on the allow list + if not request.user.is_authenticated: + for path in allowed_views: + if re.search(path, request.path): + return self.get_response(request) + return login_required(self.get_response)(request) + + # we're good, continue + return self.get_response(request) diff --git a/bookwyrm/middleware/require_signed_get.py b/bookwyrm/middleware/require_signed_get.py new file mode 100644 index 0000000000..66bf29c3c0 --- /dev/null +++ b/bookwyrm/middleware/require_signed_get.py @@ -0,0 +1,111 @@ +"""Require all GET API requests to use signed HTTP headers""" + +import re +from requests.exceptions import HTTPError + +from django.core.exceptions import PermissionDenied + +from bookwyrm.activitypub import resolve_remote_id +from bookwyrm.connectors import get_data +from bookwyrm.models import SiteSettings, User +from bookwyrm.signatures import Signature +from bookwyrm.views.helpers import is_api_request +from bookwyrm.views.inbox import raise_is_blocked_user_agent + + +class RequireSignedGet: + """lock down incoming GET API requests""" + + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + """run before next middleware or view""" + + if is_api_request(request): + # Always check if this server is on our shitlist + raise_is_blocked_user_agent(request) + + # if we disabled federation, disallow all API requests + # this will include nodeinfo and webfinger etc + SiteSettings.raise_federation_disabled() + + if SiteSettings.get().require_signed_get and request.method == "GET": + allowed_api_views = [ + r"^/\.well-known/webfinger/?$", + r"^/\.well-known/nodeinfo/?$", + r"^/\.well-known/host-meta/?$", + r"^/nodeinfo/2\.0/?$", + ] + + # ignore well-known and nodeinfo paths + # otherwise nobody can follow our users + for path in allowed_api_views: + if re.search(path, request.path): + return self.get_response(request) + + # require signed headers for everything else + if not has_valid_get_signature(request): + raise PermissionDenied + + # we're good, continue + return self.get_response(request) + + +def has_valid_get_signature(request): + """verify incoming signature""" + try: + signature = Signature.parse(request) + # have we seen this actor before? It's probably an instance actor + known_actor = User.objects.filter(key_pair__remote_id=signature.key_id).first() + if known_actor: + remote_actor = known_actor + else: + # Key id is probably the same as the user endpoint + remote_actor = resolve_remote_id(signature.key_id, model=User, save=False) + + if not remote_actor: + # ...but it might not be + # see https://swicg.github.io/activitypub-http-signature/#how-to-obtain-a-signature-s-public-key + data = get_data(signature.key_id) + + try: + actor_id = data.get("owner") + except KeyError: + actor_id = data.get("controller") + + remote_actor = resolve_remote_id(actor_id, model=User, save=False) + + # well we tried everything I guess + if not remote_actor: + return False + + if signature.key_id != remote_actor.key_pair.remote_id: + if ( + signature.key_id != f"{remote_actor.remote_id}#main-key" + ): # legacy Bookwyrm + raise ValueError("Wrong actor created signature.") + + try: + signature.verify( + remote_actor.key_pair.public_key, request, request_type="get" + ) + except ValueError: + old_key = remote_actor.key_pair.public_key + remote_actor = resolve_remote_id( + remote_actor.remote_id, model=User, refresh=True, save=False + ) + if not remote_actor: + return False + if remote_actor.key_pair.public_key == old_key: + raise # Key unchanged. + signature.verify( + remote_actor.key_pair.public_key, request, request_type="get" + ) + except (KeyError, ValueError, HTTPError): + return False + + # save previously unknown actors so we can check our DB next time + if not remote_actor.id: + remote_actor.save(broadcast=False) + return True diff --git a/bookwyrm/migrations/0231_sitesettings_block_incoming_search_and_more.py b/bookwyrm/migrations/0231_sitesettings_block_incoming_search_and_more.py new file mode 100644 index 0000000000..93c29d5a8a --- /dev/null +++ b/bookwyrm/migrations/0231_sitesettings_block_incoming_search_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 5.2.14 on 2026-05-23 01:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0230_merge_20260522_2105'), + ] + + operations = [ + migrations.AddField( + model_name='sitesettings', + name='block_incoming_search', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='sitesettings', + name='require_login_nearly_everywhere', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='sitesettings', + name='require_signed_get', + field=models.BooleanField(default=False), + ), + ] diff --git a/bookwyrm/models/site.py b/bookwyrm/models/site.py index 160b296c62..5d584b56a3 100644 --- a/bookwyrm/models/site.py +++ b/bookwyrm/models/site.py @@ -57,6 +57,11 @@ class SiteSettings(SiteModel): install_mode = models.BooleanField(default=False) admin_code = models.CharField(max_length=50, default=uuid.uuid4) + # security + require_signed_get = models.BooleanField(default=False) + require_login_nearly_everywhere = models.BooleanField(default=False) + block_incoming_search = models.BooleanField(default=False) + # about page registration_closed_text = models.TextField( default="We aren't taking new users at this time. You can find an open " diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 7cdf75efc1..4b80665820 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -118,6 +118,8 @@ "django.middleware.csrf.CsrfViewMiddleware", "csp.middleware.CSPMiddleware", "django.contrib.auth.middleware.AuthenticationMiddleware", + "bookwyrm.middleware.RequireSignedGet", + "bookwyrm.middleware.RequireLoginNearlyEverywhere", "bookwyrm.middleware.TimezoneMiddleware", "bookwyrm.middleware.IPBlocklistMiddleware", "django.contrib.messages.middleware.MessageMiddleware", diff --git a/bookwyrm/signatures.py b/bookwyrm/signatures.py index e33033d094..29550446ec 100644 --- a/bookwyrm/signatures.py +++ b/bookwyrm/signatures.py @@ -103,7 +103,7 @@ def parse(cls, request): return cls(key_id, headers, signature) - def verify(self, public_key, request): + def verify(self, public_key, request, request_type="post"): """verify rsa signature""" if http_date_age(request.headers["date"]) > MAX_SIGNATURE_AGE: raise ValueError(f"Request too old: {request.headers['date']}") @@ -112,7 +112,9 @@ def verify(self, public_key, request): comparison_string = [] for signed_header_name in self.headers.split(" "): if signed_header_name == "(request-target)": - comparison_string.append(f"(request-target): post {request.path}") + comparison_string.append( + f"(request-target): {request_type} {request.path}" + ) else: if signed_header_name == "digest": verify_digest(request) diff --git a/bookwyrm/templates/landing/landing.html b/bookwyrm/templates/landing/landing.html index 847370e456..050f62b33b 100644 --- a/bookwyrm/templates/landing/landing.html +++ b/bookwyrm/templates/landing/landing.html @@ -4,7 +4,7 @@ {% load landing_page_tags %} {% block panel %} - +{% if not require_login_nearly_everywhere %}

    {% trans "Recent Books" %}

    @@ -54,4 +54,5 @@

    {% trans "Recent Books" %}

    {% endcache %} -{% endblock %} +{% endif %} +{% endblock %} \ No newline at end of file diff --git a/bookwyrm/templates/settings/federation/settings.html b/bookwyrm/templates/settings/federation/settings.html index 665bc29528..450fcbe138 100644 --- a/bookwyrm/templates/settings/federation/settings.html +++ b/bookwyrm/templates/settings/federation/settings.html @@ -31,15 +31,48 @@ > {% csrf_token %}
    +
    + + + + {% trans "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" %} + +
    +
    + + + {% trans "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" %} + +
    {% trans "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." %}
    +
    + + + {% trans "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." %} + + + +
    diff --git a/bookwyrm/tests/middleware/test_get_signatures.py b/bookwyrm/tests/middleware/test_get_signatures.py new file mode 100644 index 0000000000..f2cb9699e8 --- /dev/null +++ b/bookwyrm/tests/middleware/test_get_signatures.py @@ -0,0 +1,264 @@ +"""test get signatures middleware""" + +from collections import namedtuple +import json +import pathlib +import responses + +from django.contrib.auth.models import AnonymousUser +from django.test import TestCase, override_settings +from django.utils.http import http_date + +from bookwyrm import models +from bookwyrm.activitypub.base_activity import get_representative +from bookwyrm.settings import DOMAIN +from bookwyrm.signatures import make_signature, create_key_pair + + +class TestBookWyrmGetSignatures(TestCase): + """aka authorized fetch""" + + @classmethod + def setUpTestData(cls): + """create users and test data""" + + cls.user = models.User.objects.create_user( + f"mouse@{DOMAIN}", + "mouse@example.com", + "changeme", + local=True, + localname="mouse", + ) + + cls.site = models.SiteSettings.get() + cls.sender = get_representative() + cls.sender.remote_id = "https://example.com/user/bookwyrm.instance.actor" + key_pair = cls.sender.key_pair + key_pair.remote_id = ( + "https://example.com/user/bookwyrm.instance.actor/#main-key" + ) + key_pair.save(update_fields=["remote_id"]) + cls.sender.save(update_fields=["remote_id"]) + + @override_settings( + MIDDLEWARE=[ + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "bookwyrm.middleware.RequireSignedGet", + ] + ) + def test_get_signature_not_required(self): + """do not require signed GET activitypub requests""" + + now = http_date() + self.client.user = AnonymousUser() + response = self.client.get( + "/user/mouse", + headers={ + "Host": DOMAIN, + "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + "Date": now, + "Signature": make_signature( + "get", self.sender, self.user.remote_id, now + ), + }, + ) + self.assertEqual(response.status_code, 200) + + @override_settings( + MIDDLEWARE=[ + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "bookwyrm.middleware.RequireSignedGet", + ] + ) + @responses.activate + def test_get_signature_required(self): + """require signed GET activitypub requests""" + + datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") + data = json.loads(datafile.read_bytes()) + data["id"] = self.sender.remote_id + data["publicKey"]["id"] = f"{self.sender.remote_id}/#main-key" + data["publicKey"]["publicKeyPem"] = self.sender.key_pair.public_key + del data["icon"] # Avoid having to return an avatar. + + responses.add( + responses.GET, f"{self.sender.remote_id}/#main-key", json=data, status=200 + ) + responses.add(responses.GET, self.sender.remote_id, json=data, status=200) + + self.site.require_signed_get = True + self.site.save(update_fields=["require_signed_get"]) + + now = http_date() + self.client.user = AnonymousUser() + response = self.client.get( + "/user/mouse", + headers={ + "Host": DOMAIN, + "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + "Date": now, + "Signature": make_signature( + "get", self.sender, self.user.remote_id, now + ), + }, + ) + self.assertEqual(response.status_code, 200) + + @override_settings( + MIDDLEWARE=[ + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "bookwyrm.middleware.RequireSignedGet", + ] + ) + @responses.activate + def test_get_signature_required_wrong_signature(self): + """require signed GET activitypub requests""" + + KeyPair = namedtuple("KeyPair", ("private_key", "public_key")) + Sender = namedtuple("Sender", ("remote_id", "key_pair")) + private_key, public_key = create_key_pair() + self.unknown_sender = Sender( + "http://localhost/user/remote", KeyPair(private_key, public_key) + ) + + datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") + data = json.loads(datafile.read_bytes()) + data["id"] = self.unknown_sender.remote_id + data["publicKey"]["id"] = f"{self.unknown_sender.remote_id}/#main-key" + data["publicKey"]["publicKeyPem"] = self.sender.key_pair.public_key # wrong key + del data["icon"] # Avoid having to return an avatar. + + responses.add( + responses.GET, + f"{self.unknown_sender.remote_id}/#main-key", + json=data, + status=200, + ) + responses.add( + responses.GET, self.unknown_sender.remote_id, json=data, status=200 + ) + + self.site.require_signed_get = True + self.site.save(update_fields=["require_signed_get"]) + + now = http_date() + self.client.user = AnonymousUser() + response = self.client.get( + "/user/mouse", + headers={ + "Host": DOMAIN, + "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + "Date": now, + "Signature": make_signature( + "get", self.unknown_sender, self.user.remote_id, now + ), + }, + ) + self.assertEqual(response.status_code, 403) + + @override_settings( + MIDDLEWARE=[ + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "bookwyrm.middleware.RequireSignedGet", + ] + ) + @responses.activate + def test_get_signature_required_unknown_sender(self): + """require signed GET activitypub requests""" + + KeyPair = namedtuple("KeyPair", ("private_key", "public_key")) + Sender = namedtuple("Sender", ("remote_id", "key_pair")) + private_key, public_key = create_key_pair() + self.unknown_sender = Sender( + "http://localhost/user/remote", KeyPair(private_key, public_key) + ) + + datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") + data = json.loads(datafile.read_bytes()) + data["id"] = self.unknown_sender.remote_id + data["publicKey"]["id"] = f"{self.unknown_sender.remote_id}/#main-key" + data["publicKey"]["publicKeyPem"] = self.unknown_sender.key_pair.public_key + del data["icon"] # Avoid having to return an avatar. + + responses.add( + responses.GET, + f"{self.unknown_sender.remote_id}/#main-key", + json=data, + status=200, + ) + responses.add( + responses.GET, self.unknown_sender.remote_id, json=data, status=200 + ) + + self.site.require_signed_get = True + self.site.save(update_fields=["require_signed_get"]) + + now = http_date() + self.client.user = AnonymousUser() + response = self.client.get( + "/user/mouse", + headers={ + "Host": DOMAIN, + "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + "Date": now, + "Signature": make_signature( + "get", self.unknown_sender, self.user.remote_id, now + ), + }, + ) + self.assertEqual(response.status_code, 200) + + @override_settings( + MIDDLEWARE=[ + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "bookwyrm.middleware.RequireSignedGet", + "bookwyrm.middleware.RequireLoginNearlyEverywhere", + ] + ) + @responses.activate + def test_require_login_everywhere_and_signed_get_api_request(self): + """allow api requests but only if signed""" + + datafile = pathlib.Path(__file__).parent.joinpath("../data/ap_user.json") + data = json.loads(datafile.read_bytes()) + data["id"] = self.sender.remote_id + data["publicKey"]["id"] = f"{self.sender.remote_id}/#main-key" + data["publicKey"]["publicKeyPem"] = self.sender.key_pair.public_key + del data["icon"] # Avoid having to return an avatar. + + responses.add( + responses.GET, f"{self.sender.remote_id}/#main-key", json=data, status=200 + ) + responses.add(responses.GET, self.sender.remote_id, json=data, status=200) + + self.site.require_signed_get = True + self.site.require_login_nearly_everywhere = True + self.site.save( + update_fields=["require_signed_get", "require_login_nearly_everywhere"] + ) + + # no signed headers, go away + response = self.client.get("/user/mouse") + self.assertEqual(response.status_code, 302) + self.assertEqual(response.url, "/login/?next=/user/mouse") + + now = http_date() + self.client.user = AnonymousUser() + response = self.client.get( + "/user/mouse", + headers={ + "Host": DOMAIN, + "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + "Date": now, + "Signature": make_signature( + "get", self.sender, self.user.remote_id, now + ), + }, + ) + # ok! + self.assertEqual(response.status_code, 200) diff --git a/bookwyrm/tests/middleware/test_require_login.py b/bookwyrm/tests/middleware/test_require_login.py new file mode 100644 index 0000000000..f3cbc753db --- /dev/null +++ b/bookwyrm/tests/middleware/test_require_login.py @@ -0,0 +1,128 @@ +"""test require login middleware""" + +from unittest.mock import patch + +from django.contrib.auth.models import AnonymousUser +from django.test import TestCase, override_settings + +from bookwyrm import models +from bookwyrm.settings import DOMAIN + + +class TestRequireLogin(TestCase): + """lets get fuzzing""" + + @classmethod + def setUpTestData(cls): + """create users and test data""" + + cls.user = models.User.objects.create_user( + f"mouse@{DOMAIN}", + "mouse@example.com", + "changeme", + local=True, + localname="mouse", + ) + + cls.site = models.SiteSettings.get() + cls.site.require_login_nearly_everywhere = False + cls.site.block_incoming_search = False + cls.site.save( + update_fields=["block_incoming_search", "require_login_nearly_everywhere"] + ) + + @override_settings( + MIDDLEWARE=[ + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "bookwyrm.middleware.RequireLoginNearlyEverywhere", + ] + ) + def test_require_login_everywhere(self): + """block pages with require_login_nearly_everywhere turned on""" + + self.client.user = AnonymousUser() + + # default is to allow user pages + response = self.client.get("/user/mouse") + self.assertEqual(response.status_code, 200) + + # turn on require_login_nearly_everywhere + self.site.require_login_nearly_everywhere = True + self.site.save(update_fields=["require_login_nearly_everywhere"]) + + # should redirect to login for user page + response = self.client.get("/user/mouse") + self.assertEqual(response.status_code, 302) + self.assertEqual(response.url, "/login/?next=/user/mouse") + + with patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream"): + response = self.client.get("/discover") + self.assertEqual(response.status_code, 302) + + response = self.client.get("") + self.assertEqual(response.status_code, 200) + + @override_settings(MIDDLEWARE=["bookwyrm.middleware.RequireLoginNearlyEverywhere"]) + def test_require_login_everywhere_allowed_pages(self): + """don't block allowlist""" + + # should allow allow_list pages + response = self.client.get("/robots.txt") + self.assertEqual(response.status_code, 200) + + response = self.client.get("/2fa-check") + self.assertEqual(response.status_code, 200) + + @override_settings( + MIDDLEWARE=[ + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "bookwyrm.middleware.RequireLoginNearlyEverywhere", + ] + ) + def test_require_login_everywhere_logged_in(self): + """allow logged in users""" + + # turn on require_login_nearly_everywhere + self.site.require_login_nearly_everywhere = True + self.site.save(update_fields=["require_login_nearly_everywhere"]) + + self.client.user = self.user + self.client.login(username=self.user.username, password="changeme") + + response = self.client.get("/user/mouse") + self.assertEqual(response.status_code, 200) + + with patch("bookwyrm.activitystreams.ActivityStream.get_activity_stream"): + response = self.client.get("/discover") + self.assertEqual(response.status_code, 200) + + @override_settings( + MIDDLEWARE=[ + "django.contrib.sessions.middleware.SessionMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "bookwyrm.middleware.RequireLoginNearlyEverywhere", + ] + ) + def test_require_login_everywhere_api_request(self): + """allow api requests""" + + self.client.user = AnonymousUser() + + # default is to allow user pages + response = self.client.get("/user/mouse") + self.assertEqual(response.status_code, 200) + + # turn on require_login_nearly_everywhere + self.site.require_login_nearly_everywhere = True + self.site.save(update_fields=["require_login_nearly_everywhere"]) + + # allow API requewsts + response = self.client.get( + "/user/mouse", + headers={ + "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"' + }, + ) + self.assertEqual(response.status_code, 200) diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index 2cbc15fce2..38ad413888 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -12,7 +12,7 @@ from bookwyrm import models, views from bookwyrm.book_search import SearchResult from bookwyrm.views.search import author_search -from bookwyrm.settings import BASE_URL +from bookwyrm.settings import BASE_URL, DOMAIN from bookwyrm.tests.validate_html import validate_html @@ -44,6 +44,8 @@ def setUpTestData(cls): cls.author = models.Author.objects.create(name="Philip Howard") cls.another_author = models.Author.objects.create(name="Author Name") + cls.site = models.SiteSettings.get() + def setUp(self): """individual test setup""" self.factory = RequestFactory() @@ -228,6 +230,30 @@ def test_search_lists_extra_whitespace(self): validate_html(response.render()) self.assertEqual(response.context_data["results"][0], booklist) + def test_block_incoming_search(self): + """disallow search endpoint""" + + response = self.client.get( + "/search/?q=beep", + headers={ + "Host": DOMAIN, + "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + }, + ) + self.assertEqual(response.status_code, 200) + + self.site.block_incoming_search = True + self.site.save(update_fields=["block_incoming_search"]) + + response = self.client.get( + "/search/?q=boop", + headers={ + "Host": DOMAIN, + "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', + }, + ) + self.assertEqual(response.status_code, 403) + def test_author_search(self): """search for authors""" request = self.factory.get("", {"q": "Author Name"}) diff --git a/bookwyrm/views/landing/landing.py b/bookwyrm/views/landing/landing.py index 083f28d14a..8819cbe2b5 100644 --- a/bookwyrm/views/landing/landing.py +++ b/bookwyrm/views/landing/landing.py @@ -33,5 +33,6 @@ def get(self, request): data = { "register_form": forms.RegisterForm(), "request_form": forms.InviteRequestForm(), + "require_login_nearly_everywhere": models.SiteSettings.get().require_login_nearly_everywhere, } return TemplateResponse(request, "landing/landing.html", data) diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index 0c8fbf160e..5fc9650967 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -31,6 +31,8 @@ class Search(View): def get(self, request): """that search bar up top""" if is_api_request(request): + if models.SiteSettings.get().block_incoming_search: + raise PermissionDenied return api_book_search(request) query = request.GET.get("q") From 1ce0af886b0f28d190ff0558643c64c8c78f46b8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 11:41:02 -0700 Subject: [PATCH 697/962] Updates English locale file with new strings --- locale/en_US/LC_MESSAGES/django.po | 186 +++++++++++++++++++---------- 1 file changed, 120 insertions(+), 66 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 0cd684f976..4dec2a00d2 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: 2026-05-18 20:01+0000\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -108,7 +108,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -176,40 +176,40 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:534 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:535 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:536 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:537 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:538 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "" -#: bookwyrm/models/book.py:547 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 -#: bookwyrm/models/book.py:570 bookwyrm/models/book.py:588 -#: bookwyrm/models/book.py:594 bookwyrm/models/book.py:599 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:576 bookwyrm/models/book.py:616 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" -#: bookwyrm/models/book.py:799 +#: bookwyrm/models/book.py:797 msgid "Book is already in this series" msgstr "" @@ -466,12 +466,12 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -494,19 +494,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:238 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -515,91 +515,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1081,7 +1081,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1977,7 +1977,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -2071,21 +2071,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2271,14 +2272,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -4421,7 +4422,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4888,7 +4889,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
    Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -5081,9 +5082,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5138,6 +5138,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -6005,13 +6010,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -7393,12 +7434,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7499,6 +7540,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7711,35 +7759,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7798,16 +7846,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8086,12 +8140,12 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:151 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" From 5f948ba8536cb2447790ecd018afb03e8d41e0b0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 23 May 2026 14:25:16 -0700 Subject: [PATCH 698/962] Make suggestions visible on user page --- bookwyrm/templates/user/layout.html | 2 -- bookwyrm/views/suggestion_list.py | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index 28d4902c51..ab3468d9d6 100755 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -106,12 +106,10 @@

    {% trans "Follow Requests" %}

    {% endif %} - {% if is_self %} {% url 'user-suggestions' user|username as url %} {% trans "Suggestions"%} - {% endif %} {% if user.shelf_set.exists %} {% url 'user-shelves' user|username as url %} diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py index db8de4a4e3..c40c7d645b 100644 --- a/bookwyrm/views/suggestion_list.py +++ b/bookwyrm/views/suggestion_list.py @@ -3,7 +3,6 @@ from typing import Any from django.contrib.auth.decorators import login_required -from django.core.exceptions import PermissionDenied from django.core.paginator import Paginator from django.db import transaction from django.db.models import Count, Q @@ -104,7 +103,6 @@ def post( return redirect_to_referer(request) -@method_decorator(login_required, name="dispatch") class UserSuggestions(View): """view all suggestions made by a user""" @@ -114,11 +112,9 @@ def get( """display a book list""" user = get_user_from_username(request.user, username) is_self = request.user.id == user.id - if not is_self: - raise PermissionDenied() suggestions = models.SuggestionListItem.objects.filter( - user=request.user + user=user ).prefetch_related("book_list") paginated = Paginator(suggestions, 12) data = { From 0ac190a3de71081f8685dc28835d0882b4f746c6 Mon Sep 17 00:00:00 2001 From: ProtonsAndElectrons Date: Sun, 24 May 2026 07:37:41 +0200 Subject: [PATCH 699/962] Add Readwise quote sync integration --- bookwyrm/forms/edit_user.py | 35 ++++++ .../migrations/0232_user_readwise_api_key.py | 17 +++ bookwyrm/models/user.py | 1 + bookwyrm/readwise.py | 99 +++++++++++++++ bookwyrm/templates/preferences/edit_user.html | 27 +++++ bookwyrm/tests/test_readwise.py | 113 ++++++++++++++++++ bookwyrm/tests/views/test_status.py | 23 ++++ bookwyrm/views/status.py | 3 + 8 files changed, 318 insertions(+) create mode 100644 bookwyrm/migrations/0232_user_readwise_api_key.py create mode 100644 bookwyrm/readwise.py create mode 100644 bookwyrm/tests/test_readwise.py diff --git a/bookwyrm/forms/edit_user.py b/bookwyrm/forms/edit_user.py index 72ec6f2dac..d0fb358f7c 100644 --- a/bookwyrm/forms/edit_user.py +++ b/bookwyrm/forms/edit_user.py @@ -11,6 +11,20 @@ class EditUserForm(CustomForm): + readwise_api_key = forms.CharField( + label=_("Readwise access token"), + required=False, + strip=True, + widget=forms.PasswordInput( + attrs={"aria-describedby": "desc_readwise_api_key"}, + render_value=False, + ), + ) + clear_readwise_api_key = forms.BooleanField( + label=_("Remove saved Readwise access token"), + required=False, + ) + class Meta: model = models.User fields = [ @@ -42,6 +56,27 @@ class Meta: ), } + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + if self.instance and self.instance.readwise_api_key: + self.fields["readwise_api_key"].help_text = _( + "A Readwise access token is saved. Leave this blank to keep it." + ) + + def save(self, request, *args, **kwargs): + commit = kwargs.get("commit", True) + user = super().save(request, *args, **kwargs) + changed = False + if self.cleaned_data.get("clear_readwise_api_key"): + user.readwise_api_key = "" + changed = True + elif token := self.cleaned_data.get("readwise_api_key"): + user.readwise_api_key = token + changed = True + if changed and commit: + user.save(update_fields=["readwise_api_key"]) + return user + class LimitedEditUserForm(CustomForm): class Meta: diff --git a/bookwyrm/migrations/0232_user_readwise_api_key.py b/bookwyrm/migrations/0232_user_readwise_api_key.py new file mode 100644 index 0000000000..3c52603364 --- /dev/null +++ b/bookwyrm/migrations/0232_user_readwise_api_key.py @@ -0,0 +1,17 @@ +"""add Readwise integration token""" + +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("bookwyrm", "0231_sitesettings_block_incoming_search_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="user", + name="readwise_api_key", + field=models.CharField(blank=True, max_length=255, null=True), + ), + ] diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 85055d6ae8..ece1a88d20 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -162,6 +162,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): discoverable = fields.BooleanField(default=False) show_guided_tour = models.BooleanField(default=True) show_ratings = models.BooleanField(default=True) + readwise_api_key = models.CharField(max_length=255, null=True, blank=True) # feed options feed_status_types = DjangoArrayField( diff --git a/bookwyrm/readwise.py b/bookwyrm/readwise.py new file mode 100644 index 0000000000..73c07af1ed --- /dev/null +++ b/bookwyrm/readwise.py @@ -0,0 +1,99 @@ +"""Readwise integration helpers.""" + +import logging +import re +from html import unescape + +import requests +from django.utils.html import strip_tags + +from bookwyrm import models, settings +from bookwyrm.models.readthrough import ProgressMode +from bookwyrm.tasks import app, MISC + +logger = logging.getLogger(__name__) + +READWISE_HIGHLIGHTS_URL = "https://readwise.io/api/v2/highlights/" +READWISE_SOURCE_TYPE = "bookwyrm" + + +def _clean_text(value): + value = unescape(strip_tags(value or "")) + return re.sub(r"\s+", " ", value).strip() + + +def _truncate(value, length): + if not value: + return value + return value[:length] + + +def _page_location(quotation): + if quotation.position_mode != ProgressMode.PAGE or not quotation.position: + return None + try: + return int(quotation.position) + except (TypeError, ValueError): + return None + + +def build_readwise_highlight(quotation): + """Convert a BookWyrm quotation to a Readwise highlight payload item.""" + highlight = { + "text": _truncate(_clean_text(quotation.raw_quote or quotation.quote), 8191), + "title": _truncate(quotation.book.title, 511), + "source_type": READWISE_SOURCE_TYPE, + "category": "books", + "source_url": _truncate(quotation.book.remote_id, 2047), + "highlight_url": _truncate( + quotation.remote_id or quotation.get_remote_id(), 4095 + ), + "highlighted_at": quotation.published_date.isoformat(), + } + + if author := _clean_text(quotation.book.author_text): + highlight["author"] = _truncate(author, 1024) + + if note := _clean_text(quotation.raw_content or quotation.content): + highlight["note"] = _truncate(note, 8191) + + if location := _page_location(quotation): + highlight["location_type"] = "page" + highlight["location"] = location + + return highlight + + +@app.task(queue=MISC) +def sync_readwise_quotation(quotation_id): + """Send a quotation to Readwise for users who configured a token.""" + quotation = ( + models.Quotation.objects.select_related("user", "book") + .prefetch_related("book__authors") + .get(id=quotation_id) + ) + + token = quotation.user.readwise_api_key + if not token or quotation.deleted: + return None + + highlight = build_readwise_highlight(quotation) + if not highlight["text"]: + return None + + try: + response = requests.post( + READWISE_HIGHLIGHTS_URL, + headers={ + "Authorization": f"Token {token}", + "User-Agent": settings.USER_AGENT, + }, + json={"highlights": [highlight]}, + timeout=settings.QUERY_TIMEOUT, + ) + response.raise_for_status() + except requests.RequestException as err: + logger.warning("Unable to sync quotation %s to Readwise: %s", quotation_id, err) + return None + + return response.json() diff --git a/bookwyrm/templates/preferences/edit_user.html b/bookwyrm/templates/preferences/edit_user.html index c5764e36f0..fe55aa10d6 100644 --- a/bookwyrm/templates/preferences/edit_user.html +++ b/bookwyrm/templates/preferences/edit_user.html @@ -12,6 +12,7 @@
  • {% trans "Profile" %}
  • {% trans "Display" %}
  • {% trans "Privacy" %}
    • +
  • {% trans "Integrations" %}
    • {% endblock %} @@ -143,6 +144,32 @@

    {% trans "Privacy" %}

    + + + +
    +

    {% trans "Integrations" %}

    +
    +
    + + {{ form.readwise_api_key }} + + {% include 'snippets/form_errors.html' with errors_list=form.readwise_api_key.errors id="desc_readwise_api_key" %} +

    + {% blocktrans %}Send new quote posts to Readwise. You can create a token at readwise.io/access_token.{% endblocktrans %} + {% if form.readwise_api_key.help_text %}{{ form.readwise_api_key.help_text }}{% endif %} +

    +
    + {% if request.user.readwise_api_key %} +
    + +
    + {% endif %} +
    +
    {% endblock %} diff --git a/bookwyrm/tests/test_readwise.py b/bookwyrm/tests/test_readwise.py new file mode 100644 index 0000000000..16c26a2c16 --- /dev/null +++ b/bookwyrm/tests/test_readwise.py @@ -0,0 +1,113 @@ +"""Readwise integration tests.""" + +import json +from unittest.mock import patch + +import responses +from django.test import TestCase + +from bookwyrm import models +from bookwyrm.models.readthrough import ProgressMode +from bookwyrm.readwise import ( + READWISE_HIGHLIGHTS_URL, + build_readwise_highlight, + sync_readwise_quotation, +) + + +class Readwise(TestCase): + """sending BookWyrm quotes to Readwise""" + + @classmethod + def setUpTestData(cls): + """model objects we'll need""" + with ( + patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), + patch("bookwyrm.activitystreams.populate_stream_task.delay"), + patch("bookwyrm.lists_stream.populate_lists_task.delay"), + ): + cls.user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + readwise_api_key="readwise-token", + ) + cls.author = models.Author.objects.create(name="Octavia Butler") + cls.work = models.Work.objects.create(title="Example Work") + cls.book = models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=cls.work, + ) + cls.book.authors.add(cls.author) + + def create_quotation(self): + """create a quotation without exercising broadcast tasks""" + with ( + patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"), + patch("bookwyrm.activitystreams.add_status_task.apply_async"), + ): + return models.Quotation.objects.create( + user=self.user, + book=self.book, + quote="

    There is nothing new under the sun.

    ", + raw_quote="There is nothing new under the sun.", + content="

    Worth remembering.

    ", + raw_content="Worth remembering.", + privacy="public", + position="42", + position_mode=ProgressMode.PAGE, + ) + + def test_build_readwise_highlight(self): + """format a BookWyrm quotation for Readwise""" + quotation = self.create_quotation() + + result = build_readwise_highlight(quotation) + + self.assertEqual(result["text"], "There is nothing new under the sun.") + self.assertEqual(result["note"], "Worth remembering.") + self.assertEqual(result["title"], "Example Edition") + self.assertEqual(result["author"], "Octavia Butler") + self.assertEqual(result["source_type"], "bookwyrm") + self.assertEqual(result["category"], "books") + self.assertEqual(result["source_url"], "https://example.com/book/1") + self.assertEqual(result["highlight_url"], quotation.remote_id) + self.assertEqual(result["location_type"], "page") + self.assertEqual(result["location"], 42) + + @responses.activate + def test_sync_readwise_quotation(self): + """post a quotation to Readwise""" + quotation = self.create_quotation() + responses.post( + READWISE_HIGHLIGHTS_URL, + json=[{"modified_highlights": [123]}], + status=200, + ) + + result = sync_readwise_quotation(quotation.id) + + self.assertEqual(result, [{"modified_highlights": [123]}]) + self.assertEqual(len(responses.calls), 1) + request = responses.calls[0].request + self.assertEqual(request.headers["Authorization"], "Token readwise-token") + payload = json.loads(request.body) + self.assertEqual( + payload["highlights"][0]["text"], + "There is nothing new under the sun.", + ) + + @responses.activate + def test_sync_readwise_quotation_without_token(self): + """do not call Readwise unless a token is configured""" + self.user.readwise_api_key = "" + self.user.save(broadcast=False, update_fields=["readwise_api_key"]) + quotation = self.create_quotation() + + result = sync_readwise_quotation(quotation.id) + + self.assertIsNone(result) + self.assertEqual(len(responses.calls), 0) diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index 8a3f2c0373..d9753f52dc 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -146,6 +146,29 @@ def test_create_status_comment(self, *_): self.assertEqual(status.book, self.book) self.assertIsNone(status.edited_date) + def test_create_status_quotation_syncs_readwise(self, *_): + """create a quote and enqueue Readwise sync""" + self.local_user.readwise_api_key = "readwise-token" + self.local_user.save(broadcast=False, update_fields=["readwise_api_key"]) + view = views.CreateStatus.as_view() + form = forms.QuotationForm( + { + "quote": "a quotable bit", + "content": "a note", + "user": self.local_user.id, + "book": self.book.id, + "privacy": "public", + } + ) + request = self.factory.post("", form.data) + request.user = self.local_user + + with patch("bookwyrm.views.status.sync_readwise_quotation.delay") as task_mock: + view(request, "quotation") + + status = models.Quotation.objects.get() + task_mock.assert_called_once_with(status.id) + def test_create_status_rating(self, *_): """create a status""" view = views.CreateStatus.as_view() diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index 2f698f04e0..7d90cff85f 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -19,6 +19,7 @@ from markdown import markdown from bookwyrm import forms, models from bookwyrm.models.report import DELETE_ITEM +from bookwyrm.readwise import sync_readwise_quotation from bookwyrm.utils import regex, sanitizer from bookwyrm.views.helpers import get_mergeable_object_or_404 from .helpers import handle_remote_webfinger, is_api_request @@ -124,6 +125,8 @@ def post(self, request, status_type, existing_status_id=None): status.quote = to_markdown(status.quote) status.save(created=created) + if isinstance(status, models.Quotation) and status.user.readwise_api_key: + sync_readwise_quotation.delay(status.id) # update a readthrough, if needed if bool(request.POST.get("id")): From 98e8f6f8f3eb1edaa6c4882085d700fc10587f2d Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 24 May 2026 18:43:04 +1000 Subject: [PATCH 700/962] block books on author & series pages plus other fixes - clean up terrible code in Series view - don't show blocked books on author or series pages - fix HomeStream showing statuses it shouldn't when book un-blocked - don't show blocked books in local search but do show warning if anything is blocked --- bookwyrm/activitystreams.py | 35 ++++++++++++++++++++++- bookwyrm/templates/book/series.html | 2 +- bookwyrm/templates/search/book.html | 10 +++++++ bookwyrm/tests/views/books/test_series.py | 27 +++++++++++++++++ bookwyrm/tests/views/test_author.py | 34 ++++++++++++++++++++++ bookwyrm/tests/views/test_search.py | 17 +++++++++++ bookwyrm/views/author.py | 6 ++++ bookwyrm/views/books/series.py | 21 +++++++------- bookwyrm/views/search.py | 15 +++++++++- 9 files changed, 154 insertions(+), 13 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index feedf5492d..1fcfb88e57 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -272,6 +272,39 @@ def get_statuses_for_user(self, user): ), ) + def add_book_statuses(self, user, book): + """add statuses about a book to a user's feed""" + work = book.parent_work + + statuses = models.Status.privacy_filter( + user, + privacy_levels=["public", "unlisted", "followers"], + ).exclude( + ~Q( # remove everything except + Q(user__followers=user) # user following + | Q(user=user) # is self + | Q(mention_users=user) # mentions user + ), + ) + + book_comments = statuses.filter(Q(comment__book__parent_work=work)) + book_quotations = statuses.filter(Q(quotation__book__parent_work=work)) + book_reviews = statuses.filter(Q(review__book__parent_work=work)) + book_mentions = statuses.filter(Q(mention_books__parent_work=work)) + + book_statuses = book_comments.union( + book_quotations, book_reviews, book_mentions + ) + + self.bulk_add_objects_to_store(book_statuses, self.stream_id(user.id)) + + threads = book_statuses.values_list("thread_id", flat=True) + thread_statuses = statuses.exclude( + id__in=book_statuses.values_list("id", flat=True) + ).filter(thread_id__in=threads) + + self.bulk_add_objects_to_store(thread_statuses, self.stream_id(user.id)) + class LocalStream(ActivityStream): """users you follow""" @@ -538,7 +571,7 @@ def remove_book_statuses_task(user_id, book_id): @app.task(queue=STREAMS) def add_blocked_book_statuses_task(user_id, book_id): - """add statuses related to a book on shelve""" + """add statuses related to a formerly blocked book""" user = models.User.objects.get(id=user_id) book = models.Edition.objects.get(id=book_id) BooksStream().add_book_statuses(user, book) diff --git a/bookwyrm/templates/book/series.html b/bookwyrm/templates/book/series.html index 9d8c86d1ce..5d3cfb6b36 100644 --- a/bookwyrm/templates/book/series.html +++ b/bookwyrm/templates/book/series.html @@ -64,7 +64,7 @@

    {% trans "External links" %}

    - {% for seriesbook in series.seriesbooks.all %} + {% for seriesbook in books %}
    diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html index b93c967545..80812c9380 100644 --- a/bookwyrm/templates/search/book.html +++ b/bookwyrm/templates/search/book.html @@ -1,10 +1,20 @@ {% extends 'search/layout.html' %} {% load i18n %} {% load humanize %} +{% load utilities %} {% load book_display_tags %} {% block panel %} +{% if blocked_books_excluded %} +

    + {% url "prefs-block-books" as bb_path %} + {% blocktrans trimmed %} + Some results have been excluded because they are in your blocked books list + {% endblocktrans %} +

    +{% endif %} + {% if results or remote_results %}
      {% for result in results %} diff --git a/bookwyrm/tests/views/books/test_series.py b/bookwyrm/tests/views/books/test_series.py index 83a88e6174..33d13148b4 100644 --- a/bookwyrm/tests/views/books/test_series.py +++ b/bookwyrm/tests/views/books/test_series.py @@ -122,3 +122,30 @@ def test_seriesbook_api(self): result = view(request, self.seriesbook.id) self.assertIsInstance(result, ActivitypubResponse) self.assertEqual(result.status_code, 200) + + def test_series_page_with_blocked_book(self): + """do not display blocked books on series homepage""" + + bad_work = models.Work.objects.create(title="awful book") + + models.SeriesBook.objects.create( + book=bad_work, + series=self.series, + user=self.user, + remote_id="https://example.com/seriesbook/666", + ) + + view = views.Series.as_view() + request = self.factory.get("") + request.user = self.user + result = view(request, self.seriesbook.id) + + books = result.context_data["books"] + self.assertEqual(books.object_list.count(), 2) + + self.user.blocked_books.add(bad_work) + + result = view(request, self.series.id) + + books = result.context_data["books"] + self.assertEqual(books.object_list.count(), 1) diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index f43a75f937..0df3cdb6f5 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -91,6 +91,40 @@ def test_author_page_edition_author(self): validate_html(result.render()) self.assertEqual(result.status_code, 200) + def test_author_page_edition_author_blocked_book(self): + """blocked books should not display""" + view = views.Author.as_view() + models.Edition.objects.create( + title="Example Edition", + remote_id="https://example.com/book/1", + parent_work=self.work, + isbn_13="9780300112511", + ) + author = models.Author.objects.create(name="Jessica") + self.book.authors.add(author) + + bad_book = models.Edition.objects.create( + title="Bad Edition", + remote_id="https://example.com/book/3", + parent_work=models.Work.objects.create(title="Bad Work"), + isbn_13="9780123456789", + ) + bad_book.authors.add(author) + + self.local_user.blocked_books.add(bad_book.parent_work) + + request = self.factory.get("") + request.user = self.local_user + with patch("bookwyrm.views.author.is_api_request") as is_api: + is_api.return_value = False + result = view(request, author.id) + books = result.context_data["books"] + self.assertEqual(books.object_list.count(), 1) + + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + self.assertEqual(result.status_code, 200) + def test_author_page_empty(self): """there are so many views, this just makes sure it LOADS""" view = views.Author.as_view() diff --git a/bookwyrm/tests/views/test_search.py b/bookwyrm/tests/views/test_search.py index 2cbc15fce2..1119081ec1 100644 --- a/bookwyrm/tests/views/test_search.py +++ b/bookwyrm/tests/views/test_search.py @@ -235,3 +235,20 @@ def test_author_search(self): validate_html(response.render()) self.assertEqual(len(response.context_data["results"]), 1) self.assertEqual(response.context_data["results"][0], self.another_author) + + def test_search_books_blocked_book(self): + """don't return blocked books on search""" + + self.local_user.blocked_books.add(self.work) + + view = views.Search.as_view() + request = self.factory.get("", {"q": "Test Book", "remote": False}) + request.user = self.local_user + with patch("bookwyrm.views.search.is_api_request") as is_api: + is_api.return_value = False + response = view(request) + self.assertIsInstance(response, TemplateResponse) + validate_html(response.render()) + + self.assertEqual(response.context_data["blocked_books_excluded"], True) + self.assertEqual(len(response.context_data["results"]), 0) diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index 571343cd64..3348d87825 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -34,8 +34,14 @@ def get(self, request, author_id, slug=None): if redirect_local_path := maybe_redirect_local_path(request, author): return redirect_local_path + blocked_books = ( + request.user.blocked_books.values_list("id", flat=True) + if request.user.is_authenticated + else [] + ) books = ( models.Work.objects.filter(editions__authors=author) + .exclude(id__in=blocked_books) .order_by("created_date") .distinct() ) diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index fbad8d13f1..5c8434c8c0 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -30,20 +30,21 @@ def get(self, request, series_id, slug=None): if is_api_request(request): return ActivitypubResponse(series.to_activity(**request.GET)) - authors = models.Author.objects.none() - books = [] - items = ( - series.seriesbooks.filter(series=series.id) + blocked_books = ( + request.user.blocked_books.all() if request.user.is_authenticated else [] + ) + books = ( + series.seriesbooks.exclude(book__in=blocked_books) .prefetch_related("book__work", "book__authors") .order_by("series_number") ) - for item in items: - book = item.book.work.default_edition - book_data = {"book": book, "series_number": item.series_number} - books.append(book_data) - authors = authors.union(item.book.authors.all()) - paginated = Paginator(books, PAGE_LENGTH) + works = models.Work.objects.filter(id__in=books.values_list("book", flat=True)) + authors = models.Author.objects.filter( + id__in=works.values_list("authors", flat=True) + ) + + paginated = Paginator(books.all(), PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) data = { diff --git a/bookwyrm/views/search.py b/bookwyrm/views/search.py index 0c8fbf160e..08b7d62f63 100644 --- a/bookwyrm/views/search.py +++ b/bookwyrm/views/search.py @@ -75,10 +75,23 @@ def book_search(request): # try a local-only search local_results = search(query, min_confidence=min_confidence) - paginated = Paginator(local_results, PAGE_LENGTH) + + cleaned_results = local_results + if request.user.is_authenticated: + blocked = request.user.blocked_books.values_list("id", flat=True) + cleaned_results = list( + filter(lambda b: b.parent_work.id not in blocked, local_results) + ) + + blocked_books_excluded = ( + True if len(cleaned_results) < len(local_results) else False + ) + + paginated = Paginator(cleaned_results, PAGE_LENGTH) page = paginated.get_page(request.GET.get("page")) data = { "query": query, + "blocked_books_excluded": blocked_books_excluded, "results": page, "type": "book", "remote": search_remote, From 77e09991b8fa346fce453f0e4ed7f0c9fea9dcc2 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 24 May 2026 18:59:29 +1000 Subject: [PATCH 701/962] update wording on search page --- bookwyrm/templates/search/book.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/search/book.html b/bookwyrm/templates/search/book.html index 80812c9380..9174e4655c 100644 --- a/bookwyrm/templates/search/book.html +++ b/bookwyrm/templates/search/book.html @@ -10,7 +10,7 @@

      {% url "prefs-block-books" as bb_path %} {% blocktrans trimmed %} - Some results have been excluded because they are in your blocked books list + Some blocked books have been excluded. {% endblocktrans %}

      {% endif %} From 2c410c0f7bdb3306d7562e4e680da1e230d636cf Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 24 May 2026 19:04:20 +1000 Subject: [PATCH 702/962] add merge migration --- bookwyrm/migrations/0232_merge_20260524_0901.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 bookwyrm/migrations/0232_merge_20260524_0901.py diff --git a/bookwyrm/migrations/0232_merge_20260524_0901.py b/bookwyrm/migrations/0232_merge_20260524_0901.py new file mode 100644 index 0000000000..70a112c072 --- /dev/null +++ b/bookwyrm/migrations/0232_merge_20260524_0901.py @@ -0,0 +1,14 @@ +# Generated by Django 5.2.14 on 2026-05-24 09:01 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0231_sitesettings_block_incoming_search_and_more'), + ('bookwyrm', '0231_user_blocked_books'), + ] + + operations = [ + ] From ea97cce0e74998f190aacbea51f28b18c64e05c8 Mon Sep 17 00:00:00 2001 From: ProtonsAndElectrons Date: Mon, 25 May 2026 01:33:29 +0200 Subject: [PATCH 703/962] Stabilize Readwise source URL test --- bookwyrm/tests/test_readwise.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/tests/test_readwise.py b/bookwyrm/tests/test_readwise.py index 16c26a2c16..312d1ea309 100644 --- a/bookwyrm/tests/test_readwise.py +++ b/bookwyrm/tests/test_readwise.py @@ -73,7 +73,7 @@ def test_build_readwise_highlight(self): self.assertEqual(result["author"], "Octavia Butler") self.assertEqual(result["source_type"], "bookwyrm") self.assertEqual(result["category"], "books") - self.assertEqual(result["source_url"], "https://example.com/book/1") + self.assertEqual(result["source_url"], quotation.book.remote_id) self.assertEqual(result["highlight_url"], quotation.remote_id) self.assertEqual(result["location_type"], "page") self.assertEqual(result["location"], 42) From 4ab4b6a4a455db2144de88309a432eccfcbfa8af Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 25 May 2026 09:31:11 -0700 Subject: [PATCH 704/962] Updates tests to reflect public suggestions --- bookwyrm/tests/views/test_user.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index c566aa4dd5..b025c66282 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -364,4 +364,5 @@ def test_suggestions_page_is_not_self(self): request = self.factory.get("") request.user = self.anonymous_user result = view(request, "mouse") - self.assertEqual(result.status_code, 302) + self.assertEqual(result.status_code, 200) + validate_html(result.render()) From c14be3b7ee260e91b076fe354222bf85d7d800a7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 25 May 2026 09:57:38 -0700 Subject: [PATCH 705/962] Landing page re-work --- bookwyrm/templates/landing/landing.html | 49 +++++----------------- bookwyrm/templates/landing/large-book.html | 39 ----------------- bookwyrm/templates/landing/small-book.html | 23 ---------- bookwyrm/templatetags/landing_page_tags.py | 8 +--- 4 files changed, 11 insertions(+), 108 deletions(-) delete mode 100644 bookwyrm/templates/landing/large-book.html delete mode 100644 bookwyrm/templates/landing/small-book.html diff --git a/bookwyrm/templates/landing/landing.html b/bookwyrm/templates/landing/landing.html index 050f62b33b..54639db079 100644 --- a/bookwyrm/templates/landing/landing.html +++ b/bookwyrm/templates/landing/landing.html @@ -13,46 +13,17 @@

      {% trans "Recent Books" %}

      {# 1 hour cache #} {% cache 3600 landing LANGUAGE_CODE %} {% get_landing_books as books %} -
      -
      -
      -
      - {% include 'landing/large-book.html' with book=books.0 %} -
      -
      -
      -
      -
      - {% include 'landing/small-book.html' with book=books.1 %} -
      -
      -
      -
      - {% include 'landing/small-book.html' with book=books.2 %} -
      -
      -
      -
      -
      -
      -
      -
      - {% include 'landing/small-book.html' with book=books.3 %} -
      -
      -
      -
      - {% include 'landing/small-book.html' with book=books.4 %} -
      -
      -
      -
      -
      - {% include 'landing/large-book.html' with book=books.5 %} -
      -
      +
      + {% for work in books %} + {% with book=work.default_edition %} +
      + + {% include 'snippets/book_cover.html' with size='xxlarge' %} +
      + {% endwith %} + {% endfor %}
      {% endcache %} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/bookwyrm/templates/landing/large-book.html b/bookwyrm/templates/landing/large-book.html deleted file mode 100644 index 9b4fd1f938..0000000000 --- a/bookwyrm/templates/landing/large-book.html +++ /dev/null @@ -1,39 +0,0 @@ -{% load book_display_tags %} -{% load rating_tags %} -{% load markdown %} -{% load i18n %} - -{% if book %} - {% with book=book %} -
      -
      - {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' size='xxlarge' %} - - {% include 'snippets/stars.html' with rating=book|rating:request.user %} -
      - - -
      -

      - {{ book.title }} -

      - - {% if book.authors %} -

      - {% trans "by" %} - {% include 'snippets/authors.html' with limit=3 %} -

      - {% endif %} - - {% if book|book_description %} -
      - {{ book|book_description|to_markdown|safe|truncatewords_html:50 }} -
      - {% endif %} -
      -
      - {% endwith %} -{% endif %} diff --git a/bookwyrm/templates/landing/small-book.html b/bookwyrm/templates/landing/small-book.html deleted file mode 100644 index 31f80e41f4..0000000000 --- a/bookwyrm/templates/landing/small-book.html +++ /dev/null @@ -1,23 +0,0 @@ -{% load rating_tags %} -{% load i18n %} - -{% if book %} - {% with book=book %} - - {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' size='xxlarge' %} - - - {% include 'snippets/stars.html' with rating=book|rating:request.user %} - -

      - {{ book.title }} -

      - - {% if book.authors.exists %} -

      - {% trans "by" %} - {% include 'snippets/authors.html' with limit=3 %} -

      - {% endif %} - {% endwith %} -{% endif %} diff --git a/bookwyrm/templatetags/landing_page_tags.py b/bookwyrm/templatetags/landing_page_tags.py index 50e0471fec..b63f9bb80b 100644 --- a/bookwyrm/templatetags/landing_page_tags.py +++ b/bookwyrm/templatetags/landing_page_tags.py @@ -70,10 +70,4 @@ def get_book_superlatives(): @register.simple_tag(takes_context=False) def get_landing_books(): """list of books for the landing page""" - return list( - set( - models.Edition.objects.exclude(cover__exact="") - .distinct() - .order_by("-updated_date")[:6] - ) - ) + return models.Work.objects.distinct().order_by("-updated_date")[:20] From d38674c028f90cc10a26615f118f0d460a0f9199 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 25 May 2026 09:58:21 -0700 Subject: [PATCH 706/962] Revert "Landing page re-work" This reverts commit c14be3b7ee260e91b076fe354222bf85d7d800a7. --- bookwyrm/templates/landing/landing.html | 49 +++++++++++++++++----- bookwyrm/templates/landing/large-book.html | 39 +++++++++++++++++ bookwyrm/templates/landing/small-book.html | 23 ++++++++++ bookwyrm/templatetags/landing_page_tags.py | 8 +++- 4 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 bookwyrm/templates/landing/large-book.html create mode 100644 bookwyrm/templates/landing/small-book.html diff --git a/bookwyrm/templates/landing/landing.html b/bookwyrm/templates/landing/landing.html index 54639db079..050f62b33b 100644 --- a/bookwyrm/templates/landing/landing.html +++ b/bookwyrm/templates/landing/landing.html @@ -13,17 +13,46 @@

      {% trans "Recent Books" %}

      {# 1 hour cache #} {% cache 3600 landing LANGUAGE_CODE %} {% get_landing_books as books %} -
      - {% for work in books %} - {% with book=work.default_edition %} -
      - - {% include 'snippets/book_cover.html' with size='xxlarge' %} - +
      +
      +
      +
      + {% include 'landing/large-book.html' with book=books.0 %} +
      +
      +
      +
      +
      + {% include 'landing/small-book.html' with book=books.1 %} +
      +
      +
      +
      + {% include 'landing/small-book.html' with book=books.2 %} +
      +
      +
      +
      +
      +
      +
      +
      + {% include 'landing/small-book.html' with book=books.3 %} +
      +
      +
      +
      + {% include 'landing/small-book.html' with book=books.4 %} +
      +
      +
      +
      +
      + {% include 'landing/large-book.html' with book=books.5 %} +
      +
      - {% endwith %} - {% endfor %}
      {% endcache %} {% endif %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/bookwyrm/templates/landing/large-book.html b/bookwyrm/templates/landing/large-book.html new file mode 100644 index 0000000000..9b4fd1f938 --- /dev/null +++ b/bookwyrm/templates/landing/large-book.html @@ -0,0 +1,39 @@ +{% load book_display_tags %} +{% load rating_tags %} +{% load markdown %} +{% load i18n %} + +{% if book %} + {% with book=book %} +
      +
      + {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' size='xxlarge' %} + + {% include 'snippets/stars.html' with rating=book|rating:request.user %} +
      + + +
      +

      + {{ book.title }} +

      + + {% if book.authors %} +

      + {% trans "by" %} + {% include 'snippets/authors.html' with limit=3 %} +

      + {% endif %} + + {% if book|book_description %} +
      + {{ book|book_description|to_markdown|safe|truncatewords_html:50 }} +
      + {% endif %} +
      +
      + {% endwith %} +{% endif %} diff --git a/bookwyrm/templates/landing/small-book.html b/bookwyrm/templates/landing/small-book.html new file mode 100644 index 0000000000..31f80e41f4 --- /dev/null +++ b/bookwyrm/templates/landing/small-book.html @@ -0,0 +1,23 @@ +{% load rating_tags %} +{% load i18n %} + +{% if book %} + {% with book=book %} + + {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' size='xxlarge' %} + + + {% include 'snippets/stars.html' with rating=book|rating:request.user %} + +

      + {{ book.title }} +

      + + {% if book.authors.exists %} +

      + {% trans "by" %} + {% include 'snippets/authors.html' with limit=3 %} +

      + {% endif %} + {% endwith %} +{% endif %} diff --git a/bookwyrm/templatetags/landing_page_tags.py b/bookwyrm/templatetags/landing_page_tags.py index b63f9bb80b..50e0471fec 100644 --- a/bookwyrm/templatetags/landing_page_tags.py +++ b/bookwyrm/templatetags/landing_page_tags.py @@ -70,4 +70,10 @@ def get_book_superlatives(): @register.simple_tag(takes_context=False) def get_landing_books(): """list of books for the landing page""" - return models.Work.objects.distinct().order_by("-updated_date")[:20] + return list( + set( + models.Edition.objects.exclude(cover__exact="") + .distinct() + .order_by("-updated_date")[:6] + ) + ) From ec64b23b29da5baea9d935483099a8e8195e9f68 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 25 May 2026 10:00:10 -0700 Subject: [PATCH 707/962] Landing page re-work --- bookwyrm/templates/landing/landing.html | 49 +++++----------------- bookwyrm/templates/landing/large-book.html | 39 ----------------- bookwyrm/templates/landing/small-book.html | 23 ---------- bookwyrm/templatetags/landing_page_tags.py | 8 +--- 4 files changed, 11 insertions(+), 108 deletions(-) delete mode 100644 bookwyrm/templates/landing/large-book.html delete mode 100644 bookwyrm/templates/landing/small-book.html diff --git a/bookwyrm/templates/landing/landing.html b/bookwyrm/templates/landing/landing.html index 050f62b33b..54639db079 100644 --- a/bookwyrm/templates/landing/landing.html +++ b/bookwyrm/templates/landing/landing.html @@ -13,46 +13,17 @@

      {% trans "Recent Books" %}

      {# 1 hour cache #} {% cache 3600 landing LANGUAGE_CODE %} {% get_landing_books as books %} -
      -
      -
      -
      - {% include 'landing/large-book.html' with book=books.0 %} -
      -
      -
      -
      -
      - {% include 'landing/small-book.html' with book=books.1 %} -
      -
      -
      -
      - {% include 'landing/small-book.html' with book=books.2 %} -
      -
      -
      -
      -
      -
      -
      -
      - {% include 'landing/small-book.html' with book=books.3 %} -
      -
      -
      -
      - {% include 'landing/small-book.html' with book=books.4 %} -
      -
      -
      -
      -
      - {% include 'landing/large-book.html' with book=books.5 %} -
      -
      +
      + {% for work in books %} + {% with book=work.default_edition %} +
      + + {% include 'snippets/book_cover.html' with size='xxlarge' %} +
      + {% endwith %} + {% endfor %}
      {% endcache %} {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/bookwyrm/templates/landing/large-book.html b/bookwyrm/templates/landing/large-book.html deleted file mode 100644 index 9b4fd1f938..0000000000 --- a/bookwyrm/templates/landing/large-book.html +++ /dev/null @@ -1,39 +0,0 @@ -{% load book_display_tags %} -{% load rating_tags %} -{% load markdown %} -{% load i18n %} - -{% if book %} - {% with book=book %} -
      -
      - {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto-tablet' size='xxlarge' %} - - {% include 'snippets/stars.html' with rating=book|rating:request.user %} -
      - - -
      -

      - {{ book.title }} -

      - - {% if book.authors %} -

      - {% trans "by" %} - {% include 'snippets/authors.html' with limit=3 %} -

      - {% endif %} - - {% if book|book_description %} -
      - {{ book|book_description|to_markdown|safe|truncatewords_html:50 }} -
      - {% endif %} -
      -
      - {% endwith %} -{% endif %} diff --git a/bookwyrm/templates/landing/small-book.html b/bookwyrm/templates/landing/small-book.html deleted file mode 100644 index 31f80e41f4..0000000000 --- a/bookwyrm/templates/landing/small-book.html +++ /dev/null @@ -1,23 +0,0 @@ -{% load rating_tags %} -{% load i18n %} - -{% if book %} - {% with book=book %} - - {% include 'snippets/book_cover.html' with cover_class='is-w-l-mobile is-w-auto align to-b to-l' size='xxlarge' %} - - - {% include 'snippets/stars.html' with rating=book|rating:request.user %} - -

      - {{ book.title }} -

      - - {% if book.authors.exists %} -

      - {% trans "by" %} - {% include 'snippets/authors.html' with limit=3 %} -

      - {% endif %} - {% endwith %} -{% endif %} diff --git a/bookwyrm/templatetags/landing_page_tags.py b/bookwyrm/templatetags/landing_page_tags.py index 50e0471fec..b63f9bb80b 100644 --- a/bookwyrm/templatetags/landing_page_tags.py +++ b/bookwyrm/templatetags/landing_page_tags.py @@ -70,10 +70,4 @@ def get_book_superlatives(): @register.simple_tag(takes_context=False) def get_landing_books(): """list of books for the landing page""" - return list( - set( - models.Edition.objects.exclude(cover__exact="") - .distinct() - .order_by("-updated_date")[:6] - ) - ) + return models.Work.objects.distinct().order_by("-updated_date")[:20] From ecd5bfb934b816aacce7052d68e5dc430da8596b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 25 May 2026 10:05:05 -0700 Subject: [PATCH 708/962] Fixes mobile display of landing page --- bookwyrm/templates/landing/landing.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/landing/landing.html b/bookwyrm/templates/landing/landing.html index 54639db079..723235c2a6 100644 --- a/bookwyrm/templates/landing/landing.html +++ b/bookwyrm/templates/landing/landing.html @@ -16,7 +16,7 @@

      {% trans "Recent Books" %}

      {% for work in books %} {% with book=work.default_edition %} -
      +
      {% include 'snippets/book_cover.html' with size='xxlarge' %} From 6937e58383e4f6719d29d4296b07978df7441032 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 25 May 2026 11:18:24 -0700 Subject: [PATCH 709/962] Fixes other pages that use "small-book" template --- bookwyrm/templates/author/author.html | 2 +- bookwyrm/templates/book/edit/edit_series.html | 2 +- bookwyrm/templates/book/series.html | 2 +- bookwyrm/templates/snippets/small-book.html | 23 +++++++++++++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 bookwyrm/templates/snippets/small-book.html diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index cf8a970984..c022d0dd4d 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -181,7 +181,7 @@

      {% blocktrans with name=author.name %}Books by {{ name }} {% with book=book|author_edition:author %}
      - {% include 'landing/small-book.html' with book=book %} + {% include 'snippets/small-book.html' with book=book %}
      {% include 'snippets/shelve_button/shelve_button.html' with book=book %}
      diff --git a/bookwyrm/templates/book/edit/edit_series.html b/bookwyrm/templates/book/edit/edit_series.html index 42b3f5441f..2eb961535a 100644 --- a/bookwyrm/templates/book/edit/edit_series.html +++ b/bookwyrm/templates/book/edit/edit_series.html @@ -69,7 +69,7 @@

      {% blocktrans with name=series.name %}Edit "{{ name }}"{% endb - {% include 'landing/small-book.html' with book=seriesbook.book.work.default_edition %} + {% include 'snippets/small-book.html' with book=seriesbook.book.work.default_edition %}

      diff --git a/bookwyrm/templates/book/series.html b/bookwyrm/templates/book/series.html index 9d8c86d1ce..666628fdd5 100644 --- a/bookwyrm/templates/book/series.html +++ b/bookwyrm/templates/book/series.html @@ -70,7 +70,7 @@

      {% trans "External links" %}

      {% if seriesbook.series_number %}{% blocktrans with series_number=seriesbook.series_number %}Book {{ series_number }}{% endblocktrans %}{% endif %} - {% include 'landing/small-book.html' with book=seriesbook.book.work.default_edition %} + {% include 'snippets/small-book.html' with book=seriesbook.book.work.default_edition %}
      {% endfor %} diff --git a/bookwyrm/templates/snippets/small-book.html b/bookwyrm/templates/snippets/small-book.html new file mode 100644 index 0000000000..4df1522e25 --- /dev/null +++ b/bookwyrm/templates/snippets/small-book.html @@ -0,0 +1,23 @@ +{% load rating_tags %} +{% load i18n %} + +{% if book %} + {% with book=book %} + + {% include 'snippets/book_cover.html' with size='xlarge' %} + + + {% include 'snippets/stars.html' with rating=book|rating:request.user %} + +

      + {{ book.title }} +

      + + {% if book.authors.exists %} +

      + {% trans "by" %} + {% include 'snippets/authors.html' with limit=3 %} +

      + {% endif %} + {% endwith %} +{% endif %} From 877a1ba78d677eed3861da85a24a3c68df66ebcc Mon Sep 17 00:00:00 2001 From: Leni Kadali Date: Tue, 26 May 2026 23:02:03 +0300 Subject: [PATCH 710/962] Make changes in correct view, correct assertion Previous commit made the changes in the List view when the fix was supposed to be in the ListItem view. Updated the assertion to check the correct fields and values. --- bookwyrm/migrations/0230_listitem_raw_notes.py | 2 +- bookwyrm/tests/views/lists/test_list_item.py | 4 ++-- bookwyrm/views/list/list_item.py | 14 ++++++++++++-- bookwyrm/views/list/lists.py | 15 --------------- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/bookwyrm/migrations/0230_listitem_raw_notes.py b/bookwyrm/migrations/0230_listitem_raw_notes.py index 6155fc749b..1175588815 100644 --- a/bookwyrm/migrations/0230_listitem_raw_notes.py +++ b/bookwyrm/migrations/0230_listitem_raw_notes.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.14 on 2026-05-22 19:10 +# Generated by Django 5.2.14 on 2026-05-22 19:24 from django.db import migrations, models diff --git a/bookwyrm/tests/views/lists/test_list_item.py b/bookwyrm/tests/views/lists/test_list_item.py index 506a89c9b3..3b46a513b7 100644 --- a/bookwyrm/tests/views/lists/test_list_item.py +++ b/bookwyrm/tests/views/lists/test_list_item.py @@ -71,5 +71,5 @@ def test_add_list_item_notes(self): self.assertEqual(mock.call_count, 1) item.refresh_from_db() - self.assertEqual(item.notes, "beep boop") - self.assertEqual(item.raw_notes, "

      beep boop

      ") + self.assertEqual(item.notes, "

      beep boop

      ") + self.assertEqual(item.raw_notes, "beep boop") diff --git a/bookwyrm/views/list/list_item.py b/bookwyrm/views/list/list_item.py index 29b6bb7ec1..3d2b3a8064 100644 --- a/bookwyrm/views/list/list_item.py +++ b/bookwyrm/views/list/list_item.py @@ -5,8 +5,10 @@ from django.utils.decorators import method_decorator from django.views import View +from markdown import markdown + from bookwyrm import forms, models -from bookwyrm.views.status import to_markdown +from bookwyrm.utils import sanitizer @method_decorator(login_required, name="dispatch") @@ -18,9 +20,17 @@ def post(self, request, list_id, list_item): list_item = get_object_or_404(models.ListItem, id=list_item, book_list=list_id) form = forms.ListItemForm(request.POST, instance=list_item) if form.is_valid(): + # save the plain, unformatted version of the status for future editing item = form.save(request, commit=False) - item.notes = to_markdown(item.notes) + item.raw_notes = item.notes + item.notes = notes_to_markdown(item.notes) item.save() else: raise Exception(form.errors) return redirect("list", list_item.book_list.id) + +def notes_to_markdown(notes): + """convert to markdown""" + notes = markdown(notes) + # sanitize resulting html + return sanitizer.clean(notes) diff --git a/bookwyrm/views/list/lists.py b/bookwyrm/views/list/lists.py index 07a6012a3f..205d1a60fb 100644 --- a/bookwyrm/views/list/lists.py +++ b/bookwyrm/views/list/lists.py @@ -9,13 +9,10 @@ from django.utils.decorators import method_decorator from django.views import View -from markdown import markdown - from bookwyrm import forms, models from bookwyrm.lists_stream import ListsStream from bookwyrm.views.helpers import get_user_from_username from bookwyrm.views.list.list import add_book -from bookwyrm.utils import sanitizer logger = logging.getLogger(__name__) @@ -49,11 +46,6 @@ def post(self, request): if not book_list.curation == "group": book_list.group = None - # save the plain, unformatted version of the status for future editing - book_list.raw_notes = book_list.notes - book_list.notes = notes_to_markdown(book_list.notes) - book_list.save() - book_id = request.POST.get("book") if book_id: # We want to add a book to the new list directly after its creation @@ -102,10 +94,3 @@ def get(self, request, username): "path": user.local_path + "/lists", } return TemplateResponse(request, "user/lists.html", data) - - -def notes_to_markdown(notes): - """convert to markdown""" - notes = markdown(notes) - # sanitize resulting html - return sanitizer.clean(notes) From c9fe5e958a0f404c42ea645c782652a8ef9d4774 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Wed, 25 Mar 2026 22:57:14 -0500 Subject: [PATCH 711/962] Merge migrations --- bookwyrm/migrations/0232_merge_20260527_0333.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 bookwyrm/migrations/0232_merge_20260527_0333.py diff --git a/bookwyrm/migrations/0232_merge_20260527_0333.py b/bookwyrm/migrations/0232_merge_20260527_0333.py new file mode 100644 index 0000000000..b9ea5aece8 --- /dev/null +++ b/bookwyrm/migrations/0232_merge_20260527_0333.py @@ -0,0 +1,13 @@ +# Generated by Django 5.2.9 on 2026-05-27 03:33 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0230_merge_20260326_0357"), + ("bookwyrm", "0231_sitesettings_block_incoming_search_and_more"), + ] + + operations = [] From d3feccaa75392a24e8aaee2ed4af61a03a8a127c Mon Sep 17 00:00:00 2001 From: Ian Young Date: Tue, 26 May 2026 22:36:21 -0500 Subject: [PATCH 712/962] Fix ruff violations --- bookwyrm/tests/views/test_user_upload.py | 9 +-------- bookwyrm/views/status.py | 1 - bookwyrm/views/user_upload.py | 7 ++----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/bookwyrm/tests/views/test_user_upload.py b/bookwyrm/tests/views/test_user_upload.py index 456e6e7240..ff99b8482f 100644 --- a/bookwyrm/tests/views/test_user_upload.py +++ b/bookwyrm/tests/views/test_user_upload.py @@ -1,16 +1,9 @@ -import pathlib from unittest.mock import patch -from PIL import Image -from django.contrib.auth.models import AnonymousUser -from django.core.files.base import ContentFile -from django.core.files.uploadedfile import SimpleUploadedFile -from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory -from bookwyrm import forms, models, views -from bookwyrm.tests.validate_html import validate_html +from bookwyrm import models, views class UserUploadViews(TestCase): diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index a2d9fbf027..894bed39ee 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -16,7 +16,6 @@ from django.views import View from django.views.decorators.http import require_POST -from functools import partial import mistune from bookwyrm import forms, models from bookwyrm.models.report import DELETE_ITEM diff --git a/bookwyrm/views/user_upload.py b/bookwyrm/views/user_upload.py index c07f56be12..e9f7f9d0ee 100644 --- a/bookwyrm/views/user_upload.py +++ b/bookwyrm/views/user_upload.py @@ -1,12 +1,9 @@ -import re import logging -import tempfile from PIL import Image from io import BytesIO from django.core.files import File from django.contrib.auth.decorators import login_required -from django.http import HttpResponse, HttpResponseBadRequest, Http404 from django.utils.decorators import method_decorator from django.views import View from django.http import JsonResponse @@ -55,7 +52,7 @@ def post(self, request): e.message_dict, status=422, ) - except Exception as e: + except Exception: return JsonResponse( {"original_file": "File was not a supported image type."}, status=422, @@ -66,7 +63,7 @@ def post(self, request): width, height = image.size for size in UPLOAD_IMAGE_DIMENSIONS: - v = self.create_version(image, upload, size) + self.create_version(image, upload, size) if width < size and height < size: break From 2a575a00bc9cc0a56f3668343d3510bc6b231a90 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Tue, 26 May 2026 22:55:27 -0500 Subject: [PATCH 713/962] Add Django translation tools in JS --- bookwyrm/static/js/xhr_files.js | 10 ++++++---- bookwyrm/templates/layout.html | 1 + bookwyrm/urls.py | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/bookwyrm/static/js/xhr_files.js b/bookwyrm/static/js/xhr_files.js index 173745b392..6d0bff0ca6 100644 --- a/bookwyrm/static/js/xhr_files.js +++ b/bookwyrm/static/js/xhr_files.js @@ -35,9 +35,11 @@ let XhrFiles = new (class { const file = item.getAsFile(); if (file.size > event.currentTarget.dataset.maxUpload) { - alert( - `File exceeds maximum size: ${event.currentTarget.dataset.maxUploadHuman}` - ); + const errStr = interpolate( + gettext("File exceeds maximum size: %s"), + [event.currentTarget.dataset.maxUploadHuman] + ) + alert(errStr); return; } @@ -56,7 +58,7 @@ let XhrFiles = new (class { console.error(this.response); if (this.status == 422) { - alert("The provided file isn't a valid image."); + alert(gettext("The provided file isn't a valid image")); } return; diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index c70c3805af..7662674b98 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -204,6 +204,7 @@ var csrf_token = '{{ csrf_token }}'; + diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index aafb134381..0573647532 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -5,6 +5,7 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.urls import path, re_path, include from django.views.generic.base import TemplateView +from django.views.i18n import JavaScriptCatalog from bookwyrm import settings, views from bookwyrm.utils import regex @@ -30,6 +31,7 @@ STREAMS = "|".join(s["key"] for s in settings.STREAMS) urlpatterns = [ + path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"), path("admin/", admin.site.urls), path( "robots.txt", From 9c59f315f3c0c27de30b6442e7329533fe58b33e Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Wed, 27 May 2026 21:33:37 +1000 Subject: [PATCH 714/962] Do not log PermissionDenied errors on unsigned get requests - subclass PermissionDenied as UnsignedGetRequest - skip logging for UnsignedGetRequest --- bookwyrm/middleware/require_signed_get.py | 6 +++++- bookwyrm/settings.py | 5 ++++- bookwyrm/utils/log.py | 18 ++++++++++++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/bookwyrm/middleware/require_signed_get.py b/bookwyrm/middleware/require_signed_get.py index 66bf29c3c0..6d5ee3d971 100644 --- a/bookwyrm/middleware/require_signed_get.py +++ b/bookwyrm/middleware/require_signed_get.py @@ -13,6 +13,10 @@ from bookwyrm.views.inbox import raise_is_blocked_user_agent +class UnsignedGetRequest(PermissionDenied): + pass + + class RequireSignedGet: """lock down incoming GET API requests""" @@ -46,7 +50,7 @@ def __call__(self, request): # require signed headers for everything else if not has_valid_get_signature(request): - raise PermissionDenied + raise UnsignedGetRequest # we're good, continue return self.get_response(request) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 4b80665820..a70bf78e53 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -178,6 +178,9 @@ "ignore_missing_variable": { "()": "bookwyrm.utils.log.IgnoreVariableDoesNotExist", }, + "skip_unsigned_get_errors": { + "()": "bookwyrm.utils.log.SkipUnsignedGetErrors", + }, }, "handlers": { # Overrides the default handler to make it log to console @@ -185,7 +188,7 @@ # console if DEBUG=False) "console": { "level": LOG_LEVEL, - "filters": ["ignore_missing_variable"], + "filters": ["ignore_missing_variable", "skip_unsigned_get_errors"], "class": "logging.StreamHandler", }, # This is copied as-is from the default logger, and is diff --git a/bookwyrm/utils/log.py b/bookwyrm/utils/log.py index a18a26bac4..03da411f77 100644 --- a/bookwyrm/utils/log.py +++ b/bookwyrm/utils/log.py @@ -19,3 +19,21 @@ def filter(self, record: logging.LogRecord) -> bool: return False err_value = err_value.__context__ return True + + +class SkipUnsignedGetErrors(logging.Filter): + """ + UnsignedGetRequest is a custom error for PermissionDenied + exceptions when we require signed get requests. + + This allows us to ignore these "errors" since they are expected + """ + + def filter(self, record: logging.LogRecord) -> bool: + if record.exc_info: + (_, err_value, _) = record.exc_info + while err_value: + if type(err_value).__name__ == "UnsignedGetRequest": + return False + err_value = err_value.__context__ + return True From 77d6a8ba7d9197a51b63cca0ab6db72804f403f3 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Wed, 27 May 2026 23:46:23 +0700 Subject: [PATCH 715/962] Fix numeric ordering of series books --- bookwyrm/models/book.py | 11 +++++++++ bookwyrm/templates/book/series.html | 2 +- bookwyrm/tests/models/test_series.py | 16 ++++++++++++ bookwyrm/tests/views/books/test_series.py | 30 +++++++++++++++++++++++ bookwyrm/views/books/series.py | 21 ++++------------ 5 files changed, 63 insertions(+), 17 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index dba62af5fb..7d91c06f18 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -1003,3 +1003,14 @@ def get_remote_id(self): def raise_not_editable(self, viewer): if not viewer.has_perm("bookwyrm.edit_book"): raise PermissionDenied() + + @property + def natural_sort_key(self): + """numeric-aware key for series_number, so '2' sorts before '10'""" + value = self.series_number or "" + if not value: + return float("inf"), "" + match = re.match(r"\d+(?:\.\d+)?", value) + numeric_prefix = float(match.group()) if match else float("inf") + rest = value[match.end() :] if match else value + return numeric_prefix, rest diff --git a/bookwyrm/templates/book/series.html b/bookwyrm/templates/book/series.html index 9d8c86d1ce..588b81cdbe 100644 --- a/bookwyrm/templates/book/series.html +++ b/bookwyrm/templates/book/series.html @@ -64,7 +64,7 @@

      {% trans "External links" %}

      - {% for seriesbook in series.seriesbooks.all %} + {% for seriesbook in series_books %}
      diff --git a/bookwyrm/tests/models/test_series.py b/bookwyrm/tests/models/test_series.py index aadcc61674..39e48af6c4 100644 --- a/bookwyrm/tests/models/test_series.py +++ b/bookwyrm/tests/models/test_series.py @@ -48,3 +48,19 @@ def test_seriesbook_fields(self): self.assertEqual(self.work.seriesbooks.first(), seriesbook) self.assertEqual(self.work.book_series()[0], self.series) self.assertEqual(self.series.seriesbooks.first(), seriesbook) + + def test_natural_sort_key(self): + cases = { + "2": (2.0, ""), + "10": (10.0, ""), + "4.5": (4.5, ""), + "2-beta": (2.0, "-beta"), + "1.5-rc": (1.5, "-rc"), + "Prequel": (float("inf"), "Prequel"), + None: (float("inf"), ""), + "": (float("inf"), ""), + } + for number, expected in cases.items(): + with self.subTest(series_number=number): + seriesbook = models.SeriesBook(series_number=number) + self.assertEqual(seriesbook.natural_sort_key, expected) diff --git a/bookwyrm/tests/views/books/test_series.py b/bookwyrm/tests/views/books/test_series.py index 83a88e6174..98c5eab5d5 100644 --- a/bookwyrm/tests/views/books/test_series.py +++ b/bookwyrm/tests/views/books/test_series.py @@ -64,6 +64,36 @@ def test_series_page(self): self.assertEqual(result.status_code, 200) + def test_series_page_orders_books_by_numeric_semantics(self): + """series books are ordered by numeric semantics, not lexicographically""" + series = models.Series.objects.create( + user=self.user, + name="ordering series", + remote_id="https://example.com/series/1", + ) + for i, number in enumerate( + ["10", "2-beta", "1", "Prequel", "2", "4.5", "2-alpha", "1.5-rc"] + ): + book = models.Work.objects.create(title=f"book {i}") + models.SeriesBook.objects.create( + book=book, + series=series, + user=self.user, + series_number=number, + remote_id=f"https://example.com/seriesbook/{i}", + ) + + view = views.Series.as_view() + request = self.factory.get("") + request.user = self.user + result = view(request, series.id) + + ordered = [sb.series_number for sb in result.context_data["series_books"]] + self.assertEqual( + ordered, + ["1", "1.5-rc", "2", "2-alpha", "2-beta", "4.5", "10", "Prequel"], + ) + def test_editseries_page(self): """there are so many views, this just makes sure it LOADS""" view = views.EditSeries.as_view() diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index fbad8d13f1..7ea175d99b 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -1,6 +1,5 @@ """book series""" -from django.core.paginator import Paginator from django.db.utils import IntegrityError from django.http import Http404 from django.shortcuts import redirect @@ -12,7 +11,6 @@ from bookwyrm.forms import SeriesForm from bookwyrm import models from bookwyrm.activitypub import ActivitypubResponse -from bookwyrm.settings import PAGE_LENGTH from bookwyrm.views.helpers import ( is_api_request, get_mergeable_object_or_404, @@ -31,24 +29,15 @@ def get(self, request, series_id, slug=None): return ActivitypubResponse(series.to_activity(**request.GET)) authors = models.Author.objects.none() - books = [] - items = ( - series.seriesbooks.filter(series=series.id) - .prefetch_related("book__work", "book__authors") - .order_by("series_number") - ) - for item in items: - book = item.book.work.default_edition - book_data = {"book": book, "series_number": item.series_number} - books.append(book_data) - authors = authors.union(item.book.authors.all()) + items = series.seriesbooks.prefetch_related("book__work", "book__authors").all() + series_books = sorted(items, key=lambda sb: sb.natural_sort_key) - paginated = Paginator(books, PAGE_LENGTH) - page = paginated.get_page(request.GET.get("page")) + for item in series_books: + authors = authors.union(item.book.authors.all()) data = { "series": series, - "books": page, + "series_books": series_books, "series_authors": {"authors": authors}, } From 785bbb6bb275d9f9c8ed3872e45cf4fbeb89c117 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Thu, 28 May 2026 07:21:16 +1000 Subject: [PATCH 716/962] Just return HttpResponseForbidden for invalid GET signatures --- bookwyrm/middleware/require_signed_get.py | 8 ++------ bookwyrm/settings.py | 5 +---- bookwyrm/utils/log.py | 18 ------------------ 3 files changed, 3 insertions(+), 28 deletions(-) diff --git a/bookwyrm/middleware/require_signed_get.py b/bookwyrm/middleware/require_signed_get.py index 6d5ee3d971..1a744eea8d 100644 --- a/bookwyrm/middleware/require_signed_get.py +++ b/bookwyrm/middleware/require_signed_get.py @@ -3,7 +3,7 @@ import re from requests.exceptions import HTTPError -from django.core.exceptions import PermissionDenied +from django.http import HttpResponseForbidden from bookwyrm.activitypub import resolve_remote_id from bookwyrm.connectors import get_data @@ -13,10 +13,6 @@ from bookwyrm.views.inbox import raise_is_blocked_user_agent -class UnsignedGetRequest(PermissionDenied): - pass - - class RequireSignedGet: """lock down incoming GET API requests""" @@ -50,7 +46,7 @@ def __call__(self, request): # require signed headers for everything else if not has_valid_get_signature(request): - raise UnsignedGetRequest + return HttpResponseForbidden("Invalid signature") # we're good, continue return self.get_response(request) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index a70bf78e53..4b80665820 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -178,9 +178,6 @@ "ignore_missing_variable": { "()": "bookwyrm.utils.log.IgnoreVariableDoesNotExist", }, - "skip_unsigned_get_errors": { - "()": "bookwyrm.utils.log.SkipUnsignedGetErrors", - }, }, "handlers": { # Overrides the default handler to make it log to console @@ -188,7 +185,7 @@ # console if DEBUG=False) "console": { "level": LOG_LEVEL, - "filters": ["ignore_missing_variable", "skip_unsigned_get_errors"], + "filters": ["ignore_missing_variable"], "class": "logging.StreamHandler", }, # This is copied as-is from the default logger, and is diff --git a/bookwyrm/utils/log.py b/bookwyrm/utils/log.py index 03da411f77..a18a26bac4 100644 --- a/bookwyrm/utils/log.py +++ b/bookwyrm/utils/log.py @@ -19,21 +19,3 @@ def filter(self, record: logging.LogRecord) -> bool: return False err_value = err_value.__context__ return True - - -class SkipUnsignedGetErrors(logging.Filter): - """ - UnsignedGetRequest is a custom error for PermissionDenied - exceptions when we require signed get requests. - - This allows us to ignore these "errors" since they are expected - """ - - def filter(self, record: logging.LogRecord) -> bool: - if record.exc_info: - (_, err_value, _) = record.exc_info - while err_value: - if type(err_value).__name__ == "UnsignedGetRequest": - return False - err_value = err_value.__context__ - return True From e30c3df21b72899da17f60c92c4910f27d89d845 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Thu, 28 May 2026 09:49:52 +0700 Subject: [PATCH 717/962] address feedback --- bookwyrm/models/book.py | 4 ++-- bookwyrm/templates/book/series.html | 3 +++ bookwyrm/tests/models/test_series.py | 10 +++++++++ bookwyrm/tests/views/books/test_series.py | 26 +++++++++++++++++++++-- bookwyrm/views/books/series.py | 16 +++++++++----- 5 files changed, 50 insertions(+), 9 deletions(-) diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index 7d91c06f18..46526f3ac8 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -1007,8 +1007,8 @@ def raise_not_editable(self, viewer): @property def natural_sort_key(self): """numeric-aware key for series_number, so '2' sorts before '10'""" - value = self.series_number or "" - if not value: + value = self.series_number + if value is None or len(value) == 0: return float("inf"), "" match = re.match(r"\d+(?:\.\d+)?", value) numeric_prefix = float(match.group()) if match else float("inf") diff --git a/bookwyrm/templates/book/series.html b/bookwyrm/templates/book/series.html index 588b81cdbe..63b1901079 100644 --- a/bookwyrm/templates/book/series.html +++ b/bookwyrm/templates/book/series.html @@ -76,5 +76,8 @@

      {% trans "External links" %}

      {% endfor %}
      {% endwith %} +
      + {% include 'snippets/pagination.html' with page=series_books path=request.path %} +
      {% endblock %} diff --git a/bookwyrm/tests/models/test_series.py b/bookwyrm/tests/models/test_series.py index 39e48af6c4..2a19b84a70 100644 --- a/bookwyrm/tests/models/test_series.py +++ b/bookwyrm/tests/models/test_series.py @@ -52,11 +52,21 @@ def test_seriesbook_fields(self): def test_natural_sort_key(self): cases = { "2": (2.0, ""), + "0": (0.0, ""), + "0a": (0.0, "a"), "10": (10.0, ""), "4.5": (4.5, ""), + "01": (1.0, ""), + "007": (7.0, ""), "2-beta": (2.0, "-beta"), "1.5-rc": (1.5, "-rc"), + "12abc34": (12.0, "abc34"), + # values without a leading number sort last "Prequel": (float("inf"), "Prequel"), + "abc123": (float("inf"), "abc123"), + "Book 2": (float("inf"), "Book 2"), + " 2": (float("inf"), " 2"), + "v2": (float("inf"), "v2"), None: (float("inf"), ""), "": (float("inf"), ""), } diff --git a/bookwyrm/tests/views/books/test_series.py b/bookwyrm/tests/views/books/test_series.py index 98c5eab5d5..4040220a29 100644 --- a/bookwyrm/tests/views/books/test_series.py +++ b/bookwyrm/tests/views/books/test_series.py @@ -72,7 +72,18 @@ def test_series_page_orders_books_by_numeric_semantics(self): remote_id="https://example.com/series/1", ) for i, number in enumerate( - ["10", "2-beta", "1", "Prequel", "2", "4.5", "2-alpha", "1.5-rc"] + [ + "10", + "2-beta", + "1", + "Prequel", + "Book 2", + "2", + "4.5", + "Book 1", + "2-alpha", + "1.5-rc", + ] ): book = models.Work.objects.create(title=f"book {i}") models.SeriesBook.objects.create( @@ -91,7 +102,18 @@ def test_series_page_orders_books_by_numeric_semantics(self): ordered = [sb.series_number for sb in result.context_data["series_books"]] self.assertEqual( ordered, - ["1", "1.5-rc", "2", "2-alpha", "2-beta", "4.5", "10", "Prequel"], + [ + "1", + "1.5-rc", + "2", + "2-alpha", + "2-beta", + "4.5", + "10", + "Book 1", + "Book 2", + "Prequel", + ], ) def test_editseries_page(self): diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index 7ea175d99b..b2195c8dc6 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -1,5 +1,6 @@ """book series""" +from django.core.paginator import Paginator from django.db.utils import IntegrityError from django.http import Http404 from django.shortcuts import redirect @@ -11,6 +12,7 @@ from bookwyrm.forms import SeriesForm from bookwyrm import models from bookwyrm.activitypub import ActivitypubResponse +from bookwyrm.settings import PAGE_LENGTH from bookwyrm.views.helpers import ( is_api_request, get_mergeable_object_or_404, @@ -28,16 +30,20 @@ def get(self, request, series_id, slug=None): if is_api_request(request): return ActivitypubResponse(series.to_activity(**request.GET)) - authors = models.Author.objects.none() - items = series.seriesbooks.prefetch_related("book__work", "book__authors").all() + items = series.seriesbooks.prefetch_related( + "book__work", "book__work__editions__authors" + ).all() series_books = sorted(items, key=lambda sb: sb.natural_sort_key) + authors = models.Author.objects.filter( + id__in=items.values_list("book__work__editions__authors") + ) - for item in series_books: - authors = authors.union(item.book.authors.all()) + paginated = Paginator(series_books, PAGE_LENGTH) + page = paginated.get_page(request.GET.get("page")) data = { "series": series, - "series_books": series_books, + "series_books": page, "series_authors": {"authors": authors}, } From 490ddfc0ec2875679cd473f259098506cfbbb02d Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Fri, 29 May 2026 19:17:08 +0700 Subject: [PATCH 718/962] Render stopped-reading status headers --- bookwyrm/templates/discover/card-header.html | 5 +++++ .../templates/snippets/status/headers/generatednote.html | 2 ++ 2 files changed, 7 insertions(+) diff --git a/bookwyrm/templates/discover/card-header.html b/bookwyrm/templates/discover/card-header.html index 89aa111092..8c8df30424 100644 --- a/bookwyrm/templates/discover/card-header.html +++ b/bookwyrm/templates/discover/card-header.html @@ -19,6 +19,11 @@ {{ username }} started reading {{ book_title }} {% endblocktrans %} {% endif %} + {% if status.content == 'stopped reading' or status.content == '

      stopped reading

      ' %} + {% blocktrans trimmed %} + {{ username }} stopped reading {{ book_title }} + {% endblocktrans %} + {% endif %} {% elif status.status_type == 'Rating' %} {% blocktrans trimmed %} {{ username }} rated {{ book_title }} diff --git a/bookwyrm/templates/snippets/status/headers/generatednote.html b/bookwyrm/templates/snippets/status/headers/generatednote.html index 398dc09db8..cec183f880 100644 --- a/bookwyrm/templates/snippets/status/headers/generatednote.html +++ b/bookwyrm/templates/snippets/status/headers/generatednote.html @@ -10,6 +10,8 @@ {% include 'snippets/status/headers/read.html' with book=status.mention_books.first %} {% elif status.content == 'started reading' or status.content == '

      started reading

      ' %} {% include 'snippets/status/headers/reading.html' with book=status.mention_books.first %} +{% elif status.content == 'stopped reading' or status.content == '

      stopped reading

      ' %} + {% include 'snippets/status/headers/stopped_reading.html' with book=status.mention_books.first %} {% else %} {{ status.content }} {% endif %} From c4b0eed319514d9a1f97baa14add94ed2bba92f1 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 30 May 2026 12:29:11 -0700 Subject: [PATCH 719/962] Revert "caching: set cache expire to 0 in debug mode" --- bookwyrm/settings.py | 3 --- nginx/locations | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 4b80665820..3ad83783d9 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -110,7 +110,6 @@ ] MIDDLEWARE = [ - "django.middleware.cache.UpdateCacheMiddleware", "django.middleware.security.SecurityMiddleware", "django.contrib.sessions.middleware.SessionMiddleware", "django.middleware.locale.LocaleMiddleware", @@ -126,7 +125,6 @@ "django.middleware.clickjacking.XFrameOptionsMiddleware", "bookwyrm.middleware.FileTooBig", "bookwyrm.middleware.ForceLogoutMiddleware", - "django.middleware.cache.FetchFromCacheMiddleware", ] ROOT_URLCONF = "bookwyrm.urls" @@ -154,7 +152,6 @@ }, ] -CACHE_MIDDLEWARE_SECONDS = 0 if DEBUG else env.int("CACHE_MIDDLEWARE_SECONDS", 60) LOG_LEVEL = env("LOG_LEVEL", "INFO").upper() # Override aspects of the default handler to our taste # See https://docs.djangoproject.com/en/3.2/topics/logging/#default-logging-configuration diff --git a/nginx/locations b/nginx/locations index 80178f11dc..39a4fd49a3 100644 --- a/nginx/locations +++ b/nginx/locations @@ -21,7 +21,7 @@ add_header X-Cache-Status $upstream_cache_status; # ignore the set cookie header when deciding to # store a response in the cache -proxy_ignore_headers Set-Cookie; +proxy_ignore_headers Cache-Control Set-Cookie Expires; # PUT requests always bypass the cache # logged in sessions also do not populate the cache From 2e7ee676da6974f8a06313298099ba157f4817e0 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Sun, 31 May 2026 20:47:36 +0700 Subject: [PATCH 720/962] Admin can revoke sent request invites --- .../invites/manage_invite_requests.html | 49 ++++++++++++------- bookwyrm/tests/views/landing/test_invite.py | 38 ++++++++++++++ bookwyrm/views/admin/invite.py | 17 +++++++ 3 files changed, 85 insertions(+), 19 deletions(-) diff --git a/bookwyrm/templates/settings/invites/manage_invite_requests.html b/bookwyrm/templates/settings/invites/manage_invite_requests.html index 59eca25d58..8fea559acc 100644 --- a/bookwyrm/templates/settings/invites/manage_invite_requests.html +++ b/bookwyrm/templates/settings/invites/manage_invite_requests.html @@ -73,20 +73,29 @@

      {# no invite OR invite not yet used #} {% if not req.invite.times_used %} -
      - {% csrf_token %} - - {% if not req.invite %} - - {% else %} - - {% endif %} -
      +
      +
      + {% csrf_token %} + + {% if not req.invite %} + + {% else %} + + {% endif %} +
      +
      {% endif %} {# invite created but not used #} {% if req.invite and not req.invite.times_used %} - {# #} +
      +
      + {% csrf_token %} + + + +
      +
      {% elif req.invite %} {# accepted #} {% if req.invite.invitees.exists %} @@ -95,15 +104,17 @@

        {% endif %} {% else %} -
      - {% csrf_token %} - - {% if not req.ignored %} - - {% else %} - - {% endif %} -
      +
      +
      + {% csrf_token %} + + {% if not req.ignored %} + + {% else %} + + {% endif %} +
      +
      {% endif %}

      diff --git a/bookwyrm/tests/views/landing/test_invite.py b/bookwyrm/tests/views/landing/test_invite.py index 22fa5f6b0b..63bc282f7d 100644 --- a/bookwyrm/tests/views/landing/test_invite.py +++ b/bookwyrm/tests/views/landing/test_invite.py @@ -145,6 +145,44 @@ def test_manage_invite_requests_send(self): req.refresh_from_db() self.assertIsNotNone(req.invite) + def test_manage_invite_requests_revoke(self): + """revoke a sent, unused invite""" + invite = models.SiteInvite.objects.create(user=self.local_user) + req = models.InviteRequest.objects.create( + email="fish@example.com", invite=invite + ) + + view = views.ManageInviteRequests.as_view() + request = self.factory.post("", {"invite-request": req.id, "revoke": "true"}) + request.user = self.local_user + request.user.is_superuser = True + + view(request) + + req.refresh_from_db() + self.assertIsNone(req.invite) + self.assertFalse(models.SiteInvite.objects.filter(id=invite.id).exists()) + + def test_manage_invite_requests_revoke_used(self): + """a used invite is not revoked""" + invite = models.SiteInvite.objects.create( + user=self.local_user, use_limit=1, times_used=1 + ) + req = models.InviteRequest.objects.create( + email="fish@example.com", invite=invite + ) + + view = views.ManageInviteRequests.as_view() + request = self.factory.post("", {"invite-request": req.id, "revoke": "true"}) + request.user = self.local_user + request.user.is_superuser = True + + view(request) + + req.refresh_from_db() + self.assertIsNotNone(req.invite) + self.assertTrue(models.SiteInvite.objects.filter(id=invite.id).exists()) + def test_ignore_invite_request(self): """don't invite that jerk""" req = models.InviteRequest.objects.create(email="fish@example.com") diff --git a/bookwyrm/views/admin/invite.py b/bookwyrm/views/admin/invite.py index 0681a948fc..88e637269d 100644 --- a/bookwyrm/views/admin/invite.py +++ b/bookwyrm/views/admin/invite.py @@ -146,6 +146,9 @@ def get(self, request): def post(self, request): """send out an invite""" + if request.POST.get("revoke") == "true": + return self.delete(request) + invite_request = get_object_or_404( models.InviteRequest, id=request.POST.get("invite-request") ) @@ -165,6 +168,20 @@ def post(self, request): ) ) + def delete(self, request): + """revoke a sent, unused invite""" + invite_request = get_object_or_404( + models.InviteRequest, id=request.POST.get("invite-request") + ) + + if invite_request.invite and not invite_request.invite.times_used: + invite_request.invite.delete() + return redirect( + "{:s}?{:s}".format( + reverse("settings-invite-requests"), urlencode(request.GET.dict()) + ) + ) + class InviteRequest(View): """prospective users sign up here""" From d82c97fc00a3c9142e10118e528eb16a90cecf4f Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Sun, 31 May 2026 23:47:47 +0700 Subject: [PATCH 721/962] Allow admins to delete invite codes --- .../invites/manage_invite_requests.html | 2 +- .../settings/invites/manage_invites.html | 11 ++++++++++- bookwyrm/tests/views/landing/test_invite.py | 17 +++++++++++++++-- bookwyrm/views/admin/invite.py | 15 +++++++++++++-- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/bookwyrm/templates/settings/invites/manage_invite_requests.html b/bookwyrm/templates/settings/invites/manage_invite_requests.html index 8fea559acc..a8f0be1285 100644 --- a/bookwyrm/templates/settings/invites/manage_invite_requests.html +++ b/bookwyrm/templates/settings/invites/manage_invite_requests.html @@ -92,7 +92,7 @@

      {% csrf_token %} - +

      diff --git a/bookwyrm/templates/settings/invites/manage_invites.html b/bookwyrm/templates/settings/invites/manage_invites.html index 95b8bdf006..4c492b35a3 100644 --- a/bookwyrm/templates/settings/invites/manage_invites.html +++ b/bookwyrm/templates/settings/invites/manage_invites.html @@ -48,9 +48,10 @@

      {% trans "Generate New Invite" %}

      {% trans "Expires" %} {% trans "Max uses" %} {% trans "Times used" %} + {% trans "Action" %} {% if not invites %} - {% trans "No active invites" %} + {% trans "No active invites" %} {% endif %} {% for invite in invites %} @@ -58,6 +59,14 @@

      {% trans "Generate New Invite" %}

      {{ invite.expiry|naturaltime }} {{ invite.use_limit }} {{ invite.times_used }} + +
      + {% csrf_token %} + + + +
      + {% endfor %} diff --git a/bookwyrm/tests/views/landing/test_invite.py b/bookwyrm/tests/views/landing/test_invite.py index 63bc282f7d..4808a6401a 100644 --- a/bookwyrm/tests/views/landing/test_invite.py +++ b/bookwyrm/tests/views/landing/test_invite.py @@ -81,6 +81,19 @@ def test_manage_invites_post(self): self.assertEqual(invite.use_limit, 3) self.assertIsNone(invite.expiry) + def test_manage_invites_delete(self): + """delete an invite code""" + invite = models.SiteInvite.objects.create(user=self.local_user) + + view = views.ManageInvites.as_view() + request = self.factory.post("", {"invite": invite.id, "delete": "true"}) + request.user = self.local_user + request.user.is_superuser = True + + view(request) + + self.assertFalse(models.SiteInvite.objects.filter(id=invite.id).exists()) + def test_invite_request(self): """request to join a server""" form = forms.InviteRequestForm() @@ -153,7 +166,7 @@ def test_manage_invite_requests_revoke(self): ) view = views.ManageInviteRequests.as_view() - request = self.factory.post("", {"invite-request": req.id, "revoke": "true"}) + request = self.factory.post("", {"invite-request": req.id, "delete": "true"}) request.user = self.local_user request.user.is_superuser = True @@ -173,7 +186,7 @@ def test_manage_invite_requests_revoke_used(self): ) view = views.ManageInviteRequests.as_view() - request = self.factory.post("", {"invite-request": req.id, "revoke": "true"}) + request = self.factory.post("", {"invite-request": req.id, "delete": "true"}) request.user = self.local_user request.user.is_superuser = True diff --git a/bookwyrm/views/admin/invite.py b/bookwyrm/views/admin/invite.py index 88e637269d..2924e9d44a 100644 --- a/bookwyrm/views/admin/invite.py +++ b/bookwyrm/views/admin/invite.py @@ -48,6 +48,9 @@ def get(self, request): def post(self, request): """creates an invite database entry""" + if request.POST.get("delete") == "true": + return self.delete(request) + form = forms.CreateInviteForm(request.POST) if not form.is_valid(): return HttpResponseBadRequest(f"ERRORS: {form.errors}") @@ -65,6 +68,14 @@ def post(self, request): data = {"invites": paginated.page(1), "form": form} return TemplateResponse(request, "settings/invites/manage_invites.html", data) + def delete(self, request): + """delete an invite code""" + invite = get_object_or_404( + models.SiteInvite, id=request.POST.get("invite"), user=request.user + ) + invite.delete() + return redirect("settings-invites") + class Invite(View): """use an invite to register""" @@ -146,7 +157,7 @@ def get(self, request): def post(self, request): """send out an invite""" - if request.POST.get("revoke") == "true": + if request.POST.get("delete") == "true": return self.delete(request) invite_request = get_object_or_404( @@ -169,7 +180,7 @@ def post(self, request): ) def delete(self, request): - """revoke a sent, unused invite""" + """delete an unused invite request""" invite_request = get_object_or_404( models.InviteRequest, id=request.POST.get("invite-request") ) From af58a3e82511e8818dc0606eb15bcd8b93f0f6f3 Mon Sep 17 00:00:00 2001 From: Leni Kadali Date: Mon, 1 Jun 2026 10:17:58 +0300 Subject: [PATCH 722/962] Restore saving book list --- bookwyrm/views/list/lists.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/views/list/lists.py b/bookwyrm/views/list/lists.py index 205d1a60fb..de6b9d0f7e 100644 --- a/bookwyrm/views/list/lists.py +++ b/bookwyrm/views/list/lists.py @@ -45,6 +45,7 @@ def post(self, request): # list should not have a group if it is not group curated if not book_list.curation == "group": book_list.group = None + book_list.save() book_id = request.POST.get("book") if book_id: From da76e477cad7af2613716ff72e24b3660d099573 Mon Sep 17 00:00:00 2001 From: Leni Kadali Date: Mon, 1 Jun 2026 11:45:59 +0300 Subject: [PATCH 723/962] Update ListForm, item_notes_field template Update ListForm, item_notes_field template to use the new `raw_notes` field. --- bookwyrm/forms/lists.py | 2 +- bookwyrm/templates/lists/item_notes_field.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py index 6c2a38c816..37933ddbf7 100644 --- a/bookwyrm/forms/lists.py +++ b/bookwyrm/forms/lists.py @@ -17,7 +17,7 @@ class Meta: class ListItemForm(CustomForm): class Meta: model = models.ListItem - fields = ["user", "book", "book_list", "notes"] + fields = ["user", "book", "book_list", "notes", "raw_notes"] class SortListForm(forms.Form): diff --git a/bookwyrm/templates/lists/item_notes_field.html b/bookwyrm/templates/lists/item_notes_field.html index c09c50236b..d10d882ac5 100644 --- a/bookwyrm/templates/lists/item_notes_field.html +++ b/bookwyrm/templates/lists/item_notes_field.html @@ -13,7 +13,7 @@ maxlength="300" name="notes" aria-describedby="notes_description_{{ form_id }}" - >{{ item.notes|default:'' }} + >{{ item.raw_notes|default:'' }}

      {% trans "An optional note that will be displayed with the book." %} From fbd4f6fa6b7082292e5887a1365e1614c4a6b5b7 Mon Sep 17 00:00:00 2001 From: Leni Kadali Date: Mon, 1 Jun 2026 11:56:26 +0300 Subject: [PATCH 724/962] Move, rename markdown method; update item save Moved and renamed the method that converts content to markdown so that it can be more easily re-used without running into import conflicts. Updated the initial save of a list item to save notes added if they are there. --- bookwyrm/views/helpers.py | 11 ++++++++++- bookwyrm/views/list/list.py | 6 ++++++ bookwyrm/views/list/list_item.py | 12 ++---------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 3ed738f79b..36fe8d4cea 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -6,6 +6,8 @@ import dateutil.tz from dateutil.parser import ParserError +from markdown import markdown + from requests import HTTPError from django.db.models import Q from django.conf import settings as django_settings @@ -16,7 +18,7 @@ from bookwyrm import activitypub, models, settings from bookwyrm.connectors import ConnectorException, get_data from bookwyrm.status import create_generated_note -from bookwyrm.utils import regex +from bookwyrm.utils import regex, sanitizer from bookwyrm.utils.validate import validate_url_domain @@ -261,3 +263,10 @@ def get_mergeable_object_or_404(klass, id): pass raise Http404(f"No {queryset.model} with ID {id} exists") + + +def convert_to_markdown(content): + """convert given content to markdown""" + content = markdown(content) + # sanitize resulting html + return sanitizer.clean(content) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 10c2e763df..b6d6a5d217 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -21,6 +21,7 @@ from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.settings import PAGE_LENGTH from bookwyrm.views.helpers import ( + convert_to_markdown, is_api_request, maybe_redirect_local_path, redirect_to_referer, @@ -225,6 +226,11 @@ def add_book(request): ) increment_order_in_reverse(book_list.id, order_max + 1) item.order = order_max + 1 + + if item.notes: + item.raw_notes = item.notes + item.notes = convert_to_markdown(item.notes) + item.save() return List().get(request, book_list.id, add_succeeded=True) diff --git a/bookwyrm/views/list/list_item.py b/bookwyrm/views/list/list_item.py index 3d2b3a8064..7ec4668b5a 100644 --- a/bookwyrm/views/list/list_item.py +++ b/bookwyrm/views/list/list_item.py @@ -5,10 +5,8 @@ from django.utils.decorators import method_decorator from django.views import View -from markdown import markdown - from bookwyrm import forms, models -from bookwyrm.utils import sanitizer +from bookwyrm.views.helpers import convert_to_markdown @method_decorator(login_required, name="dispatch") @@ -23,14 +21,8 @@ def post(self, request, list_id, list_item): # save the plain, unformatted version of the status for future editing item = form.save(request, commit=False) item.raw_notes = item.notes - item.notes = notes_to_markdown(item.notes) + item.notes = convert_to_markdown(item.notes) item.save() else: raise Exception(form.errors) return redirect("list", list_item.book_list.id) - -def notes_to_markdown(notes): - """convert to markdown""" - notes = markdown(notes) - # sanitize resulting html - return sanitizer.clean(notes) From 87501c8d4e5ea02c7cba2e71da3ac24afda06f24 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Wed, 3 Jun 2026 23:26:49 +0700 Subject: [PATCH 725/962] replace asyncio with gevent --- bookwyrm/models/activitypub_mixin.py | 52 ++++++------------- .../tests/models/test_activitypub_mixin.py | 10 ++-- 2 files changed, 22 insertions(+), 40 deletions(-) diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index d94780112d..311b4e233c 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -1,6 +1,5 @@ """activitypub model functionality""" -import asyncio from base64 import b64encode from collections import namedtuple from functools import reduce @@ -11,7 +10,8 @@ from uuid import uuid4 from typing_extensions import Self -import aiohttp +from gevent.pool import Pool +import requests from Crypto.PublicKey import RSA from Crypto.Signature import pkcs1_15 from Crypto.Hash import SHA256 @@ -541,27 +541,13 @@ def broadcast_task(sender_id: int, activity: str, recipients: list[str]): user_model = apps.get_model("bookwyrm.User", require_ready=True) sender = user_model.objects.select_related("key_pair").get(id=sender_id) - asyncio.run(async_broadcast(recipients, sender, activity)) + pool = Pool(100) + pool.map(lambda recipient: sign_and_send(sender, activity, recipient), recipients) -async def async_broadcast(recipients: list[str], sender, data: str): - """Send all the broadcasts simultaneously""" - timeout = aiohttp.ClientTimeout(total=10) - async with aiohttp.ClientSession(timeout=timeout) as session: - tasks = [] - for recipient in recipients: - tasks.append( - asyncio.ensure_future(sign_and_send(session, sender, data, recipient)) - ) - - results = await asyncio.gather(*tasks) - return results - -async def sign_and_send( - session: aiohttp.ClientSession, sender, data: str, destination: str, **kwargs -): - """Sign the messages and send them in an asynchronous bundle""" +def sign_and_send(sender, data: str, destination: str, **kwargs): + """Sign a message and send it to a single destination inbox""" now = http_date() if not sender.key_pair.private_key: @@ -587,23 +573,17 @@ async def sign_and_send( } try: - async with session.post(destination, data=data, headers=headers) as response: - if not response.ok: - logger.exception( - "Failed to send broadcast to %s: %s", destination, response.reason - ) - if kwargs.get("use_legacy_key") is not True: - logger.info("Trying again with legacy keyId header value") - asyncio.ensure_future( - sign_and_send( - session, sender, data, destination, use_legacy_key=True - ) - ) - - return response - except asyncio.TimeoutError: + response = requests.post(destination, data=data, headers=headers, timeout=10) + if not response.ok: + logger.error( + "Failed to send broadcast to %s: %s", destination, response.reason + ) + if kwargs.get("use_legacy_key") is not True: + logger.info("Trying again with legacy keyId header value") + sign_and_send(sender, data, destination, use_legacy_key=True) + except requests.exceptions.Timeout: logger.info("Connection timed out for url: %s", destination) - except aiohttp.ClientError as err: + except requests.exceptions.RequestException as err: logger.exception(err) diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 3a257ca744..fef1432e7a 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -452,12 +452,14 @@ def test_to_ordered_collection(self, *_): self.assertEqual(page_2.orderedItems[-1]["content"], "

      test status 0

      ") def test_broadcast_task(self, *_): - """Should be calling asyncio""" + """Should sign and send to each recipient""" recipients = [ "https://instance.example/user/inbox", "https://instance.example/okay/inbox", ] - with patch("bookwyrm.models.activitypub_mixin.asyncio.run") as mock: + with patch("bookwyrm.models.activitypub_mixin.sign_and_send") as mock: broadcast_task(self.local_user.id, {}, recipients) - self.assertTrue(mock.called) - self.assertEqual(mock.call_count, 1) + self.assertEqual(mock.call_count, len(recipients)) + self.assertEqual( + {call.args[2] for call in mock.call_args_list}, set(recipients) + ) From e5be652ab3cdebe85b6d2f2c8046dbe152ca0bf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 03:09:17 +0000 Subject: [PATCH 726/962] build(deps-dev): bump aiohttp from 3.13.4 to 3.14.0 --- updated-dependencies: - dependency-name: aiohttp dependency-version: 3.14.0 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2f8047c088..aa00175c57 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [dependency-groups] main = [ - "aiohttp==3.13.4", + "aiohttp==3.14.0", "bleach==6.1.0", "boto3==1.34.74", "bw-file-resubmit==0.6.0rc2", From 9077aa8b5252b29d93f47e03ff06ababf683de49 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 6 Jun 2026 15:47:12 +1000 Subject: [PATCH 727/962] Fix Series view and tests --- bookwyrm/tests/views/books/test_series.py | 11 ++++++----- bookwyrm/views/books/series.py | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/bookwyrm/tests/views/books/test_series.py b/bookwyrm/tests/views/books/test_series.py index fa16970b81..aeac4e073e 100644 --- a/bookwyrm/tests/views/books/test_series.py +++ b/bookwyrm/tests/views/books/test_series.py @@ -190,14 +190,15 @@ def test_series_page_with_blocked_book(self): view = views.Series.as_view() request = self.factory.get("") request.user = self.user - result = view(request, self.seriesbook.id) + result = view(request, self.series.id) - books = result.context_data["books"] - self.assertEqual(books.object_list.count(), 2) + books = result.context_data["series_books"] + print(books.object_list) + self.assertEqual(len(books.object_list), 2) self.user.blocked_books.add(bad_work) result = view(request, self.series.id) - books = result.context_data["books"] - self.assertEqual(books.object_list.count(), 1) + books = result.context_data["series_books"] + self.assertEqual(len(books.object_list), 1) diff --git a/bookwyrm/views/books/series.py b/bookwyrm/views/books/series.py index b2195c8dc6..8b75b4d990 100644 --- a/bookwyrm/views/books/series.py +++ b/bookwyrm/views/books/series.py @@ -30,9 +30,10 @@ def get(self, request, series_id, slug=None): if is_api_request(request): return ActivitypubResponse(series.to_activity(**request.GET)) - items = series.seriesbooks.prefetch_related( + blocked = request.user.blocked_books.all() if request.user else [] + items = series.seriesbooks.exclude(book__in=blocked).prefetch_related( "book__work", "book__work__editions__authors" - ).all() + ) series_books = sorted(items, key=lambda sb: sb.natural_sort_key) authors = models.Author.objects.filter( id__in=items.values_list("book__work__editions__authors") From 19fb9375950b74be771568d1c15513c737fad8d1 Mon Sep 17 00:00:00 2001 From: Tim Rogers Date: Sat, 6 Jun 2026 20:50:03 -0500 Subject: [PATCH 728/962] Updated author birth and death dates to allow partial dates --- bookwyrm/forms/author.py | 5 +-- ...recision_author_died_precision_and_more.py | 34 +++++++++++++++++++ bookwyrm/models/author.py | 4 +-- bookwyrm/models/fields.py | 3 ++ bookwyrm/templates/author/author.html | 9 +++-- bookwyrm/templates/author/edit_author.html | 4 +-- 6 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 bookwyrm/migrations/0232_author_born_precision_author_died_precision_and_more.py diff --git a/bookwyrm/forms/author.py b/bookwyrm/forms/author.py index 8ec25374db..5fe6d0ed31 100644 --- a/bookwyrm/forms/author.py +++ b/bookwyrm/forms/author.py @@ -4,6 +4,7 @@ from bookwyrm import models from .custom_form import CustomForm +from .widgets import SelectDateWidget class AuthorForm(CustomForm): @@ -35,8 +36,8 @@ class Meta: ), "wikidata": forms.TextInput(attrs={"aria-describedby": "desc_wikidata"}), "website": forms.TextInput(attrs={"aria-describedby": "desc_website"}), - "born": forms.SelectDateWidget(attrs={"aria-describedby": "desc_born"}), - "died": forms.SelectDateWidget(attrs={"aria-describedby": "desc_died"}), + "born": SelectDateWidget(attrs={"aria-describedby": "desc_born"}), + "died": SelectDateWidget(attrs={"aria-describedby": "desc_died"}), "openlibrary_key": forms.TextInput( attrs={"aria-describedby": "desc_openlibrary_key"} ), diff --git a/bookwyrm/migrations/0232_author_born_precision_author_died_precision_and_more.py b/bookwyrm/migrations/0232_author_born_precision_author_died_precision_and_more.py new file mode 100644 index 0000000000..e7c986dd17 --- /dev/null +++ b/bookwyrm/migrations/0232_author_born_precision_author_died_precision_and_more.py @@ -0,0 +1,34 @@ +# Generated by Django 5.2.14 on 2026-06-06 19:42 + +import bookwyrm.models.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0231_sitesettings_block_incoming_search_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='author', + name='born_precision', + field=models.CharField(blank=True, choices=[('DAY', 'Day prec.'), ('MONTH', 'Month prec.'), ('YEAR', 'Year prec.')], editable=False, max_length=10, null=True), + ), + migrations.AddField( + model_name='author', + name='died_precision', + field=models.CharField(blank=True, choices=[('DAY', 'Day prec.'), ('MONTH', 'Month prec.'), ('YEAR', 'Year prec.')], editable=False, max_length=10, null=True), + ), + migrations.AlterField( + model_name='author', + name='born', + field=bookwyrm.models.fields.PartialDateField(blank=True, null=True), + ), + migrations.AlterField( + model_name='author', + name='died', + field=bookwyrm.models.fields.PartialDateField(blank=True, null=True), + ), + ] diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 54f7f0e0bd..3a8d9ebd8b 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -37,8 +37,8 @@ class Author(BookDataModel): max_length=255, blank=True, null=True, deduplication_field=True ) # idk probably other keys would be useful here? - born = fields.DateTimeField(blank=True, null=True) - died = fields.DateTimeField(blank=True, null=True) + born = fields.PartialDateField(blank=True, null=True) + died = fields.PartialDateField(blank=True, null=True) name = fields.CharField(max_length=255) aliases = fields.ArrayField( models.CharField(max_length=255), blank=True, default=list diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index d4812f1faa..c2a15c0e16 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -573,6 +573,9 @@ def field_to_activity(self, value) -> str: return value.partial_isoformat() if value else None def field_from_activity(self, value, allow_external_connections=True, trigger=None): + if not value: + return None + try: return from_partial_isoformat(value) except ValueError: diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index c022d0dd4d..20299a6821 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -4,6 +4,7 @@ {% load humanize %} {% load utilities %} {% load book_display_tags %} +{% load date_ext %} {% block title %}{{ author.name }}{% endblock %} @@ -44,19 +45,23 @@

      {% trans "Author details" %}

      {% endif %} + {% with date=author.born|naturalday_partial %} {% if author.born %}
      {% trans "Born:" %}
      -
      {{ author.born|naturalday }}
      +
      {{ date }}
      {% endif %} + {% endwith %} + {% with date=author.died|naturalday_partial %} {% if author.died %}
      {% trans "Died:" %}
      -
      {{ author.died|naturalday }}
      +
      {{ date }}
      {% endif %} + {% endwith %} {% if series %}
      diff --git a/bookwyrm/templates/author/edit_author.html b/bookwyrm/templates/author/edit_author.html index f3e908c9b6..82595d3247 100644 --- a/bookwyrm/templates/author/edit_author.html +++ b/bookwyrm/templates/author/edit_author.html @@ -65,14 +65,14 @@

      {% trans "Metadata" %}

      - + {{ form.born }} {% include 'snippets/form_errors.html' with errors_list=form.born.errors id="desc_born" %}
      - + {{ form.died }} {% include 'snippets/form_errors.html' with errors_list=form.died.errors id="desc_died" %}
      From 2baaa1562dac5918cf8756b46ad2290b7c0c2994 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 7 Jun 2026 15:13:04 +1000 Subject: [PATCH 729/962] fixes - fix incoming Mastodon reports janking everything up - fix statuses not attaching to reports sent to external server --- bookwyrm/activitypub/verbs.py | 22 +++++++++++++++++-- .../migrations/0232_merge_20260606_0829.py | 14 ++++++++++++ bookwyrm/views/report.py | 8 ++++++- 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 bookwyrm/migrations/0232_merge_20260606_0829.py diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py index debe34bccc..d507d6f194 100644 --- a/bookwyrm/activitypub/verbs.py +++ b/bookwyrm/activitypub/verbs.py @@ -276,13 +276,13 @@ def action(self, allow_external_connections=True): class Flag(Verb): """Report a user to their home server""" - to: str + to: str = None object: List[str] = None links: List[str] = None type: str = "Flag" content: str = None - def action(self, allow_external_connections=False): + def action(self, allow_external_connections=True): """Create the report and attach reported statuses""" report = self.to_model(allow_external_connections=allow_external_connections) # go through "objects" and figure out what they are @@ -296,5 +296,23 @@ def action(self, allow_external_connections=False): allow_external_connections=allow_external_connections, ) except ActivitySerializerError: + try: + # Mastodon includes the user in the object + item = resolve_remote_id( + remote_id=obj, + save=False, + model="User", + allow_external_connections=allow_external_connections, + ) + except ActivitySerializerError: + # ¯\_(ツ)_/¯ + continue + + # fix incoming Mastodon objects + if hasattr(item, "username"): + if not report.reported_user: + report.reported_user = item continue + report.statuses.add(item) + report.save(allow_external_connections=allow_external_connections) diff --git a/bookwyrm/migrations/0232_merge_20260606_0829.py b/bookwyrm/migrations/0232_merge_20260606_0829.py new file mode 100644 index 0000000000..e1f99b3e0a --- /dev/null +++ b/bookwyrm/migrations/0232_merge_20260606_0829.py @@ -0,0 +1,14 @@ +# Generated by Django 5.2.14 on 2026-06-06 08:29 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0229_alter_report_statuses'), + ('bookwyrm', '0231_sitesettings_block_incoming_search_and_more'), + ] + + operations = [ + ] diff --git a/bookwyrm/views/report.py b/bookwyrm/views/report.py index f8f3d8ab1a..731d7473d2 100644 --- a/bookwyrm/views/report.py +++ b/bookwyrm/views/report.py @@ -33,7 +33,13 @@ def post(self, request): if not form.is_valid(): raise ValueError(form.errors) - report = form.save(request) + # don't broadcast before the statuses are attached + # there might be a better way to do this + report = form.save(request, commit=False) + report.save(broadcast=False) + form.save_m2m() + report.broadcast(report.to_activity(), report.user) + if report.links.exists(): # revert the domain to pending domain = report.links.first().domain From 991b5c53b409b5bbfaa577ed23c3dbfc56264ace Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 7 Jun 2026 17:07:33 +1000 Subject: [PATCH 730/962] fix tests and tidy Flag activity - remove irrelevant kwarg allowing external calls - add mocks to tests --- bookwyrm/activitypub/verbs.py | 8 +++----- bookwyrm/tests/views/inbox/test_inbox_flag.py | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py index d507d6f194..0cdac2d01f 100644 --- a/bookwyrm/activitypub/verbs.py +++ b/bookwyrm/activitypub/verbs.py @@ -282,9 +282,9 @@ class Flag(Verb): type: str = "Flag" content: str = None - def action(self, allow_external_connections=True): + def action(self): """Create the report and attach reported statuses""" - report = self.to_model(allow_external_connections=allow_external_connections) + report = self.to_model() # go through "objects" and figure out what they are for obj in self.object: # what type of obj is it? @@ -293,7 +293,6 @@ def action(self, allow_external_connections=True): remote_id=obj, save=False, model="Status", - allow_external_connections=allow_external_connections, ) except ActivitySerializerError: try: @@ -302,7 +301,6 @@ def action(self, allow_external_connections=True): remote_id=obj, save=False, model="User", - allow_external_connections=allow_external_connections, ) except ActivitySerializerError: # ¯\_(ツ)_/¯ @@ -315,4 +313,4 @@ def action(self, allow_external_connections=True): continue report.statuses.add(item) - report.save(allow_external_connections=allow_external_connections) + report.save() diff --git a/bookwyrm/tests/views/inbox/test_inbox_flag.py b/bookwyrm/tests/views/inbox/test_inbox_flag.py index 0600f6c2a0..d8d2135000 100644 --- a/bookwyrm/tests/views/inbox/test_inbox_flag.py +++ b/bookwyrm/tests/views/inbox/test_inbox_flag.py @@ -51,7 +51,12 @@ def test_flag_local_user(self): "content": "hello hello", "@context": "https://www.w3.org/ns/activitystreams", } - views.inbox.activity_task(activity) + + with patch( + "bookwyrm.activitypub.verbs.resolve_remote_id", + side_effect=[self.local_user], + ): + views.inbox.activity_task(activity) # a report should now exist report = models.Report.objects.get( user=self.remote_user, reported_user=self.local_user @@ -81,7 +86,12 @@ def test_flag_local_user_with_statuses(self): "content": "hello hello", "@context": "https://www.w3.org/ns/activitystreams", } - views.inbox.activity_task(activity) + + with patch( + "bookwyrm.activitypub.verbs.resolve_remote_id", + side_effect=[self.local_user, status_1, status_2], + ): + views.inbox.activity_task(activity) # a report should now exist report = models.Report.objects.get( user=self.remote_user, reported_user=self.local_user From ec294df3f1db1e70f5d1bee1a58605a72fb3f171 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 7 Jun 2026 17:46:17 +1000 Subject: [PATCH 731/962] fix federated server notes Notes on federated servers were causing an error. Now they don't. --- bookwyrm/views/admin/federation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/admin/federation.py b/bookwyrm/views/admin/federation.py index dea79099bf..85eb78c1da 100644 --- a/bookwyrm/views/admin/federation.py +++ b/bookwyrm/views/admin/federation.py @@ -156,7 +156,7 @@ def post(self, request, server): """update note""" server = get_object_or_404(models.FederatedServer, id=server) server.notes = request.POST.get("notes") - server.save(request) + server.save(update_fields=["notes"]) return redirect("settings-federated-server", server.id) From 0a4d54b8a170bce7d9fb9a779390587ca31f657a Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Sun, 7 Jun 2026 15:41:30 +0300 Subject: [PATCH 732/962] utils/db: fix typehints changes for mypy --- bookwyrm/utils/db.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/bookwyrm/utils/db.py b/bookwyrm/utils/db.py index 21fd163431..00822907e4 100644 --- a/bookwyrm/utils/db.py +++ b/bookwyrm/utils/db.py @@ -1,7 +1,7 @@ """Database utilities""" from typing import Optional, Iterable, Set, cast -import sqlparse # type: ignore[import-untyped] +import sqlparse def format_trigger(sql: str) -> str: @@ -10,16 +10,13 @@ def format_trigger(sql: str) -> str: we remove whitespace and use consistent casing so as to avoid migrations due to formatting changes. """ - return cast( - str, - sqlparse.format( - sql, - strip_comments=True, - strip_whitespace=True, - use_space_around_operators=True, - keyword_case="upper", - identifier_case="lower", - ), + return sqlparse.format( + sql, + strip_comments=True, + strip_whitespace=True, + use_space_around_operators=True, + keyword_case="upper", + identifier_case="lower", ) From e988e41f27e20620f40b9b68eb20c4817ab9a417 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Sun, 7 Jun 2026 15:46:13 +0300 Subject: [PATCH 733/962] utils/db: remove ununsed import --- bookwyrm/utils/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/utils/db.py b/bookwyrm/utils/db.py index 00822907e4..03445cdf6d 100644 --- a/bookwyrm/utils/db.py +++ b/bookwyrm/utils/db.py @@ -1,6 +1,6 @@ """Database utilities""" -from typing import Optional, Iterable, Set, cast +from typing import Optional, Iterable, Set import sqlparse From ac4e2aa4217242c7dd7ac14e804f7f77949643c4 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Sun, 7 Jun 2026 23:19:12 +0700 Subject: [PATCH 734/962] Revert "replace asyncio with gevent" This reverts commit 87501c8d4e5ea02c7cba2e71da3ac24afda06f24. --- bookwyrm/models/activitypub_mixin.py | 52 +++++++++++++------ .../tests/models/test_activitypub_mixin.py | 10 ++-- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index 311b4e233c..d94780112d 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -1,5 +1,6 @@ """activitypub model functionality""" +import asyncio from base64 import b64encode from collections import namedtuple from functools import reduce @@ -10,8 +11,7 @@ from uuid import uuid4 from typing_extensions import Self -from gevent.pool import Pool -import requests +import aiohttp from Crypto.PublicKey import RSA from Crypto.Signature import pkcs1_15 from Crypto.Hash import SHA256 @@ -541,13 +541,27 @@ def broadcast_task(sender_id: int, activity: str, recipients: list[str]): user_model = apps.get_model("bookwyrm.User", require_ready=True) sender = user_model.objects.select_related("key_pair").get(id=sender_id) + asyncio.run(async_broadcast(recipients, sender, activity)) - pool = Pool(100) - pool.map(lambda recipient: sign_and_send(sender, activity, recipient), recipients) +async def async_broadcast(recipients: list[str], sender, data: str): + """Send all the broadcasts simultaneously""" + timeout = aiohttp.ClientTimeout(total=10) + async with aiohttp.ClientSession(timeout=timeout) as session: + tasks = [] + for recipient in recipients: + tasks.append( + asyncio.ensure_future(sign_and_send(session, sender, data, recipient)) + ) + + results = await asyncio.gather(*tasks) + return results -def sign_and_send(sender, data: str, destination: str, **kwargs): - """Sign a message and send it to a single destination inbox""" + +async def sign_and_send( + session: aiohttp.ClientSession, sender, data: str, destination: str, **kwargs +): + """Sign the messages and send them in an asynchronous bundle""" now = http_date() if not sender.key_pair.private_key: @@ -573,17 +587,23 @@ def sign_and_send(sender, data: str, destination: str, **kwargs): } try: - response = requests.post(destination, data=data, headers=headers, timeout=10) - if not response.ok: - logger.error( - "Failed to send broadcast to %s: %s", destination, response.reason - ) - if kwargs.get("use_legacy_key") is not True: - logger.info("Trying again with legacy keyId header value") - sign_and_send(sender, data, destination, use_legacy_key=True) - except requests.exceptions.Timeout: + async with session.post(destination, data=data, headers=headers) as response: + if not response.ok: + logger.exception( + "Failed to send broadcast to %s: %s", destination, response.reason + ) + if kwargs.get("use_legacy_key") is not True: + logger.info("Trying again with legacy keyId header value") + asyncio.ensure_future( + sign_and_send( + session, sender, data, destination, use_legacy_key=True + ) + ) + + return response + except asyncio.TimeoutError: logger.info("Connection timed out for url: %s", destination) - except requests.exceptions.RequestException as err: + except aiohttp.ClientError as err: logger.exception(err) diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index fef1432e7a..3a257ca744 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -452,14 +452,12 @@ def test_to_ordered_collection(self, *_): self.assertEqual(page_2.orderedItems[-1]["content"], "

      test status 0

      ") def test_broadcast_task(self, *_): - """Should sign and send to each recipient""" + """Should be calling asyncio""" recipients = [ "https://instance.example/user/inbox", "https://instance.example/okay/inbox", ] - with patch("bookwyrm.models.activitypub_mixin.sign_and_send") as mock: + with patch("bookwyrm.models.activitypub_mixin.asyncio.run") as mock: broadcast_task(self.local_user.id, {}, recipients) - self.assertEqual(mock.call_count, len(recipients)) - self.assertEqual( - {call.args[2] for call in mock.call_args_list}, set(recipients) - ) + self.assertTrue(mock.called) + self.assertEqual(mock.call_count, 1) From d28eca9c2d22b6e260c6a85a90cf2391aebdde22 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Mon, 8 Jun 2026 00:02:40 +0700 Subject: [PATCH 735/962] celery-worker: use threads pool instead of gevent --- docker-compose.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 005781e822..737935fa72 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -144,7 +144,7 @@ services: build: . networks: - main - command: celery -A celerywyrm worker --pool=gevent --concurrency=1000 -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc + command: celery -A celerywyrm worker --pool=threads --concurrency=100 -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc healthcheck: test: celery -A celerywyrm status interval: 10s diff --git a/pyproject.toml b/pyproject.toml index 2f8047c088..758af5c772 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ main = [ "bleach==6.1.0", "boto3==1.34.74", "bw-file-resubmit==0.6.0rc2", - "celery[gevent,redis]==5.6.2", + "celery[redis]==5.6.2", "colorthief==0.2.1", "Django==5.2.14", "django-celery-beat==2.8.1", From 6d6687cb6e866643ebc6506975a19695de088a9d Mon Sep 17 00:00:00 2001 From: Tim Rogers Date: Sun, 7 Jun 2026 14:27:47 -0500 Subject: [PATCH 736/962] Added check to clear invalid files from book cover upload form before resubmit when file is invaild --- bookwyrm/views/books/edit_book.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index 4ad3272977..bec94247bf 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -28,7 +28,6 @@ ) from bookwyrm.views.helpers import get_edition, get_mergeable_object_or_404 - @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch" @@ -61,6 +60,8 @@ def post(self, request, book_id): data = {"book": book, "form": form} ensure_transient_values_persist(request, data) if not form.is_valid(): + if "cover" in form.errors and form.has_error("cover", "invalid_image"): + del data["form"].files["cover"] ensure_transient_values_persist(request, data, add_author=True) return TemplateResponse(request, "book/edit/edit_book.html", data) @@ -152,6 +153,8 @@ def post(self, request): } if not form.is_valid(): + if "cover" in form.errors and form.has_error("cover", "invalid_image"): + del data["form"].files["cover"] ensure_transient_values_persist(request, data, form=form) return TemplateResponse(request, "book/edit/edit_book.html", data) From 777bfc2df8083816e795d6949bcd7414d5dbebcd Mon Sep 17 00:00:00 2001 From: Tim Rogers Date: Sun, 7 Jun 2026 14:33:11 -0500 Subject: [PATCH 737/962] Whitespace correction --- bookwyrm/views/books/edit_book.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/views/books/edit_book.py b/bookwyrm/views/books/edit_book.py index bec94247bf..5ccc86d0a3 100644 --- a/bookwyrm/views/books/edit_book.py +++ b/bookwyrm/views/books/edit_book.py @@ -28,6 +28,7 @@ ) from bookwyrm.views.helpers import get_edition, get_mergeable_object_or_404 + @method_decorator(login_required, name="dispatch") @method_decorator( permission_required("bookwyrm.edit_book", raise_exception=True), name="dispatch" From 6eb0fc467b796910584049fe487e2dcd84b28821 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Mon, 8 Jun 2026 14:30:00 +0700 Subject: [PATCH 738/962] LibraryThing import to respect shelf colunm --- bookwyrm/importers/librarything_import.py | 3 +- .../importers/test_librarything_import.py | 59 +++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/bookwyrm/importers/librarything_import.py b/bookwyrm/importers/librarything_import.py index f118d7ea20..9220689881 100644 --- a/bookwyrm/importers/librarything_import.py +++ b/bookwyrm/importers/librarything_import.py @@ -36,4 +36,5 @@ def get_shelf(self, normalized_row: dict[str, Optional[str]]) -> Optional[str]: return Shelf.READ_FINISHED if normalized_row["date_started"]: return Shelf.READING - return Shelf.TO_READ + # no reading dates: fall back to the "shelf" column + return super().get_shelf(normalized_row) or Shelf.TO_READ diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index d564801c90..4790e059e0 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -181,3 +181,62 @@ def test_handle_imported_book_review(self, *_): self.assertEqual(review.rating, 4.5) self.assertEqual(review.published_date, make_date(2007, 5, 8)) self.assertEqual(review.privacy, "unlisted") + + def test_get_shelf_prefers_reading_dates(self, *_): + """a recorded finish/start date wins over the shelf column""" + self.assertEqual( + self.importer.get_shelf( + { + "date_finished": "2007-05-08", + "date_started": None, + "shelf": "To read", + } + ), + models.Shelf.READ_FINISHED, + ) + self.assertEqual( + self.importer.get_shelf( + { + "date_finished": None, + "date_started": "2007-04-16", + "shelf": "Read", + } + ), + models.Shelf.READING, + ) + + def test_get_shelf_falls_back_to_shelf_column(self, *_): + """with no reading dates, recognised shelf values map to read statuses (#3887)""" + cases = [ + ("Read", models.Shelf.READ_FINISHED), + ("read", models.Shelf.READ_FINISHED), + ("Currently reading", models.Shelf.READING), + ("to-read", models.Shelf.TO_READ), + ] + for value, expected in cases: + with self.subTest(value=value): + self.assertEqual( + self.importer.get_shelf( + { + "date_finished": None, + "date_started": None, + "shelf": value, + } + ), + expected, + ) + + def test_get_shelf_passes_through_custom_values(self, *_): + """an unrecognized shelf value becomes a custom shelf""" + self.assertEqual( + self.importer.get_shelf( + {"date_finished": None, "date_started": None, "shelf": "Favorites"} + ), + "Favorites", + ) + self.assertEqual( + self.importer.get_shelf( + {"date_finished": None, "date_started": None, "shelf": None} + ), + models.Shelf.TO_READ, + ) From 5dd24f8ae00a1cab012f3ce89cb2964f914ecd86 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Mon, 8 Jun 2026 14:35:00 +0700 Subject: [PATCH 739/962] OpenReads import to respect shelf colunm --- bookwyrm/importers/openreads_import.py | 3 +- .../importers/test_librarything_import.py | 2 +- .../tests/importers/test_openreads_import.py | 59 +++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/bookwyrm/importers/openreads_import.py b/bookwyrm/importers/openreads_import.py index f17ce8425a..d99691a2d3 100644 --- a/bookwyrm/importers/openreads_import.py +++ b/bookwyrm/importers/openreads_import.py @@ -58,4 +58,5 @@ def get_shelf(self, normalized_row: dict[str, Optional[str]]) -> Optional[str]: return Shelf.READ_FINISHED if normalized_row["date_started"]: return Shelf.READING - return Shelf.TO_READ + # no reading dates: fall back to the "shelf" column + return super().get_shelf(normalized_row) or Shelf.TO_READ diff --git a/bookwyrm/tests/importers/test_librarything_import.py b/bookwyrm/tests/importers/test_librarything_import.py index 4790e059e0..a96ef979e0 100644 --- a/bookwyrm/tests/importers/test_librarything_import.py +++ b/bookwyrm/tests/importers/test_librarything_import.py @@ -206,7 +206,7 @@ def test_get_shelf_prefers_reading_dates(self, *_): ) def test_get_shelf_falls_back_to_shelf_column(self, *_): - """with no reading dates, recognised shelf values map to read statuses (#3887)""" + """with no reading dates, recognised shelf values map to read statuses""" cases = [ ("Read", models.Shelf.READ_FINISHED), ("read", models.Shelf.READ_FINISHED), diff --git a/bookwyrm/tests/importers/test_openreads_import.py b/bookwyrm/tests/importers/test_openreads_import.py index 729bbd44d0..899996876d 100644 --- a/bookwyrm/tests/importers/test_openreads_import.py +++ b/bookwyrm/tests/importers/test_openreads_import.py @@ -192,3 +192,62 @@ def test_handle_imported_book_review(self, *_): self.assertEqual(review.rating, 4) self.assertEqual(review.published_date, make_date(2023, 11, 15)) self.assertEqual(review.privacy, "unlisted") + + def test_get_shelf_prefers_reading_dates(self, *_): + """a recorded finish/start date wins over the shelf column""" + self.assertEqual( + self.importer.get_shelf( + { + "date_finished": "2007-05-08", + "date_started": None, + "shelf": "To read", + } + ), + models.Shelf.READ_FINISHED, + ) + self.assertEqual( + self.importer.get_shelf( + { + "date_finished": None, + "date_started": "2007-04-16", + "shelf": "Read", + } + ), + models.Shelf.READING, + ) + + def test_get_shelf_falls_back_to_shelf_column(self, *_): + """with no reading dates, recognized shelf values map to read statuses""" + cases = [ + ("Read", models.Shelf.READ_FINISHED), + ("read", models.Shelf.READ_FINISHED), + ("Currently reading", models.Shelf.READING), + ("to-read", models.Shelf.TO_READ), + ] + for value, expected in cases: + with self.subTest(value=value): + self.assertEqual( + self.importer.get_shelf( + { + "date_finished": None, + "date_started": None, + "shelf": value, + } + ), + expected, + ) + + def test_get_shelf_passes_through_custom_values(self, *_): + """an unrecognized shelf value becomes a custom shelf""" + self.assertEqual( + self.importer.get_shelf( + {"date_finished": None, "date_started": None, "shelf": "Favorites"} + ), + "Favorites", + ) + self.assertEqual( + self.importer.get_shelf( + {"date_finished": None, "date_started": None, "shelf": None} + ), + models.Shelf.TO_READ, + ) From 3dfbaf73d84726a317bb80b352d33b07b3bbde03 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Tue, 9 Jun 2026 09:36:17 +0700 Subject: [PATCH 740/962] calibre import to respect shelf colunm --- bookwyrm/importers/calibre_import.py | 4 +-- .../tests/importers/test_calibre_import.py | 36 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/bookwyrm/importers/calibre_import.py b/bookwyrm/importers/calibre_import.py index 76b7ae63fa..1b02698345 100644 --- a/bookwyrm/importers/calibre_import.py +++ b/bookwyrm/importers/calibre_import.py @@ -22,5 +22,5 @@ def __init__(self, *args: Any, **kwargs: Any): super().__init__(*args, **kwargs) def get_shelf(self, normalized_row: dict[str, Optional[str]]) -> Optional[str]: - # Calibre export does not indicate which shelf to use. Use a default one for now - return Shelf.TO_READ + # Calibre export does not indicate which shelf to use. + return super().get_shelf(normalized_row) or Shelf.TO_READ diff --git a/bookwyrm/tests/importers/test_calibre_import.py b/bookwyrm/tests/importers/test_calibre_import.py index 5cdddd7b58..ffe03a5462 100644 --- a/bookwyrm/tests/importers/test_calibre_import.py +++ b/bookwyrm/tests/importers/test_calibre_import.py @@ -82,3 +82,39 @@ def test_handle_imported_book(self, *_): shelf.refresh_from_db() self.assertEqual(shelf.books.first(), self.book) + + def test_get_shelf_falls_back_to_shelf_column(self, *_): + """with no reading dates, recognised shelf values map to read statuses""" + cases = [ + ("Read", models.Shelf.READ_FINISHED), + ("read", models.Shelf.READ_FINISHED), + ("Currently reading", models.Shelf.READING), + ("to-read", models.Shelf.TO_READ), + ] + for value, expected in cases: + with self.subTest(value=value): + self.assertEqual( + self.importer.get_shelf( + { + "date_finished": None, + "date_started": None, + "shelf": value, + } + ), + expected, + ) + + def test_get_shelf_passes_through_custom_values(self, *_): + """an unrecognized shelf value becomes a custom shelf""" + self.assertEqual( + self.importer.get_shelf( + {"date_finished": None, "date_started": None, "shelf": "Favorites"} + ), + "Favorites", + ) + self.assertEqual( + self.importer.get_shelf( + {"date_finished": None, "date_started": None, "shelf": None} + ), + models.Shelf.TO_READ, + ) From b54e3b41c6c02d49c81fab311e056561b1152b07 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Tue, 9 Jun 2026 19:05:24 +0700 Subject: [PATCH 741/962] Avoid queuing broadcast_task with no recipients --- bookwyrm/models/activitypub_mixin.py | 6 +++++- bookwyrm/tests/models/test_activitypub_mixin.py | 13 ++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index d94780112d..9dcde0a32d 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -136,6 +136,10 @@ def broadcast(self, activity, sender, software=None, queue=BROADCAST): except PermissionDenied: return + recipients = self.get_recipients(software=software) + if len(recipients) == 0: + return + # if we're posting about ShelfBooks, set a delay to give the base activity # time to add the book on remote servers first to avoid race conditions countdown = ( @@ -152,7 +156,7 @@ def broadcast(self, activity, sender, software=None, queue=BROADCAST): args=( sender.id, json.dumps(activity, cls=activitypub.ActivityEncoder), - self.get_recipients(software=software), + recipients, ), queue=queue, ) diff --git a/bookwyrm/tests/models/test_activitypub_mixin.py b/bookwyrm/tests/models/test_activitypub_mixin.py index 3a257ca744..63d522f4e7 100644 --- a/bookwyrm/tests/models/test_activitypub_mixin.py +++ b/bookwyrm/tests/models/test_activitypub_mixin.py @@ -1,6 +1,6 @@ """testing model activitypub utilities""" -from unittest.mock import patch +from unittest.mock import Mock, patch from collections import namedtuple from dataclasses import dataclass import re @@ -461,3 +461,14 @@ def test_broadcast_task(self, *_): broadcast_task(self.local_user.id, {}, recipients) self.assertTrue(mock.called) self.assertEqual(mock.call_count, 1) + + def test_broadcast_no_recipients(self, broadcast_mock, *_): + """should not queue a task when there is nobody to send to""" + mock_self = Mock() + mock_self.get_recipients.return_value = [] + + ActivitypubMixin.broadcast( + mock_self, {"type": "Create", "object": {}}, self.local_user + ) + + self.assertFalse(broadcast_mock.called) From 87ea764581ec846422ba6b4608d981d566af8aff Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Tue, 9 Jun 2026 19:22:05 +0700 Subject: [PATCH 742/962] Fix activity type check in broadcast countdown --- bookwyrm/models/activitypub_mixin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/models/activitypub_mixin.py b/bookwyrm/models/activitypub_mixin.py index 9dcde0a32d..2b0cf20144 100644 --- a/bookwyrm/models/activitypub_mixin.py +++ b/bookwyrm/models/activitypub_mixin.py @@ -145,7 +145,7 @@ def broadcast(self, activity, sender, software=None, queue=BROADCAST): countdown = ( 10 if ( - isinstance(activity, object) + isinstance(activity, dict) and not isinstance(activity["object"], str) and activity["object"].get("type", None) in ["GeneratedNote", "Comment"] ) From afb6ecccce265f8dc228da87e9938c345294d8fc Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 9 Jun 2026 07:25:02 -0700 Subject: [PATCH 743/962] New Crowdin updates (#3908) * New translations django.po (Romanian) [ci skip] * New translations django.po (French) [ci skip] * New translations django.po (Spanish) [ci skip] * New translations django.po (Afrikaans) [ci skip] * New translations django.po (Arabic) [ci skip] * New translations django.po (Bulgarian) [ci skip] * New translations django.po (Catalan) [ci skip] * New translations django.po (Czech) [ci skip] * New translations django.po (Danish) [ci skip] * New translations django.po (German) [ci skip] * New translations django.po (Greek) [ci skip] * New translations django.po (Basque) [ci skip] * New translations django.po (Finnish) [ci skip] * New translations django.po (Irish) [ci skip] * New translations django.po (Hebrew) [ci skip] * New translations django.po (Hungarian) [ci skip] * New translations django.po (Italian) [ci skip] * New translations django.po (Japanese) [ci skip] * New translations django.po (Korean) [ci skip] * New translations django.po (Lithuanian) [ci skip] * New translations django.po (Dutch) [ci skip] * New translations django.po (Norwegian) [ci skip] * New translations django.po (Polish) [ci skip] * New translations django.po (Portuguese) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Slovak) [ci skip] * New translations django.po (Slovenian) [ci skip] * New translations django.po (Serbian (Cyrillic)) [ci skip] * New translations django.po (Swedish) [ci skip] * New translations django.po (Turkish) [ci skip] * New translations django.po (Ukrainian) [ci skip] * New translations django.po (Chinese Simplified) [ci skip] * New translations django.po (Chinese Traditional) [ci skip] * New translations django.po (Vietnamese) [ci skip] * New translations django.po (Galician) [ci skip] * New translations django.po (Portuguese, Brazilian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Persian) [ci skip] * New translations django.po (Bengali) [ci skip] * New translations django.po (Yiddish) [ci skip] * New translations django.po (Welsh) [ci skip] * New translations django.po (Faroese) [ci skip] * New translations django.po (Esperanto) [ci skip] * New translations django.po (Bashkir) [ci skip] * New translations django.po (Bengali, India) [ci skip] * New translations django.po (Oulipo) [ci skip] * New translations django.po (Eastern Min) [ci skip] * New translations django.po (Galician) [ci skip] * New translations django.po (Romanian) [ci skip] * New translations django.po (French) [ci skip] * New translations django.po (Spanish) [ci skip] * New translations django.po (Afrikaans) [ci skip] * New translations django.po (Arabic) [ci skip] * New translations django.po (Bulgarian) [ci skip] * New translations django.po (Catalan) [ci skip] * New translations django.po (Czech) [ci skip] * New translations django.po (Danish) [ci skip] * New translations django.po (German) [ci skip] * New translations django.po (Greek) [ci skip] * New translations django.po (Basque) [ci skip] * New translations django.po (Finnish) [ci skip] * New translations django.po (Irish) [ci skip] * New translations django.po (Hebrew) [ci skip] * New translations django.po (Hungarian) [ci skip] * New translations django.po (Italian) [ci skip] * New translations django.po (Japanese) [ci skip] * New translations django.po (Korean) [ci skip] * New translations django.po (Lithuanian) [ci skip] * New translations django.po (Dutch) [ci skip] * New translations django.po (Norwegian) [ci skip] * New translations django.po (Polish) [ci skip] * New translations django.po (Portuguese) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Slovak) [ci skip] * New translations django.po (Slovenian) [ci skip] * New translations django.po (Serbian (Cyrillic)) [ci skip] * New translations django.po (Swedish) [ci skip] * New translations django.po (Turkish) [ci skip] * New translations django.po (Ukrainian) [ci skip] * New translations django.po (Chinese Simplified) [ci skip] * New translations django.po (Chinese Traditional) [ci skip] * New translations django.po (Vietnamese) [ci skip] * New translations django.po (Galician) [ci skip] * New translations django.po (Portuguese, Brazilian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Persian) [ci skip] * New translations django.po (Bengali) [ci skip] * New translations django.po (Yiddish) [ci skip] * New translations django.po (Welsh) [ci skip] * New translations django.po (Faroese) [ci skip] * New translations django.po (Esperanto) [ci skip] * New translations django.po (Bashkir) [ci skip] * New translations django.po (Bengali, India) [ci skip] * New translations django.po (Oulipo) [ci skip] * New translations django.po (Eastern Min) [ci skip] * New translations django.po (Dutch) [ci skip] * New translations django.po (Galician) [ci skip] * New translations django.po (French) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Indonesian) [ci skip] * New translations django.po (Hebrew) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] * New translations django.po (Russian) [ci skip] --- locale/af_ZA/LC_MESSAGES/django.po | 571 +++++++++------ locale/ar_SA/LC_MESSAGES/django.po | 575 +++++++++------ locale/ba_RU/LC_MESSAGES/django.po | 570 +++++++++------ locale/bg_BG/LC_MESSAGES/django.po | 571 +++++++++------ locale/bn_BD/LC_MESSAGES/django.po | 571 +++++++++------ locale/bn_IN/LC_MESSAGES/django.po | 571 +++++++++------ locale/ca_ES/LC_MESSAGES/django.po | 575 +++++++++------ locale/cdo/LC_MESSAGES/django.po | 571 +++++++++------ locale/cs_CZ/LC_MESSAGES/django.po | 575 +++++++++------ locale/cy_GB/LC_MESSAGES/django.po | 575 +++++++++------ locale/da_DK/LC_MESSAGES/django.po | 571 +++++++++------ locale/de_DE/LC_MESSAGES/django.po | 575 +++++++++------ locale/el_GR/LC_MESSAGES/django.po | 575 +++++++++------ locale/en_Oulipo/LC_MESSAGES/django.po | 571 +++++++++------ locale/eo_UY/LC_MESSAGES/django.po | 575 +++++++++------ locale/es_ES/LC_MESSAGES/django.po | 575 +++++++++------ locale/eu_ES/LC_MESSAGES/django.po | 574 +++++++++------ locale/fa_IR/LC_MESSAGES/django.po | 567 ++++++++++----- locale/fi_FI/LC_MESSAGES/django.po | 575 +++++++++------ locale/fo_FO/LC_MESSAGES/django.po | 571 +++++++++------ locale/fr_FR/LC_MESSAGES/django.po | 575 +++++++++------ locale/ga_IE/LC_MESSAGES/django.po | 574 +++++++++------ locale/gl_ES/LC_MESSAGES/django.po | 575 +++++++++------ locale/he_IL/LC_MESSAGES/django.po | 587 +++++++++------ locale/hu_HU/LC_MESSAGES/django.po | 571 +++++++++------ locale/id_ID/LC_MESSAGES/django.po | 970 ++++++++++++++----------- locale/it_IT/LC_MESSAGES/django.po | 575 +++++++++------ locale/ja_JP/LC_MESSAGES/django.po | 574 +++++++++------ locale/ko_KR/LC_MESSAGES/django.po | 572 +++++++++------ locale/lt_LT/LC_MESSAGES/django.po | 577 +++++++++------ locale/nl_NL/LC_MESSAGES/django.po | 575 +++++++++------ locale/no_NO/LC_MESSAGES/django.po | 575 +++++++++------ locale/pl_PL/LC_MESSAGES/django.po | 577 +++++++++------ locale/pt_BR/LC_MESSAGES/django.po | 575 +++++++++------ locale/pt_PT/LC_MESSAGES/django.po | 575 +++++++++------ locale/ro_RO/LC_MESSAGES/django.po | 575 +++++++++------ locale/ru_RU/LC_MESSAGES/django.po | 939 ++++++++++++++---------- locale/sk_SK/LC_MESSAGES/django.po | 573 +++++++++------ locale/sl_SI/LC_MESSAGES/django.po | 573 +++++++++------ locale/sr_SP/LC_MESSAGES/django.po | 572 +++++++++------ locale/sv_SE/LC_MESSAGES/django.po | 575 +++++++++------ locale/tr_TR/LC_MESSAGES/django.po | 572 +++++++++------ locale/uk_UA/LC_MESSAGES/django.po | 575 +++++++++------ locale/vi_VN/LC_MESSAGES/django.po | 570 +++++++++------ locale/yi_DE/LC_MESSAGES/django.po | 571 +++++++++------ locale/zh_Hans/LC_MESSAGES/django.po | 574 +++++++++------ locale/zh_Hant/LC_MESSAGES/django.po | 570 +++++++++------ 47 files changed, 17586 insertions(+), 10134 deletions(-) diff --git a/locale/af_ZA/LC_MESSAGES/django.po b/locale/af_ZA/LC_MESSAGES/django.po index f9575341e7..6c558b5fba 100644 --- a/locale/af_ZA/LC_MESSAGES/django.po +++ b/locale/af_ZA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:12\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Afrikaans\n" "Language: af\n" @@ -107,7 +107,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -175,39 +175,43 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -489,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -839,7 +843,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1870,7 +1976,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2459,6 +2566,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5563,31 +5673,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7295,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/ar_SA/LC_MESSAGES/django.po b/locale/ar_SA/LC_MESSAGES/django.po index b330565a9b..1b83eaf9f3 100644 --- a/locale/ar_SA/LC_MESSAGES/django.po +++ b/locale/ar_SA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:12\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Arabic\n" "Language: ar\n" @@ -107,7 +107,7 @@ msgstr "عنوان الكتاب" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -175,39 +175,43 @@ msgstr "حذف المراقب" msgid "Domain block" msgstr "حجب النطاق" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "كتاب مسموع" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "كتاب الكتروني" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "الرواية الرسومية" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "غلاف صُلْب" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "غلاف ورقي" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s لا يبدو مثل ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s ليس لديه صيغة ISBN الصحيح، توقعنا %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -477,7 +481,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -493,19 +497,19 @@ msgstr "" msgid "Everything else" msgstr "كل شيء آخر" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "الخط الزمني الرئيسي" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "الصفحة الرئيسية" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "الخط الزمني اللكتب" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -514,91 +518,91 @@ msgstr "الخط الزمني اللكتب" msgid "Books" msgstr "الكتب" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "الإنجليزية" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (الألمانية)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (الإسبانية)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (الفرنسية)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "بولندي (البولندية)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "السويدية (السويدي)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -851,7 +855,7 @@ msgstr "أقصر قراءتهم هذا العام…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -930,57 +934,62 @@ msgstr "ولد:" msgid "Died:" msgstr "مات:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "الروابط الخارجية" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "ويكيبيديا" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "تحميل البيانات" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "عرض على OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -1017,8 +1026,8 @@ msgid "Name:" msgstr "الإسم:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1055,7 +1064,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1064,7 +1074,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "مفتاح Goodreads" @@ -1077,8 +1087,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1090,7 +1100,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1102,10 +1112,10 @@ msgstr "حفظ" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1115,7 +1125,7 @@ msgstr "حفظ" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1132,7 +1142,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1149,31 +1160,50 @@ msgstr "تأكيد" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "تعديل الكتاب" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "انقر لإضافة غلاف" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "إخفاق في تحميل الغلاف" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "اضغط للتوسيع" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1184,17 +1214,17 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "إضافة وصف" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "الوصف:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1205,49 +1235,49 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "ليس لديك أي نشاط للقراءة لهذا الكتاب." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "تعليقاتك" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "الإقتباسات الخاصة بك" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "المواضيع" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "الأماكن" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1262,15 +1292,15 @@ msgstr "الأماكن" msgid "Lists" msgstr "القوائم" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "إضافة إلى قائمة" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1293,25 +1323,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1322,12 +1353,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1336,12 +1367,12 @@ msgid "Add cover" msgstr "إضافة غلاف" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "تحميل الغلاف:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1406,15 +1437,32 @@ msgstr "هذا مؤلف جديد" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1476,124 +1524,190 @@ msgstr "ترتيب العنوان:" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "اللغات:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "تاريخ النشر الأول:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "المؤلفون" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "صفحة المؤلف ل %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "إضافة مؤلف" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "الغلاف" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "الخصائص المادية" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "الصفحات:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1780,19 +1894,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "كتاب غير مرتب" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1837,7 +1943,7 @@ msgstr "رمز التأكيد:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "قدم" @@ -1898,7 +2004,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -2000,21 +2106,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2200,14 +2307,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2495,6 +2602,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3753,6 +3864,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4385,7 +4497,7 @@ msgstr[4] "" msgstr[5] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4856,7 +4968,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -5049,9 +5161,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5106,6 +5217,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5116,39 +5232,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5257,13 +5367,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5637,7 +5747,7 @@ msgid "Dashboard" msgstr "لوحة التحكم" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "إجمالي المستخدمين" @@ -5651,31 +5761,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "أيام" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "أسابيع" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -6003,13 +6113,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6720,10 +6866,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7391,10 +7533,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7407,12 +7545,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7529,6 +7667,17 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7745,35 +7894,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7832,16 +7981,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8132,15 +8287,23 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/ba_RU/LC_MESSAGES/django.po b/locale/ba_RU/LC_MESSAGES/django.po index 9c70221fd9..db9529918a 100644 --- a/locale/ba_RU/LC_MESSAGES/django.po +++ b/locale/ba_RU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:49\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:14\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bashkir\n" "Language: ba\n" @@ -107,7 +107,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -175,39 +175,43 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,18 +465,18 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -488,19 +492,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -509,91 +513,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -836,7 +840,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -905,57 +909,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -992,8 +1001,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1030,7 +1039,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1039,7 +1049,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1052,8 +1062,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1065,7 +1075,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1077,10 +1087,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1090,7 +1100,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1107,7 +1117,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1124,95 +1135,114 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,15 +1257,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1258,25 +1288,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1287,12 +1318,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1301,12 +1332,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1371,15 +1402,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1441,124 +1489,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1745,19 +1859,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1802,7 +1908,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1863,7 +1969,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1955,21 +2061,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2155,14 +2262,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2450,6 +2557,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3683,6 +3794,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4290,7 +4402,7 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4756,7 +4868,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4949,9 +5061,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5006,6 +5117,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5016,39 +5132,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5147,13 +5257,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5527,7 +5637,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5541,31 +5651,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5873,13 +5983,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6590,10 +6736,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7251,10 +7393,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7267,12 +7405,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7369,6 +7507,12 @@ msgid "rated %(title)s: %(display_rating)s sta msgid_plural "rated %(title)s: %(display_rating)s stars" msgstr[0] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7580,35 +7724,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7667,16 +7811,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7952,15 +8102,23 @@ msgid "%(num)d book - by %(user)s" msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/bg_BG/LC_MESSAGES/django.po b/locale/bg_BG/LC_MESSAGES/django.po index 755094a9c8..bfc14e5fb1 100644 --- a/locale/bg_BG/LC_MESSAGES/django.po +++ b/locale/bg_BG/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:12\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bulgarian\n" "Language: bg\n" @@ -107,7 +107,7 @@ msgstr "Заглавие на книгата" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Оценка" @@ -175,39 +175,43 @@ msgstr "Изтриване от модератор" msgid "Domain block" msgstr "Блокиране на домейн" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Аудиокнига" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Е-книга" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Графичен роман" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Твърди корици" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Меки корици" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -489,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -839,7 +843,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1870,7 +1976,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2459,6 +2566,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5563,31 +5673,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7295,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/bn_BD/LC_MESSAGES/django.po b/locale/bn_BD/LC_MESSAGES/django.po index 030c1afa38..67a320f7c8 100644 --- a/locale/bn_BD/LC_MESSAGES/django.po +++ b/locale/bn_BD/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:49\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bengali\n" "Language: bn\n" @@ -107,7 +107,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -175,39 +175,43 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -489,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -839,7 +843,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1870,7 +1976,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2459,6 +2566,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5563,31 +5673,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7295,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/bn_IN/LC_MESSAGES/django.po b/locale/bn_IN/LC_MESSAGES/django.po index ba98c86b4d..e8b7ed4c71 100644 --- a/locale/bn_IN/LC_MESSAGES/django.po +++ b/locale/bn_IN/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:49\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:14\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bengali, India\n" "Language: bn_IN\n" @@ -107,7 +107,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -175,39 +175,43 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -489,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -839,7 +843,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1870,7 +1976,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2459,6 +2566,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5563,31 +5673,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7295,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/ca_ES/LC_MESSAGES/django.po b/locale/ca_ES/LC_MESSAGES/django.po index f0af60c158..77b52620c0 100644 --- a/locale/ca_ES/LC_MESSAGES/django.po +++ b/locale/ca_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -107,7 +107,7 @@ msgstr "Títol del llibre" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Valoració" @@ -175,39 +175,43 @@ msgstr "Eliminació pel moderador" msgid "Domain block" msgstr "Bloqueig de domini" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audiollibre" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Llibre electrònic" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Novel·la gràfica" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Tapa dura" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Edició de butxaca" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s no semblen ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s no té l'ISBN checksum correcte, hauria de ser %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "Comentari de %(display_name)s sobre %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "Cita de %(display_name)s sobre %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "Ressenya de %(display_name)s sobre %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "%(display_name)s ha valorat %(book_title)s: %(display_rating). 1f estrelles" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Ressenya" @@ -489,19 +493,19 @@ msgstr "Citacions" msgid "Everything else" msgstr "Tota la resta" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Línia de temps Inici" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Inici" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Cronologia dels llibres" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Cronologia dels llibres" msgid "Books" msgstr "Llibres" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Anglès)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Alemany)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (espanyol)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskera (Basc)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (gallec)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (italià)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Coreà)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (finès)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (francès)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituà)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Països Baixos (Holandès)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (noruec)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (polonès)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portuguès del Brasil)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portuguès europeu)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (romanès)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (suec)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Ucraïnès)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (xinès simplificat)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (xinès tradicional)" @@ -839,7 +843,7 @@ msgstr "La seva lectura més breu d'aquest any…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Data de naixement:" msgid "Died:" msgstr "Data de defunció:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Sèrie:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Enllaços externs" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Vikipèdia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Mira-ho a la Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Pàgina web" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Veure el registre ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Veure a ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Carregueu dades" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Veure a OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Veure a Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Veure a LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Veure a Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Llibres de %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Nom:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Separeu diversos valors amb comes." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Clau d'OpenLibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "ID a l'Inventaire:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Clau de Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Identificador a Goodreads:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Desa" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Desa" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "La càrrega de les dades es connectarà a %(source_name)s i comprovarà si hi ha metadades sobre aquest autor que no estan aquí. Les metadades existents no seran sobreescrites." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Confirmeu" msgid "Unable to connect to remote source." msgstr "No ha estat possible connectar a la font externa." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Edita el llibre" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Fes clic per afegir una coberta" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "No sh'a pogut carregar la coberta" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Feu clic per ampliar" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Mira-ho a Finna" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s ressenya)" msgstr[1] "(%(review_count)s ressenyes)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Afegiu una descripció" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descripció:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s edició" msgstr[1] "%(count)s edicions" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Has deixat aquesta edició a:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Una edició diferent d'aquest llibre és al teu %(shelf_name)s prestatge." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Les vostres lectures" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Afegiu dates de lectura" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "No tens cap activitat de lectura per aquest llibre." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Les vostres ressenyes" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "El vostres comentaris" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Les teves cites" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Temes" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Llocs" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Llocs" msgid "Lists" msgstr "Llistes" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Afegiu a la llista" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN copiat!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Nombre OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "ASIN d'audiollibre:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "Identificador ISFDB:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Afegiu una coberta" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Carregueu una coberta:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Carregueu una coberta des d'un enllaç:" @@ -1378,15 +1409,32 @@ msgstr "Es tracta d'un nou autor" msgid "Creating a new author: %(name)s" msgstr "Creando un autor nuevo: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Es tracta d'una edició d'una obra ja existent?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Es tracta d'una publicació nova" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Ordena per títol:" msgid "Subtitle:" msgstr "Subtítol:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Sèrie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Nombre de la sèrie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Idiomes:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Temes:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Afegiu un tema" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Elimineu un tema" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Afegiu un altre tema" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Posició:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publicació" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Editorial:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Data de publicació per primera vegada:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Data de publicació:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autoria" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Elimineu %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Pàgina de l'autor de %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Afegiu autoria:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Afegiu autoria" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Jane Doe" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Afegiu un altre autor" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Coberta" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Propietats físiques" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Detalls del format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Pàgines:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identificadors del llibre" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "ID OpenLibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Nom" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Publicat el %(date)s" msgid "rated it" msgstr "el va valorar amb" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Sèries per" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Llibre %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Llibre sense classificar" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Codi de confirmació:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Envieu" @@ -1870,7 +1976,7 @@ msgstr "Podeu dir que no en qualsevol moment al vostre perf #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s ha començat a llegir %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s ha valorat %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s ha comentat %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s ha comentat sobre %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s ha citat %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "No hi ha cap tipus d'activitat de moment. Proveu de seguir usuaris per a msgid "Alternatively, you can try enabling more status types" msgstr "Alternativament, pots intentar habilitar més tipus d'estat" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Objectiu de lectura del %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Pots establir o canviar el teu objectiu de lectura en qualsevol moment des de la teva pàgina de perfil" @@ -2459,6 +2566,10 @@ msgstr "Aquest grup no té llistes" msgid "Edit group" msgstr "Edita el grup" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Cerca per afegir un usuari" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Cerca un llibre, un usuari o una llista" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Escanejeu codi de barres" @@ -4309,7 +4421,7 @@ msgstr[0] "Una nova denúncia necessita moderació" msgstr[1] "%(display_count)s noves denúncies necessiten moderació" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Avís de contingut" @@ -4776,7 +4888,7 @@ msgstr "Exporta la llista de llibres" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "El vostre fitxer d'exportació CSV inclourà tots els llibres dels vostres prestatges, els llibres que hàgiu revisat i els llibres amb activitat de lectura.
      Feu servir això per importar a un servei com Goodreads." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Baixa el fitxer" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Esteu eliminant aquest diari de lectures i les seves %(count)s actualitzacions de progrés associades." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Actualitza dates de lectura per a \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Edita dates de lectura" msgid "Delete these read dates" msgstr "Elimina aquestes dates de lectura" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Actualitza dates de lectura per a \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Afegeix dates de lectura per a \"%(title)s\"" msgid "Report" msgstr "Notifica" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Scan Barcode\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Sol·licitant permisos per a la càmera..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Dona permisos d'accés a la càmera per escanejar el codi de barres d'aquest llibre." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "No s'ha pogut accedir a la càmera" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "S'està escanejant..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Alinea el codi de barres del teu llibre amb la càmera." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "S'ha escanejat l'ISBN" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Cercant el llibre:" @@ -5171,13 +5279,13 @@ msgstr "Fals" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data d'inici:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data final:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Panell de control" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Total d'usuàries" @@ -5565,31 +5673,31 @@ msgstr "Actives aquest mes" msgid "Works" msgstr "Treballs" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Activitat de la instància" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Interval:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dies" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Setmanes" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Activitat de registre d'usuàries" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Activitat de l'estat" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Treballs creats" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "No s'ha pogut desar la configuració" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "Tasques programades" msgid "Tasks" msgstr "Tasques" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Nom" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "Tasques Celery" @@ -7281,10 +7421,6 @@ msgstr "Cita:" msgid "An excerpt from '%(book_title)s'" msgstr "Un extracte de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Posició:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "A la pàgina:" @@ -7297,12 +7433,12 @@ msgstr "Al per cent:" msgid "to" msgstr "a" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "La teva ressenya de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Ressenya:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "ha valorat %(title)s: %(display_rating)s estrella" msgstr[1] "ha valorat %(title)s: %(display_rating)s estrelles" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Acaba de llegir" msgid "Show rating" msgstr "Mostra la valoració" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Mostra l'estat" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Pàgina %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Obre imatge en una finestra nova" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Amaga l'estat" @@ -7702,16 +7845,22 @@ msgstr "ha començat a llegir %(book)s de %(book)s" msgstr "ha començat a llegir %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "ha escrit una ressenya de %(book)s de %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "ha escrit una ressenya de %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d llibre - per %(user)s" msgstr[1] "%(num)d llibres - per %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "compte d'usuari nou" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/cdo/LC_MESSAGES/django.po b/locale/cdo/LC_MESSAGES/django.po index d2f439f458..eaae87729a 100644 --- a/locale/cdo/LC_MESSAGES/django.po +++ b/locale/cdo/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:49\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:14\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Eastern Min\n" "Language: cdo\n" @@ -107,7 +107,7 @@ msgstr "書名" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "分數" @@ -175,39 +175,43 @@ msgstr "審覈員除去" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "有聲書" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "電子書" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "視覺文學" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "精裝" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "平裝" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "書評" @@ -489,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "頭頁時間線" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "頭頁" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "書其時間線" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "書其時間線" msgid "Books" msgstr "書" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (英語)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (德語)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (西語)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (加利西亞話)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (法語)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (立陶宛話)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (官話)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (官話)" @@ -839,7 +843,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "出世:" msgid "Died:" msgstr "過後:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "系列:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "維基百科" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "去OpenLibrary看" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "去Inventaire看" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "去LibraryThing看" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "去Goodreads看" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "%(name)s 寫其書" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "名字:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "請使半形逗號 (,) 隔開這幾芘值." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary 密匙:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything 密匙:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads 密匙:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "存下" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "存下" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "確認" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "修改者書" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "書皮做儥出" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 條書評)" msgstr[1] "（%(review_count)s 條評價）" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "加添介紹" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "介紹:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "這幫讀其書" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "加添讀書時間" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "汝故未讀這本書." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "汝寫其書評" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "汝做其評論" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "汝抄下其話" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "主題" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "所在" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "所在" msgid "Lists" msgstr "單單" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "添遘單單裏勢" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC 號:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "加添書皮" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "乞蜀芘書皮:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "嚽是蜀隻新其作者" msgid "Creating a new author: %(name)s" msgstr "着𡅏乞新其作者開網頁: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "嚽是伓是本站已經有其書其另蜀芘版本?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "嚽是新其作品" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "副題:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "系列:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "系列編號:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "語言:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "位址:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "出版" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "出版者:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "頭版其時間:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "出版其時間:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "作者" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "除去 %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "%(name)s 其作者頁" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "加添作者:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "書皮" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "實體性質" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "格式:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "裝訂情況:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "頁數:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "着 %(date)s 出版" msgid "rated it" msgstr "拍了分數" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "確認碼:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "交付" @@ -1870,7 +1976,7 @@ msgstr "汝乜乇前後都會使由汝其 資料設定 #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s 開始讀 %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s 乞 %(book_title)s 拍了分數" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s 寫了 %(book_title)s 其書評" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s 評了幾句 %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s 抄下 %(book_title)s 裏勢其文字" @@ -2164,14 +2271,14 @@ msgstr "現刻世乇活動都無! 試蜀試先關注蜀隻儂" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s 讀書目標" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "汝乜乇前後都會使着汝自家其 資料頁 裏勢定下或者改蜀下汝其讀書目標" @@ -2459,6 +2566,10 @@ msgstr "這芘群裏勢故無單單" msgid "Edit group" msgstr "修改群" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "討儂加裏" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "修改讀書時間" msgid "Delete these read dates" msgstr "除去這価讀書時間其紀錄" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "舉報" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "開始其日子:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "結束其日子:" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "所有其儂" @@ -5563,31 +5673,31 @@ msgstr "這蜀月日有使其" msgid "Works" msgstr "作品" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "實例活動" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "區段:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "日" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "禮拜" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "各儂其註冊活動" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "抄錄:" msgid "An excerpt from '%(book_title)s'" msgstr "'%(book_title)s' 裏勢抄其蜀段話" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "位址:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "頁碼:" @@ -7295,12 +7433,12 @@ msgstr "百分比:" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "汝乞 '%(book_title)s' 寫其書評" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "書評:" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "乞 %(title)s 拍了分數: %(display_rating)s 粒星" msgstr[1] "乞 %(title)s 拍了分數: %(display_rating)s 粒星" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "讀完了" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/cs_CZ/LC_MESSAGES/django.po b/locale/cs_CZ/LC_MESSAGES/django.po index a0b2b7b837..3f6bf10094 100644 --- a/locale/cs_CZ/LC_MESSAGES/django.po +++ b/locale/cs_CZ/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Czech\n" "Language: cs\n" @@ -107,7 +107,7 @@ msgstr "Název knihy" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Hodnocení" @@ -175,39 +175,43 @@ msgstr "Odstraněn moderátorem" msgid "Domain block" msgstr "Blokování domény" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audiokniha" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Ekniha" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Grafický román" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Pevná vazba" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Měkká vazba" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s nevypadá jako ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s nemá správný kontrolní součet ISBN, očekávali jsme %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "Komentář %(display_name)s k %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "Citát %(display_name)s z %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)s' hodnocení knihy %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -475,7 +479,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Hodnocení" @@ -491,19 +495,19 @@ msgstr "Citace" msgid "Everything else" msgstr "Vše ostatní" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Domovská časová osa" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Domov" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Zeď knih" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -512,91 +516,91 @@ msgstr "Zeď knih" msgid "Books" msgstr "Knihy" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Anglicky" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (katalánština)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (němčina)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (španělština)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (galicijština)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (italština)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Korejština)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (finština)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (francouzština)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (litevština)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (Nizozemština)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (norština)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (polština)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugalština (Brazílie))" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugalština (Evropa))" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (rumunština)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (švédština)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrajinština)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (zjednodušená čínština)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (tradiční čínština)" @@ -845,7 +849,7 @@ msgstr "Nejkratší četbou v tomto roce…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -920,57 +924,62 @@ msgstr "Narozený/á:" msgid "Died:" msgstr "Zemřel/a:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Série:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Externí odkazy" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedie" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Zobrazit na Wikidatech" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Webová stránka" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Zobrazit ISNI záznam" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Prohlédnout na ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Načíst data" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Zobrazit na OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Zobrazit na Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Zobrazit na LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Zobrazit na Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Knihy od %(name)s" @@ -1007,8 +1016,8 @@ msgid "Name:" msgstr "Jméno:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Oddělte více hodnot čárkami." @@ -1045,7 +1054,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary klíč:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1054,7 +1064,7 @@ msgid "Librarything key:" msgstr "Librarything klíč:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Klíč Goodreads:" @@ -1067,8 +1077,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1080,7 +1090,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1092,10 +1102,10 @@ msgstr "Uložit" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1105,7 +1115,7 @@ msgstr "Uložit" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1122,7 +1132,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Načítání dat se připojí k %(source_name)s a zkontrolujte metadata o tomto autorovi, která zde nejsou přítomna. Stávající metadata nebudou přepsána." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1139,31 +1150,50 @@ msgstr "Potvrdit" msgid "Unable to connect to remote source." msgstr "Nelze se připojit ke vzdálenému zdroji." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Upravit knihu" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Klepnutím přidáte obal" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Nezdařilo se obálku načíst" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Kliknutím zvětšíte" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1172,17 +1202,17 @@ msgstr[1] "(%(review_count)s hodnocení)" msgstr[2] "(%(review_count)s hodnocení)" msgstr[3] "(%(review_count)s hodnocení)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Přidat popis" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Popis:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1191,49 +1221,49 @@ msgstr[1] "%(count)s vydání" msgstr[2] "%(count)s vydání" msgstr[3] "%(count)s vydání" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Toto vydání bylo odloženo v:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Jiné vydání této knihy je na vaší poličce %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Vaše aktivita čtení" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Přidat datum přečtení" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Tuto knihu jste ještě nečetly." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Tvoje hodnocení" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Vaše komentáře" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Vaše citace" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Témata" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Místa" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1248,15 +1278,15 @@ msgstr "Místa" msgid "Lists" msgstr "Seznamy" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Přidat na seznam" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1279,25 +1309,26 @@ msgid "Copied ISBN!" msgstr "ISBN zkopírováno!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC číslo:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1308,12 +1339,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1322,12 +1353,12 @@ msgid "Add cover" msgstr "Přidat obálku" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Nahrát obálku:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Nahrát obal z URL:" @@ -1392,15 +1423,32 @@ msgstr "Tohle je nový autor" msgid "Creating a new author: %(name)s" msgstr "Vytvoření nového autora: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Je to edice již existující práce?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Toto je nová práce" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1462,124 +1510,190 @@ msgstr "" msgid "Subtitle:" msgstr "Podtitulek:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Série:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Číslo série:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Jazyky:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Témata:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Přidat téma" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Odebrat téma" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Přidat další téma" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Datum publikace" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Vydavatel:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Prvně vydáno:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Datum vydání:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autoři" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Odstranit %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Stránka autora %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Přidat autory:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Přidat autora" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Jane Doe" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Přidat dalšího autora" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Obálka" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Fyzické vlastnosti" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formát:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Podrobnosti o formátu:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Stránek:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identifikátory knih" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1766,19 +1880,11 @@ msgstr "Vydáno %(date)s" msgid "rated it" msgstr "ohodnotil" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Série od" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Kniha %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Nevytříděná kniha" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1823,7 +1929,7 @@ msgstr "Potvrzovací kód:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Odeslat" @@ -1884,7 +1990,7 @@ msgstr "Můžete se kdykoliv odhlásit v nastavení profilu #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1982,21 +2088,22 @@ msgid "%(username)s started reading %(username)s začal číst %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s ohodnotil %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s hodnotil*a %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s okomentoval %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s citoval %(book_title)s" @@ -2182,14 +2289,14 @@ msgstr "Momentálně tu nejsou žádné aktivity! Pro začátek zkuste sledovat msgid "Alternatively, you can try enabling more status types" msgstr "Případně můžete zkusit povolit více typů stavů" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s cíl pro čtení" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Cíl čtení můžete nastavit nebo změnit kdykoliv na vaší profilové stránce" @@ -2477,6 +2584,10 @@ msgstr "Tato skupina nemá žádné seznamy" msgid "Edit group" msgstr "Upravit skupinu" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Vyhledat uživatele pro přidání" @@ -3725,6 +3836,7 @@ msgid "Search for a book, author, user, or list" msgstr "Hledat knihu, autora, uživatele nebo seznam" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Skenovat čarový kód" @@ -4347,7 +4459,7 @@ msgstr[2] "" msgstr[3] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Varování o obsahu" @@ -4816,7 +4928,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -5009,9 +5121,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5066,6 +5177,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5076,41 +5192,33 @@ msgstr "" msgid "Report" msgstr "Nahlásit" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Skenovat čárový kód\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Pořaduji přístup ke kameře..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Udělte přístup k fotoaparátu pro naskenování čárového kódu knihy." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Skenuji..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Zarovnejte čárový kód své knihy s kamerou." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN naskenováno" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5215,13 +5323,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5595,7 +5703,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5609,31 +5717,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5953,13 +6061,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6670,10 +6814,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7337,10 +7477,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7353,12 +7489,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Tvoje hodnocení knihy '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Recenze:" @@ -7467,6 +7603,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7681,35 +7826,35 @@ msgstr "Přečteno" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7768,16 +7913,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "hodnotil*a %(book)s od %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "hodnotil*a %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8062,15 +8213,23 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/cy_GB/LC_MESSAGES/django.po b/locale/cy_GB/LC_MESSAGES/django.po index d66b9039d3..1956f4fbb6 100644 --- a/locale/cy_GB/LC_MESSAGES/django.po +++ b/locale/cy_GB/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:49\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Welsh\n" "Language: cy\n" @@ -107,7 +107,7 @@ msgstr "Teitl y Llyfr" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Cyfraddiad" @@ -175,39 +175,43 @@ msgstr "Dileu cymedrolwr" msgid "Domain block" msgstr "Parth wedi ei rwystro" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Llyfr sain" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "eLyfr" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Nofel graffig" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Clawr caled" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Clawr meddal" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -477,7 +481,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Adolygiadau" @@ -493,19 +497,19 @@ msgstr "Dyfyniadau" msgid "Everything else" msgstr "Popeth arall" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Ffrwd gartref" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Cartref" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Ffrwd lyfrau" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -514,91 +518,91 @@ msgstr "Ffrwd lyfrau" msgid "Books" msgstr "Llyfrau" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Saesneg" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Almaeneg)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Sbaeneg)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galiseg)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Eidaleg)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomoi (Finneg)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Ffrangeg)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lithwaneg)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwyaidd)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portiwgaleg Brasil)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portiwgaleg Ewropeaidd)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Rwmaneg)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Swedeg)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Tsieinëeg Syml)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tsieinëeg Traddodiadol)" @@ -851,7 +855,7 @@ msgstr "Eu llyfr byrraf eleni…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -930,57 +934,62 @@ msgstr "Ganwyd:" msgid "Died:" msgstr "Bu farw:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Cyfres:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Dolenni allanol" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wicipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Gwelwch y cofnod ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Llwythwch y data" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Gwelwch ar OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Gweld ar Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Gweld ar LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Gweld ar Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Llyfrau gan %(name)s" @@ -1017,8 +1026,8 @@ msgid "Name:" msgstr "Enw:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Rhifau lluosol gwahanol gyda chomas." @@ -1055,7 +1064,8 @@ msgid "Openlibrary key:" msgstr "Allwedd Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "ID Inventaire:" @@ -1064,7 +1074,7 @@ msgid "Librarything key:" msgstr "Allwedd Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Allwedd Goodreads:" @@ -1077,8 +1087,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1090,7 +1100,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1102,10 +1112,10 @@ msgstr "Cadw" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1115,7 +1125,7 @@ msgstr "Cadw" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1132,7 +1142,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Cysylltir data a lwythir at %(source_name)s a bydd yn gwirio metadata eraill am yr awdur hwn. Ni fydd yn ysgrifennu dros fetadata presennol." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1149,31 +1160,50 @@ msgstr "Cadarnhau" msgid "Unable to connect to remote source." msgstr "Methu â chysylltu â'r rhwydwaith." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Golygu'r Llyfr" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Cliciwch i ychwanegu clawr" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Methwyd â llwytho clawr" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Cliciwch i ehangu" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1184,17 +1214,17 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "(adolygiadau %(review_count)s)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Ychwanegu disgrifiad" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Disgrifiad:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1205,49 +1235,49 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "Argraffiadau %(count)s" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Rydych wedi rhoi'r fersiwn yma ar silff:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Mae fersiwn wahanolo'r llyfr hwn ar eich %(shelf_name)ssilff." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Eich darllen" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Ychwanegu dyddiadau darllen" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Does gennych ddim cofnod darllen ar gyfer y llyfr hwn." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Eich adolygiadau" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Eich sylwadau" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Eich dyfyniadau" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Pynciau" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Lleoedd" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1262,15 +1292,15 @@ msgstr "Lleoedd" msgid "Lists" msgstr "Rhestrau" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Ychwanegu i'r rhestr" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1293,25 +1323,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Rhif OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1322,12 +1353,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1336,12 +1367,12 @@ msgid "Add cover" msgstr "Ychwanegu clawr" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Lanlwythwch y clawr:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1406,15 +1437,32 @@ msgstr "Awdur newydd yw hwn" msgid "Creating a new author: %(name)s" msgstr "Yn creu awdur newydd: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Ai fersiwn o waith sy'n bodoli eisoes ydyw?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Llyfr newydd yw hwn" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1476,124 +1524,190 @@ msgstr "" msgid "Subtitle:" msgstr "Is-deitl:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Cyfres:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Rhif y cyfres:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Iaith:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Pynciau:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Ychwanegu pwnc" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Tynnu pwnc" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Ychwanegu Pwnc Arall" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Cyhoeddiad" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Cyhoeddwr:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Dyddiad y cyhoeddiad cyntaf:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Dyddiad Cyhoeddi:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Awduron" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Tynnwch %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Awdur tudalen %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Ychwanegwch awduron:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Ychwanegwch awdur" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Sian ap Sion" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Ychwanegwch Awdur Arall" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Clawr" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Priodweddau" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Fformat:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Fformatio'r manylion:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Tudalennau:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Manylion y Llyfr" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1780,19 +1894,11 @@ msgstr "Dyddiad Cyhoeddi: %(date)s" msgid "rated it" msgstr "graddio fe" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1837,7 +1943,7 @@ msgstr "Côd cadarnhau:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Cyflwyno" @@ -1898,7 +2004,7 @@ msgstr "Gallwch optio allan unrhyw bryd yn eich gosodiadau #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -2000,21 +2106,22 @@ msgid "%(username)s started reading %(username)s wedi dechrau darllen %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "Mae %(username)s wedi gwerthuso%(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "Mae %(username)s wedi adolygu %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "Mae %(username)s wedi rhoi sylw ar %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "Mae %(username)s wedi dyfynnu %(book_title)s" @@ -2200,14 +2307,14 @@ msgstr "Does dim gweithgareddau! Dilynwch ddefnyddiwr i gychwyn arni" msgid "Alternatively, you can try enabling more status types" msgstr "Neu, ceisiwch wireddu rhagor o fathau o statws" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Amcan Darllen %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Fe allwch osod neu newid eich amcan darllen unrhyw bryd o'ch tudalen proffil " @@ -2495,6 +2602,10 @@ msgstr "Does dim rhestrau â'r grŵp hwn" msgid "Edit group" msgstr "Golygu'r grŵp" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Chwilio i ychwanegu defnyddiwr" @@ -3753,6 +3864,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4385,7 +4497,7 @@ msgstr[4] "" msgstr[5] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4856,7 +4968,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -5049,9 +5161,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5106,6 +5217,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5116,39 +5232,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5257,13 +5367,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5637,7 +5747,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5651,31 +5761,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -6003,13 +6113,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6720,10 +6866,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7391,10 +7533,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7407,12 +7545,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7529,6 +7667,17 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" +msgstr[5] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7745,35 +7894,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7832,16 +7981,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8132,15 +8287,23 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/da_DK/LC_MESSAGES/django.po b/locale/da_DK/LC_MESSAGES/django.po index 9ac477b878..17af7c44b2 100644 --- a/locale/da_DK/LC_MESSAGES/django.po +++ b/locale/da_DK/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Danish\n" "Language: da\n" @@ -107,7 +107,7 @@ msgstr "Bogtitel" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Bedømmelse" @@ -175,39 +175,43 @@ msgstr "Slettet af moderator" msgid "Domain block" msgstr "Domæneblokering" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Lydbog" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "e-bog" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Grafisk roman" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Hardcover" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Paperback" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)ss kommentar på %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Anmeldelser" @@ -489,19 +493,19 @@ msgstr "Citater" msgid "Everything else" msgstr "Alt det andet" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Hjem-tidslinje" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Hjem" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Bøger-tidslinje" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Bøger-tidslinje" msgid "Books" msgstr "Bøger" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Engelsk" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (catalansk)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (tysk)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (spansk)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Baskisk)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (galicisk)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (italiensk)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (finsk)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (fransk)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (litauisk)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (hollandsk)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (norsk)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (polsk)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasiliansk portugisisk)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (europæisk portugisisk)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (rumænsk)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (svensk)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainsk)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (forenklet kinesisk)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (traditionelt kinesisk)" @@ -839,7 +843,7 @@ msgstr "Vedkommendes korteste læsning i år…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Født:" msgid "Died:" msgstr "Død:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serie:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Eksterne links" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Hjemmeside" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Se ISNI-optegnelse" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Se på ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Indlæs data" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Se på OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Se på Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Se på LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Se på Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Bøger af %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Navn:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Adskil flere værdier med kommaer." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary-nøgle:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire-ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything-nøgle:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads-nøgle:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Gem" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Gem" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Indlæsning af data vil forbinde til %(source_name)s og tjekke efter metadata om denne forfatter, som ikke er til stede her. Eksisterende metadata vil ikke blive overskrevet." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Bekræft" msgid "Unable to connect to remote source." msgstr "Kan ikke forbinde til ekstern kilde." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Rediger bog" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Klik for at tilføje omslag" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Kunne ikke indlæse omslag" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Klik for at forstørre" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s anmeldelse)" msgstr[1] "(%(review_count)s anmeldelser)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Tilføj beskrivelse" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Beskrivelse:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s udgave" msgstr[1] "%(count)s udgaver" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Du har tilføjet denne udgave til hylden:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "En anden udgave af denne bog er på din %(shelf_name)s hylde." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Din læseaktivitet" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Tilføj læste datoer" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Du har ikke nogen læseaktivitet for denne bog." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Dine anmeldelser" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Dine kommentarer" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Dine citater" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Emner" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Steder" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Steder" msgid "Lists" msgstr "Lister" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Tilføj til liste" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN kopieret!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC nummer:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Tilføj omslag" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Upload omslag:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Indlæs omslag fra URL:" @@ -1378,15 +1409,32 @@ msgstr "Dette er en ny forfatter" msgid "Creating a new author: %(name)s" msgstr "Opretter en ny forfatter: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Er dette en udgave af et eksisterende værk?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Dette er et nyt værk" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Sorteringstitel:" msgid "Subtitle:" msgstr "Undertitel:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Nummer i serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Sprog:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Emner:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Tilføj emne" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Fjern emne" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Tilføj endnu et emne" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Udgivelse" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Forlag:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Dato for første udgivelse:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Udgivelsesdato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Forfattere" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Fjern %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Forfatterside for %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Tilføj forfattere:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Tilføj forfatter" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Ukendt Navn" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Tilføj en forfatter mere" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Forside" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Fysiske egenskaber" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Formatdetaljer:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Sider:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Bogidentifikatorer" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Udgivet %(date)s" msgid "rated it" msgstr "gav den" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Bog %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Usorteret Bog" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Bekræftelseskode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Send" @@ -1870,7 +1976,7 @@ msgstr "Du kan til enhver tid ændre mening i dine profilin #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "%(username)s bedømte %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "Der er ingen aktiviteter lige nu! Prøv at følge en bruger for at komme msgid "Alternatively, you can try enabling more status types" msgstr "Du kan også prøve at aktivere flere statustyper" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Læsemål for %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Du kan til enhver tid indstille eller ændre dit læsemål fra din profilside" @@ -2459,6 +2566,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5563,31 +5673,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7295,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 3542aba444..7fa8c493fb 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-03-18 08:12\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -107,7 +107,7 @@ msgstr "Buchtitel" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Bewertung" @@ -175,39 +175,43 @@ msgstr "Löschung durch Moderator*in" msgid "Domain block" msgstr "Domainsperrung" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Hörbuch" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "E-Book" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Graphic Novel" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Hardcover" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Taschenbuch" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s sieht nicht wie eine ISBN aus" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s hat keine korrekte ISBN-Prüfsumme, wir erwarteten %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)ss Kommentar zu %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)ss Zitat aus %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)ss Rezension zu %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s bewertete %(book_title)s: %(display_rating).1f Stern" msgstr[1] "%(display_name)s bewertete %(book_title)s: %(display_rating).1f Sterne" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Rezensionen" @@ -489,19 +493,19 @@ msgstr "Zitate" msgid "Everything else" msgstr "Alles andere" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Start-Zeitleiste" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Startseite" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Bücher-Timeline" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Bücher-Timeline" msgid "Books" msgstr "Bücher" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Englisch)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Katalanisch)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Spanisch)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Baskisch)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galizisch)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italienisch)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Koreanisch)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Finnisch)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Französisch)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisch)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (Niederländisch)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwegisch)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Polnisch)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasilianisches Portugiesisch)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugiesisch)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Rumänisch)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Schwedisch)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainisch)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (vereinfachtes Chinesisch)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinesisch, traditionell)" @@ -839,7 +843,7 @@ msgstr "Das am schnellsten gelesene Buch dieses Jahr…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Geboren:" msgid "Died:" msgstr "Gestorben:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serie:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Externe Links" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Auf Wikidata ansehen" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Webseite" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "ISNI-Datensatz anzeigen" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Auf ISFDB ansehen" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Lade Daten" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Auf OpenLibrary ansehen" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Auf Inventaire anzeigen" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Auf LibraryThing anzeigen" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Auf Goodreads ansehen" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Bücher von %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Name:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Mehrere Werte durch Kommas getrennt eingeben." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary-Schlüssel:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire-ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything-Schlüssel:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads-Schlüssel:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Speichern" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Speichern" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Das Laden von Daten wird eine Verbindung zu %(source_name)s aufbauen und überprüfen, ob Autor*in-Informationen vorliegen, die hier noch nicht bekannt sind. Bestehende Informationen werden nicht überschrieben." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Bestätigen" msgid "Unable to connect to remote source." msgstr "Verbindung zum Server konnte nicht hergestellt werden." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Buch bearbeiten" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Cover durch Klicken hinzufügen" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Fehler beim Laden des Titelbilds" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Zum Vergrößern anklicken" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Auf Finna ansehen" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "Auf Libris ansehen" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s Rezension)" msgstr[1] "(%(review_count)s Besprechungen)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Beschreibung hinzufügen" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Beschreibung:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s Auflage" msgstr[1] "%(count)s Auflagen" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Du hast diese Ausgabe im folgenden Regal:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Eine andere Ausgabe dieses Buches befindet sich in deinem %(shelf_name)s Regal." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Deine Leseaktivität" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Lesedaten hinzufügen" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 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:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Deine Rezensionen" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Deine Kommentare" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Deine Zitate" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Themen" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Orte" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Orte" msgid "Lists" msgstr "Listen" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Zur Liste hinzufügen" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "Neue Liste erstellen..." -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN kopiert!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC-Nummer:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "Libris-ID:" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Titelbild hinzufügen" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Titelbild hochladen:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Titelbild via URL herunterladen:" @@ -1378,15 +1409,32 @@ msgstr "Neue*r Autor*in" msgid "Creating a new author: %(name)s" msgstr "Als neue*r Autor*in erstellen: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Ist das eine Ausgabe eines vorhandenen Werkes?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Dies ist ein neues Werk." -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Sortieren nach Titel:" msgid "Subtitle:" msgstr "Untertitel:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Nummer in der Serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Sprachen:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Themen:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Thema hinzufügen" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Thema entfernen" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Weiteres Thema hinzufügen" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Position:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Veröffentlichung" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Verlag:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Erstveröffentlichungsdatum:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Veröffentlichungsdatum:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autor*innen" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "%(name)s entfernen" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Autor*inseite für %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Autor*innen hinzufügen:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Autor*in hinzufügen" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Lisa Musterfrau" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Weitere*n Autor*in hinzufügen" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Cover" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Physikalische Eigenschaften" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Formatdetails:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Seiten:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Buch-Identifikatoren" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "OpenLibrary-ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Name" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Erschienen am %(date)s" msgid "rated it" msgstr "bewertet es mit" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Serie von" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Buch %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Nicht einsortiertes Buch" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Bestätigungscode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Absenden" @@ -1870,7 +1976,7 @@ msgstr "Du kannst dich jederzeit in deinen Profileinstellun #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s hat angefangen, %(book_title)s zu lesen" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s hat %(book_title)s bewertet" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s hat %(book_title)s besprochen" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s hat %(book_title)s kommentiert" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s hat %(book_title)s zitiert" @@ -2164,14 +2271,14 @@ msgstr "Hier sind noch keine Aktivitäten! Folge Anderen, um loszulegen" msgid "Alternatively, you can try enabling more status types" msgstr "Alternativ könntest du auch weitere Statustypen aktivieren" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Leseziel für %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Du kannst dein Leseziel jederzeit auf deiner Profilseite festlegen oder ändern" @@ -2459,6 +2566,10 @@ msgstr "Diese Gruppe enthält keine Listen" msgid "Edit group" msgstr "Gruppe bearbeiten" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Suche, um eine*n Benutzer*in hinzuzufügen" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Nach einem Buch, Autor*in, Benutzer*in oder einer Liste suchen" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Barcode scannen" @@ -4309,7 +4421,7 @@ msgstr[0] "Ein neuer -Bericht muss moderiert werden" msgstr[1] "%(display_count)s neue Berichte müssen moderiert werden" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Inhaltswarnung" @@ -4776,7 +4888,7 @@ msgstr "Bücherliste exportieren" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "Die exportierte CSV-Datei wird alle Bücher aus deinen Regalen, die du rezensiert hast und die du gerade liest, enthalten.
      Nutze sie, um deine Daten in andere Services wie Goodreads zu importieren." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Datei herunterladen" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Du löscht diesen Leseforschritt und %(count)s zugehörige Zwischenstände." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Lesedaten für „%(title)s“ aktualisieren" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Lesedaten bearbeiten" msgid "Delete these read dates" msgstr "Diese Lesedaten löschen" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Lesedaten für „%(title)s“ aktualisieren" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Lesedaten für „%(title)s“ hinzufügen" msgid "Report" msgstr "Melden" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Barcode scannen\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Kamera wird angefragt..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Erlaube Zugriff auf die Kamera, um den Barcode eines Buches zu scannen." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Konnte nicht auf die Kamera zugreifen" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Scannen..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Richte den Barcode des Buches mit der Kamera aus." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN gescannt" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Nach Buch suchen:" @@ -5171,13 +5279,13 @@ msgstr "Nein" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Startdatum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Enddatum:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Übersicht" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Benutzer*innen insgesamt" @@ -5565,31 +5673,31 @@ msgstr "Diesen Monat aktiv" msgid "Works" msgstr "Werke" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Instanzaktivität" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervall:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Tage" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Wochen" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Neuanmeldungen" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Statusaktivitäten" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Erstellte Werke" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Einstellungen konnten nicht gespeichert werden" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "Föderation deaktivieren" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "Verhindert, dass deine Instanz mit anderen föderierten Diensten interagiert. Bestehende Daten von anderen Instanzen werden weiterhin vorhanden sein." +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "Geplante Aufgaben" msgid "Tasks" msgstr "Aufgaben" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Name" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "Celery Aufgabe" @@ -7281,10 +7421,6 @@ msgstr "Zitat:" msgid "An excerpt from '%(book_title)s'" msgstr "Ein Auszug aus „%(book_title)s“" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Position:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Auf Seite:" @@ -7297,12 +7433,12 @@ msgstr "Bei Prozent:" msgid "to" msgstr "bis" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Deine Rezension von '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Rezension:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "hat %(title)s mit %(display_rating)s Stern bewertet" msgstr[1] "hat %(title)s mit %(display_rating)s Sternen bewertet" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Lesen abschließen" msgid "Show rating" msgstr "Bewertung anzeigen" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Status anzeigen" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Seite %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Bild in neuem Fenster öffnen" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Status ausblenden" @@ -7702,16 +7845,22 @@ msgstr "hat angefangen, %(book)s von %(book)s" msgstr "hat angefangen, %(book)s zu lesen" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "hat %(book)s von %(author_name)s besprochen" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "hat %(book)s besprochen" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d Bücher - von %(user)s" msgstr[1] "%(num)d Bücher - von %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "Ein neues Benutzerkonto" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/el_GR/LC_MESSAGES/django.po b/locale/el_GR/LC_MESSAGES/django.po index b57b4082cd..1ae201eef2 100644 --- a/locale/el_GR/LC_MESSAGES/django.po +++ b/locale/el_GR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Greek\n" "Language: el\n" @@ -107,7 +107,7 @@ msgstr "Τίτλος Βιβλίου" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Αξιολογήσεις" @@ -175,39 +175,43 @@ msgstr "Διαγραφή συντονιστή" msgid "Domain block" msgstr "Aποκλεισμός τομέα" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Ηχογραφημένο βιβλίο" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Ηλεκτρονικό βιβλίο" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Γραφικό μυθιστόρημα" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Σκληρό εξώφυλλο" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Χαρτόδετο" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Κριτικές" @@ -489,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "Οτιδήποτε άλλο" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Αρχική σελίδα" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Χρονολόγιο Βιβλίων" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Χρονολόγιο Βιβλίων" msgid "Books" msgstr "Βιβλία" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Αγγλικά" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Καταλανικά)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Γερμανικά)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Ισπανικά)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Ιταλικά)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Φινλανδικά)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Γαλλικά)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Λιθουανικά)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Νορβηγικά)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Πολωνικά)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Πορτογαλικά Βραζιλίας)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Ευρωπαϊκά Πορτογαλικά)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Ρουμανικά)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Σουηδικά)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Απλοποιημένα Κινέζικα)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Παραδοσιακά Κινέζικα)" @@ -839,7 +843,7 @@ msgstr "Το πιο σύντομο διάβασμα φέτος…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Γεννήθηκε:" msgid "Died:" msgstr "Πέθανε:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Σειρά:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Εξωτερικοί σύνδεσμοι" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Βικιπαίδεια" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Ιστοσελίδα" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Προβολή αρχείου ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Φόρτωση δεδομένων" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Προβολή στο OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Προβολή στο Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Προβολή στο LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Δείτε στο Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Βιβλία από %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Όνομα:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Διαχωρίστε τις πολλαπλές τιμές με κόμμα." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Κλειδί Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Κλειδί Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Κλειδί Goodreads:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Αποθήκευση" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Αποθήκευση" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Υπάρχοντα μεταδεδομένα δεν θα overwritten." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Επιβεβαίωση" msgid "Unable to connect to remote source." msgstr "Αδυναμία σύνδεσης με την απομακρυσμένη πηγή." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Επεξεργασία Βιβλίου" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Κλικ για προσθήκη εξωφύλλου" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Αποτυχία φόρτωσης εξωφύλλου" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Κλικ για μεγέθυνση" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s αξιολόγηση)" msgstr[1] "(%(review_count)s αξιολογήσεις)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Προσθήκη Περιγραφής" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Περιγραφή:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s έκδοση" msgstr[1] "%(count)s εκδόσεις" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Έχετε κρατήσει αυτή την έκδοση στο:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Η δραστηριότητα ανάγνωσής σας" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Προσθήκη ημερομηνιών ανάγνωσης" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Δεν έχετε καμία δραστηριότητα ανάγνωσης για αυτό το βιβλίο." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Οι κριτικές σας" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Τα σχόλιά σας" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Τα αποσπάσματά σας" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Θέματα" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Τοποθεσίες" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Τοποθεσίες" msgid "Lists" msgstr "Λίστες" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Προσθήκη σε λίστα" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Αριθμός OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Προσθέστε ένα εξώφυλλο" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Ανέβασμα εξώφυλλου:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "Αυτός είναι ένας νέος συγγραφέας" msgid "Creating a new author: %(name)s" msgstr "Δημιουργία ενός νέου συγγραφέα: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Είναι μια έκδοση ενός υπάρχοντος έργου;" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Αυτό είναι ένα νέο έργο" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "Υπότιτλοι:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Σειρά:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Αριθμός σειράς:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Γλώσσες:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Θέματα:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Προσθήκη θέματος" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Αφαίρεση θέματος" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Προσθήκη Άλλου Θέματος" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Έκδοση" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Εκδότης:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Ημερομηνία πρώτης έκδοσης:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Ημερομηνία έκδοσης:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Συγγραφείς" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Αφαίρεση %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Σελίδα συγγραφέα %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Προσθήκη Συγγραφέων:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Προσθήκη Συγγραφέα" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Jane Doe" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Προσθήκη Άλλου Συγγραφέα" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Εξώφυλλο" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Μορφή:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Λεπτομέρειες μορφής:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Σελίδες:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Αναγνωριστικά Βιβλίου" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Κλειδί Openlibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Δημοσιεύθηκε %(date)s" msgid "rated it" msgstr "βαθμολογήστε" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Σειρά από" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Βιβλίο %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Μη ταξινομιμένο βιβλίο" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Κωδικός επιβεβαίωσης:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Υποβολή" @@ -1870,7 +1976,7 @@ msgstr "Μπορείτε να εξαιρεθείτε ανά πάσα στιγμ #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s άρχισε να διαβάζει το %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "Δεν υπάρχουν δραστηριότητες αυτή τη στ msgid "Alternatively, you can try enabling more status types" msgstr "Εναλλακτικά, μπορείτε να δοκιμάσετε να ενεργοποιήσετε περισσότερους τύπους κατάστασης" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s Στόχος Ανάγνωσης" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Μπορείτε να ορίσετε ή να αλλάξετε το στόχο ανάγνωσης οποιαδήποτε στιγμή από τη σελίδα του προφίλ σας " @@ -2459,6 +2566,10 @@ msgstr "Αυτή η ομάδα δεν έχει λίστες" msgid "Edit group" msgstr "Επεξεργασία ομάδας" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Αναζήτηση για να προσθέσετε ένα χρήστη" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Σάρωση Barcode" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Προειδοποίηση περιεχομένου" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Λήψη αρχείου" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Διαγράφετε αυτή την ανάγνωση και τις %(count)s σχετικές ενημερώσεις προόδου." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Ενημέρωση ημερομηνιών ανάγνωσης για \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Επεξεργασία ημερομηνιών ανάγνωσης" msgid "Delete these read dates" msgstr "Διαγραφή αυτών των ημερομηνιών ανάγνωσης" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Ενημέρωση ημερομηνιών ανάγνωσης για \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Προσθήκη ημερομηνιών ανάγνωσης για το \ msgid "Report" msgstr "Αναφορά" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Σάρωση Barcode\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Αίτηση κάμερας..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Παραχώρηση πρόσβασης στην κάμερα για σάρωση του barcode ενός βιβλίου." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Αδυναμία πρόσβασης στην κάμερα" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Σάρωση..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "Σάρωση ISBN" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Αναζήτηση βιβλίου:" @@ -5171,13 +5279,13 @@ msgstr "Ψευδές" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Ημερομηνία έναρξης:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Ημερομηνία λήξης:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Πίνακας Ελέγχου" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Σύνολο χρηστών" @@ -5565,31 +5673,31 @@ msgstr "Ενεργοί αυτόν το μήνα" msgid "Works" msgstr "Έργα" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Ημέρες" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Εβδομάδες" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Δεν είναι δυνατή η αποθήκευση των ρυθμίσεων" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7281,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Στη σελίδα:" @@ -7297,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7702,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/en_Oulipo/LC_MESSAGES/django.po b/locale/en_Oulipo/LC_MESSAGES/django.po index 03632b2010..3aad94825e 100644 --- a/locale/en_Oulipo/LC_MESSAGES/django.po +++ b/locale/en_Oulipo/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:49\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:14\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Oulipo\n" "Language: en_Oulipo\n" @@ -107,7 +107,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Rating" @@ -175,39 +175,43 @@ msgstr "Admin discard" msgid "Domain block" msgstr "Domain block" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audiobook" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Digital Book" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Graphic story" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Hardback" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Softback" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Rundowns" @@ -489,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Community Posts" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Community" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Book Posts" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Book Posts" msgid "Books" msgstr "Books" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -839,7 +843,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Born:" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Compilation:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Books by %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Split up with commas" @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Confirm" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Confirm" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Confirm" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Modify Book" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Could not load illustration" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s rundown)" msgstr[1] "(%(review_count)s rundowns)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Add About" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "About:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "A variant of this book is on your %(shelf_name)s stack." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Your book activity" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Add activity chronology" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "No activity for this book." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Your rundowns" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Your annotations" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Your quotations" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Topics" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Locations" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Locations" msgid "Lists" msgstr "Lists" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Add to list" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC lookup:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Add front illustration" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Upload front illustration" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "This is an unknown author" msgid "Creating a new author: %(name)s" msgstr "Adding an author: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Is this a variant of a known work?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "This is an unknown work" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Compilation:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Compilation ordinal:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Cants" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publication" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Publication company:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Orignal publication:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Publication:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Discard %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Author landing for %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Front illustration" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Physical Information" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Format info:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Pagination:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Book Lookups" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Put out in %(date)s" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Confirmation string:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1870,7 +1976,7 @@ msgstr "You can opt-out in your configuration options." #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "Nothing much going on right now! Try following an account to start thing msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s Book Goal" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "You can modify your goal in your configuration options." @@ -2459,6 +2566,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "Modify activity chronology" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Start" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Finish" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Total accounts" @@ -5563,31 +5673,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Activity" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Signup activity" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7295,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/eo_UY/LC_MESSAGES/django.po b/locale/eo_UY/LC_MESSAGES/django.po index 4ca5bbfcbb..fd862628bd 100644 --- a/locale/eo_UY/LC_MESSAGES/django.po +++ b/locale/eo_UY/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:49\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:14\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Esperanto\n" "Language: eo\n" @@ -107,7 +107,7 @@ msgstr "Titolo de la libro" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Takso" @@ -175,39 +175,43 @@ msgstr "Forigo fare de kontrolanto" msgid "Domain block" msgstr "Blokado de domajno" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Sonlibro" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Bitlibro" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Grafika romano" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Rigidkovrila" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Poŝlibro" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Recenzoj" @@ -489,19 +493,19 @@ msgstr "Citaĵoj" msgid "Everything else" msgstr "Ĉio alia" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Hejma novaĵfluo" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Hejmo" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Libra novaĵfluo" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Libra novaĵfluo" msgid "Books" msgstr "Libroj" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Angla)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Kataluna)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Germana)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Hispana)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Eŭska)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galega)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Itala)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Finna)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Franca)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litova)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (Nederlanda)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvega)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Pola)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brazila portugala)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Eŭropa portugala)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Rumana)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Sveda)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (la ukraina)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Simpligita ĉina)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradicia ĉina)" @@ -839,7 +843,7 @@ msgstr "Ria plej mallonga legaĵo ĉi-jare…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Naskiĝis:" msgid "Died:" msgstr "Mortis:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serio:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Eksteraj ligiloj" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Vikipedio" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Retejo" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Vidi la ISNI-registraĵon" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Vidi ĉe ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Ŝarĝi per la datumaro" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Vidi ĉe OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Vidi ĉe Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Vidi ĉe LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Vidi ĉe Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Libroj de %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Nomo:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Apartigu plurajn valorojn per komoj." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Ŝlosilo de Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Ŝlosilo de Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Ŝlosilo de Goodreads:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Konservi" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Konservi" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "La ŝarĝado konektos al %(source_name)s kaj kontrolos ĉu estas metadatumoj pri ĉi tiu aŭtoro kiuj ne jam ĉeestas ĉi tie. La ekzistantaj datumoj ne anstataŭiĝos." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Konfirmi" msgid "Unable to connect to remote source." msgstr "La konekto al la fora fonto malsukcesis." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Modifi libron" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Alklaku por aldoni kovrilon" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Elŝuto de la kovrilo malsukcesis" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Alklaku por grandigi" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s recenzo)" msgstr[1] "(%(review_count)s recenzoj)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Aldoni priskribon" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Priskribo:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s eldono" msgstr[1] "%(count)s eldonoj" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Vi surbretigis ĉi tiun eldonon sur:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Alia eldono de ĉi tiu libro estas sur via breto %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Via lega agado" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Aldoni legodatojn" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Vi ne havas legan agadon por ĉi tiu libro." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Viaj recenzoj" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Viaj komentoj" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Viaj citaĵoj" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Temoj" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Lokoj" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Lokoj" msgid "Lists" msgstr "Listoj" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Aldoni al la listo" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "Kopiis la ISBN!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Numero OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "ASIN Audible:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Aldoni kovrilon" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Alŝuti kovrilon:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Ŝarĝi la kovrilon el URL:" @@ -1378,15 +1409,32 @@ msgstr "Ĉi tiu estas nova aŭtoro" msgid "Creating a new author: %(name)s" msgstr "Kreiĝos nova aŭtoro: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Ĉu ĉi tio estas eldono de ekzistanta verkaĵo?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Ĉi tio estas nova verkaĵo" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Ordiga titolo:" msgid "Subtitle:" msgstr "Subtitolo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serio:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Numero en la serio:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Lingvoj:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Temoj:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Aldoni temon" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Forigi temon" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Aldoni alian temon" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Pozicio:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Eldonado" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Eldonejo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Dato de la unua eldono:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Dato de la eldonado:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Aŭtoroj" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Forigi %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Aŭtorpaĝo de %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Aldoni aŭtorojn:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Aldoni aŭtoron" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Johana Cervino" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Aldoni alian aŭtoron" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Kovrilo" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Fizikaj ecoj" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Detaloj de la formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Paĝoj:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Libroidentigiloj" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Nomo" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Eldonita je %(date)s" msgid "rated it" msgstr "taksis ĝin" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Serio de" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Libro %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Sennumera libro" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Konfirmkodo:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Sendi" @@ -1870,7 +1976,7 @@ msgstr "Vi povas ŝanĝi vian decidon iam ajn en viaj agord #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s komencis legi %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s taksis %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s recenzis %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s komentis pri %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s citis %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Ĝuste nun estas neniu ago! Provu sekvi uzanton por komenci" msgid "Alternatively, you can try enabling more status types" msgstr "Aliokaze, vi povas provi ŝalti pli da tipoj de afiŝoj" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Legocelo por %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Vi povas aldoni aŭ ŝanĝi vian legocelon iam ajn per via profilpaĝo" @@ -2459,6 +2566,10 @@ msgstr "Ĉi tiu grupo havas neniun liston" msgid "Edit group" msgstr "Modifi grupon" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Serĉi kaj aldoni uzanton" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Skani strikodon" @@ -4309,7 +4421,7 @@ msgstr[0] "Nova raporto bezonas kontrolon" msgstr[1] "%(display_count)s novaj raportoj bezonas kontrolon" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Averto pri enhavo" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Elŝuti la dosieron" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Vi forigos ĉi tiun legadon kaj ĝiajn %(count)s asociitajn ĝisdatigojn de progreso." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Ĝisdatigi legodatojn por «%(title)s»" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Modifi la legodatojn" msgid "Delete these read dates" msgstr "Forigi ĉi tiujn legodatojn" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Ĝisdatigi legodatojn por «%(title)s»" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Aldoni legodatojn por «%(title)s»" msgid "Report" msgstr "Raporti" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Skani strikodon\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Petado de permeso por la kamerao..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Permesu la aliron al la kamerao por skani strikodon de libro." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Ne eblis atingi la kameraon" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Skanado..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Rektigu la strikodon de la libro kun la kamerao." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN skaniĝis" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Serĉado de la libro:" @@ -5171,13 +5279,13 @@ msgstr "Malvera" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Komenca dato:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Fina dato:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Panelo" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Suma nombro de uzantoj" @@ -5565,31 +5673,31 @@ msgstr "Aktivaj ĉi-monate" msgid "Works" msgstr "Verkoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Aktiveco de la instanco" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intertempo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Tagoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semajnoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Novaj aliĝoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Novaj afiŝoj" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Verkoj kreitaj" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Ne eblis konservi la agordojn" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Nomo" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7281,10 +7421,6 @@ msgstr "Citaĵo:" msgid "An excerpt from '%(book_title)s'" msgstr "Ekstrakto de ‘%(book_title)s’" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Pozicio:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Ĉe paĝo:" @@ -7297,12 +7433,12 @@ msgstr "Ĉe elcento:" msgid "to" msgstr "ĝis" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Via recenzo de «%(book_title)s»" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Recenzo:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "taksis %(title)s: %(display_rating)s stelo" msgstr[1] "taksis %(title)s: %(display_rating)s steloj" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Ĉesi legi" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Montri la afiŝon" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Paĝo %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Malfermi la bildon en nova fenestro" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Kaŝi la afiŝon" @@ -7702,16 +7845,22 @@ msgstr "komencis legi %(book)s de %(book)s" msgstr "komencis legi %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "recenzis %(book)s de %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "recenzis %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d libro – de %(user)s" msgstr[1] "%(num)d libroj – de %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po index 70e5f1d6e4..e26a2f7f84 100644 --- a/locale/es_ES/LC_MESSAGES/django.po +++ b/locale/es_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-03-03 19:41\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:12\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -107,7 +107,7 @@ msgstr "Título" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Valoración" @@ -175,39 +175,43 @@ msgstr "Eliminación de moderador" msgid "Domain block" msgstr "Bloqueo de dominio" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audio libro" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Libro electrónico" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Novela gráfica" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Tapa dura" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Tapa blanda" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s no se parece a un ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s no tiene una suma de verificación ISBN correcta, esperábamos %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "Comentario de %(display_name)s sobre %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "Cita de %(display_name)sde %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "Reseña de %(display_name)sde %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s calificó %(book_title)s: %(display_rating).1f estrella" msgstr[1] "%(display_name)s calificó %(book_title)s: %(display_rating).1f estrellas" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Reseñas" @@ -489,19 +493,19 @@ msgstr "Citas" msgid "Everything else" msgstr "Todo lo demás" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Línea de tiempo principal" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Línea temporal de libros" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Línea temporal de libros" msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Catalán)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Alemán)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskera" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (gallego)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (finés)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Francés)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Países bajos (holandés)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (noruego)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Polaco)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugués brasileño)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (rumano)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (ucraniano)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chino simplificado)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chino tradicional)" @@ -839,7 +843,7 @@ msgstr "El libro más corto que ha leído este año…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Fecha de nacimiento:" msgid "Died:" msgstr "Fecha de defunción:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serie:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Enlaces externos" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Ver en Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Sitio Web" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Ver registro ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Ver en ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Cargar datos" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Ver en OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Ver en Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Ver en LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Ver en Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Libros de %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Nombre:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Separar varios valores con comas." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Clave OpenLibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "ID Inventaire:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Clave Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Clave Goodreads:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Guardar" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Guardar" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "La carga de datos se conectará a %(source_name)s y comprobará si hay metadatos sobre este autore que no están presentes aquí. Los metadatos existentes no serán sobrescritos." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Confirmar" msgid "Unable to connect to remote source." msgstr "No se ha podido conectar con la fuente remota." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Editar Libro" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Haz clic para añadir portada" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "No se pudo cargar la portada" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Haz clic para ampliar" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Ver en Finna" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "Ver en Libris" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, 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:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Agregar descripción" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descripción:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s edición" msgstr[1] "%(count)s ediciones" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Has guardado esta edición en:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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 estantería %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Tu actividad de lectura" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Agregar fechas de lectura" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 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:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Tus reseñas" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Tus comentarios" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Tus citas" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Temas" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Agregar a lista" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "Crear una lista nueva..." -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "¡ISBN copiado!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Número OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "ASIN Audible:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "ID de Finna:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "ID de Libris:" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Agregar portada" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Subir portada:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Cargar portada desde URL:" @@ -1378,15 +1409,32 @@ msgstr "Este es un autor nuevo" msgid "Creating a new author: %(name)s" msgstr "Creando un autor nuevo: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "¿Es esta una edición de una obra ya existente?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Esta es una obra nueva" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Ordenar por título:" msgid "Subtitle:" msgstr "Subtítulo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Número de serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Idiomas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Temas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Añadir tema" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Quitar tema" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Añadir otro tema" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Posición:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publicación" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Editorial:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Fecha de primera publicación:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Fecha de publicación:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autores" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Quitar %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Página de autor por %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Agregar Autores:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Añadir autore" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "María López García" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Añadir otre autore" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Portada" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Propiedades físicas" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Detalles del formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Páginas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identificadores de libro" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "ID OpenLibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Nombre" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Publicado el %(date)s" msgid "rated it" msgstr "lo valoró con" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Series de" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Libro %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Libro sin clasificar" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -1870,7 +1976,7 @@ msgstr "Puedes negarte en cualquier momento desde Configura #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s ha empezado a leer %(book_title)s." #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s ha valorado %(book_title)s." -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s ha escrito una reseña de %(book_title)s." -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s ha escrito un comentario en %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s ha citado %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "¡No hay actividad ahora mismo! Sigue a otro usuario para empezar" msgid "Alternatively, you can try enabling more status types" msgstr "Alternativamente, puedes intentar habilitar más tipos de estado" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Objetivo de lectura de %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Puedes establecer o cambiar tu objetivo de lectura en cualquier momento desde tu página de perfil" @@ -2459,6 +2566,10 @@ msgstr "Este grupo no tiene listas" msgid "Edit group" msgstr "Editar grupo" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Buscar para añadir une usuarie" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Buscar un libro, autor, usuario o lista" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Escanear código de barras" @@ -4309,7 +4421,7 @@ msgstr[0] "Un nuevo informe requiere moderación" msgstr[1] "%(display_count)s nuevos informes requieren moderación" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Advertencia de contenido" @@ -4776,7 +4888,7 @@ msgstr "Exportar lista de libros" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "Su archivo de exportación CSV incluirá: todos los libros de sus estanterías, libros que ha reseñado y libros con actividad de lectura.
      Use esto para importar desde servicios como Goodreads." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Descargar archivo" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Actualizar fechas de lectura de «%(title)s»" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Editar fechas de lectura" msgid "Delete these read dates" msgstr "Eliminar estas fechas de lectura" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Actualizar fechas de lectura de «%(title)s»" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Añadir fechas de lectura de «%(title)s»" msgid "Report" msgstr "Reportar" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Escanear código de barras\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Solicitando acceso a cámara..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Otorga acceso a la cámara para poder escanear el código de barras de tus libros." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "No se ha podido acceder a la cámara." -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Escaneando..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Alinea el código de barras del libro con la cámara." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "Se ha escaneado el ISBN." -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Buscando libro:" @@ -5171,13 +5279,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Fecha de inicio:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Fecha final:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Tablero" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Número de usuarios" @@ -5565,31 +5673,31 @@ msgstr "Activos este mes" msgid "Works" msgstr "Obras" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Actividad de instancia" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Actividad de inscripciones de usuarios" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Actividad de estado" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Obras creadas" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "No se ha podido guardar la configuración." #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "Desactivar la federación" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "Tareas programadas" msgid "Tasks" msgstr "Tareas" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Nombre" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7281,10 +7421,6 @@ msgstr "Cita:" msgid "An excerpt from '%(book_title)s'" msgstr "Un extracto de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Posición:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "En la página:" @@ -7297,12 +7433,12 @@ msgstr "Al por ciento:" msgid "to" msgstr "a" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Tu reseña de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Reseña:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "valoró %(title)s: %(display_rating)s estrella" msgstr[1] "valoró %(title)s: %(display_rating)s estrellas" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Terminar de leer" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Mostrar estado" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Página %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Abrir imagen en una nueva ventana" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Ocultar estado" @@ -7702,16 +7845,22 @@ msgstr "empezó a leer %(book)s de %(book)s" msgstr "empezó a leer %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "reseñó %(book)s de %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "reseñó a %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d libro - de %(user)s" msgstr[1] "%(num)d libros - de %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/eu_ES/LC_MESSAGES/django.po b/locale/eu_ES/LC_MESSAGES/django.po index 78ef7083d1..0e88105c8f 100644 --- a/locale/eu_ES/LC_MESSAGES/django.po +++ b/locale/eu_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Basque\n" "Language: eu\n" @@ -107,7 +107,7 @@ msgstr "Liburuaren izenburua" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Balorazioa" @@ -175,39 +175,43 @@ msgstr "Moderatzaile ezabatzea" msgid "Domain block" msgstr "Domeinu blokeoa" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audio-liburua" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "eBook" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Komikia" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Azal gogorra" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Azal biguna" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)s erabiltzailearen %(book_title)s liburuaren iruzkina" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)s erabiltzailearen %(book_title)s liburuko aipua" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)s erabiltzailearen %(book_title)s liburuaren kritika" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s erabiltzaileak %(book_title)s liburua baloratu du: %(display_rating).1f izar" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Kritikak" @@ -489,19 +493,19 @@ msgstr "Aipuak" msgid "Everything else" msgstr "Gainerako guztia" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Hasierako denbora-lerroa" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Hasiera" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Liburuen denbora-lerroa" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Liburuen denbora-lerroa" msgid "Books" msgstr "Liburuak" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Ingelesa)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (katalana)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (alemana)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperantoa" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (espainiera)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galiziera)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italiera)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (koreera)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (finlandiera)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (frantses)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lituano (lituaniera)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Herbehereak (nederlandera)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvegiera)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (poloniera)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brasilgo Portugesa)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europako Portugesa)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (errumaniera)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (suediera)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainera)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Txinera soildua)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Txinera tradizionala)" @@ -839,7 +843,7 @@ msgstr "Aurtengo irakurketarik laburrena…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Jaiotza:" msgid "Died:" msgstr "Heriotza:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Seriea:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Kanpoko estekak" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Webgunea" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Ikusi ISNI erregistroa" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Ikus ISFDB webgunean" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Kargatu datuak" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "OpenLibraryn ikusi" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Inventairen ikusi" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "LibraryThing-en ikusi" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Goodreads-en ikusi" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "%(name)s(e)k idatzitako liburuak" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Izena:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Bereizi balio anitzak komaz." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary-ren giltza:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire IDa:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything-ren giltza:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads-ren giltza:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Gorde" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Gorde" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Datuak kargatzean %(source_name)s(e)ra konektatu eta hemen aurkitzen ez diren autore honi buruzko metadatuak arakatuko dira. Dauden datuak ez dira ordezkatuko." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Berretsi" msgid "Unable to connect to remote source." msgstr "Ezin izan da urruneko edukira konektatu." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Editatu liburua" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Egin klik azala gehitzeko" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Ezin izan da azala kargatu" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Egin click handitzeko" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(berrikuspen %(review_count)s)" msgstr[1] "(%(review_count)s berrikuspen)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Gehitu deskribapena" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Deskribapena:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "Edizio %(count)s" msgstr[1] "%(count)s edizio" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Edizio hau gorde duzu:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Liburu honen edizio desberdinak %(shelf_name)s apalean dituzu." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Zure irakurketa jarduera" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Gehitu irakurketa datak" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Ez duzu liburu honetarako irakurketa jarduerarik." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Zure kritikak" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Zure iruzkinak" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Zure aipuak" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Gaiak" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Lekuak" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Lekuak" msgid "Lists" msgstr "Zerrendak" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Gehitu zerrendara" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN-a kopiatu!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC zenbakia:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads-en giltza:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Gehitu azala" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Kargatu azala:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Kargatu azala URLtik:" @@ -1378,15 +1409,32 @@ msgstr "Egile berria da" msgid "Creating a new author: %(name)s" msgstr "Egile berria sortzen: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Lehendik dagoen lan baten edizioa al da hau?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Lan berria da hau" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Izenburuaren arabera ordenatu:" msgid "Subtitle:" msgstr "Azpititulua:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Seriea:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Serie zenbakia:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Hizkuntzak:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Gaiak:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Gehitu gaia" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Ezabatu gaia" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Gehitu beste gai bat" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Posizioa:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Argitalpena" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Argitaletxea:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Argitaratutako lehen data:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Argitaratze data:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Egilea(k)" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Kendu %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "%(name)s egilearen orria" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Gehitu egilea(k):" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Gehitu egilea" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Egilearen Izen-Abizenak" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Gehitu beste egile bat" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Azala" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Ezaugarri fisikoak" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formatua:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Formatuaren xehetasunak:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Orrialdeak:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Liburuen identifikatzaileak" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary-ren IDa:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Izena" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "%(date)s(e)an argitaratua" msgid "rated it" msgstr "baloratu du" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Seriearen sortzailea: " - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "%(series_number)s. liburua" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Sailkatu gabeko liburua" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Berrespen kodea:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Bidali" @@ -1870,7 +1976,7 @@ msgstr "Edozein unetan ezeztatu dezakezu zure profilaren ez #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s erabiltzailea %(book_title)s irakurtzen hasi da" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s(e)k %(book_title)s baloratu du" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s(e)k %(book_title)s(r)en kritika egin du" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s(e)k %(book_title)s(e)ri buruzko iruzkina egin du" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s(e)k %(book_title)s(r)en aipua egin du" @@ -2164,14 +2271,14 @@ msgstr "Oraintxe ez dago jarduerarik! Hasteko, saiatu erabiltzaile bat jarraitze msgid "Alternatively, you can try enabling more status types" msgstr "Aukera gisa, estatu mota gehiago gaitzen saia zaitezke" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s(e)ko irakurketa helburua" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Irakurtzeko helburua edozein unetan ezar edo alda dezakezu zure profileko orrialdean" @@ -2459,6 +2566,10 @@ msgstr "Talde honek ez du zerrendarik" msgid "Edit group" msgstr "Editatu taldea" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Bilatu erabiltzaile bat gehitzeko" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Bilatu liburu, egile, erabiltzaile edo zerrenda bat" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Eskaneatu barra-kodea" @@ -4309,7 +4421,7 @@ msgstr[0] "Salaketa berri batek moderatzea behar du" msgstr[1] "%(display_count)s salaketa berrik moderatzea behar dute" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Edukiari buruzko abisua" @@ -4776,7 +4888,7 @@ msgstr "Esportatu liburu zerrenda" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "Zure CSV esportazio-fitxategiak zure apaletako liburu guztiak, kritikatu dituzun liburuak, eta irakurketa-aktibitatea duten liburuak izango ditu.
      Erabili hau Goodreads bezalako zerbitzuetara inportatzeko." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Deskargatu fitxategia" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Irakurketa hau eta hari lotutako %(count)s egoera-eguneratzeak ezabatzen ari zara." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Eguneratu irakurketa-datak \"%(title)s\"(r)entzat" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Editatu irakurketa datak" msgid "Delete these read dates" msgstr "Ezabatu irakurketa-data houek" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Eguneratu irakurketa-datak \"%(title)s\"(r)entzat" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,40 +5152,33 @@ msgstr "Gehitu irakurketa-datak \"%(title)s\"(r)entzat" msgid "Report" msgstr "Salatu" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -"Eskaneatu barra-kodea " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Kamera eskatzen..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Eman kamerarako sarbidea liburu baten barra-kodea eskaneatu ahal izateko." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Ezin izan da kamara eskuratu" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Eskaneatzen..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Lerrokatu zure liburuaren barra-kodea kamerarekin." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN eskaneatua" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Liburua bilatzen:" @@ -5170,13 +5279,13 @@ msgstr "Gezurra" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Hasiera data:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Amaiera data:" @@ -5550,7 +5659,7 @@ msgid "Dashboard" msgstr "Arbela" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Erabiltzaileak guztira" @@ -5564,31 +5673,31 @@ msgstr "Aktibo hilabete honetan" msgid "Works" msgstr "Liburuak" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Instantziaren aktibitatea" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Tartea:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Egunak" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Asteak" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Erabiltzaileen izen-emate aktibitatea" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Egoeren aktibitatea" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Sortutako liburuak" @@ -5900,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Ezin izan dira ezarpenak gorde" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6617,10 +6762,6 @@ msgstr "Antolaturiko zereginak" msgid "Tasks" msgstr "Zereginak" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Izena" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "Celery zeregina" @@ -7280,10 +7421,6 @@ msgstr "Aipua:" msgid "An excerpt from '%(book_title)s'" msgstr "\"%(book_title)s\"(e)ko pasarte bat" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Posizioa:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Orrialdean:" @@ -7296,12 +7433,12 @@ msgstr "Ehunekotan:" msgid "to" msgstr "hona:" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "'%(book_title)s' liburuari buruzko zure kritika" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Kritika:" @@ -7402,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "%(title)s puntuatu du: izar %(display_rating)s" msgstr[1] "%(title)s puntuatu du: %(display_rating)s izar" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7614,35 +7758,35 @@ msgstr "Bukatu irakurtzen" msgid "Show rating" msgstr "Erakutsi balorazioa" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Erakutsi egoera" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(%(page)s. orria" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%%%(percent)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %%%(endpercent)s" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Ireki irudia leiho berrian" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Ezkutatu egoera" @@ -7701,16 +7845,22 @@ msgstr "erabiltzailea %(author_name)s(r)en %(book)s" msgstr "erabiltzailea %(book)s irakurtzen hasi da" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "(e)k %(author_name)s(r)en %(book)s liburuaren kritika egin du" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "(e)k %(book)s(r)en kritika egin du" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7989,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "liburu %(num)d - %(user)s" msgstr[1] "%(num)d liburu - %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "erabiltzaile-kontu berri bat" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/fa_IR/LC_MESSAGES/django.po b/locale/fa_IR/LC_MESSAGES/django.po index 6799170a86..5b83ebc3c5 100644 --- a/locale/fa_IR/LC_MESSAGES/django.po +++ b/locale/fa_IR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-04-16 10:53\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Persian\n" "Language: fa\n" @@ -107,7 +107,7 @@ msgstr "عنوان کتاب" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "امتیاز" @@ -175,39 +175,43 @@ msgstr "حذف مدیر" msgid "Domain block" msgstr "مسدود کردن دامنه" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "کتاب صوتی" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "کتاب الکترونیکی" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "رمان گرافیکی" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "کتاب جلد سخت" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "کتاب جلد نرم" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s به نظر نمی‌رسد یک ISBN باشد" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s دارای چک‌کد ISBN صحیح نیست، ما انتظار داشتیم %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)s's نظر در مورد %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)s's نقل قول از %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)s's بررسی %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s به %(book_title)s نمره داد: %(display_rating).1f ستاره" msgstr[1] "%(display_name)s به %(book_title)s نمره داد: %(display_rating).1f ستاره" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "بررسی‌ها" @@ -489,19 +493,19 @@ msgstr "نقل قول‌ها" msgid "Everything else" msgstr "سایر موارد" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "خط زمانی خانه" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "خانه" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "خط زمانی کتاب‌ها" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "خط زمانی کتاب‌ها" msgid "Books" msgstr "کتاب‌ها" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "انگلیسی" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "کاتالان (Catalan)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "آلمانی (German)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "اسپرانتو (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "اسپانیایی (Spanish)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "باسکی (Basque)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "گالیسی (Galician)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "ایتالیایی (Italian)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "کره‌ای (Korean)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "فنلاندی (Finnish)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "فرانسوی (French)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "لیتوانیایی (Lithuanian)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "هلندی (Dutch)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "نروژی (Norwegian)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "لهستانی (Polish)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "پرتغالی برزیلی (Brazilian Portuguese)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "پرتغالی اروپایی (Português Europeu)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "رومانیایی (Română)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "سوئدی (Svenska)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "اوکراینی (Українська)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "چینی ساده (简体中文)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "چینی سنتی (繁體中文)" @@ -839,7 +843,7 @@ msgstr "کوتاه‌ترین خواندن آن‌ها در این سال…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "تولد:" msgid "Died:" msgstr "مرگ:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "سری:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "لینک‌های خارجی" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "ویکی‌پدیا" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "مشاهده در ویکی‌داده" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "وب‌سایت" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "مشاهده رکورد ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "مشاهده در ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "بارگذاری داده" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "مشاهده در OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "مشاهده در Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "مشاهده در LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "مشاهده در Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "کتاب‌های %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "نام:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "برای جدا کردن مقادیر چندگانه از ویرگول استفاده کنید." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "کلید اوپن‌لایبرری:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "شناسه اینونر:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "کلید لایبرری‌تینک:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "کلید گودریڊز:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "ذخیره" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "ذخیره" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "بارگذاری داده‌ها به %(source_name)s متصل خواهد شد و هر گونه متاداده درباره این نویسنده که در اینجا موجود نیست را بررسی خواهد کرد. متاداده‌های موجود جایگزین نخواهند شد." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "تأیید" msgid "Unable to connect to remote source." msgstr "عدم توانایی در اتصال به منبع از راه دور." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "ویرایش کتاب" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "برای افزودن جلد کلیک کنید" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "بارگذاری جلد ناموفق بود" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "برای بزرگ‌نمایی کلیک کنید" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "مشاهده در فینا" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "مشاهده در لایبریس" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s نقد)" msgstr[1] "(%(review_count)s نقدها)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "افزودن توضیحات" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "توضیحات:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s ویرایش" msgstr[1] "%(count)s ویرایش‌ها" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "شما این ویرایش را در قفسه‌تان قرار داده‌اید:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "فعالیت خواندن شما" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "تاریخ‌های خواندن را اضافه کنید" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "شما هیچ فعالیت خواندنی برای این کتاب ندارید." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "نقدهای شما" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "نظرات شما" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "نقل‌قول‌های شما" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "موضوعات" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "مکان‌ها" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "مکان‌ها" msgid "Lists" msgstr "فهرست‌ها" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "اضافه کردن به فهرست" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "ایجاد فهرست جدید..." -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN کپی شد!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "شماره OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "ASIN شنیداری:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "شناسه ISFDB:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "شناسه Finna:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "شناسه Libris:" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "کاور را اضافه کنید" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "بارگذاری کاور:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "بارگذاری کاور از URL:" @@ -1378,15 +1409,32 @@ msgstr "این یک نویسنده جدید است" msgid "Creating a new author: %(name)s" msgstr "در حال ایجاد نویسنده جدید: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "آیا این نسخه‌ای از یک اثر موجود است؟" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "این یک اثر جدید است" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "عنوان مرتب‌سازی:" msgid "Subtitle:" msgstr "زیرعنوان:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "سری:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "شماره سری:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "زبان‌ها:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "موضوعات:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "موضوع اضافه کنید" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "موضوع را حذف کنید" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "موضوع دیگری اضافه کنید" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "انتشار" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "ناشر:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "تاریخ اولین انتشار:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "تاریخ انتشار:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "نویسندگان" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "حذف %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "صفحه نویسنده برای %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "نویسندگان را اضافه کنید:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "نویسنده اضافه کنید" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "جین دو" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "نویسنده دیگری اضافه کنید" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "پوشش" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "ویژگی‌های فیزیکی" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "فرمت:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "جزئیات فرمت:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "صفحات:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "شناسه‌های کتاب" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "شناسه Openlibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "نام" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "منتشر شده در %(date)s" msgid "rated it" msgstr "آن را ارزیابی کرد" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "مجموعه توسط" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "کتاب %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "کتاب نامرتب" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "کد تأیید:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "ارسال" @@ -1870,7 +1976,7 @@ msgstr "شما می توانید هر زمان که بخواهید از %(username)s started reading %(username)s شروع به خواندن کتاب %(book_title)s کرد" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s به کتاب %(book_title)s امتیاز داد" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s نقدی برای %(book_title)s نوشت." -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s بر روی %(book_title)s نظری گذاشت." -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s از %(book_title)s نقل قول کرد." @@ -2164,14 +2271,14 @@ msgstr "در حال حاضر فعالیتی وجود ندارد! سعی کنید msgid "Alternatively, you can try enabling more status types" msgstr "به جای آن، می‌توانید تلاش کنید تا نوع‌های بیشتری از وضعیت‌ها را فعال کنید" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s هدف خواندن" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "شما می‌توانید هر زمان هدف خواندن خود را از صفحه پروفایل خود تنظیم یا تغییر دهید" @@ -2459,6 +2566,10 @@ msgstr "این گروه هیچ فهرستی ندارد" msgid "Edit group" msgstr "ویرایش گروه" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "برای افزودن یک کاربر جستجو کنید" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "برای یک کتاب، نویسنده، کاربر، یا فهرست جستجو کنید" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "بارکد را اسکن کنید" @@ -4309,7 +4421,7 @@ msgstr[0] "یک گزارش جدید نیاز به تع msgstr[1] "%(display_count)s گزارش جدید نیاز به تعدیل دارند" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "هشدار محتوا" @@ -4776,7 +4888,7 @@ msgstr "صادر کردن فهرست کتاب" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "فایل صادر CSV شما شامل تمام کتاب‌هایی روی قفسه‌های شما، کتاب‌هایی که نقد کرده‌اید و کتاب‌هایی با فعالیت خواندن خواهد شد.
      از این برای درونریزی به سرویسی مانند Goodreads استفاده کنید." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "دانلود فایل" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "شما این خواندگی و %(count)s به‌روزرسانی پیشرفت مرتبط آن را حذف می‌کنید." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "به‌روزرسانی تاریخ‌های خواندن برای \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "ویرایش تاریخ‌های خواندن" msgid "Delete these read dates" msgstr "حذف این تاریخ‌های خواندن" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "به‌روزرسانی تاریخ‌های خواندن برای \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,33 +5152,33 @@ msgstr "اضافه کردن تاریخ‌های خواندن برای \"%(ti msgid "Report" msgstr "گزارش" -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "درخواست دوربین..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "دسترسی به دوربین را برای اسکن بارکد کتاب اعطا کنید." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "نمی‌توان به دوربین دسترسی پیدا کرد" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "در حال اسکن..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "بارکد کتاب خود را با دوربین تراز کنید." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN اسکن شد" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "جستجو برای کتاب:" @@ -5163,13 +5279,13 @@ msgstr "خیر" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "تاریخ شروع:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "تاریخ پایان:" @@ -5543,7 +5659,7 @@ msgid "Dashboard" msgstr "داشبورد" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "کل کاربران" @@ -5557,31 +5673,31 @@ msgstr "فعال در این ماه" msgid "Works" msgstr "آثار" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "فعالیت نمونه" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "بازه:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "روزها" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "هفته‌ها" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "فعالیت ثبت‌نام کاربر" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "فعالیت وضعیت" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "آثار ایجاد شده" @@ -5893,13 +6009,49 @@ msgid "Unable to save settings" msgstr "نمی‌توان تنظیمات را ذخیره کرد" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "غیرفعال کردن فدراسیون" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "مانع تعامل نمونه شما با سرویس‌های فدراسیون دیگر می‌شود. داده‌های موجود از نمونه‌های دیگر همچنان وجود خواهند داشت." +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6610,10 +6762,6 @@ msgstr "وظایف برنامه‌ریزی شده" msgid "Tasks" msgstr "وظایف" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "نام" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "وظیفه Celery" @@ -7273,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7289,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7395,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7607,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7694,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7982,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/fi_FI/LC_MESSAGES/django.po b/locale/fi_FI/LC_MESSAGES/django.po index 6e92bd99ab..17a0660a6b 100644 --- a/locale/fi_FI/LC_MESSAGES/django.po +++ b/locale/fi_FI/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Finnish\n" "Language: fi\n" @@ -107,7 +107,7 @@ msgstr "Kirjan nimi" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Arvosana" @@ -175,39 +175,43 @@ msgstr "Moderaattorin poistama" msgid "Domain block" msgstr "Verkkotunnuksen esto" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Äänikirja" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "E-kirja" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Sarjakuva" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Kovakantinen" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Pehmeäkantinen" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s ei näytä olevan ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s ei sisällä oikein olevaa ISBN-tarkistussummaa, odotimme %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "Käyttäjan %(display_name)s kommentti kirjasta %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "Käyttäjän %(display_name)s lainaus kirjasta %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "Käyttäjan %(display_name)s arvostelu kirjasta %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s arvosteli %(book_title)s: %(display_rating).1f tähti" msgstr[1] "%(display_name)s arvosteli %(book_title)s: %(display_rating).1f tähteä" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Arviot" @@ -489,19 +493,19 @@ msgstr "Lainaukset" msgid "Everything else" msgstr "Muut" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Oma aikajana" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Etusivu" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Kirjavirta" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Kirjavirta" msgid "Books" msgstr "Kirjat" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (englanti)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (katalaani)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (saksa)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (espanja)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (baski)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (galego)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (italia)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (korea)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "suomi" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (ranska)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (liettua)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (hollanti)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (norja)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (puola)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasilianportugali)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugali)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (romania)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (ruotsi)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (ukraina)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (yksinkertaistettu kiina)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (perinteinen kiina)" @@ -839,7 +843,7 @@ msgstr "Vuoden lyhyin kirja…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Syntynyt:" msgid "Died:" msgstr "Kuollut:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Sarja:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Linkit muualle" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Näytä Wikidatassa" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Verkkosivu" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Näytä ISNI-tietue" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Näytä ISFDB:ssä" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Lataa tiedot" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Näytä OpenLibraryssa" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Näytä Inventairessa" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Näytä LibraryThingissä" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Näytä Goodreadsissa" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Tekijän %(name)s kirjat" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Nimi:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Erota erilliset arvot pilkulla." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary-avain:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire-tunniste:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything-avain:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads-avain:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Tallenna" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Tallenna" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Tietoja ladattaessa muodostetaan yhteys lähteeseen %(source_name)s ja sieltä haetaan metatietoja, joita ei vielä ole täällä. Olemassa olevia metatietoja ei korvata uusilla." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Vahvista" msgid "Unable to connect to remote source." msgstr "Lähteeseen ei saada yhteyttä." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Muokkaa kirjaa" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Lisää kansikuva" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Kansikuvan lataus epäonnistui" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Suurenna" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Näytä Finnassa" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s arvio)" msgstr[1] "(%(review_count)s arviota)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Lisää kuvaus" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Kuvaus:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s laitos" msgstr[1] "%(count)s laitosta" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Olet sijoittanut laitoksen hyllyyn:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Hyllyssäsi %(shelf_name)s on jo toinen tämän kirjan laitos." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Oma lukutoiminta" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Lisää lukupäivämäärät" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Ei kirjaan liittyvää lukutoimintaa." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Omat arviot" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Omat kommentit" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Omat lainaukset" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Aiheet" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Paikat" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Paikat" msgid "Lists" msgstr "Listat" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Lisää listaan" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN kopioitu!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC-numero:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB-tunniste:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna-tunniste:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Lisää kansikuva" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Lataa kansikuva:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Ladattavan kansikuvan URL:" @@ -1378,15 +1409,32 @@ msgstr "Uusi tekijä" msgid "Creating a new author: %(name)s" msgstr "Luodaan uusi tekijä: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Onko tämä aiemmin lisätyn teoksen laitos?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Uusi teos" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Lajittelussa käytettävä nimi:" msgid "Subtitle:" msgstr "Alaotsikko:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Sarja:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Osan numero:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Kielet:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Aiheet:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Lisää aihe" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Poista aihe" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Lisää uusi aihe" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Sijainti:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Julkaisu" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Kustantaja:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Julkaistu ensimmäisen kerran:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Julkaisuaika:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Tekijät" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Poista %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Tekijän %(name)s sivu" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Lisää tekijät:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Lisää tekijä" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Marras Meikäläinen" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Yksi tekijä lisää" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Kansikuva" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Painoksen ominaisuudet" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Julkaisumuoto:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Lisätietoa julkaisumuodosta:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Sivumäärä:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Kirjan tunnisteet" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary-tunniste:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Nimi" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Julkaistu: %(date)s" msgid "rated it" msgstr "antoi arvosanan" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Sarja." - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Osa %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Lajittelematon kirja" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Vahvistuskoodi:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Lähetä" @@ -1870,7 +1976,7 @@ msgstr "Hakemistosta voi milloin tahansa poistua profiilin #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s alkoi lukea teosta %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s arvosteli teoksen %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s kirjoitti arvion teoksesta %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s kommentoi teosta %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s lainasi teosta %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Ei tapahtumia. Seuraa muita käyttäjiä" msgid "Alternatively, you can try enabling more status types" msgstr "Voit myös ottaa uusia tilapäivityslajeja käyttöön" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Lukutavoite vuodelle %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Lukutavoitteen voi milloin tahansa asettaa vaikka uudelleen oman profiilisivun kautta" @@ -2459,6 +2566,10 @@ msgstr "Ryhmällä ei ole listoja" msgid "Edit group" msgstr "Muokkaa ryhmää" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Hae lisättävää käyttäjää" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Hae kirjaa, tekijää, käyttäjää tai listaa" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Skannaa viivakoodi" @@ -4309,7 +4421,7 @@ msgstr[0] "Uusi raportti odottaa tarkastusta" msgstr[1] "%(display_count)s uutta raporttia odottaa tarkastusta" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Sisältövaroitus" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Lataa tiedosto" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Olet poistamassa lukutapahtumaa ja %(count)s siihen liitettyä etenemispäivitystä." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Päivitä teoksen %(title)s lukuajankohtaa" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Muokkaa lukuajankohtaa" msgid "Delete these read dates" msgstr "Poista lukuajankohta" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Päivitä teoksen %(title)s lukuajankohtaa" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Lisää lukuajankohta teokseen %(title)s" msgid "Report" msgstr "Raportoi" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Skannaa viivakoodi\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Pyydetään kameraa..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Anna lupa käyttää kameraa, jotta viivakoodi voidaan skannata." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Kameraa ei löytynyt" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Skannataan..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Kohdista kirjan viivakoodi kameraan." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN skannattu" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Haetaan kirjaa:" @@ -5171,13 +5279,13 @@ msgstr "Epätosi" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Alkaen:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Päättyen:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Kojelauta" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Käyttäjiä yhteensä" @@ -5565,31 +5673,31 @@ msgstr "Aktiivisena tässä kuussa" msgid "Works" msgstr "Teoksia" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Palvelimen aktiivisuus" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Aikaväli:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "päivä" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "viikko" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Rekisteröityneitä käyttäjiä" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Tilapäivityksiä" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Luotuja teoksia" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Asetuksia ei voi tallentaa" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "Tehtävät" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Nimi" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7281,10 +7421,6 @@ msgstr "Lainaus:" msgid "An excerpt from '%(book_title)s'" msgstr "Lainaus teoksesta ”%(book_title)s”" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Sijainti:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Sivulla:" @@ -7297,12 +7433,12 @@ msgstr "Prosenttikohdassa:" msgid "to" msgstr "–" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Arviosi teoksesta ”%(book_title)s”" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Arvio:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "arvosteli teoksen %(title)s: %(display_rating)s tähti" msgstr[1] "arvosteli teoksen %(title)s: %(display_rating)s tähteä" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Luettu kokonaan" msgid "Show rating" msgstr "Näytä arvio" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Näytä tilapäivitys" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Sivu %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s %%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "–%(endpercent)s %%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Avaa kuva uudessa ikkunassa" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Piilota tilapäivitys" @@ -7702,16 +7845,22 @@ msgstr "alkoi lukea teosta %(author_name)s: %(book)s" msgstr "alkoi lukea teosta %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "kirjoitti arvion teoksesta %(author_name)s: %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "kirjoitti arvion teoksesta %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d kirja — %(user)s" msgstr[1] "%(num)d kirjaa — %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "uusi käyttäjätili" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/fo_FO/LC_MESSAGES/django.po b/locale/fo_FO/LC_MESSAGES/django.po index c52028601a..b0045d37ef 100644 --- a/locale/fo_FO/LC_MESSAGES/django.po +++ b/locale/fo_FO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:49\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:14\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Faroese\n" "Language: fo\n" @@ -107,7 +107,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -175,39 +175,43 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -489,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -839,7 +843,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1870,7 +1976,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2459,6 +2566,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5563,31 +5673,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7295,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 38d47b7741..82df93c7ed 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-03-19 07:32\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-26 05:34\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -107,7 +107,7 @@ msgstr "Titre du livre" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Note" @@ -175,39 +175,43 @@ msgstr "Suppression par un modérateur" msgid "Domain block" msgstr "Blocage de domaine" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Livre audio" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "eBook" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Roman graphique" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Livre relié" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Livre broché" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s ne ressemble pas à un numéro ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s n'a pas la somme de contrôle ISBN correcte, nous nous attendions à %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "Ce livre fait déjà partie de cette collection" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "Commentaire de %(display_name)s pour « %(book_title)s »" msgid "%(display_name)s's quote from %(book_title)s" msgstr "Citation de %(display_name)s pour « %(book_title)s »" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "Critique de %(display_name)s pour « %(book_title)s »" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s a noté « %(book_title)s » : %(display_rating).1f étoile" msgstr[1] "%(display_name)s a noté « %(book_title)s » : %(display_rating).1f étoiles" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Critiques" @@ -489,19 +493,19 @@ msgstr "Citations" msgid "Everything else" msgstr "Tout le reste" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Mon fil d’actualité" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Accueil" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Mon fil d’actualité littéraire" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Mon fil d’actualité littéraire" msgid "Books" msgstr "Livres" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Catalan)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Espéranto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galicien)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italien)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Coréen)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Finnois)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituanien)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (néerlandais)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvégien)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Polonais)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugais brésilien)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugais européen)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Roumain)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Suédois)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainien)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简化字" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (chinois traditionnel)" @@ -839,7 +843,7 @@ msgstr "Sa lecture la plus courte l’année…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Naissance :" msgid "Died:" msgstr "Décès :" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Série :" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Liens externes" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Voir sur Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Site Internet" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Voir l’enregistrement ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Voir sur ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Charger les données" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Voir sur OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Voir sur Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Voir sur LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Voir sur Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Livres de %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Nom :" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Séparez plusieurs valeurs par une virgule." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Clé Openlibrary :" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Identifiant Inventaire :" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Clé Librarything :" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Clé Goodreads :" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI :" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI :" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Enregistrer" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Enregistrer" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Le chargement des données se connectera à %(source_name)s et vérifiera les métadonnées de cet auteur ou autrice qui ne sont pas présentes ici. Les métadonnées existantes ne seront pas écrasées." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Confirmer" msgid "Unable to connect to remote source." msgstr "Impossible de se connecter au serveur distant." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "Ce livre fait peut-être partie de la série %(series)s." + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "Modifiez-le pour confirmer." + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "Livre %(number)s sur %(title)s" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "Extrait de %(title)s" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Modifier le livre" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Cliquez pour ajouter une couverture" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "La couverture n’a pu être chargée" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Cliquez pour élargir" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Voir sur Finna" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "Voir sur Libris" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s critique)" msgstr[1] "(%(review_count)s critiques)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Ajouter une description" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Description :" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s édition" msgstr[1] "%(count)s éditions" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Vous avez rangé cette édition dans :" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Une édition différente de ce livre existe sur votre étagère %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Votre activité de lecture" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Ajouter des dates de lecture" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 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:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Vos critiques" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Vos commentaires" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Vos citations" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Sujets" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Lieux" msgid "Lists" msgstr "Listes" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Ajouter à la liste" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "Créer une liste..." -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN copié !" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Numéro OCLC :" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN :" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "ASIN Audible:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "ID Libris :" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Ajouter une couverture" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Charger une couverture :" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Charger la couverture depuis une URL :" @@ -1378,15 +1409,32 @@ msgstr "Il s’agit d’un nouvel auteur ou d’une nouvelle autrice." msgid "Creating a new author: %(name)s" msgstr "Création d’un nouvel auteur/autrice : %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Est‑ce l’édition d’un ouvrage existant ?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Il s’agit d’un nouvel ouvrage." -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "Êtes-vous sûr qu'il s'agit d'une nouvelle série ? Les séries suivantes ont des titres similaires et le même auteur." + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "Ce livre fait-il partie d'une de ces séries ?" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "Il s'agit d'une nouvelle série" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "Créer une nouvelle série" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Titre de tri :" msgid "Subtitle:" msgstr "Sous‑titre :" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Série :" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Numéro dans la série :" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Langues :" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Sujets :" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Ajouter un sujet" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Retirer le sujet" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Ajouter un autre sujet" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "Série" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "Modifier la série" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "Pour modifier les détails d'une série, cliquez sur le nom de celle-ci" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Emplacement :" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "Supprimer ce livre de %(series_name)s" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "Ajouter une série" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "Titre de la série :" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "Position dans la série :" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "Ce champ s'appelait auparavant « Numéro de série »" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publication" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Éditeur :" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Première date de parution :" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Date de parution :" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Auteurs ou autrices" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Retirer %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Page de %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Ajouter des auteurs ou autrices :" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Ajouter un auteur ou une autrice" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Camille Dupont" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Ajouter un autre auteur ou autrice" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Couverture" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Propriétés physiques" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Format :" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Détails du format :" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Pages :" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identifiants du livre" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13 :" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10 :" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Identifiant Openlibrary :" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "Modifier « %(title)s »" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "Modifier « %(name)s »" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Nom" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "Autre nom" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "Ajouter un autre nom :" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "Ajouter un autre nom" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "ID Wikidata :" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Publié %(date)s" msgid "rated it" msgstr "l’a noté" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Séries par" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Livre %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Livre hors classement" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Code de confirmation :" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Valider" @@ -1870,7 +1976,7 @@ msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment dep #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s a commencé %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s a noté %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s a critiqué %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s a commenté %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s a cité un passage de %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour msgid "Alternatively, you can try enabling more status types" msgstr "Sinon, vous pouvez essayer d’activer plus de types de statuts" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Défi lecture pour %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Vous pouvez définir ou changer votre défi lecture à n’importe quel moment depuis votre profil" @@ -2459,6 +2566,10 @@ msgstr "Ce groupe n'a pas de liste" msgid "Edit group" msgstr "Modifier le groupe" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "Membres du groupe" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Chercher et ajouter un·e utilisateur·rice" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Rechercher un livre, un auteur, un utilisateur ou une liste" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Scanner le code-barres" @@ -4309,7 +4421,7 @@ msgstr[0] "Un nouveau signalement a besoin d’être tr msgstr[1] "%(display_count)s nouveaux signalements ont besoin d’être traités" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Avertissement sur le contenu" @@ -4776,7 +4888,7 @@ msgstr "Exporter la liste des livres" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "Votre fichier d'exportation CSV comprendra tous les livres sur vos étagères, les livres que vous avez examinés et les livres avec activité de lecture.
      Utilisez-le pour importer dans un service comme Goodreads." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Télécharger le fichier" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Mettre à jour les dates de lecture pour « %(title)s »" +msgid "Update read dates for \"%(title)s\"" +msgstr "Mettre à jour les dates de lecture pour « %(title)s »" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Modifier les date de lecture" msgid "Delete these read dates" msgstr "Supprimer ces dates de lecture" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Mettre à jour les dates de lecture pour « %(title)s »" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Ajouter des dates de lecture pour « %(title)s »" msgid "Report" msgstr "Signaler" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Scanner le code-barres\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "En attente de la caméra…" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Autorisez l’accès à l’appareil photo pour scanner le code‑barres d’un livre." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Impossible d’accéder à la caméra" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Scan en cours…" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Alignez le code‑barres de votre livre avec l’appareil photo." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN scanné" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Recherche du livre :" @@ -5171,13 +5279,13 @@ msgstr "Faux" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Date de début :" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Date de fin :" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Tableau de bord" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Nombre total d'utilisateurs·rices" @@ -5565,31 +5673,31 @@ msgstr "Actifs ce mois" msgid "Works" msgstr "Œuvres" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Activité de l'instance" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalle :" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Jours" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semaines" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Nouvelles inscriptions" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Nouveaux statuts" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Œuvres créées" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Impossible d’enregistrer les paramètres" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "Exiger des requêtes GET signées" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "Recommandé" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "Empêche les requêtes anonymes provenant d'instances fédérées. Cela correspond à peu près au « mode sécurisé » de Mastodon ou à « AUTHORIZED_FETCH »" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "Empêcher les consultations sans authentification" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "Empêche les utilisateurs anonymes d'accéder à la plupart des pages. Pour bloquer également les requêtes JSON, activez l'option « Exiger des requêtes GET signées »" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "Désactiver la fédération" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "Avertissement" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "Empêche votre instance d'interagir avec d'autres services fédérés. Les données existantes d'autres instances seront toujours présentes." +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "Bloquer les recherches entrantes" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "Non recommandé" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "Empêche les autres serveurs d'effectuer des recherches sur votre instance. Il est fortement recommandé de NE PAS activer ce paramètre." + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "Tâches planifiées" msgid "Tasks" msgstr "Tâches" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Nom" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "Tâche Celery" @@ -7281,10 +7421,6 @@ msgstr "Citation :" msgid "An excerpt from '%(book_title)s'" msgstr "Un extrait de « %(book_title)s »" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Emplacement :" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "À la page :" @@ -7297,12 +7433,12 @@ msgstr "Au pourcentage :" msgid "to" msgstr "à" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Votre critique de « %(book_title)s »" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Critique :" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "a noté %(title)s : %(display_rating)s étoile" msgstr[1] "a noté %(title)s : %(display_rating)s étoiles" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "Note : « %(book_title)s » %(display_rating)s étoile %(review_title)s" +msgstr[1] "Note : « %(book_title)s » %(display_rating)s étoiles %(review_title)s" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Terminer la lecture" msgid "Show rating" msgstr "Voir la note" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Afficher le statut" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Page %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Ouvrir l’image dans une nouvelle fenêtre" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Masquer le statut" @@ -7702,16 +7845,22 @@ msgstr "a commencé la lecture de %(book)s par %(book)s" msgstr "a commencé %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "a publié une critique de %(book)s par %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "a critiqué %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "note %(book)s" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d livre - par %(user)s" msgstr[1] "%(num)d livres - par %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s (%(subtitle)s)" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "un nouveau compte utilisateur" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "Il existe un autre ouvrage de la série qui a la même valeur" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "Le numéro de la collection doit être unique pour chaque livre" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/ga_IE/LC_MESSAGES/django.po b/locale/ga_IE/LC_MESSAGES/django.po index 4cb07fbcdc..cf03340ca3 100644 --- a/locale/ga_IE/LC_MESSAGES/django.po +++ b/locale/ga_IE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Irish\n" "Language: ga\n" @@ -107,7 +107,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -175,39 +175,43 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -476,7 +480,7 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -492,19 +496,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -513,91 +517,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -848,7 +852,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -925,57 +929,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -1012,8 +1021,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1050,7 +1059,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1059,7 +1069,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1072,8 +1082,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1085,7 +1095,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1097,10 +1107,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1110,7 +1120,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1127,7 +1137,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1144,31 +1155,50 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1178,17 +1208,17 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1198,49 +1228,49 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1255,15 +1285,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1286,25 +1316,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1315,12 +1346,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1329,12 +1360,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1399,15 +1430,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1469,124 +1517,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1773,19 +1887,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1830,7 +1936,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1891,7 +1997,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1991,21 +2097,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2191,14 +2298,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2486,6 +2593,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3739,6 +3850,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4366,7 +4478,7 @@ msgstr[3] "" msgstr[4] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4836,7 +4948,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -5029,9 +5141,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5086,6 +5197,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5096,39 +5212,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5235,13 +5345,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5615,7 +5725,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5629,31 +5739,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5977,13 +6087,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6694,10 +6840,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7363,10 +7505,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7379,12 +7517,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7497,6 +7635,16 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7712,35 +7860,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7799,16 +7947,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8096,15 +8250,23 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po index 521ef12893..b47af1cce2 100644 --- a/locale/gl_ES/LC_MESSAGES/django.po +++ b/locale/gl_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-07 03:33\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-26 04:55\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -107,7 +107,7 @@ msgstr "Título do libro" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Valoración" @@ -175,39 +175,43 @@ msgstr "Eliminado pola moderación" msgid "Domain block" msgstr "Bloqueo de dominio" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audiolibro" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "eBook" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Novela gráfica" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Tapa dura" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Libro de bolso" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s non semella ser un ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s non ten a suma de comprobación ISBN correcta, agardábase %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "O libro xa está incluído nesta serie" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "Comentario de %(display_name)s en %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "Cita de %(display_name)s en %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "Recensión de %(display_name)s en %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s valorou %(book_title)s: %(display_rating).1f estrela" msgstr[1] "%(display_name)s valorou %(book_title)s: %(display_rating).1f estrelas" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Recensións" @@ -489,19 +493,19 @@ msgstr "Citas" msgid "Everything else" msgstr "As outras cousas" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Cronoloxía de Inicio" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Cronoloxía de libros" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Cronoloxía de libros" msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Catalan)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Alemán)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Español)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Éuscaro)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galego)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Finés)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Francés)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Paises Baixos (Dutch)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Noruegués)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Polaco)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugués brasileiro)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Rumanés)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Ucraíno)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinés simplificado)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinés tradicional)" @@ -839,7 +843,7 @@ msgstr "A lectura máis curta deste ano…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Nacemento:" msgid "Died:" msgstr "Morte:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serie:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Ligazóns externas" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Ver en Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Sitio web" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Ver rexistro ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Ver en ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Cargar datos" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Ver en OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Ver en Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Ver en LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Ver en Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Libros de %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Nome:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Separa múltiples valores con vírgulas." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Clave en Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "ID en Inventaire:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Clave en Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Clave en Goodreads:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Gardar" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Gardar" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Ao cargar os datos vas conectar con %(source_name)s e comprobar se existen metadatos desta persoa autora que non están aquí presentes. Non se sobrescribirán os datos existentes." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Confirmar" msgid "Unable to connect to remote source." msgstr "Non se pode conectar coa fonte remota." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "Este libro podería ser parte da serie %(series)s." + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "Edítao para confirmar." + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "Libro %(number)s en %(title)s" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "Parte de %(title)s" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Editar libro" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Preme para engadir portada" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Fallou a carga da portada" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Preme para agrandar" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Ver en Finna" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "Ver en Libris" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s recensión)" msgstr[1] "(%(review_count)s recensións)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Engadir descrición" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descrición:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s edición" msgstr[1] "%(count)s edicións" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Puxeches esta edición no estante:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Hai unha edición diferente deste libro no teu estante %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Actividade lectora" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Engadir datas de lectura" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Non tes actividade lectora neste libro." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "As túas recensións" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Os teus comentarios" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "As túas citas" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Temas" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Engadir á lista" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "Crear nova lista…" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN copiado!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Número OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "ASIN Audible:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ID ISFDB:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "ID en Finna:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "ID en Libris:" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Engadir portada" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Subir portada:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Cargar portada desde URL:" @@ -1378,15 +1409,32 @@ msgstr "Esta é unha nova autora" msgid "Creating a new author: %(name)s" msgstr "Creando nova autora: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "É esta a edición dun traballo existente?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Este é un novo traballo" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "Tes certeza de que esta é unha nova serie? As seguintes series teñen un nome parecido e a autoría coincide." + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "Pertence este libro a algunha destas series?" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "Esta é unha nova serie" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "Creando unha nova serie" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Orde por título:" msgid "Subtitle:" msgstr "Subtítulo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Número da serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Idiomas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Temas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Engadir tema" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Eliminar tema" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Engadir outro tema" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "Serie" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "Editar a serie" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "Para editar os detalles dunha serie, fai click no nome da serie" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Posición:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "Retirar este libro de %(series_name)s" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "Engadir serie" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "Nome da serie:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "Posición na serie:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "Este campo antes tiña o nome de «Número na serie»" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publicación" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Editorial:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Data da primeira edición:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Data de publicación:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autoría" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Eliminar %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Páxina de autora para %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Engadir autoras:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Engadir Autora" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Xoana Pedre" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Engade outra Autora" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Portada" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Propiedades físicas" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Detalles do formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Páxinas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identificadores do libro" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "ID en Openlibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "Editar «%(title)s»" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "Editar «%(name)s»" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Nome" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "Nomes alternativos" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "Engadir un nome alternativo:" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "Engade un nome alternativo" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "ID en Wikidata:" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Publicado o %(date)s" msgid "rated it" msgstr "valorouno" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Unha Serie de" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Libro %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Libro non ordenado" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -1870,7 +1976,7 @@ msgstr "Podes retirar o permiso en calquera momento nos axu #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s comezou a ler %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s valorou %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s fixo a recensión de %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s comentou %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s citou %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Non hai actividade por agora! Proba a seguir algunha persoa para comezar msgid "Alternatively, you can try enabling more status types" msgstr "De xeito alternativo, podes activar máis tipos de estados" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s Obxectivo de lectura" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Podes establecer ou cambiar un obxectivo de lectura en calquera momento desde a túa páxina de perfil" @@ -2459,6 +2566,10 @@ msgstr "Este grupo non ten listas" msgid "Edit group" msgstr "Editar grupo" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "Integrantes do grupo" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Buscar para engadir usuaria" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Buscar por título, autoría, usuarias ou listas" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Escanear código de barras" @@ -4309,7 +4421,7 @@ msgstr[0] "Nova denuncia pendente de revisión" msgstr[1] "Novas %(display_count)s new denuncias pendentes de revisión" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Aviso sobre o contido" @@ -4776,7 +4888,7 @@ msgstr "Exportar Lista de Libros" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "O ficheiro CSV de exportación incluirá todos os libros dos teus estantes, libros que recensionaches e libros con actividade lectora.
      Úsao para importalo en servizos como Goodreads." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Descargar ficheiro" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Vas eliminar o diario de lectura e as súas %(count)s actualizacións de progreso da lectura." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Actualizar as datas de lectura para \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "Actualizar as datas de lectura para «%(title)s»" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Editar datas da lectura" msgid "Delete these read dates" msgstr "Eliminar estas datas da lectura" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Actualizar as datas de lectura para \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Engadir datas de lectura para \"%(title)s\"" msgid "Report" msgstr "Denunciar" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Escanear Código de barras\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Accedendo á cámara..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Permite o acceso á cámara para escanear o código de barras do libro." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Non hai acceso á cámara" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Escaneando..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Aliña o código de barras do libro coa cámara." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN escaneado" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Buscando o libro:" @@ -5171,13 +5279,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data de inicio:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data de fin:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Taboleiro" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Total de usuarias" @@ -5565,31 +5673,31 @@ msgstr "Activas este mes" msgid "Works" msgstr "Traballos" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Actividade na instancia" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Días" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Rexistros de usuarias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Actividade do estado" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Traballos creados" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Non se gardaron os axustes" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "Requerir peticións GET asinadas" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "Recomendable" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "Evita solicitudes anónimas desde instancias federadas. É máis ou menos equivalente ao «modo seguro» de Mastodon ou «AUTHORIZED_FETCH»" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "Evitar visualizacións sen autenticación" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "Evita que usuarias anónimas vexan a maioría das páxinas. Para bloquear tamén as solicitudes JSON activa «Requerir peticións GET asinadas»" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "Desactivar a federación" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "Coidado" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "Evita que a túa instancia interactúe con outros servizos federados. Os datos existentes de outras instancias vanse manter." +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "Bloquear búsquedas entrantes" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "Non recomendable" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "Evita que outros servidores fagan búsquedas na túa instancia. Recomendámosche que NON actives esta opción." + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "Programar tarefas" msgid "Tasks" msgstr "Tarefas" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Nome" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "Tarefa Celery" @@ -7281,10 +7421,6 @@ msgstr "Cita:" msgid "An excerpt from '%(book_title)s'" msgstr "Un extracto de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Posición:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Na páxina:" @@ -7297,12 +7433,12 @@ msgstr "Na porcentaxe:" msgid "to" msgstr "para" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "A túa recensión de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Recensión:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "valorado %(title)s: %(display_rating)s estrela" msgstr[1] "valorado %(title)s: %(display_rating)s estrelas" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "Valorou «%(book_title)s» con %(display_rating)s estrela %(review_title)s" +msgstr[1] "Valorou «%(book_title)s» con %(display_rating)s estrelas %(review_title)s" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Rematar a lectura" msgid "Show rating" msgstr "Mostrar valoración" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Mostrar estado" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Páxina %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Abrir imaxe en nova xanela" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Agochar estado" @@ -7702,16 +7845,22 @@ msgstr "comezou a ler %(book)s de %(book)s" msgstr "comezou a ler %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "recensionou %(book)s de %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "recensionou %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "valorou %(book)s" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d libro - por %(user)s" msgstr[1] "%(num)d libros - por %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "unha nova conta de usuaria" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "Hai outro libro na serie co mesmo valor" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "A posición na serie ten que ser única para cada libro" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/he_IL/LC_MESSAGES/django.po b/locale/he_IL/LC_MESSAGES/django.po index 1a51faa59a..6ab0723429 100644 --- a/locale/he_IL/LC_MESSAGES/django.po +++ b/locale/he_IL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-06-07 19:46\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Hebrew\n" "Language: he\n" @@ -107,7 +107,7 @@ msgstr "כותרת ספר" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "דירוג" @@ -175,39 +175,43 @@ msgstr "מחיקת מגשר" msgid "Domain block" msgstr "חסימת דומיין" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "אודיובוק" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "ספר אלקטרוני" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "נובלה גרפית" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "כריכה קשה" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "כריכה רכה" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -449,33 +453,33 @@ msgstr "" #: bookwyrm/models/status.py:191 #, python-format msgid "%(display_name)s's status" -msgstr "" +msgstr "הסטטוס של %(display_name)s" #: bookwyrm/models/status.py:365 #, python-format msgid "%(display_name)s's comment on %(book_title)s" -msgstr "" +msgstr "התגובה של %(display_name)s על %(book_title)s" #: bookwyrm/models/status.py:416 #, python-format msgid "%(display_name)s's quote from %(book_title)s" -msgstr "" +msgstr "הציטוט של %(display_name)s מתוך %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" -msgstr "" +msgstr "הביקורת של %(display_name)s על %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" -msgstr[0] "" +msgstr[0] "%(display_name)s דירג.ה את %(book_title)s: %(display_rating).1f כוכב" msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "ביקורות" @@ -491,19 +495,19 @@ msgstr "ציטוטים" msgid "Everything else" msgstr "כל השאר" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "ציר זמן הבית" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "ראשי" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "ציר זמן הספרים" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -512,91 +516,91 @@ msgstr "ציר זמן הספרים" msgid "Books" msgstr "ספרים" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "אנגלית" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (קטלנית)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (גרמנית)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (אספרנטו)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (ספרדית)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (באסקית)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (גליציאנית)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (איטלקית)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (קוריאנית)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (פינית)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (צרפתית)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (ליטאית)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (הולנדית)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (נורווגית)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (פולנית)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (פוטוגזית ברזילאית)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (פורטוגזית אירופאית)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (רומנית)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (שוודית)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (אוקראינית)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (סינית מפושטת)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (סינית מסורתית)" @@ -611,7 +615,7 @@ msgstr "ההרשאה נדחתה" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "אין לך הרשאה לצפות בעמוד זה או לבצע את הפעולה הזו. רמת הרשאות המשתמש שלך היא %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." @@ -845,7 +849,7 @@ msgstr "הקריאה הקצרה ביותר שלהם בשנה הזו…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -920,57 +924,62 @@ msgstr "נולד.ה:" msgid "Died:" msgstr "מת.ה:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "סדרה:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "קישורים חיצוניים" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "ויקיפדיה" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "אתר" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "צפייה ברשומת ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "לצפייה ב-ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "טען.י מידע" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "צפייה ב-OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "צפייה ב-Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "צפייה ב-LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "צפייה ב-Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "ספרים מאת %(name)s" @@ -1007,8 +1016,8 @@ msgid "Name:" msgstr "שם:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "יש להפריד ערכים מרובים באמצעות פסיקים" @@ -1045,7 +1054,8 @@ msgid "Openlibrary key:" msgstr "מפתח Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "מזהה Inventaire:" @@ -1054,7 +1064,7 @@ msgid "Librarything key:" msgstr "מפתח Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "מפתח Goodreads:" @@ -1067,8 +1077,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1080,7 +1090,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1092,10 +1102,10 @@ msgstr "שמירה" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1105,7 +1115,7 @@ msgstr "שמירה" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1122,7 +1132,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "טעינת מידע תוביל לחיבור ל-%(source_name)s ותאתר כל פריט מטא-דאטה שאינו מופיע כאן. מטא-דאטה קיים לא ישוכתב." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1139,31 +1150,50 @@ msgstr "אישור" msgid "Unable to connect to remote source." msgstr "לא ניתן להתחבר למקור מרוחק." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "ערוך ספר" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "לחץ.י להוספת כריכה" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "טעינת כריכה נכשלה" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "לחץ.י להגדלה" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1172,17 +1202,17 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "(%(review_count)s ביקורות)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "הוספת תיאור" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "תיאור:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1191,49 +1221,49 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "הנחת את המהדורה על מדף:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "פעילות הקריאה שלך" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "הוספת תאריכי קריאה" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "אין פעילות קריאה עבור ספר זה." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "הביקורות שלך" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "התגובות שלך" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "הציטוטים שלך" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "נושאים" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "מקומות" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1248,15 +1278,15 @@ msgstr "מקומות" msgid "Lists" msgstr "רשימות" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "הוספה לרשימה" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1279,25 +1309,26 @@ msgid "Copied ISBN!" msgstr "ISBN הועתק!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "מספר OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1308,12 +1339,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1322,12 +1353,12 @@ msgid "Add cover" msgstr "הוספת כריכה" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "העלאת כריכה:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "טעינת כריכה מכתובת:" @@ -1392,15 +1423,32 @@ msgstr "זהו מחבר/ת חדש/ה" msgid "Creating a new author: %(name)s" msgstr "יוצר מחבר/ת חדש/ה: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "האם זוהי מהדורה של ספר קיים?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "זו עבודה חדשה" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1462,124 +1510,190 @@ msgstr "מיין כותרת:" msgid "Subtitle:" msgstr "כותרת משנה:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "סדרה:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "מספר סדרה:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "שפות:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "נושאים:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "הוספת נושא" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "הסרת נושא" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "הוסיפו נושא" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "פרסום" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "הוצאה:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "פורסם לראשונה בתאריך:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "פורסם בתאריך:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "מחברים-ות" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "הסר %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "עמוד המחבר-ת של %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "הוסיפו מחברים-ות:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "הוסיפו מחבר-ת" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "פלוני-ת אלמוני-ת" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "הוספת מחבר/ת נוסף/ת" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "כריכה" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "מאפיינים פיזיים" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "פורמט:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "פרטי פורמט:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "עמודים:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "מזהי ספר" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "מזהה Openlibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1766,19 +1880,11 @@ msgstr "פורסם בתאריך: %(date)s" msgid "rated it" msgstr "דירג/ה" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "סדרה מאת" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "ספר לא ממוין" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1823,7 +1929,7 @@ msgstr "קוד אימות:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "הגשה" @@ -1884,7 +1990,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1982,21 +2088,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2182,14 +2289,14 @@ msgstr "אין פעילויות כרגע! נסו לעקוב אחרי משתמש msgid "Alternatively, you can try enabling more status types" msgstr "לחלופין, ניתן להפעיל סוגי סטטוס נוספים" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "יעד הקריאה של %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "ניתן לקבוע או לשנות את יעד הקריאה בכל זמן מ->עמוד הפרופיל שלך" @@ -2477,6 +2584,10 @@ msgstr "בקבוצה זו אין רשימות" msgid "Edit group" msgstr "עריכת קבוצה" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "חפש/י כדי להוסיף משתמש" @@ -3725,6 +3836,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "סרוק/י ברקוד" @@ -4347,7 +4459,7 @@ msgstr[2] "" msgstr[3] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "אזהרת תוכן" @@ -4816,7 +4928,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "הורד קובץ" @@ -5009,9 +5121,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5066,6 +5177,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5076,41 +5192,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -"סרוק ברקוד\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "מבקש מצלמה..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "אפשרו גישה למצלמה כדי לסרוק ברקוד של ספר." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "לא ניתן היה להשתמש במצלמה" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "סורק..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "ישרו את הברקוד אל מול המצלמה." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "מסת\"ב (ISBN) נסרק" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "מחפש ספר:" @@ -5215,13 +5323,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5595,7 +5703,7 @@ msgid "Dashboard" msgstr "לוח בקרה" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "סך הכל משתמשים" @@ -5609,31 +5717,31 @@ msgstr "" msgid "Works" msgstr "יצירות" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "פעילות בשרת" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "מרווח זמן:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "ימים" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "שבועות" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "פעילות הרשמה" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5953,13 +6061,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6670,10 +6814,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7337,10 +7477,6 @@ msgstr "ציטוט:" msgid "An excerpt from '%(book_title)s'" msgstr "קטע מתוך \"%(book_title)s\"" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7353,12 +7489,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7467,6 +7603,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7681,35 +7826,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "הסתר סטטוס" @@ -7768,16 +7913,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8062,15 +8213,23 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "%(num)d ספרים - מאת %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/hu_HU/LC_MESSAGES/django.po b/locale/hu_HU/LC_MESSAGES/django.po index 46f3e87039..cb559a9215 100644 --- a/locale/hu_HU/LC_MESSAGES/django.po +++ b/locale/hu_HU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Hungarian\n" "Language: hu\n" @@ -107,7 +107,7 @@ msgstr "Könyv címe" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Értékelés" @@ -175,39 +175,43 @@ msgstr "Moderátor által törölve" msgid "Domain block" msgstr "Domain tiltás" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Hangoskönyv" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "e-Könyv" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Képregényalbum" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Keménytáblás" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Puhatáblás" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -489,19 +493,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Angol)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Katalán)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Német)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Eszperantó)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Spanyol)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Baszk)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galiciai)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Olasz)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Koreai)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Finn)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Francia)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litván)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -839,7 +843,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1870,7 +1976,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2459,6 +2566,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5563,31 +5673,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7295,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/id_ID/LC_MESSAGES/django.po b/locale/id_ID/LC_MESSAGES/django.po index 08ea9f9a57..527639dff4 100644 --- a/locale/id_ID/LC_MESSAGES/django.po +++ b/locale/id_ID/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:49\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-06-07 05:49\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -19,51 +19,51 @@ msgstr "" #: bookwyrm/forms/admin.py:42 msgid "One Day" -msgstr "" +msgstr "Satu Hari" #: bookwyrm/forms/admin.py:43 msgid "One Week" -msgstr "" +msgstr "Satu Minggu" #: bookwyrm/forms/admin.py:44 msgid "One Month" -msgstr "" +msgstr "Satu Bulan" #: bookwyrm/forms/admin.py:45 msgid "Does Not Expire" -msgstr "" +msgstr "Tidak Kedaluwarsa" #: bookwyrm/forms/admin.py:50 msgid "Unlimited" -msgstr "" +msgstr "Tanpa Batas" #: bookwyrm/forms/edit_user.py:100 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" -msgstr "" +msgstr "Sandi salah" #: bookwyrm/forms/edit_user.py:107 bookwyrm/forms/landing.py:93 msgid "Password does not match" -msgstr "" +msgstr "Sandi tidak cocok" #: bookwyrm/forms/edit_user.py:130 msgid "Incorrect Password" -msgstr "" +msgstr "Sandi Tidak Cocok" #: bookwyrm/forms/forms.py:60 msgid "Reading finish date cannot be before start date." -msgstr "" +msgstr "Tanggal selesai baca tidak boleh sebelum tanggal mulai baca." #: bookwyrm/forms/forms.py:65 msgid "Reading stopped date cannot be before start date." -msgstr "" +msgstr "Tangga berhenti baca tidak boleh sebelum tanggal mulai baca." #: bookwyrm/forms/forms.py:73 msgid "Reading stopped date cannot be in the future." -msgstr "" +msgstr "Tanggal berhenti baca tidak boleh pada masa depan." #: bookwyrm/forms/forms.py:80 msgid "Reading finished date cannot be in the future." -msgstr "" +msgstr "Tanggal selesai baca tidak boleh pada masa depan." #: bookwyrm/forms/landing.py:37 msgid "Username or password are incorrect" @@ -79,11 +79,11 @@ msgstr "Pengguna dengan surel ini sudah terdaftar." #: bookwyrm/forms/landing.py:69 msgid "This email address cannot be registered." -msgstr "" +msgstr "Alamat surel ini tidak dapat didaftarkan." #: bookwyrm/forms/landing.py:114 msgid "Password cannot be the same as your current password" -msgstr "" +msgstr "Sandi tidak boleh sama dengan sandi Anda saat ini" #: bookwyrm/forms/landing.py:144 bookwyrm/forms/landing.py:152 msgid "Incorrect code" @@ -91,15 +91,15 @@ msgstr "Kode salah" #: bookwyrm/forms/links.py:34 msgid "This domain is blocked. Please contact your administrator if you think this is an error." -msgstr "" +msgstr "Domain ini diblokir. Silakan hubungi administrator Anda jika memang ada kesalahan." #: bookwyrm/forms/links.py:47 msgid "This link has already been added for this book. If it is not visible, the domain is still pending." -msgstr "" +msgstr "Tautan ini sudah ditambahkan untuk buku ini. Jika tidak terlihat, domain masih tetap ditunda." #: bookwyrm/forms/lists.py:26 msgid "List Order" -msgstr "" +msgstr "Urutan Daftar" #: bookwyrm/forms/lists.py:27 msgid "Book Title" @@ -107,7 +107,7 @@ msgstr "Judul buku" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Nilai" @@ -117,15 +117,15 @@ msgstr "Urutkan" #: bookwyrm/forms/lists.py:34 msgid "Ascending" -msgstr "" +msgstr "Naik" #: bookwyrm/forms/lists.py:35 msgid "Descending" -msgstr "" +msgstr "Turun" #: bookwyrm/models/announcement.py:12 msgid "Primary" -msgstr "" +msgstr "Utama" #: bookwyrm/models/announcement.py:13 msgid "Success" @@ -134,7 +134,7 @@ msgstr "Berhasil" #: bookwyrm/models/announcement.py:14 #: bookwyrm/templates/settings/invites/manage_invites.html:47 msgid "Link" -msgstr "" +msgstr "Tautan" #: bookwyrm/models/announcement.py:15 msgid "Warning" @@ -142,131 +142,135 @@ msgstr "Peringatan" #: bookwyrm/models/announcement.py:16 msgid "Danger" -msgstr "" +msgstr "Bahaya" #: bookwyrm/models/antispam.py:114 bookwyrm/models/antispam.py:148 msgid "Automatically generated report" -msgstr "" +msgstr "Laporan yang dibuat otomatis" #: bookwyrm/models/base_model.py:19 bookwyrm/models/import_job.py:50 #: bookwyrm/models/job.py:18 bookwyrm/models/link.py:77 #: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" -msgstr "" +msgstr "Ditunda" #: bookwyrm/models/base_model.py:20 msgid "Self deletion" -msgstr "" +msgstr "Penghapusan mandiri" #: bookwyrm/models/base_model.py:21 msgid "Self deactivation" -msgstr "" +msgstr "Deaktivasi mandiri" #: bookwyrm/models/base_model.py:22 msgid "Moderator suspension" -msgstr "" +msgstr "Penangguhan oleh moderator" #: bookwyrm/models/base_model.py:23 msgid "Moderator deletion" -msgstr "" +msgstr "Penghapusan oleh moderator" #: bookwyrm/models/base_model.py:24 msgid "Domain block" -msgstr "" +msgstr "Blokir domain" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" -msgstr "" +msgstr "Audiobook" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" -msgstr "" +msgstr "Buku-el" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" -msgstr "" +msgstr "Novel grafik" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" -msgstr "" +msgstr "Sampul keras" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" -msgstr "" +msgstr "Sampul tipis" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" -msgstr "" +msgstr "%(value)s tidak tampak seperti ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" -msgstr "" +msgstr "%(value)s tidak sesuai dengan checksum ISBN, kami mengharapkan %(check_version)s" + +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "Buku sudah ada di serial ini" #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 msgid "Comment" -msgstr "" +msgstr "Komentar" #: bookwyrm/models/bookwyrm_import_job.py:152 #: bookwyrm/templates/import/import_status.html:127 #: bookwyrm/templates/import/manual_review.html:13 #: bookwyrm/templates/snippets/create_status.html:16 msgid "Review" -msgstr "" +msgstr "Ulasan" #: bookwyrm/models/bookwyrm_import_job.py:153 msgid "Quotation" -msgstr "" +msgstr "Kutipan" #: bookwyrm/models/bookwyrm_import_job.py:181 #: bookwyrm/templates/snippets/follow_button.html:24 msgid "Follow" -msgstr "" +msgstr "Ikuti" #: bookwyrm/models/bookwyrm_import_job.py:182 #: bookwyrm/templates/settings/federation/instance.html:116 #: bookwyrm/templates/settings/link_domains/link_domains.html:87 #: bookwyrm/templates/snippets/block_button.html:5 msgid "Block" -msgstr "" +msgstr "Blokir" #: bookwyrm/models/bookwyrm_import_job.py:395 msgid "Unknown error importing book" -msgstr "" +msgstr "Eror tidak diketahui saat mengimpor buku" #: bookwyrm/models/bookwyrm_import_job.py:490 msgid "unauthorized" -msgstr "" +msgstr "tidak sah" #: bookwyrm/models/bookwyrm_import_job.py:496 msgid "Unknown error importing book status" -msgstr "" +msgstr "Status eror tidak diketahui saat mengimpor buku" #: bookwyrm/models/bookwyrm_import_job.py:686 #: bookwyrm/models/bookwyrm_import_job.py:711 msgid "connection_error" -msgstr "" +msgstr "connection_error" #: bookwyrm/models/bookwyrm_import_job.py:721 msgid "invalid_relationship" -msgstr "" +msgstr "invalid_relationship" #: bookwyrm/models/bookwyrm_import_job.py:729 msgid "Unkown error importing relationship" -msgstr "" +msgstr "Eror tidak diketahui saat mengimpor hubungan" #: bookwyrm/models/federated_server.py:12 #: bookwyrm/templates/settings/federation/edit_instance.html:55 #: bookwyrm/templates/settings/federation/instance_list.html:22 msgid "Federated" -msgstr "" +msgstr "Terfederasi" #: bookwyrm/models/federated_server.py:13 bookwyrm/models/link.py:76 #: bookwyrm/templates/settings/federation/edit_instance.html:56 @@ -274,26 +278,26 @@ msgstr "" #: bookwyrm/templates/settings/federation/instance_list.html:26 #: bookwyrm/templates/settings/link_domains/link_domains.html:27 msgid "Blocked" -msgstr "" +msgstr "Diblokir" #: bookwyrm/models/fields.py:36 #, python-format msgid "%(value)s is not a valid remote_id" -msgstr "" +msgstr "%(value)s bukan remote_id yang valid" #: bookwyrm/models/fields.py:45 bookwyrm/models/fields.py:54 #, python-format msgid "%(value)s is not a valid username" -msgstr "" +msgstr "%(value)s buka nama pengguna yang valid" #: bookwyrm/models/fields.py:201 bookwyrm/templates/layout.html:129 #: bookwyrm/templates/ostatus/error.html:29 msgid "username" -msgstr "" +msgstr "nama pengguna" #: bookwyrm/models/fields.py:206 msgid "A user with that username already exists." -msgstr "" +msgstr "Pengguna dengan nama tersebut sudah ada." #: bookwyrm/models/fields.py:225 #: bookwyrm/templates/snippets/privacy-icons.html:3 @@ -301,7 +305,7 @@ msgstr "" #: bookwyrm/templates/snippets/privacy_select.html:11 #: bookwyrm/templates/snippets/privacy_select_no_followers.html:11 msgid "Public" -msgstr "" +msgstr "Publik" #: bookwyrm/models/fields.py:226 #: bookwyrm/templates/snippets/privacy-icons.html:7 @@ -309,7 +313,7 @@ msgstr "" #: bookwyrm/templates/snippets/privacy_select.html:14 #: bookwyrm/templates/snippets/privacy_select_no_followers.html:14 msgid "Unlisted" -msgstr "" +msgstr "Tidak terdaftar" #: bookwyrm/models/fields.py:227 #: bookwyrm/templates/snippets/privacy_select.html:17 @@ -318,7 +322,7 @@ msgstr "" #: bookwyrm/templates/user/relationships/followers.html:21 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" -msgstr "" +msgstr "Pengikut" #: bookwyrm/models/fields.py:228 #: bookwyrm/templates/snippets/create_status/post_options_block.html:6 @@ -327,15 +331,15 @@ msgstr "" #: bookwyrm/templates/snippets/privacy_select.html:20 #: bookwyrm/templates/snippets/privacy_select_no_followers.html:17 msgid "Private" -msgstr "" +msgstr "Privat" #: bookwyrm/models/housekeeping.py:117 msgid "Missing" -msgstr "" +msgstr "Hilang" #: bookwyrm/models/housekeeping.py:118 msgid "Wrong Path" -msgstr "" +msgstr "Jalur Salah" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 @@ -348,7 +352,7 @@ msgstr "" #: bookwyrm/templates/settings/imports/imports.html:270 #: bookwyrm/templates/snippets/user_active_tag.html:8 msgid "Active" -msgstr "" +msgstr "Aktif" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 #: bookwyrm/templates/import/import.html:182 @@ -358,265 +362,265 @@ msgstr "" #: bookwyrm/templates/settings/files.html:160 #: bookwyrm/templates/settings/files.html:342 msgid "Complete" -msgstr "" +msgstr "Selesai" #: bookwyrm/models/import_job.py:53 bookwyrm/models/job.py:21 msgid "Stopped" -msgstr "" +msgstr "Dihentikan" #: bookwyrm/models/import_job.py:87 bookwyrm/models/import_job.py:95 msgid "Import stopped" -msgstr "" +msgstr "Impor dihentikan" #: bookwyrm/models/import_job.py:377 bookwyrm/models/import_job.py:402 msgid "Error loading book" -msgstr "" +msgstr "Eror saat memuat buku" #: bookwyrm/models/import_job.py:386 msgid "Could not find a match for book" -msgstr "" +msgstr "Tidak dapat menemukan buku yang cocok" #: bookwyrm/models/job.py:22 #: bookwyrm/templates/import/user_import_status.html:69 msgid "Failed" -msgstr "" +msgstr "Gagal" #: bookwyrm/models/link.py:56 msgid "Free" -msgstr "" +msgstr "Gratis" #: bookwyrm/models/link.py:57 msgid "Purchasable" -msgstr "" +msgstr "Dapat dibeli" #: bookwyrm/models/link.py:58 msgid "Available for loan" -msgstr "" +msgstr "Dapat dipinjam" #: bookwyrm/models/link.py:75 #: bookwyrm/templates/settings/link_domains/link_domains.html:23 msgid "Approved" -msgstr "" +msgstr "Disetujui" #: bookwyrm/models/report.py:86 msgid "Resolved report" -msgstr "" +msgstr "Laporan diselesaikan" #: bookwyrm/models/report.py:87 msgid "Re-opened report" -msgstr "" +msgstr "Laporan dibuka kembali" #: bookwyrm/models/report.py:88 msgid "Messaged reporter" -msgstr "" +msgstr "Pesan pelapor" #: bookwyrm/models/report.py:89 msgid "Messaged reported user" -msgstr "" +msgstr "Pesan pengguna terlapor" #: bookwyrm/models/report.py:90 msgid "Suspended user" -msgstr "" +msgstr "Pengguna yang ditangguhkan" #: bookwyrm/models/report.py:91 msgid "Un-suspended user" -msgstr "" +msgstr "Pengguna yang batal ditangguhkan" #: bookwyrm/models/report.py:92 msgid "Changed user permission level" -msgstr "" +msgstr "Level hak pengguna yang diubah" #: bookwyrm/models/report.py:93 msgid "Deleted user account" -msgstr "" +msgstr "Akun pengguna yang dihapus" #: bookwyrm/models/report.py:94 msgid "Blocked domain" -msgstr "" +msgstr "Domain yang diblokir" #: bookwyrm/models/report.py:95 msgid "Approved domain" -msgstr "" +msgstr "Domain yang disetujui" #: bookwyrm/models/report.py:96 msgid "Deleted item" -msgstr "" +msgstr "Item yang dihapus" #: bookwyrm/models/session.py:43 msgid "Unknown" -msgstr "" +msgstr "Tidak diketahui" #: bookwyrm/models/status.py:191 #, python-format msgid "%(display_name)s's status" -msgstr "" +msgstr "Status %(display_name)s" #: bookwyrm/models/status.py:365 #, python-format msgid "%(display_name)s's comment on %(book_title)s" -msgstr "" +msgstr "Komentar %(display_name)s di %(book_title)s" #: bookwyrm/models/status.py:416 #, python-format msgid "%(display_name)s's quote from %(book_title)s" -msgstr "" +msgstr "Kutipan %(display_name)s dari %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" -msgstr "" +msgstr "Ulasan %(display_name)s terhadap %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" -msgstr[0] "" +msgstr[0] "%(display_name)s menilai %(book_title)s: %(display_rating).1f bintang" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" -msgstr "" +msgstr "Ulasan" #: bookwyrm/models/user.py:41 msgid "Comments" -msgstr "" +msgstr "Komentar" #: bookwyrm/models/user.py:42 bookwyrm/templates/import/import_user.html:154 msgid "Quotations" -msgstr "" +msgstr "Kutipan" #: bookwyrm/models/user.py:43 msgid "Everything else" -msgstr "" +msgstr "Yang lainnya" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" -msgstr "" +msgstr "Linimasa Beranda" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" -msgstr "" +msgstr "Beranda" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" -msgstr "" +msgstr "Linimasa Buku" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 #: bookwyrm/templates/search/layout.html:44 #: bookwyrm/templates/user/layout.html:107 msgid "Books" -msgstr "" +msgstr "Buku" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Bahasa Inggris" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Bahasa Katalan)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Bahasa Jerman)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Bahasa Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Bahasa Spanyol)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" -msgstr "" +msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" -msgstr "" +msgstr "Galego (Galician)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Bahasa Italia)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" -msgstr "" +msgstr "한국어 (Korea)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Bahasa Finlandia)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Bahasa Prancis)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Bahasa Lithuania)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (Bahasa Belanda)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Bahasa Norwegia)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Bahasa Polandia)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" -msgstr "" +msgstr "Português do Brasil (Portugis Brazil)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" -msgstr "" +msgstr "Português Europeu (Portugis Eropa)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" -msgstr "" +msgstr "Română (Rumania)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" -msgstr "" +msgstr "Svenska (Swedia)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" -msgstr "" +msgstr "Українська (Ukraina)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" -msgstr "" +msgstr "简体中文 (Cina Sederhana)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" -msgstr "" +msgstr "繁體中文 (Cina Tradisional)" #: bookwyrm/templates/403.html:5 msgid "Oh no!" -msgstr "" +msgstr "Oh tidak!" #: bookwyrm/templates/403.html:9 bookwyrm/templates/landing/invite.html:21 msgid "Permission Denied" -msgstr "" +msgstr "Izin Ditolak" #: bookwyrm/templates/403.html:11 #, python-format msgid "You do not have permission to view this page or perform this action. Your user permission level is %(level)s." -msgstr "" +msgstr "Anda tidak memiliki izin untuk melihat halaman ini atau melakukan hal ini. Level izin pengguna Anda adalah %(level)s." #: bookwyrm/templates/403.html:15 msgid "If you think you should have access, please speak to your BookWyrm server administrator." -msgstr "" +msgstr "Jika Anda pikir Anda harus memiliki akses, silakan sampaikan ke administrator server BookWyrm Anda." #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" -msgstr "" +msgstr "Tidak Ditemukan" #: bookwyrm/templates/404.html:9 msgid "The page you requested doesn't seem to exist!" @@ -624,15 +628,15 @@ msgstr "Laman tidak ditemukan" #: bookwyrm/templates/413.html:4 bookwyrm/templates/413.html:8 msgid "File too large" -msgstr "" +msgstr "Berkas terlalu besar" #: bookwyrm/templates/413.html:9 msgid "The file you are uploading is too large." -msgstr "" +msgstr "Berkas yang Anda unggah terlalu besar." #: bookwyrm/templates/413.html:11 msgid "You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting." -msgstr "" +msgstr "Anda dapat mencoba dengan ukuran kecil, atau tanyakan ke administrator server BookWyrm Anda untuk meningkatkan pengaturan DATA_UPLOAD_MAX_MEMORY_SIZE." #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -644,7 +648,7 @@ msgstr "Galat server" #: bookwyrm/templates/500.html:9 msgid "Something went wrong! Sorry about that." -msgstr "" +msgstr "Ada yang salah! Mohon maaf." #: bookwyrm/templates/about/about.html:9 #: bookwyrm/templates/about/layout.html:35 @@ -660,400 +664,406 @@ msgstr "Selamat datang di %(site_name)s!" #: bookwyrm/templates/about/about.html:26 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." -msgstr "" +msgstr "%(site_name)s adalah bagian BookWyrm, jaringan independen, berbasis komunitas untuk pembaca. Anda pun dapat berinteraksi lancar dengan pengguna di mana saja di jaringan BookWyrm, komunitas ini unik." #: bookwyrm/templates/about/about.html:47 #, python-format msgid "%(title)s is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5." -msgstr "" +msgstr "%(title)s adalah buku yang paling disukai %(site_name)s, dengan rata-rata nilai %(rating)s dari 5." #: bookwyrm/templates/about/about.html:66 #, python-format msgid "More %(site_name)s users want to read %(title)s than any other book." -msgstr "" +msgstr "Lebih banyak pengguna %(site_name)s ingin membaca %(title)s dari pada buku lainnya." #: bookwyrm/templates/about/about.html:85 #, python-format msgid "%(title)s has the most divisive ratings of any book on %(site_name)s." -msgstr "" +msgstr "%(title)s memiliki nilai paling kontroversial dibandingkan buku manapun di %(site_name)s." #: bookwyrm/templates/about/about.html:96 msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, reach out and make yourself heard." -msgstr "" +msgstr "Lacak pembacaan Anda, ngobrol tentang buku, tulis ulasan, atau temukan bacaan lainnya. Akan selalu bebas iklan, anti-korporasi, dan berorientasi komunitas, BookWyrm adalah perangkat lunak yang diolah manusia, derancang untuk tetap kecil dan personal. Jika Anda memiliki permintaan fitur, laporan bug, atau impian, hubungi kami dan buat Anda didengar." #: bookwyrm/templates/about/about.html:107 msgid "Meet your admins" -msgstr "" +msgstr "Sapa admin Anda" #: bookwyrm/templates/about/about.html:110 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." -msgstr "" +msgstr "Moderator dan administrator %(site_name)s menjaga situs tetap berjalan, dan menjaga kode etik, serta merespon ketika pengguna melaporkan spam serta perilaku buruk." #: bookwyrm/templates/about/about.html:124 msgid "Moderator" -msgstr "" +msgstr "Moderator" #: bookwyrm/templates/about/about.html:126 bookwyrm/templates/user_menu.html:62 msgid "Admin" -msgstr "" +msgstr "Admin" #: bookwyrm/templates/about/about.html:142 #: bookwyrm/templates/settings/users/user_moderation_actions.html:28 #: bookwyrm/templates/snippets/status/status_options.html:35 #: bookwyrm/templates/snippets/user_options.html:14 msgid "Send direct message" -msgstr "" +msgstr "Kirim pesan langsung" #: bookwyrm/templates/about/conduct.html:4 #: bookwyrm/templates/about/conduct.html:9 #: bookwyrm/templates/about/layout.html:41 #: bookwyrm/templates/snippets/footer.html:27 msgid "Code of Conduct" -msgstr "" +msgstr "Kode Etik" #: bookwyrm/templates/about/impressum.html:4 #: bookwyrm/templates/about/impressum.html:9 #: bookwyrm/templates/about/layout.html:54 #: bookwyrm/templates/snippets/footer.html:34 msgid "Impressum" -msgstr "" +msgstr "Impressum" #: bookwyrm/templates/about/layout.html:11 msgid "Active users:" -msgstr "" +msgstr "Pengguna aktif:" #: bookwyrm/templates/about/layout.html:15 msgid "Statuses posted:" -msgstr "" +msgstr "Status diposting:" #: bookwyrm/templates/about/layout.html:19 #: bookwyrm/templates/setup/config.html:68 msgid "Software version:" -msgstr "" +msgstr "Versi perangkat lunak:" #: bookwyrm/templates/about/layout.html:30 #: bookwyrm/templates/embed-layout.html:34 #: bookwyrm/templates/snippets/footer.html:8 #, python-format msgid "About %(site_name)s" -msgstr "" +msgstr "Tentang %(site_name)s" #: bookwyrm/templates/about/layout.html:47 #: bookwyrm/templates/about/privacy.html:4 #: bookwyrm/templates/about/privacy.html:9 #: bookwyrm/templates/snippets/footer.html:30 msgid "Privacy Policy" -msgstr "" +msgstr "Kebijakan Privasi" #: bookwyrm/templates/annual_summary/layout.html:7 #: bookwyrm/templates/feed/summary_card.html:8 #, python-format msgid "%(year)s in the books" -msgstr "" +msgstr "%(year)s dalam buku" #: bookwyrm/templates/annual_summary/layout.html:43 #, python-format msgid "%(year)s in the books" -msgstr "" +msgstr "%(year)s dalam buku" #: bookwyrm/templates/annual_summary/layout.html:47 #, python-format msgid "%(display_name)s’s year of reading" -msgstr "" +msgstr "Tahun bacaan %(display_name)s" #: bookwyrm/templates/annual_summary/layout.html:53 msgid "Share this page" -msgstr "" +msgstr "Bagikan halaman ini" #: bookwyrm/templates/annual_summary/layout.html:67 msgid "Copy address" -msgstr "" +msgstr "Salin alamat" #: bookwyrm/templates/annual_summary/layout.html:68 #: bookwyrm/templates/lists/list.html:277 msgid "Copied!" -msgstr "" +msgstr "Disalin!" #: bookwyrm/templates/annual_summary/layout.html:77 msgid "Sharing status: public with key" -msgstr "" +msgstr "Status berbagi: publik dengan kunci" #: bookwyrm/templates/annual_summary/layout.html:78 msgid "The page can be seen by anyone with the complete address." -msgstr "" +msgstr "Halaman ini dapat dilihat siapa saja dengan alamat lengkap." #: bookwyrm/templates/annual_summary/layout.html:83 msgid "Make page private" -msgstr "" +msgstr "Buat halaman pribadi" #: bookwyrm/templates/annual_summary/layout.html:89 msgid "Sharing status: private" -msgstr "" +msgstr "Status berbagi: pribadi" #: bookwyrm/templates/annual_summary/layout.html:90 msgid "The page is private, only you can see it." -msgstr "" +msgstr "Halaman ini pribadi, hanya Anda yang dapat melihatnya." #: bookwyrm/templates/annual_summary/layout.html:95 msgid "Make page public" -msgstr "" +msgstr "Buat halaman publik" #: bookwyrm/templates/annual_summary/layout.html:99 msgid "When you make your page private, the old key won’t give access to the page anymore. A new key will be created if the page is once again made public." -msgstr "" +msgstr "Saat menjadikan halaman Anda sebagai pribadi, kunci lama tidak akan memberi akses ke halaman ini lagi. Kunci baru akan dibuat lagi saat ia dijadikan publik." #: bookwyrm/templates/annual_summary/layout.html:112 #, python-format msgid "Sadly %(display_name)s didn’t finish any books in %(year)s" -msgstr "" +msgstr "Sayangnya %(display_name)s tidak menyelesaikan buku apapun pada %(year)s" #: bookwyrm/templates/annual_summary/layout.html:118 #, python-format msgid "In %(year)s, %(display_name)s read %(books_total)s book
      for a total of %(pages_total)s pages!" msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
      for a total of %(pages_total)s pages!" -msgstr[0] "" +msgstr[0] "Pada %(year)s, %(display_name)s membaca %(books_total)s buku
      dengan total halaman %(pages_total)s!" #: bookwyrm/templates/annual_summary/layout.html:124 msgid "That’s great!" -msgstr "" +msgstr "Hebat!" #: bookwyrm/templates/annual_summary/layout.html:128 #, python-format msgid "That makes an average of %(pages)s pages per book." -msgstr "" +msgstr "Itu sekitar rata-rata %(pages)s halaman per buku." #: bookwyrm/templates/annual_summary/layout.html:134 #, python-format msgid "(No page data was available for %(no_page_number)s book)" msgid_plural "(No page data was available for %(no_page_number)s books)" -msgstr[0] "" +msgstr[0] "(Tidak ada data halaman tersedia untuk %(no_page_number)s buku)" #: bookwyrm/templates/annual_summary/layout.html:150 msgid "Their shortest read this year…" -msgstr "" +msgstr "Bacaan terpendek tahun ini…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 msgid "by" -msgstr "" +msgstr "oleh" #: bookwyrm/templates/annual_summary/layout.html:163 #: bookwyrm/templates/annual_summary/layout.html:184 #, python-format msgid "%(pages)s pages" -msgstr "" +msgstr "%(pages)s halaman" #: bookwyrm/templates/annual_summary/layout.html:171 msgid "…and the longest" -msgstr "" +msgstr "…dan yang terpanjang" #: bookwyrm/templates/annual_summary/layout.html:202 #, python-format msgid "%(display_name)s set a goal of reading %(goal)s book in %(year)s,
      and achieved %(goal_percent)s%% of that goal" msgid_plural "%(display_name)s set a goal of reading %(goal)s books in %(year)s,
      and achieved %(goal_percent)s%% of that goal" -msgstr[0] "" +msgstr[0] "%(display_name)s menarget membaca %(goal)s buku pada %(year)s,
      dan sudah mencapai %(goal_percent)s%% dari target tersebut" #: bookwyrm/templates/annual_summary/layout.html:211 msgid "Way to go!" -msgstr "" +msgstr "Bagus sekali!" #: bookwyrm/templates/annual_summary/layout.html:226 #, python-format msgid "%(display_name)s left %(ratings_total)s rating,
      their average rating is %(rating_average)s" msgid_plural "%(display_name)s left %(ratings_total)s ratings,
      their average rating is %(rating_average)s" -msgstr[0] "" +msgstr[0] "%(display_name)s memberi nilai %(ratings_total)s,
      rata-rata nilainya adalah %(rating_average)s" #: bookwyrm/templates/annual_summary/layout.html:240 msgid "Their best rated review" -msgstr "" +msgstr "Nilai ulasan terbaik mereka" #: bookwyrm/templates/annual_summary/layout.html:253 #, python-format msgid "Their rating: %(rating)s" -msgstr "" +msgstr "Nilainya: %(rating)s" #: bookwyrm/templates/annual_summary/layout.html:270 #, python-format msgid "All the books %(display_name)s read in %(year)s" -msgstr "" +msgstr "Semua buku yang dibaca %(display_name)s tahun %(year)s" #: bookwyrm/templates/author/author.html:19 #: bookwyrm/templates/author/author.html:20 msgid "Edit Author" -msgstr "" +msgstr "Edit Penulis" #: bookwyrm/templates/author/author.html:36 msgid "Author details" -msgstr "" +msgstr "Rincian penulis" #: bookwyrm/templates/author/author.html:40 #: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" -msgstr "" +msgstr "Alias:" #: bookwyrm/templates/author/author.html:49 msgid "Born:" -msgstr "" +msgstr "Lahir:" #: bookwyrm/templates/author/author.html:56 msgid "Died:" -msgstr "" +msgstr "Meninggal:" + +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serial:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" -msgstr "" +msgstr "Tautan eksternal" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" -msgstr "" +msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" -msgstr "" +msgstr "Lihat di Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" -msgstr "" +msgstr "Situs web" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" -msgstr "" +msgstr "Lihat data ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" -msgstr "" +msgstr "Lihat di ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" -msgstr "" +msgstr "Muat data" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" -msgstr "" +msgstr "Lihat di OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" -msgstr "" +msgstr "Lihat di Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" -msgstr "" +msgstr "Lihat di LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" -msgstr "" +msgstr "Lihat di Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" -msgstr "" +msgstr "Buku oleh %(name)s" #: bookwyrm/templates/author/edit_author.html:5 msgid "Edit Author:" -msgstr "" +msgstr "Edit Penulis:" #: bookwyrm/templates/author/edit_author.html:13 #: bookwyrm/templates/book/edit/edit_book.html:25 msgid "Added:" -msgstr "" +msgstr "Ditambahkan:" #: bookwyrm/templates/author/edit_author.html:14 #: bookwyrm/templates/book/edit/edit_book.html:28 msgid "Updated:" -msgstr "" +msgstr "Diperbarui:" #: bookwyrm/templates/author/edit_author.html:16 #: bookwyrm/templates/book/edit/edit_book.html:32 msgid "Last edited by:" -msgstr "" +msgstr "Diedit terakhir oleh:" #: bookwyrm/templates/author/edit_author.html:33 #: bookwyrm/templates/book/edit/edit_book_form.html:21 msgid "Metadata" -msgstr "" +msgstr "Metadata" #: bookwyrm/templates/author/edit_author.html:35 #: bookwyrm/templates/lists/form.html:9 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:14 #: bookwyrm/templates/shelf/form.html:9 msgid "Name:" -msgstr "" +msgstr "Nama:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." -msgstr "" +msgstr "Pisahkan banyak nilai dengan koma." #: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" -msgstr "" +msgstr "Bio:" #: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" -msgstr "" +msgstr "Tautan Wikipedia:" #: bookwyrm/templates/author/edit_author.html:58 msgid "Wikidata:" -msgstr "" +msgstr "Wikidata:" #: bookwyrm/templates/author/edit_author.html:62 msgid "Website:" -msgstr "" +msgstr "Situs web:" #: bookwyrm/templates/author/edit_author.html:67 msgid "Birth date:" -msgstr "" +msgstr "Tanggal lahir:" #: bookwyrm/templates/author/edit_author.html:74 msgid "Death date:" -msgstr "" +msgstr "Tanggal meninggal:" #: bookwyrm/templates/author/edit_author.html:81 msgid "Author Identifiers" -msgstr "" +msgstr "Pengidentifikasi Penulis" #: bookwyrm/templates/author/edit_author.html:83 msgid "Openlibrary key:" -msgstr "" +msgstr "Kunci Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" -msgstr "" +msgstr "ID Inventaire:" #: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" -msgstr "" +msgstr "Kunci Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" -msgstr "" +msgstr "Kunci Goodreads:" #: bookwyrm/templates/author/edit_author.html:111 msgid "ISFDB:" -msgstr "" +msgstr "ISFDB:" #: bookwyrm/templates/author/edit_author.html:118 msgid "ISNI:" -msgstr "" +msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1065,7 +1075,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1073,14 +1083,14 @@ msgstr "" #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" -msgstr "" +msgstr "Simpan" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1090,7 +1100,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1099,15 +1109,16 @@ msgstr "" #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22 #: bookwyrm/templates/snippets/report_modal.html:52 msgid "Cancel" -msgstr "" +msgstr "Batal" #: bookwyrm/templates/author/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." -msgstr "" +msgstr "Memuat data akan menyambungkan ke %(source_name)s dan memeriksa matadata manapun tentang penulis yang tidak ditampilkan di sini. Metadata yang sudah ada tidak akan ditimpa." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1118,101 +1129,120 @@ msgstr "" #: bookwyrm/templates/settings/users/force_password_reset.html:55 #: bookwyrm/templates/snippets/remove_from_group_button.html:17 msgid "Confirm" -msgstr "" +msgstr "Konfirmasi" #: bookwyrm/templates/book/book.html:24 msgid "Unable to connect to remote source." +msgstr "Tidak dapat terkoneksi dengan sumber jarak jauh." + +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "Buku ini mungkin bagian dari serial %(series)s." + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "Edit ini untuk mengonfirmasi." + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,15 +1257,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1258,25 +1288,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1287,12 +1318,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1301,12 +1332,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1371,15 +1402,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1441,124 +1489,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1745,19 +1859,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1802,7 +1908,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1863,7 +1969,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1955,21 +2061,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2155,14 +2262,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2450,6 +2557,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3683,6 +3794,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4290,7 +4402,7 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4756,7 +4868,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4949,9 +5061,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5006,6 +5117,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5016,39 +5132,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5147,13 +5257,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5527,7 +5637,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5541,31 +5651,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5873,13 +5983,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6590,10 +6736,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7251,10 +7393,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7267,12 +7405,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7369,6 +7507,12 @@ msgid "rated %(title)s: %(display_rating)s sta msgid_plural "rated %(title)s: %(display_rating)s stars" msgstr[0] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7580,35 +7724,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7667,16 +7811,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7952,15 +8102,23 @@ msgid "%(num)d book - by %(user)s" msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/it_IT/LC_MESSAGES/django.po b/locale/it_IT/LC_MESSAGES/django.po index d25fef1fb0..43829b2830 100644 --- a/locale/it_IT/LC_MESSAGES/django.po +++ b/locale/it_IT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Italian\n" "Language: it\n" @@ -107,7 +107,7 @@ msgstr "Titolo del libro" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Valutazione" @@ -175,39 +175,43 @@ msgstr "Cancellazione del moderatore" msgid "Domain block" msgstr "Blocco del dominio" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audiolibro" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "eBook" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Graphic novel" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Copertina rigida" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Brossura" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "“%(value)s” non rispetta il formato previsto per un ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "“%(value)s” non ha un codice di controllo ISBN corretto; valore atteso: %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "Commento di %(display_name)ssu %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "Citazione di %(display_name)sda %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "Recensione di %(display_name)sdi %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s ha valutato %(book_title)s: %(display_rating).1f stella" msgstr[1] "%(display_name)s ha valutato %(book_title)s: %(display_rating).1f stelle" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Recensioni" @@ -489,19 +493,19 @@ msgstr "Citazioni" msgid "Everything else" msgstr "Tutto il resto" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "La tua timeline" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Home" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Timeline dei libri" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Timeline dei libri" msgid "Books" msgstr "Libri" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Inglese)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (catalano)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Tedesco)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Spagnolo)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galiziano)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Finlandese)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Francese)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (Olandese)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvegese)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Polacco)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portoghese Brasiliano)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portoghese europeo)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Rumeno (Romanian)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Svedese)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (ucraino)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Cinese Semplificato)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Cinese Tradizionale)" @@ -839,7 +843,7 @@ msgstr "La loro lettura più breve quest’anno…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Nascita:" msgid "Died:" msgstr "Morte:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serie:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Collegamenti esterni" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Vedi su Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Sito web" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Visualizza record ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Vedi su ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Carica dati" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Visualizza su OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Visualizza su Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Visualizza su LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Visualizza su Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Libri di %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Nome:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Separa valori multipli con la virgola (,)" @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Chiave OpenLibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Chiave Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Chiave Goodreads:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Salva" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Salva" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Il caricamento dei dati si connetterà a %(source_name)s e verificherà la presenza di eventuali metadata su questo autore non presenti qui. I metadata esistenti non verranno sovrascritti." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Conferma" msgid "Unable to connect to remote source." msgstr "Impossibile connettersi alla sorgente remota." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Modifica libro" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Clicca per aggiungere una copertina" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Impossibile caricare la copertina" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Clicca per ingrandire" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Visualizza su Finna" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s recensione)" msgstr[1] "(%(review_count)s recensioni)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Aggiungi descrizione" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descrizione:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s edizione" msgstr[1] "%(count)s edizioni" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Hai salvato questa edizione in:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Un’a edizione diversa di questo libro si trova nella tua libreria %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Le tue attività di lettura" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Aggiungi data di lettura" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Non hai alcuna attività di lettura per questo libro." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Le tue recensioni" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "I tuoi commenti" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Le tue citazioni" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Argomenti" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Luoghi" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Luoghi" msgid "Lists" msgstr "Liste" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Aggiungi all'elenco" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN copiato!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Numero OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Aggiungi copertina" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Carica la copertina:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Carica la copertina dall'URL:" @@ -1378,15 +1409,32 @@ msgstr "Questo è un nuovo autore" msgid "Creating a new author: %(name)s" msgstr "Creazione di un nuovo autore: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "È un'edizione di un'opera esistente?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Si tratta di un nuovo lavoro" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Ordina per titolo:" msgid "Subtitle:" msgstr "Sottotitolo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Numero nella serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Lingue:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Argomenti:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Aggiungi argomento" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Rimuovi argomento" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Aggiungi argomento" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Posizione:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Data di pubblicazione" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Editore:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Prima data di pubblicazione:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Data di pubblicazione:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autori" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Rimuovi %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Pagina autore per %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Aggiungi Autori:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Aggiungi Autore" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Jane Doe" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Aggiungi un altro autore" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Copertina" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Caratteristiche" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Dettagli del formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Pagine:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identificativi del Libro" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "OpenLibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Nome" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Pubblicato il %(date)s" msgid "rated it" msgstr "Valuta" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Serie di" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Libro %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Libro non ordinato" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Codice di conferma:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Invia" @@ -1870,7 +1976,7 @@ msgstr "Puoi cancellare in qualsiasi momento nelle impostazioni del tuo %(username)s started reading %(username)s ha iniziato a leggere %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s ha valutato %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s ha recensito %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s ha commentato %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s ha citato %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Non ci sono attività in questo momento! Prova a seguire qualcuno per in msgid "Alternatively, you can try enabling more status types" msgstr "In alternativa, puoi provare ad abilitare più tipi di stato" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Obiettivo di Lettura del %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Puoi impostare o modificare il tuo obiettivo di lettura in qualsiasi momento dalla tua pagina del profilo" @@ -2459,6 +2566,10 @@ msgstr "Questo gruppo non ha alcuna lista" msgid "Edit group" msgstr "Modifica gruppo" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Cerca o aggiungi utente" @@ -3701,6 +3812,7 @@ msgid "Search for a book, author, user, or list" msgstr "Cerca un libro, autore, utente o lista" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Scansiona codice a barre" @@ -4313,7 +4425,7 @@ msgstr[0] "Un nuovo report necessita di moderazione" msgstr[1] "%(display_count)s nuovi report necessitano di moderazione" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Avviso sul contenuto" @@ -4780,7 +4892,7 @@ msgstr "Esporta Elenco Libri" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "Il tuo file di esportazione CSV includerà tutti i libri sugli scaffali, libri che hai recensito e libri con attività di lettura.
      Usalo per importare in un servizio come Goodreads." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Scarica il file" @@ -4973,10 +5085,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Stai eliminando questa lettura e i suoi %(count)s aggiornamenti di avanzamento associati." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Aggiorna date di lettura per \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5030,6 +5141,11 @@ msgstr "Modifica data di lettura" msgid "Delete these read dates" msgstr "Elimina queste date di lettura" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Aggiorna date di lettura per \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5040,41 +5156,33 @@ msgstr "Aggiungi date di lettura per \"%(title)s\"" msgid "Report" msgstr "Report" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Scansiona codice a barre\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Richiesta fotocamera..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Concedi l'accesso alla fotocamera per scansionare il codice a barre di un libro." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Impossibile accedere alla fotocamera" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Ricerca in corso..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Allinea il codice a barre del tuo libro con la fotocamera." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN scansionato" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Ricerca libro:" @@ -5175,13 +5283,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data d'inizio:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data di fine:" @@ -5555,7 +5663,7 @@ msgid "Dashboard" msgstr "Dashboard" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Totale utenti" @@ -5569,31 +5677,31 @@ msgstr "Attivo questo mese" msgid "Works" msgstr "Lavori" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Attività di Istanza" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervallo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Giorni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Settimane" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Attività di registrazione dell'utente" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Attività di stato" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Opere create" @@ -5905,13 +6013,49 @@ msgid "Unable to save settings" msgstr "Impossibile salvare le impostazioni" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "Disabilita federazione" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6622,10 +6766,6 @@ msgstr "Attività pianificate" msgid "Tasks" msgstr "Attività" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Nome" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "Task Celery" @@ -7285,10 +7425,6 @@ msgstr "Citazione:" msgid "An excerpt from '%(book_title)s'" msgstr "Un estratto da '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Posizione:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Alla pagina:" @@ -7301,12 +7437,12 @@ msgstr "Alla percentuale:" msgid "to" msgstr "a" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "La tua recensione di '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Recensione:" @@ -7407,6 +7543,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "ha valutato %(title)s: %(display_rating)s stella" msgstr[1] "ha valutato %(title)s: %(display_rating)s stelle" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7619,35 +7762,35 @@ msgstr "Finito di leggere" msgid "Show rating" msgstr "Mostra valutazione" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Mostra stato" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Pagina %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Apri immagine in una nuova finestra" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Nascondi lo stato" @@ -7706,16 +7849,22 @@ msgstr "ha iniziato a leggere %(book)s di %(book)s" msgstr "hai iniziato a leggere %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "ha recensito %(book)s di %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "ha recensito %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7994,15 +8143,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d libro - di %(user)s" msgstr[1] "%(num)d libri - di %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "un nuovo utente registrato" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/ja_JP/LC_MESSAGES/django.po b/locale/ja_JP/LC_MESSAGES/django.po index 7df83660bb..847db323c9 100644 --- a/locale/ja_JP/LC_MESSAGES/django.po +++ b/locale/ja_JP/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Japanese\n" "Language: ja\n" @@ -107,7 +107,7 @@ msgstr "本のタイトル" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "評価" @@ -175,39 +175,43 @@ msgstr "モデレーターによる削除" msgid "Domain block" msgstr "ドメインブロック" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "オーディオブック" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "電子書籍" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "グラフィックノベル" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "ハードカバー" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "ペーパーバック" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,18 +465,18 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "レビュー" @@ -488,19 +492,19 @@ msgstr "引用" msgid "Everything else" msgstr "他のすべて" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "ホームタイムライン" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "ホーム" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "本のタイムライン" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -509,91 +513,91 @@ msgstr "本のタイムライン" msgid "Books" msgstr "本" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (英語)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català(カタルーニャ語)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (ドイツ語)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (エスペラント)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (スペイン語)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (バスク語)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (ガリシア語)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (イタリア語)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (フィンランド語)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (フランス語)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (リトアニア語)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (オランダ語)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (ノルウェー語)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (ポーランド語)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil(ブラジルポルトガル語)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (ヨーロッパポルトガル語)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (ルーマニア語)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "スウェーデン語 (Swedish)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (簡体字中国語)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (繁体字中国語)" @@ -836,7 +840,7 @@ msgstr "最も短かった読み物……" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -905,57 +909,62 @@ msgstr "出生日:" msgid "Died:" msgstr "逝去日:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "シリーズ:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "外部リンク" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "ウェブサイト" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "ISNIレコードを表示" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "ISFDBで表示" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "データを読み込む" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "OpenLibraryで表示" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Inventaireで表示" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "LibraryThingで表示" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Goodreadsで表示" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "%(name)s による本" @@ -992,8 +1001,8 @@ msgid "Name:" msgstr "名前:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "複数ある場合はコンマで区切ってください。" @@ -1030,7 +1039,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary キー:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "InventaireのID:" @@ -1039,7 +1049,7 @@ msgid "Librarything key:" msgstr "Librarythingのキー:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreadsのキー:" @@ -1052,8 +1062,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1065,7 +1075,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1077,10 +1087,10 @@ msgstr "保存" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1090,7 +1100,7 @@ msgstr "保存" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1107,7 +1117,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "データのロードでは、 %(source_name)s に接続し、この著者に関するここにないメタデータを取得します。既存のメタデータは上書きされません。" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1124,95 +1135,114 @@ msgstr "確認" msgid "Unable to connect to remote source." msgstr "リモートの情報源に接続できませんでした。" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "本を編集" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "クリックしてカバーを追加" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "カバーを読み込めませんでした" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "クリックして拡大" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 件のレビュー)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "説明を追加" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "概要:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s 個の版" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "次の本棚に既に追加されています:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "あなたの読書活動" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "読了日を追加" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "あなたはこの本の読書活動をしていません。" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "あなたのレビュー" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "あなたのコメント" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "あなたの引用" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "テーマ" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "場所" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,15 +1257,15 @@ msgstr "場所" msgid "Lists" msgstr "リスト" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "リストに追加" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1258,25 +1288,26 @@ msgid "Copied ISBN!" msgstr "ISBNをコピーしました！" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLCナンバー:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1287,12 +1318,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1301,12 +1332,12 @@ msgid "Add cover" msgstr "カバー画像を追加" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "カバー画像をアップロード:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1371,15 +1402,32 @@ msgstr "これは新しい著者です" msgid "Creating a new author: %(name)s" msgstr "新しい著者を作成: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "これは既存の作品の版ですか？" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "これは新しい作品です" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1441,124 +1489,190 @@ msgstr "" msgid "Subtitle:" msgstr "サブタイトル:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "シリーズ:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "シリーズ番号:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "言語:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "テーマ:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "テーマを追加する" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "テーマを削除する" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "別のテーマを追加する" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "引用元:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "出版" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "出版社:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "初版の出版日:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "出版日:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "著者" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "%(name)s を削除" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "%(name)sの著者ページ" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "著者を加える:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "著者を加える" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Jane Doe" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "別の著者を加える" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "カバー" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "物理的なプロパティ" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "フォーマット:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "フォーマットの詳細:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "ページ数:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "書籍識別子" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "OpenlibraryのID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1745,19 +1859,11 @@ msgstr "出版日: %(date)s" msgid "rated it" msgstr "評価" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1802,7 +1908,7 @@ msgstr "確認用コード:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "送信" @@ -1863,7 +1969,7 @@ msgstr "プロフィ─ル設定 で、いつでもデ #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1955,21 +2061,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)sさんが%(book_title)sをレビューしました" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2155,14 +2262,14 @@ msgstr "現在アクティビティはありません！ユーザーをフォロ msgid "Alternatively, you can try enabling more status types" msgstr "または、他のステータスタイプを有効にしてみてください" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s の読書目標" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "プロフィールページから、読書目標をいつでも設定または変更できます。" @@ -2450,6 +2557,10 @@ msgstr "このグループにはリストがありません" msgid "Edit group" msgstr "グループを編集" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "追加するユーザーを検索" @@ -3683,6 +3794,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "バーコードをスキャン" @@ -4290,7 +4402,7 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "CW" @@ -4756,7 +4868,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "ファイルをダウンロード" @@ -4949,10 +5061,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "\"%(title)s\"の読書日を更新" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5006,6 +5117,11 @@ msgstr "読書日を編集" msgid "Delete these read dates" msgstr "これらの読書日を削除" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "\"%(title)s\"の読書日を更新" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5016,41 +5132,33 @@ msgstr "\"%(title)s\"の読書日を追加" msgid "Report" msgstr "通報" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" バーコードをスキャン\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "カメラへのアクセスを要求しています..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "カメラに対して、本のバーコードをスキャンするためのアクセスを許可してください。" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "カメラにアクセスできませんでした" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "読み込み中..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "本のバーコードをカメラに合わせてください。" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBNをスキャンしました" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "本を検索:" @@ -5149,13 +5257,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5529,7 +5637,7 @@ msgid "Dashboard" msgstr "ダッシュボード" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "合計ユーザー" @@ -5543,31 +5651,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "インスタンスのアクティビティ" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5875,13 +5983,49 @@ msgid "Unable to save settings" msgstr "設定を保存できません" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6592,10 +6736,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7253,10 +7393,6 @@ msgstr "引用:" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "引用元:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "ページ:" @@ -7269,12 +7405,12 @@ msgstr "パーセント:" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "'%(book_title)s' のレビュー" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "レビュー:" @@ -7371,6 +7507,12 @@ msgid "rated %(title)s: %(display_rating)s sta msgid_plural "rated %(title)s: %(display_rating)s stars" msgstr[0] "さんは%(title)sを評価しました: %(display_rating)s stars" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7582,35 +7724,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "画像を新しいウィンドウで開く" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "ステータスを非表示" @@ -7669,16 +7811,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "さんが、 %(author_name)s著の%(book)s をレビューしました" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "さんが %(book)s をレビューしました" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7954,15 +8102,23 @@ msgid "%(num)d book - by %(user)s" msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/ko_KR/LC_MESSAGES/django.po b/locale/ko_KR/LC_MESSAGES/django.po index a842b78079..97a40599ea 100644 --- a/locale/ko_KR/LC_MESSAGES/django.po +++ b/locale/ko_KR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Korean\n" "Language: ko\n" @@ -107,7 +107,7 @@ msgstr "책제목" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "별점" @@ -175,39 +175,43 @@ msgstr "중재자가 삭제" msgid "Domain block" msgstr "도메인 차단" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "오디오북" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "전자책" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "만화" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "양장제본" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "무선제본" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,18 +465,18 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "서평" @@ -488,19 +492,19 @@ msgstr "인용구" msgid "Everything else" msgstr "그 밖의 것들" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "홈 타임라인" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "홈" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "도서 타임라임" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -509,91 +513,91 @@ msgstr "도서 타임라임" msgid "Books" msgstr "도서" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Catalan)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (German)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Spanish)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italian)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Korean)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Finnish)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (French)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lithuanian)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "네덜란드 (Dutch)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwegian)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Polish)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brazilian Portuguese)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (European Portuguese)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Romanian)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Swedish)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (우크라이나)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Simplified Chinese)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Traditional Chinese)" @@ -836,7 +840,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -905,57 +909,62 @@ msgstr "출생:" msgid "Died:" msgstr "사망:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "총서" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "외부 링크" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "위키백과" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "웹사이트" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "ISNI 레코드 보기" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "ISFDB에서 보기" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "데이터 불러오기" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "OpenLibrary 자료 보기" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Inventaire 자료 보기" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "LibraryThing 자료 보기" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Goodreads 자료 보기" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -992,8 +1001,8 @@ msgid "Name:" msgstr "이름:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "쉼표로 값을 구분합니다." @@ -1030,7 +1039,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary key:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1039,7 +1049,7 @@ msgid "Librarything key:" msgstr "Librarything key:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads key:" @@ -1052,8 +1062,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1065,7 +1075,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1077,10 +1087,10 @@ msgstr "저장" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1090,7 +1100,7 @@ msgstr "저장" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1107,7 +1117,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1124,95 +1135,114 @@ msgstr "확정" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "책 수정" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "클릭하여 표지 추가" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "표지 불러오기 실패" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "확대하려면 클릭" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "설명 추가" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "설명:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s개의 판" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "책 꽂아둔 곳:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "내 독서 활동" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "읽은 날짜 추가" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "이 책에 관한 독서 활동이 없어요." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "내 서평" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "내 코멘트" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "내 인용" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "화제" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "장소" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,15 +1257,15 @@ msgstr "장소" msgid "Lists" msgstr "목록" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "목록에 추가" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1258,25 +1288,26 @@ msgid "Copied ISBN!" msgstr "ISBN 복사!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC Number:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1287,12 +1318,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1301,12 +1332,12 @@ msgid "Add cover" msgstr "표지 추가" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "표지 올려두기" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "URL에서 책표지 불러오기" @@ -1371,15 +1402,32 @@ msgstr "새로운 저자" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "이미 등록된 작품의 다른 판일까요?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "새 작품" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1441,124 +1489,190 @@ msgstr "책제목 정렬:" msgid "Subtitle:" msgstr "부제목" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "총서" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "총서편차:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "언어:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "화제:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "화제 추가" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "화제 제거" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "그 밖의 화제 추가" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "출판물" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "발행처:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "최초 발행일:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "발행일:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "저자" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "%(name)s 제거" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "저자 추가:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "저자 추가" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "신원 미상" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "그 밖의 저자 추가" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "표지" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "제본 정보" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "포맷:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "포맷 상세:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "쪽 수:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "책 식별자" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "OpenLibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1745,19 +1859,11 @@ msgstr " 발행일: %(date)s" msgid "rated it" msgstr "별점" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "시리즈" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "%(series_number)s번째 도서" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "정리안된 책" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1802,7 +1908,7 @@ msgstr "확인 코드" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "제출" @@ -1863,7 +1969,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1955,21 +2061,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s 독자의 %(book_title)s 서평" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s 독자의 %(book_title)s 주석" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s 독자의 %(book_title)s 인용" @@ -2155,14 +2262,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s 읽기 목표" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2450,6 +2557,10 @@ msgstr "이 그룹에는 목록이 없습니다." msgid "Edit group" msgstr "그룹 편집" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "검색하여 이용자 추가하기" @@ -3683,6 +3794,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "바코드 스캔하기" @@ -4290,7 +4402,7 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "내용 경고" @@ -4756,7 +4868,7 @@ msgstr "도서 목록 내보내기" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "파일 다운로드" @@ -4949,9 +5061,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5006,6 +5117,11 @@ msgstr "읽은 날짜 편집" msgid "Delete these read dates" msgstr "이 읽은 날짜 지우기" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5016,41 +5132,33 @@ msgstr "" msgid "Report" msgstr "제보" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" 바코드 스캔\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "카메로 요청하는 중…" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "카메라에 접근할 수 없음" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "스캔 중" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN 스캠 마침" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5149,13 +5257,13 @@ msgstr "거짓" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "시작일:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "종료일:" @@ -5529,7 +5637,7 @@ msgid "Dashboard" msgstr "대시보드" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "전체 이용자" @@ -5543,31 +5651,31 @@ msgstr "이번 달 활동 수" msgid "Works" msgstr "작품 수" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "간격:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "이용자 가입 활동" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "기록 활동" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "등록된 작품" @@ -5875,13 +5983,49 @@ msgid "Unable to save settings" msgstr "설정을 저장할 수 없음" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6592,10 +6736,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7253,10 +7393,6 @@ msgstr "인용:" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7269,12 +7405,12 @@ msgstr "퍼센트:" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "서평:" @@ -7371,6 +7507,12 @@ msgid "rated %(title)s: %(display_rating)s sta msgid_plural "rated %(title)s: %(display_rating)s stars" msgstr[0] "님이 %(title)s에 남긴 별점: %(display_rating)s" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7582,35 +7724,35 @@ msgstr "읽기 마침" msgid "Show rating" msgstr "별점 보기" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "기록 보기" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "숨기기" @@ -7669,16 +7811,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "독자가 읽기 시작한 %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7954,15 +8102,23 @@ msgid "%(num)d book - by %(user)s" msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index f0d0ef693b..1375151abd 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -107,7 +107,7 @@ msgstr "Knygos antraštė" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Įvertinimas" @@ -175,39 +175,43 @@ msgstr "Moderatorius ištrynė" msgid "Domain block" msgstr "Blokuoti pagal domeną" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audioknyga" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Elektroninė knyga" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Grafinė novelė" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Knyga kietais viršeliais" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Knyga minkštais viršeliais" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "„%(value)s“ neatrodo kaip ISBN kodas" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "Kode „%(value)s“ ISBN kontrolinis skaitmuo klaidingas – tikėtasi „%(check_version)s“" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "%(display_name)s – knygos „%(book_title)s“ komentaras" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)s – knygos „%(book_title)s“ citata" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)s – knygos „%(book_title)s“ apžvalga" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -475,7 +479,7 @@ msgstr[1] "%(display_name)s įvertino knygą „%(book_title)s“ %(display_rati msgstr[2] "%(display_name)s įvertino knygą „%(book_title)s“ %(display_rating).1f žvaigždučių" msgstr[3] "%(display_name)s įvertino knygą „%(book_title)s“ %(display_rating).1f žvaigždučių" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Apžvalgos" @@ -491,19 +495,19 @@ msgstr "Citatos" msgid "Everything else" msgstr "Visa kita" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Pagrindinė siena" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Pagrindinis" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Knygų siena" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -512,91 +516,91 @@ msgstr "Knygų siena" msgid "Books" msgstr "Knygos" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Anglų)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (kataloniečių)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Vokiečių)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Ispanų)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Baskų kalba)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (galisų)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italų (Italian)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (korėjiečių)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (suomių)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Prancūzų)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (Olandų)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norvegų (Norwegian)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (lenkų)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português brasileiro (Brazilijos portugalų)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europos portugalų)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (rumunų)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Švedų)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainiečių)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Supaprastinta kinų)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradicinė kinų)" @@ -845,7 +849,7 @@ msgstr "Trumpiausias skaitinys tais metais…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -920,57 +924,62 @@ msgstr "Gimęs:" msgid "Died:" msgstr "Mirė:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serija:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Išorinės nuorodos" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Žiūrėti „Wikidata“ įrašą" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Tinklapis" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Peržiūrėti ISNI įrašą" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Žiūrėti per ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Įkelti duomenis" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Žiūrėti „OpenLibrary“" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Žiūrėti „Inventaire“" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Žiūrėti „LibraryThing“" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Žiūrėti „Goodreads“" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "%(name)s knygos" @@ -1007,8 +1016,8 @@ msgid "Name:" msgstr "Vardas:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Reikšmes atskirkite kableliais." @@ -1045,7 +1054,8 @@ msgid "Openlibrary key:" msgstr "„Openlibrary“ raktas:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "„Inventaire“ ID:" @@ -1054,7 +1064,7 @@ msgid "Librarything key:" msgstr "„Librarything“ raktas:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "„Goodreads“ raktas:" @@ -1067,8 +1077,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1080,7 +1090,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1092,10 +1102,10 @@ msgstr "Išsaugoti" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1105,7 +1115,7 @@ msgstr "Išsaugoti" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1122,7 +1132,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Duomenų įkėlimas prisijungs prie %(source_name)s ir patikrins ar nėra naujos informacijos. Esantys metaduomenys nebus perrašomi." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1139,31 +1150,50 @@ msgstr "Patvirtinti" msgid "Unable to connect to remote source." msgstr "Nepavyksta prisijungti prie nuotolinio šaltinio." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Redaguoti knygą" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Spausti, kad pridėti viršelį" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Nepavyko įkelti viršelio" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Spustelėkite padidinti" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Žiūrėti „Finna“ įrašą" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1172,17 +1202,17 @@ msgstr[1] "(%(review_count)s atsiliepimai)" msgstr[2] "(%(review_count)s atsiliepimų)" msgstr[3] "(%(review_count)s atsiliepimai)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Pridėti aprašymą" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Aprašymas:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1191,49 +1221,49 @@ msgstr[1] "%(count)s leidimai" msgstr[2] "%(count)s leidimai" msgstr[3] "%(count)s leidimai" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Šis leidimas įdėtas į:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "kitas šios knygos leidimas yra jūsų %(shelf_name)s lentynoje." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Jūsų skaitymo veikla" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Pridėti skaitymo datas" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Šios knygos neskaitote." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Tavo atsiliepimai" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Tavo komentarai" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Jūsų citatos" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Temos" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Vietos" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1248,15 +1278,15 @@ msgstr "Vietos" msgid "Lists" msgstr "Sąrašai" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Pridėti prie sąrašo" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1279,25 +1309,26 @@ msgid "Copied ISBN!" msgstr "ISBN kodas nukopijuotas!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC numeris:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Įgarsintos knygos ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1308,12 +1339,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1322,12 +1353,12 @@ msgid "Add cover" msgstr "Pridėti viršelį" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Įkelti viršelį:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Įkelti viršelį iš URL:" @@ -1392,15 +1423,32 @@ msgstr "Tai naujas autorius" msgid "Creating a new author: %(name)s" msgstr "Kuriamas naujas autorius: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Ar tai egzistuojančio darbo leidimas?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Tai naujas darbas" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1462,124 +1510,190 @@ msgstr "Pavadinimas rikiavimo tikslais:" msgid "Subtitle:" msgstr "Paantraštė:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serija:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Serijos numeris:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Kalbos:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Temos:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Pridėti temą" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Pašalinti temą" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Pridėti kitą temą" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Pozicija:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Leidimas" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Leidėjas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Pirmoji publikavimo data:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Publikavimo data:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autoriai" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Pašalinti %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Autoriaus puslapis %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Pridėti autorius:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Pridėti autorių" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Jonas Jonaitė" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Pridėti dar vieną autorių" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Viršelis" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Fizinės savybės" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formatas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Informacija apie formatą:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Puslapiai:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Knygos identifikatoriai" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "„Openlibrary“ ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Pavadinimas" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1766,19 +1880,11 @@ msgstr "Publikuota %(date)s" msgid "rated it" msgstr "įvertino" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Serijos autorius" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "%(series_number)s knyga" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Nesurūšiuota knyga" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1823,7 +1929,7 @@ msgstr "Patvirtinimo kodas:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Siųsti" @@ -1884,7 +1990,7 @@ msgstr "Tai galite visada atšaukti paskyros nustatymuose.< #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1982,21 +2088,22 @@ msgid "%(username)s started reading %(username)s pradėjo skaityti %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s įvertino %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s apžvelgė %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s pakomentavo prie knygos %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s citavo %(book_title)s" @@ -2182,14 +2289,14 @@ msgstr "Šiuo metu įrašų nėra. Norėdami matyti, sekite narį." msgid "Alternatively, you can try enabling more status types" msgstr "Taip pat galite pasirinkti daugiau būsenos tipų" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s skaitymo tikslas" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Bet kuriuo metu galite pakeisti savo skaitymo tikslą savo paskyros puslapyje" @@ -2477,6 +2584,10 @@ msgstr "Šioje grupėje nėra sąrašų" msgid "Edit group" msgstr "Redaguoti grupę" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Ieškokite, kad pridėtumėte naudotoją" @@ -3725,6 +3836,7 @@ msgid "Search for a book, author, user, or list" msgstr "Ieškoti knygos, autoriaus, naudotojo ar sąrašo" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Skenuoti brūkšninį kodą" @@ -4347,7 +4459,7 @@ msgstr[2] "Reikia moderuoti %(display_count)s naujų ataska msgstr[3] "Reikia moderuoti %(display_count)s naujas ataskaitas" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Įspėjimas dėl turinio" @@ -4816,7 +4928,7 @@ msgstr "Eksportuoti knygų sąrašą" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "Į eksportuotą CSV failą bus įtrauktos visos knygos jūsų lentynose, visos apžvelgtos knygos bei skaitytos knygos.
      Šį failą galite importuoti į tokias tarnybas, kaip antai „Goodreads“." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Parsisiųsti failą" @@ -5009,10 +5121,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Trinate tai, kas perskaityta ir %(count)s susietų progreso naujinių." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Atnaujinkite knygos „%(title)s“ skaitymo datas" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5066,6 +5177,11 @@ msgstr "Redaguoti skaitymo datas" msgid "Delete these read dates" msgstr "Ištrinti šias skaitymo datas" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Atnaujinkite knygos „%(title)s“ skaitymo datas" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5076,41 +5192,33 @@ msgstr "Pridėkite knygos „%(title)s“ skaitymo datas" msgid "Report" msgstr "Pranešti" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Nuskaityti barkodą\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Reikia kameros..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Suteikite prieigą prie kameros, kad galėtumėte nuskaityti knygos barkodą." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Nepavyko pasiekti kameros" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Skenuojama..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Kamerą laikykite virš barkodo." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN nuskaitytas" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Ieškoma knygos:" @@ -5215,13 +5323,13 @@ msgstr "Netiesa" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Pradžios data:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Pabaigos data:" @@ -5595,7 +5703,7 @@ msgid "Dashboard" msgstr "Suvestinė" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Iš viso naudotojų" @@ -5609,31 +5717,31 @@ msgstr "Aktyvūs šį mėnesį" msgid "Works" msgstr "Darbai" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Serverio statistika" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalas:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dienos" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Savaitės" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Naudotojo prisijungimo veikla" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Būsenos" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Darbai sukurti" @@ -5953,13 +6061,49 @@ msgid "Unable to save settings" msgstr "Nepavyko išsaugoti nustatymų" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6670,10 +6814,6 @@ msgstr "Planinės užduotys" msgid "Tasks" msgstr "Užduotys" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Pavadinimas" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "„Celery“ užduotis" @@ -7337,10 +7477,6 @@ msgstr "Citata:" msgid "An excerpt from '%(book_title)s'" msgstr "Ištrauka iš „%(book_title)s“" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Pozicija:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Puslapyje:" @@ -7353,12 +7489,12 @@ msgstr "Proc.:" msgid "to" msgstr "į" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Jūsų apžvalga apie „%(book_title)s“" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Atsiliepimas:" @@ -7467,6 +7603,15 @@ msgstr[1] "įvertinta %(title)s: %(display_rat msgstr[2] "įvertinta %(title)s: %(display_rating)s žvaigždutėmis" msgstr[3] "įvertinta %(title)s: %(display_rating)s žvaigždutėmis" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7681,35 +7826,35 @@ msgstr "Baigti skaityti" msgid "Show rating" msgstr "Rodyti įvertinimą" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Rodyti būseną" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Psl. %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Atidaryti paveikslėlį naujame lange" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Slėpti būseną" @@ -7768,16 +7913,22 @@ msgstr "pradėjo skaityti %(author_name)s knygą msgid "started reading %(book)s" msgstr "pradėjo skaityti %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "apžvelgė autoriaus %(author_name)s knygą %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "apžvelgė %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8062,15 +8213,23 @@ msgstr[1] "%(num)d knygos %(user)s" msgstr[2] "%(num)d knygos %(user)s" msgstr[3] "%(num)d knygos %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "nauja naudotojo paskyra" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/nl_NL/LC_MESSAGES/django.po b/locale/nl_NL/LC_MESSAGES/django.po index f94558f175..66a46fecc1 100644 --- a/locale/nl_NL/LC_MESSAGES/django.po +++ b/locale/nl_NL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-24 10:23\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-24 19:01\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Dutch\n" "Language: nl\n" @@ -107,7 +107,7 @@ msgstr "Boektitel" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Beoordeling" @@ -175,39 +175,43 @@ msgstr "Verwijdering moderator" msgid "Domain block" msgstr "Domeinblokkade" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Luisterboek" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "E-book" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Striproman" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Harde kaft" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Zachte kaft" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s lijkt niet op een ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s heeft niet de juiste ISBN controlesom, we verwachten %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)s's reactie op %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)s's citaat van %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)s's beoordeling van %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s beoordeelde %(book_title)s: %(display_rating).1f ster" msgstr[1] "%(display_name)s beoordeelde %(book_title)s: %(display_rating).1f sterren" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Recensies" @@ -489,19 +493,19 @@ msgstr "Quotes" msgid "Everything else" msgstr "Overig" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Tijdlijnen" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Start" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Boeken tijdlijn" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Boeken tijdlijn" msgid "Books" msgstr "Boeken" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Engels (English)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Catalaans)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Duits (Deutsch)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Spaans (Español)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Baskisch)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galicisch)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italiaans)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Koreaans)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Fins)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Frans (Français)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litouws)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Noors)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Pools)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Braziliaans-Portugees)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeaans Portugees)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Roemeens)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Zweeds)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Oekraïens)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Vereenvoudigd Chinees)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "简体中文 (Traditioneel Chinees)" @@ -839,7 +843,7 @@ msgstr "Diens kortste lees dit jaar…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Geboren:" msgid "Died:" msgstr "Overleden:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Reeks:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Externe links" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Bekijk op Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Website" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "ISNI vermelding bekijken" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Bekijk op ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Gegevens laden" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Bekijk op OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Bekijk op Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Bekijk op LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Bekijk op Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Boeken door %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Naam:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Meerdere waardes scheiden met komma's." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary sleutel:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything sleutel:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads-ID:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Opslaan" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Opslaan" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Bij het laden van gegevens wordt verbinding gemaakt met %(source_name)s en controleren op metadata over deze auteur die hier niet aanwezig zijn. Bestaande gegevens worden niet overschreven." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Bevestigen" msgid "Unable to connect to remote source." msgstr "Verbinden met externe bron niet mogelijk." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Boek bewerken" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Klik om omslag toe te voegen" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Omslag laden mislukt" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Klik om te vergroten" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Bekijk op Finna" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "Bekijk op Libris" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s recensie)" msgstr[1] "(%(review_count)s recensies)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Beschrijving toevoegen" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Beschrijving:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s editie" msgstr[1] "%(count)s edities" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Je hebt deze editie op de plank gezet in:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Een andere editie van dit boek staat op je %(shelf_name)s plank." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Jouw leesactiviteit" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Leesdata toevoegen" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Je hebt geen leesactiviteit voor dit boek." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Je recensies" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Jouw opmerkingen" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Jouw citaten" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Onderwerpen" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Plaatsen" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Plaatsen" msgid "Lists" msgstr "Lijsten" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Toevoegen aan lijst" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "Nieuwe lijst aanmaken..." -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN gekopieerd!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC Nummer:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna-ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "Libris-ID:" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Omslag toevoegen" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Upload Omslag:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Omslag laden vanuit URL:" @@ -1378,15 +1409,32 @@ msgstr "Dit is een nieuwe auteur" msgid "Creating a new author: %(name)s" msgstr "Nieuwe auteur aanmaken: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Is dit een editie van een bestaand werk?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Dit is een nieuw werk" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Titel voor sortering:" msgid "Subtitle:" msgstr "Ondertitel:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Reeks:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Reeksnummer:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Talen:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Onderwerpen:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Onderwerpen toevoegen" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Onderwerp verwijderen" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Nog een onderwerp toevoegen" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "Reeks" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Positie:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Uitgave" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Uitgever:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Eerste publicatiedatum:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Publicatiedatum:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Auteurs" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Verwijder %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Auteurspagina voor %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Auteurs toevoegen:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Auteur toevoegen" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Pietje Puk" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Nog een auteur toevoegen" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Omslag" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Fysieke eigenschappen" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formaat:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Formaatdetails:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Pagina's:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Boek ID's" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Naam" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Gepubliceerd %(date)s" msgid "rated it" msgstr "beoordeelde het" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Reeksen van" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Boek %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Ongecategoriseerd boek" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Bevestigingscode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Versturen" @@ -1870,7 +1976,7 @@ msgstr "Je kunt je op elk moment afmelden in je profielinst #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s begon %(book_title)s te lezen" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s heeft %(book_title)s beoordeeld" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s heeft %(book_title)s gerecenseerd" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s heeft een opmerking geplaatst op %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s heeft %(book_title)s geciteerd" @@ -2164,14 +2271,14 @@ msgstr "Er zijn op dit moment geen activiteiten! Probeer een gebruiker te volgen msgid "Alternatively, you can try enabling more status types" msgstr "Als alternatief kun je proberen om meer statustypen in te schakelen" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s Leesdoel" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Je kunt je leesdoel altijd vanuit je profielpagina instellen of wijzigen" @@ -2459,6 +2566,10 @@ msgstr "Deze groep heeft geen lijsten" msgid "Edit group" msgstr "Groep bewerken" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Zoek om een gebruiker toe te voegen" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Zoeken naar een boek, auteur, gebruiker of lijst" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Scan streepjescode" @@ -4309,7 +4421,7 @@ msgstr[0] "Een nieuwe melding moet gemodereerd worden" msgstr[1] "%(display_count)s nieuwe meldingen moeten worden gemodereerd" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Inhoudswaarschuwing" @@ -4776,7 +4888,7 @@ msgstr "Exporteer boekenlijst" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "Je CSV-exportbestand bevat alle boeken op je planken, boeken die je hebt beoordeeld en boeken met leesactiviteit.
      Gebruik dit om te importeren in een service zoals Goodreads." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Download bestand" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Je verwijdert deze leesvoortgang en de %(count)s bijbehorende voortgangsupdates." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Bewerk leesdatums voor \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Leesdatums bewerken" msgid "Delete these read dates" msgstr "Deze leesdatums verwijderen" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Bewerk leesdatums voor \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Voeg leesdatums toe voor \"%(title)s\"" msgid "Report" msgstr "Melden" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Scan streepjescode\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Camera aanvragen..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Geef toegang tot de camera om de streepjescode van een boek te scannen." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Geen toegang tot camera" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Scannen..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Leg de streepjescode van je boek gelijk met de camera." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN gescand" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Boek zoeken:" @@ -5171,13 +5279,13 @@ msgstr "Onwaar" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Begindatum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Einddatum:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Dashboard" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Totaal aantal gebruikers" @@ -5565,31 +5673,31 @@ msgstr "Actief deze maand" msgid "Works" msgstr "Werken" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Instance activiteit" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Interval:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dagen" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Weken" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Nieuwe registraties" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Statusactiviteit" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Werken aangemaakt" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Instellingen opslaan mislukt" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "Aanbevolen" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "Federatie uitschakelen" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "Opgelet" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "Stopt de interactie van jouw instantie met andere federatieve diensten. Bestaande data uit andere diensten blijft zichtbaar." +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "Niet aanbevolen" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "Geplande taken" msgid "Tasks" msgstr "Taken" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Naam" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "Selderij taak" @@ -7281,10 +7421,6 @@ msgstr "Citaat:" msgid "An excerpt from '%(book_title)s'" msgstr "Een uittreksel uit '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Positie:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Op pagina:" @@ -7297,12 +7433,12 @@ msgstr "Bij percentage:" msgid "to" msgstr "tot" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Jouw recensie van '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Recensie:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "beoordeelde %(title)s: %(display_rating)s ster" msgstr[1] "beoordeelde %(title)s: %(display_rating)s sterren" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Uitgelezen" msgid "Show rating" msgstr "Beoordeling weergeven" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Toon status" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Pagina %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Afbeelding in nieuw venster openen" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Status verbergen" @@ -7702,16 +7845,22 @@ msgstr "begon met het lezen van %(book)s door %(book)s" msgstr "begonnen met lezen van %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "heeft %(book)s door %(author_name)s gerecenseerd" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "recensie geschreven voor %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d boek - van %(user)s" msgstr[1] "%(num)d boeken - van %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "een nieuwe gebruikersaccount" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/no_NO/LC_MESSAGES/django.po b/locale/no_NO/LC_MESSAGES/django.po index eea8124d9f..00536a384e 100644 --- a/locale/no_NO/LC_MESSAGES/django.po +++ b/locale/no_NO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Norwegian\n" "Language: no\n" @@ -107,7 +107,7 @@ msgstr "Boktittel" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Vurdering" @@ -175,39 +175,43 @@ msgstr "Moderatør sletting" msgid "Domain block" msgstr "Domeneblokkering" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Lydbok" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "e-bok" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Tegneserie" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Innbundet" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Paperback" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s ser ikke ut som en ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s har ikke riktig ISBN sjekksum, vi forventet %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)s sin kommentar på %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)s sitt sitat fra %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)s sin omtale av %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s vurderte %(book_title)s: %(display_rating).1f stjerne" msgstr[1] "%(display_name)s vurderte %(book_title)s: %(display_rating).1f stjerner" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Omtaler" @@ -489,19 +493,19 @@ msgstr "Sitater" msgid "Everything else" msgstr "Andre ting" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Lokal tidslinje" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Hjem" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Boktidslinja" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Boktidslinja" msgid "Books" msgstr "Bøker" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Engelsk)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (katalansk)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Tysk)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Spansk)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Baskisk)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italiensk)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (koreansk)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (finsk)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Fransk)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisk)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (nederlandsk)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norsk)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Polsk)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português - Brasil (Brasiliansk portugisisk)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisisk)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (romansk)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Svensk)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainsk)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Forenklet kinesisk)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradisjonelt kinesisk)" @@ -839,7 +843,7 @@ msgstr "Den korteste teksten lest i år…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Født:" msgid "Died:" msgstr "Død:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serie:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Eksterne lenker" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Vis på Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Nettside" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Vis ISNI-oppføring" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Vis på ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Last inn data" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Vis på OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Vis på Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Vis på LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Vis på Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Bøker av %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Navn:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Adskill flere verdier med komma." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary nøkkel:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything nøkkel:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads nøkkel:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Lagre" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Lagre" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Laster inn data kobler til %(source_name)s og finner metadata om denne forfatteren som enda ikke finnes her. Eksisterende metadata vil ikke bli overskrevet." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Bekreft" msgid "Unable to connect to remote source." msgstr "Kunne ikke koble til ekstern kilde." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Rediger bok" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Klikk for å legge til omslag" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Klarte ikke å laste inn omslag" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Klikk for å forstørre" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "Se på Finna" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s anmeldelse)" msgstr[1] "(%(review_count)s anmeldelser)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Legg til beskrivelse" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Beskrivelse:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s utgave" msgstr[1] "%(count)s utgaver" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Du har lagt denne utgaven i hylla:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "En annen utgave av denne boken ligger i hylla %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Din leseaktivitet" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Legg til lesedatoer" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Du har ikke lagt inn leseaktivitet for denne boka." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Dine omtaler" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Dine kommentarer" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Dine sitater" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Emner" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Steder" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Steder" msgid "Lists" msgstr "Lister" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Legg til i liste" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "Kopierte ISBN!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC Nummer:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Legg til et omslag" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Last opp omslag:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Last inn omslag fra hyperlenke:" @@ -1378,15 +1409,32 @@ msgstr "Dette er en ny forfatter" msgid "Creating a new author: %(name)s" msgstr "Oppretter en ny forfatter: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Er dette en utgave av et eksisterende verk?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Dette er et nytt verk" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Sorter etter tittel:" msgid "Subtitle:" msgstr "Undertittel:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Serienummer:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Språk:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Emner:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Legg til emne" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Fjern emne" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Legg til et emne" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Plassering:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publikasjon" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Forlag:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Først utgitt:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Publiseringsdato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Forfattere" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Fjern %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Forfatterside for %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Legg til forfattere:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Legg til forfatter" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Kari Nordmann" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Legg til enda en forfatter" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Omslag" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Fysiske egenskaper" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Formatdetaljer:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Sider:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Boknøkler" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary nøkkel:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Navn" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Utgitt %(date)s" msgid "rated it" msgstr "vurderte den" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "En serie av" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Bok %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Usortert bok" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Bekreftelseskode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Send inn" @@ -1870,7 +1976,7 @@ msgstr "Du kan når som helst melde deg ut på profilinnsti #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s har begynt å lese %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s vurderte %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s anmeldte %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s la inn en kommentar på %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s siterte %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Det er ingen aktiviteter akkurat nå! Prøv å følge en bruker for å k msgid "Alternatively, you can try enabling more status types" msgstr "Eller, du kan prøve å aktivere flere statustyper" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s lesemål" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Du kan sette eller endre lesemål når som helst fra profilsida di" @@ -2459,6 +2566,10 @@ msgstr "Denne gruppa har ingen lister" msgid "Edit group" msgstr "Rediger gruppe" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Søk for å legge til et medlem" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Søk etter bok, forfatter, bruker eller liste" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Les strekkode" @@ -4309,7 +4421,7 @@ msgstr[0] "En ny rapport trenger moderering" msgstr[1] "%(display_count)s nye rapporter trenger moderering" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Varsel om følsomt innhold" @@ -4776,7 +4888,7 @@ msgstr "Eksporter bokliste" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "Din CSV-eksportfil vil inkludere alle bøker på dine hyller, bøker du har omtalt, og bøker med leseaktivitet.
      Bruk dette til å importere til en tjeneste som Goodreads." -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Last ned fil" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Du sletter denne gjennomlesninga og %(count)s tilknyttede fremdriftsoppdateringer." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Oppdatér lesedatoer for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Rediger lesedatoer" msgid "Delete these read dates" msgstr "Slett disse lesedatoene" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Oppdatér lesedatoer for \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Legg til lesedatoer for \"%(title)s\"" msgid "Report" msgstr "Rapport" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Les strekkode\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Ber om kamera..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Gi tilgang til kameraet for å lese en strekkode." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Fikk ikke tilgang til kamera" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Skanner..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Juster bokens strekkode med kamera." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN ble skannet" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Søker etter bok:" @@ -5171,13 +5279,13 @@ msgstr "Usant" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Startdato:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Sluttdato:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Kontrollpanel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Totalt antall brukere" @@ -5565,31 +5673,31 @@ msgstr "Aktive denne måneden" msgid "Works" msgstr "Verker" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Instansaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervall:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dager" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Uker" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Brukerregistreringsaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Statusaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Verker laget" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Kunne ikke lagre innstillinger" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "Planlagte oppgaver" msgid "Tasks" msgstr "Oppgaver" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Navn" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "Celery-oppgave" @@ -7281,10 +7421,6 @@ msgstr "Sitat:" msgid "An excerpt from '%(book_title)s'" msgstr "En utdrag fra '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Plassering:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "På side:" @@ -7297,12 +7433,12 @@ msgstr "Ved prosent:" msgid "to" msgstr "til" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Din omtale av '%(book_title)s" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Omtale:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "vurderte %(title)s til: %(display_rating)s stjerne" msgstr[1] "vurderte %(title)s til: %(display_rating)s stjerner" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Fullfør lesing" msgid "Show rating" msgstr "Vis vurdering" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Vis status" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(side %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Åpne bilde i nytt vindu" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Skjul status" @@ -7702,16 +7845,22 @@ msgstr "begynte å lese %(book)s av %(book)s" msgstr "begynte å lese %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "anmeldte %(book)s av %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "omtalte %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d bok – av %(user)s" msgstr[1] "%(num)d bøker – av %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "en ny brukerkonto" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/pl_PL/LC_MESSAGES/django.po b/locale/pl_PL/LC_MESSAGES/django.po index 05a28f00cb..a6200e0171 100644 --- a/locale/pl_PL/LC_MESSAGES/django.po +++ b/locale/pl_PL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Polish\n" "Language: pl\n" @@ -107,7 +107,7 @@ msgstr "Tytuł książki" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Ocena" @@ -175,39 +175,43 @@ msgstr "Usunięte przez moderatora" msgid "Domain block" msgstr "Blokada domeny" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audiobook" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "eBook" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Powieść ilustrowana" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Twarda oprawa" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Miękka oprawa" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "%(display_name)s komentuje %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)s cytuje %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)s ocenia %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -475,7 +479,7 @@ msgstr[1] "%(display_name)s ocenia %(book_title)s: %(display_rating).1f gwiazdki msgstr[2] "%(display_name)s ocenia %(book_title)s: %(display_rating).1f gwiazdek" msgstr[3] "%(display_name)s ocenia %(book_title)s: %(display_rating).1f gwiazdek" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Oceny" @@ -491,19 +495,19 @@ msgstr "Cytaty" msgid "Everything else" msgstr "Wszystko inne" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Strona główna" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Start" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Oś czasu książek" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -512,91 +516,91 @@ msgstr "Oś czasu książek" msgid "Books" msgstr "Książki" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Angielski)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (kataloński)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (niemiecki)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (hiszpański)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (baskijski)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (galicyjski)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (włoski)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (koreański)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (fiński)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (francuski)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (litewski)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (holenderski)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (norweski)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "polski" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugalski — Brazylia)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugalski — Portugalia)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (rumuński)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (szwedzki)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (ukraiński)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (chiński — uproszczony)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (chiński — tradycyjny)" @@ -845,7 +849,7 @@ msgstr "Najkrócej wczytano się w…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -920,57 +924,62 @@ msgstr "Data urodzenia:" msgid "Died:" msgstr "Data śmierci:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Seria:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Zewnętrzne odnośniki" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Pokaż na Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Strona WWW" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Zobacz wpis ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Zobacz na ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Wczytaj dane" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Pokaż na OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Pokaż na Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Pokaż na LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Pokaż na Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Książki autorstwa %(name)s" @@ -1007,8 +1016,8 @@ msgid "Name:" msgstr "Nazwa:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Oddziel kilka wartości przecinkami." @@ -1045,7 +1054,8 @@ msgid "Openlibrary key:" msgstr "Klucz Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "ID Inventaire:" @@ -1054,7 +1064,7 @@ msgid "Librarything key:" msgstr "Klucz Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Klucz Goodreads:" @@ -1067,8 +1077,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1080,7 +1090,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1092,10 +1102,10 @@ msgstr "Zapisz" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1105,7 +1115,7 @@ msgstr "Zapisz" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1122,7 +1132,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Wczytanie danych spowoduje połączenie z %(source_name)s i sprawdzenie jakichkolwiek metadanych o tym autorze, które nie są tutaj obecne. Istniejące metadane nie zostaną zastąpione." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1139,31 +1150,50 @@ msgstr "Zatwierdź" msgid "Unable to connect to remote source." msgstr "Błąd połączenia ze zdalnym źródłem." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Edytuj książkę" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Naciśnij, aby dodać okładkę" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Błąd wczytywania okładki" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Naciśnij, aby powiększyć" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1172,17 +1202,17 @@ msgstr[1] "(%(review_count)s opinie)" msgstr[2] "(%(review_count)s opinii)" msgstr[3] "(%(review_count)s opinii)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Dodaj opis" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Opis:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1191,49 +1221,49 @@ msgstr[1] "%(count)s edycje" msgstr[2] "%(count)s edycji" msgstr[3] "%(count)s edycji" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Ta edycja została odłożona do:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Inna edycja tej książki znajduje się już na Twojej półce %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Twoja aktywność czytania" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Dodaj daty czytania" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Nie masz żadnej aktywności czytania dla tej książki." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Twoje opinie" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Twoje komentarze" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Twoje cytaty" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Tematy" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Miejsca" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1248,15 +1278,15 @@ msgstr "Miejsca" msgid "Lists" msgstr "Listy" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Dodaj do listy" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1279,25 +1309,26 @@ msgid "Copied ISBN!" msgstr "Skopiowano ISBN!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Numer OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Dźwiękowy ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ID ISFDB:" @@ -1308,12 +1339,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "ID Finna:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1322,12 +1353,12 @@ msgid "Add cover" msgstr "Dodaj okładkę" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Prześlij okładkę:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Wczytaj okładkę z adresu URL:" @@ -1392,15 +1423,32 @@ msgstr "To jest nowy autor" msgid "Creating a new author: %(name)s" msgstr "Tworzenie nowego autora: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Czy to jest edycja istniejącego dzieła?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "To jest nowe dzieło" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1462,124 +1510,190 @@ msgstr "Sortuj Według Tytułu:" msgid "Subtitle:" msgstr "Podtytuł:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Seria:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Numer serii:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Języki:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Tematy:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Dodaj temat" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Usuń temat" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Dodaj inny temat" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Pozycja:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publikacja" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Wydawca:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Data pierwszej publikacji:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Data publikacji:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autorzy" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Usuń %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Strona autora dla %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Dodaj autorów:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Dodaj autora" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Jan Kowalski" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Dodaj kolejnego autora" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Okładka" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Właściwości fizyczne" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Szczegóły formatu:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Strony:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identyfikatory książki" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "ID Openlibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1766,19 +1880,11 @@ msgstr "Opublikowane %(date)s" msgid "rated it" msgstr "ocenia to" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Seria autorstwa" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Książka %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Niesortowana książka" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1823,7 +1929,7 @@ msgstr "Kod potwierdzający:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Prześlij" @@ -1884,7 +1990,7 @@ msgstr "Możesz zrezygnować w dowolnym momencie poprzez us #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1982,21 +2088,22 @@ msgid "%(username)s started reading %(username)s rozpoczyna czytanie %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s ocenia %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s recenzuje %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s komentuje %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s cytuje %(book_title)s" @@ -2182,14 +2289,14 @@ msgstr "Brak aktywności na ten moment! Na początek, zacznij obserwować użytk msgid "Alternatively, you can try enabling more status types" msgstr "Możesz również aktywować więcej typów statusów" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Cel czytania na rok %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Możesz ustawić lub zmienić swój cel czytania w dowolnej chwili przez swoją stronę profilu" @@ -2477,6 +2584,10 @@ msgstr "Ta grupa nie posiada list" msgid "Edit group" msgstr "Edytuj grupę" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Wyszukaj, aby dodać użytkownika" @@ -3725,6 +3836,7 @@ msgid "Search for a book, author, user, or list" msgstr "Szukaj książek, autorów, użytkowników lub list" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Skanuj kod kreskowy" @@ -4347,7 +4459,7 @@ msgstr[2] "%(display_count)s nowych zgłoszeń wymaga u msgstr[3] "%(display_count)s nowych zgłoszeń wymaga uwagi" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Ostrzeżenie o treści" @@ -4816,7 +4928,7 @@ msgstr "Eksportuj listę książek" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Pobierz plik" @@ -5009,10 +5121,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Aktualizuj daty czytania dla \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5066,6 +5177,11 @@ msgstr "Edytuj daty czytania" msgid "Delete these read dates" msgstr "Usuń te daty czytania" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Aktualizuj daty czytania dla \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5076,41 +5192,33 @@ msgstr "Dodaj daty czytania dla \"%(title)s\"" msgid "Report" msgstr "Zgłoś" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Skanuj kod kreskowy\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Uruchamianie aparatu..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Udziel dostęp do aparatu, aby zeskanować kod kreskowy książki." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Nie można uruchomić aparatu" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Skanowanie..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Umieść kod kreskowy książki przez aparatem." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "Zeskanowano ISBN" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Wyszukiwanie książki:" @@ -5215,13 +5323,13 @@ msgstr "Nie" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data rozpoczęcia:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data zakończenia:" @@ -5595,7 +5703,7 @@ msgid "Dashboard" msgstr "Panel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Użytkowników w sumie" @@ -5609,31 +5717,31 @@ msgstr "Aktywnych w tym miesiącu" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Aktywność instancji" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Częstotliwość:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Tygodnie" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5953,13 +6061,49 @@ msgid "Unable to save settings" msgstr "Błąd zapisywania ustawień" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6670,10 +6814,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7337,10 +7477,6 @@ msgstr "Cytat:" msgid "An excerpt from '%(book_title)s'" msgstr "Fragment z '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Pozycja:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Na stronie:" @@ -7353,12 +7489,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Twoja recenzja '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Recenzja:" @@ -7467,6 +7603,15 @@ msgstr[1] "ocenia %(title)s: %(display_rating) msgstr[2] "ocenia %(title)s: %(display_rating)s gwiazdek" msgstr[3] "ocenia %(title)s: %(display_rating)s gwiazdek" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7681,35 +7826,35 @@ msgstr "Ukończ czytanie" msgid "Show rating" msgstr "Pokaż ocenę" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Pokaż status" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Strona %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s %%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s %%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Otwórz obraz w nowym oknie" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Ukryj status" @@ -7768,16 +7913,22 @@ msgstr "rozpoczyna czytanie %(book)s autorstwa %(book)s" msgstr "rozpoczyna czytanie %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "recenzuje %(book)s autorstwa %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "recenzuje %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8062,15 +8213,23 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index a10a002218..95d779f65c 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -107,7 +107,7 @@ msgstr "Título do livro" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Avaliação" @@ -175,39 +175,43 @@ msgstr "Exclusão de moderador" msgid "Domain block" msgstr "Bloqueio de domínio" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audiolivro" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "e-book" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Graphic novel" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Capa dura" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Capa mole" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "Comentário de %(display_name)s em %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "Citação de %(display_name)s em %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "Resenha de %(display_name)s de %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s avaliou %(book_title)s: %(display_rating).1f estrela" msgstr[1] "%(display_name)s avaliou %(book_title)s: %(display_rating).1f estrelas" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Resenhas" @@ -489,19 +493,19 @@ msgstr "Citações" msgid "Everything else" msgstr "Todo o resto" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Linha do tempo" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Página inicial" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Linha do tempo dos livros" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Linha do tempo dos livros" msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Inglês)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Catalão)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Basco)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galego)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Finlandês)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Holandês (Alemão)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Polonês)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português do Brasil)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Português Europeu)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Romeno)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Ucraniano)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -839,7 +843,7 @@ msgstr "A leitura mais curta do ano…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Nascimento:" msgid "Died:" msgstr "Morte:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Série:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Links externos" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipédia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Website" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Ver registro ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Veja no ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Carregar informações" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Ver na OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Ver no Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Ver no LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Ver no Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Livros de %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Nome:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Separe com vírgulas." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Chave Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "ID Inventaire:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Chave Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Chave Goodreads:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Salvar" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Salvar" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Para carregar informações nos conectaremos a %(source_name)s e buscaremos metadados que ainda não temos sobre este/a autor/a. Metadados já existentes não serão substituídos." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Confirmar" msgid "Unable to connect to remote source." msgstr "Não conseguimos nos conectar à fonte remota." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Editar livro" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Clique para adicionar uma capa" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Erro ao carregar capa" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Clique para aumentar" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s resenha)" msgstr[1] "(%(review_count)s resenhas)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Adicionar descrição" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descrição:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s edição" msgstr[1] "%(count)s edições" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Você colocou esta edição na estante em:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Uma edição diferente deste livro está em sua estante %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Andamento da sua leitura" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Adicionar registro de leitura" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Você ainda não registrou sua leitura." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Suas resenhas" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Seus comentários" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Suas citações" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Assuntos" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Adicionar à lista" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN copiado!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Número OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Adicionar capa" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Enviar capa:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Subir capa desde URL:" @@ -1378,15 +1409,32 @@ msgstr "É um/a novo/a autor/a" msgid "Creating a new author: %(name)s" msgstr "Criando um/a novo/a autor/a: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "É uma edição de uma obra já registrada?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "É uma nova obra" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Organizar título:" msgid "Subtitle:" msgstr "Subtítulo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Série:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Número na série:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Idiomas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Assuntos:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Adicionar assunto" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Excluir assunto" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Adicionar outro assunto" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Posição:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publicação" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Editora:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Data da primeira publicação:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Data de publicação:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autores/as" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Remover %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Página de autor/a de %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Adicionar autores/as:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Adicionar autor/a" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Fulana" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Adicionar outro/a autor/a" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Capa" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Propriedades físicas" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Detalhes do formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Páginas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identificadores do livro" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Publicado em %(date)s" msgid "rated it" msgstr "avaliou este livro" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Séries de" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Livro %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Livro não ordenado" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Código de confirmação:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -1870,7 +1976,7 @@ msgstr "Você pode desabilitar esta opção a qualquer momento em suas %(username)s started reading %(username)s começou a ler %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s avaliou %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s resenhou %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s comentou %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s citou %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Não há nenhuma atividade! Tente seguir um usuário para começar" msgid "Alternatively, you can try enabling more status types" msgstr "Uma outra opção é habilitar mais tipos de publicação" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Meta de leitura para %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Você pode definir ou alterar sua meta de leitura a qualquer momento em sua página de perfil" @@ -2459,6 +2566,10 @@ msgstr "Este grupo não tem listas" msgid "Edit group" msgstr "Editar grupo" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Pesquisar usuário para adicionar" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Escanear código de barras" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Aviso de conteúdo" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Você está excluindo este registro de leitura e as %(count)s atualizações de andamento associadas." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Atualizar datas de leitura de \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Editar registro de leitura" msgid "Delete these read dates" msgstr "Excluir estas datas de leitura" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Atualizar datas de leitura de \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Adicionar datas de leitura de \"%(title)s\"" msgid "Report" msgstr "Denunciar" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Escanear código de barras\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Solicitando a câmera..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Dê acesso à câmera para escanearmos o código de barras do livro." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Não conseguimos acessar a câmera" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Escaneando..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Alinhe o código de barras do livro com a câmera." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN escaneado" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Pesquisando livro:" @@ -5171,13 +5279,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data de início:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data final:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Painel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Total de usuários" @@ -5565,31 +5673,31 @@ msgstr "Ativo neste mês" msgid "Works" msgstr "Obras" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Atividade da instância" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Novos usuários" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Publicações" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Obras criadas" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Configurações não salvas" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7281,10 +7421,6 @@ msgstr "Citação:" msgid "An excerpt from '%(book_title)s'" msgstr "Um trecho de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Posição:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Na página:" @@ -7297,12 +7433,12 @@ msgstr "Na porcentagem:" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Sua resenha de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Resenha:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "avaliou %(title)s: %(display_rating)s estrela" msgstr[1] "avaliou %(title)s: %(display_rating)s estrelas" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Terminar de ler" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Mostrar publicação" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Abrir imagem em nova janela" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Esconder publicação" @@ -7702,16 +7845,22 @@ msgstr "começou a ler %(book)s de %(book)s" msgstr "começou a ler %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "resenhou %(book)s de %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "resenhou %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/pt_PT/LC_MESSAGES/django.po b/locale/pt_PT/LC_MESSAGES/django.po index efe2ab23b2..f8f7b46d00 100644 --- a/locale/pt_PT/LC_MESSAGES/django.po +++ b/locale/pt_PT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-04-12 09:05\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese\n" "Language: pt\n" @@ -107,7 +107,7 @@ msgstr "Título do livro" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Classificação" @@ -175,39 +175,43 @@ msgstr "Exclusão do moderador" msgid "Domain block" msgstr "Bloqueio de domínio" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Livro-áudio" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "eBook" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Novela gráfica" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Capa dura" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Capa mole" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s não parece ser um ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s Não tem a verificação do ISBN correta%(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)s comentou em %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" msgstr[1] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Criticas" @@ -489,19 +493,19 @@ msgstr "Citações" msgid "Everything else" msgstr "Tudo o resto" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Cronograma Inicial" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Início" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Cronograma de Livros" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Cronograma de Livros" msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Inglês" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (catalão)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Basco)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (finlandês)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (lituano)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Holanda (Holanda)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Polaco)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português brasileiro)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português (Português Europeu)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Romeno)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (sueco)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (ucraniano)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -839,7 +843,7 @@ msgstr "A sua menor leitura este ano…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Nascido a:" msgid "Died:" msgstr "Morreu em:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Séries:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Links externos" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipédia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Ver no Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Página Web" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Ver registro do ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Ver no ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Carregar dados" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Ver na OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Ver no Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Ver na LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Ver na Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Livros por %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Nome:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Separe vários valores com vírgulas." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Chave da Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "ID do Inventaire:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Chave do Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Chave do Goodreads:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Salvar" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Salvar" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Carregar os dados irá conectar a %(source_name)s e verificar se há metadados sobre este autor que não estão aqui presentes. Os metadados existentes não serão substituídos." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Confirmar" msgid "Unable to connect to remote source." msgstr "Não foi possível conectar à fonte remota." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Editar Livro" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Clica para adicionar capa" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Não foi possível carregar a capa" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Clica para ampliar" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s crítica)" msgstr[1] "(%(review_count)s criticas)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Adicionar uma descrição" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descrição:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s edição" msgstr[1] "%(count)s edições" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Tu arquivaste esta edição em:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Uma edição diferente deste livro está na tua prateleira %(shelf_name)s." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "A tua atividade de leitura" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Adicionar datas de leitura" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Não tem nenhuma atividade de leitura para este livro." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "As tuas criticas" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Os teus comentários" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "As tuas citações" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Temas/Áreas" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Adicionar à lista" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Número OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audível ASEM:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Adicionar uma capa" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Carregar uma capa:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "Este é um novo autor" msgid "Creating a new author: %(name)s" msgstr "Criar um novo autor: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Esta é uma edição de um trabalho existente?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Este é um novo trabalho" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "" msgid "Subtitle:" msgstr "Subtítulo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Séries:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Número da série:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Idiomas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Assuntos:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Adicionar um assunto" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Remover o assunto" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Adicionar outro assunto" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Posição:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publicação" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Editora:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Primeira data de publicação:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Data de publicação:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autor(es/as)" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Remover %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Página de autor do %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Adicionar Autor(es/as):" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Adicionar Autor(a)" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Joana Sem-nome" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Adicionar outro autor(a)" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Capa" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Propriedades físicas" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Detalhes do formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Páginas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identificadores de Livros" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "ID da Openlibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Publicado em %(date)s" msgid "rated it" msgstr "avalia-o" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Série por" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Livro %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Livro não organizado" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Código de confirmação:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Submeter" @@ -1870,7 +1976,7 @@ msgstr "Tu poderás optar por sair a qualquer momento nas tuas configurações d #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s começou a ler %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s avaliou %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s avaliou o %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s comentou em %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s citou %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Não existem atividades agora! Experimenta seguir um utilizador para com msgid "Alternatively, you can try enabling more status types" msgstr "Alternativamente, podes tentar ativar mais tipos de estado" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Objetivo de leitura de %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Podes definir ou alterar a tua meta de leitura a qualquer momento a partir da tua página de perfil" @@ -2459,6 +2566,10 @@ msgstr "Este grupo não tem listas" msgid "Edit group" msgstr "Editar grupo" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Procura para adicionares um utilizador" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Procurar por um livro, autor, utilizador, ou lista" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Ler código de barras" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "%(display_count)s novos domínio do link precisam de moderação" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Aviso de Conteúdo" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Descarregar ficheiro" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Estás a apagar esta leitura e suas atualizações de progresso %(count)s associadas." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Atualizar datas de leitura para \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Editar datas de leitura" msgid "Delete these read dates" msgstr "Excluir estas datas de leitura" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Atualizar datas de leitura para \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Adicionar datas de leitura para \"%(title)s\"" msgid "Report" msgstr "Denunciar" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Leia o código de barras\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Solicitando câmera..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Conceder acesso à câmara para fazer scan ao código de barras do livro." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Não foi possível aceder a câmara" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Fazendo scan..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Alinha o código de barras do livro com a câmara." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN digitalizado" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Pesquisando pelo livro:" @@ -5171,13 +5279,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data de início:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data de conclusão:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Painel de controlo" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Total de utilizadores" @@ -5565,31 +5673,31 @@ msgstr "Atividade este mês" msgid "Works" msgstr "Obras" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Atividade do domínio" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Atividade de inscrição do utilizador" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Atividade de estado" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Obras criadas" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Não é possível guardar as configurações" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7281,10 +7421,6 @@ msgstr "Citação:" msgid "An excerpt from '%(book_title)s'" msgstr "Um excerto de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Posição:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Na página:" @@ -7297,12 +7433,12 @@ msgstr "Na percentagem:" msgid "to" msgstr "para" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "A tua critica de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Critica:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "avaliado %(title)s: %(display_rating)s estrela" msgstr[1] "avaliado %(title)s: %(display_rating)s estrelas" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Terminar leitura" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Mostrar o estado" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Página %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Abrir imagem numa nova janela" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Ocultar estado" @@ -7702,16 +7845,22 @@ msgstr "começou a ler %(book)s por %(book)s" msgstr "começou a ler %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "avaliou %(book)s de %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "criticou %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/ro_RO/LC_MESSAGES/django.po b/locale/ro_RO/LC_MESSAGES/django.po index 9445472667..87d04ad8c4 100644 --- a/locale/ro_RO/LC_MESSAGES/django.po +++ b/locale/ro_RO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:12\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Romanian\n" "Language: ro\n" @@ -107,7 +107,7 @@ msgstr "Titlul cărții" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Rating" @@ -175,39 +175,43 @@ msgstr "Șters de moderator" msgid "Domain block" msgstr "Blocat de domeniu" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Carte audio" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Carte digitală" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Roman grafic" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Copertă dură" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Broșură" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "Comentariul lui %(display_name)s despre %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "Citatul lui %(display_name)s despre %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "Recenzia lui %(display_name)s despre %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -474,7 +478,7 @@ msgstr[0] "%(display_name)s a făcut recenzie la %(book_title)s: %(display_ratin msgstr[1] "" msgstr[2] "%(display_name)s a făcut recenzie la %(book_title)s: %(display_rating).1f stele" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Recenzii" @@ -490,19 +494,19 @@ msgstr "Citate" msgid "Everything else" msgstr "Orice altceva" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Friză cronologică principală" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Acasă" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Friză cronologică de cărți" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -511,91 +515,91 @@ msgstr "Friză cronologică de cărți" msgid "Books" msgstr "Cărți" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (engleză)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (catalană)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (germană)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (spaniolă)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (galiciană)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (italiană)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (finlandeză)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (franceză)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (lituaniană)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (norvegiană)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugheză braziliană)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugheză europeană)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (română)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (suedeză)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (chineză simplificată)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (chineză tradițională)" @@ -842,7 +846,7 @@ msgstr "Cea mai scurtă lectură a sa…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -915,57 +919,62 @@ msgstr "Născut:" msgid "Died:" msgstr "Mort:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serie:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Legături externe" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Vizualizați intrarea ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Încărcați date" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Vizualizați în OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Vizualizați în Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Vizualizați în LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Vizualizați în Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Cărți de %(name)s" @@ -1002,8 +1011,8 @@ msgid "Name:" msgstr "Nume:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Separați valori multiple prin virgulă." @@ -1040,7 +1049,8 @@ msgid "Openlibrary key:" msgstr "Cheie OpenLibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "ID Inventaire:" @@ -1049,7 +1059,7 @@ msgid "Librarything key:" msgstr "Cheie LibraryThing:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Cheie GoodReads:" @@ -1062,8 +1072,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1075,7 +1085,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1087,10 +1097,10 @@ msgstr "Salvați" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1100,7 +1110,7 @@ msgstr "Salvați" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1117,7 +1127,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Încărcatul de date se va conecta la %(source_name)s și verifica orice metadate despre autor care nu sunt prezente aici. Metadatele existente nu vor fi suprascrise." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1134,31 +1145,50 @@ msgstr "Confirmați" msgid "Unable to connect to remote source." msgstr "Nu s-a putut stabili conexiunea la distanță." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Editați carte" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Adăugați o copertă" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Eșec la încărcarea coperții" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Clic pentru a mări" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1166,17 +1196,17 @@ msgstr[0] "(%(review_count)s recenzie)" msgstr[1] "" msgstr[2] "(%(review_count)s recenzii)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Adăugați o descriere" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descriere:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1184,49 +1214,49 @@ msgstr[0] "%(count)s ediție" msgstr[1] "" msgstr[2] "%(count)s ediții" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Ați pus această ediție pe raftul:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "O ediție diferită a acestei cărți este pe %(shelf_name)s raftul vostru." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Activitatea dvs. de lectură" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Adăugați date de lectură" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Nu aveți nicio activitate de lectură pentru această carte." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Recenziile dvs." -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Comentariile dvs." -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Citatele dvs." -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Subiecte" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Locuri" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1241,15 +1271,15 @@ msgstr "Locuri" msgid "Lists" msgstr "Liste" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Adăugați la listă" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1272,25 +1302,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Număr OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1301,12 +1332,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1315,12 +1346,12 @@ msgid "Add cover" msgstr "Adăugați copertă" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Încărcați copertă:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1385,15 +1416,32 @@ msgstr "Acesta este un autor nou" msgid "Creating a new author: %(name)s" msgstr "Creați un autor nou: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Este această o ediție a unei opere existente?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Aceasta este o operă nouă" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1455,124 +1503,190 @@ msgstr "" msgid "Subtitle:" msgstr "Subtitlu:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Numărul din serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Limbi:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Subiecte:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Adăugați subiect" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Înlăturați subiect" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Adăugați un alt subiect" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Poziție:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publicație" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Editor:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Prima dată de publicare:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Data de publicare:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autori" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Înlăturați %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Pagina de autori pentru %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Adăugați autori:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Adaugă autor" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Necunoscut" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Adăugați un alt autor" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Copertă" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Proprietăți fizice" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Detalii de format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Pagini:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Date de identificare ale cărții" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "ID OpenLibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1759,19 +1873,11 @@ msgstr "Publicat în %(date)s" msgid "rated it" msgstr "a evaluat-o" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1816,7 +1922,7 @@ msgstr "Cod de confirmare:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Trimiteți" @@ -1877,7 +1983,7 @@ msgstr "Puteți să vă dezabonați în orice moment în se #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1973,21 +2079,22 @@ msgid "%(username)s started reading %(username)s a început să citească %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s a evaluat %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s a revizuit %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s a comentat despre %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s a citat %(book_title)s" @@ -2173,14 +2280,14 @@ msgstr "Nu există nicio activitate momentan! Încercați să urmăriți un util msgid "Alternatively, you can try enabling more status types" msgstr "Alternativ, puteți încerca să activați mai multe tipuri de statusuri" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Obiectivul de lectură din %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Puteți alege sau schimba obiectul dvs. de lectură oricând folosind pagina dvs. de profil" @@ -2468,6 +2575,10 @@ msgstr "Acest grup nu are nicio listă" msgid "Edit group" msgstr "Editați grupul" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Căutați pentru a adăuga un utilizator" @@ -3711,6 +3822,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Scanați codul de bare" @@ -4328,7 +4440,7 @@ msgstr[1] "" msgstr[2] "%(display_count)s noi rapoarte au nevoie de moderare" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Avertisment de conținut" @@ -4796,7 +4908,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Descărcați fișierul" @@ -4989,10 +5101,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Sunteți pe cale de a șterge acest rezumat și %(count)s actualizări asociate progresului." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Actualizați datele de lectură pentru „%(title)s”" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5046,6 +5157,11 @@ msgstr "Editați datele de lectură" msgid "Delete these read dates" msgstr "Ștergeți aceste date de lectură" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Actualizați datele de lectură pentru „%(title)s”" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5056,40 +5172,33 @@ msgstr "Adăugați date de lectură pentru „%(title)s”" msgid "Report" msgstr "Raportați" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -"Scanați codul de bare " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "În așteptarea camerei foto..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Acordați acces camerei foto pentru a scana codul de bare al cărții." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Camera foto nu a putut fi accesată" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Se scanează..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Poziționați codul de bare al cărții în fața camerei foto." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "Cod ISBN scanat" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Căutați o carte:" @@ -5192,13 +5301,13 @@ msgstr "Fals" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data de început:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data de sfârșit:" @@ -5572,7 +5681,7 @@ msgid "Dashboard" msgstr "Tablou de bord" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Număr total de utilizatori" @@ -5586,31 +5695,31 @@ msgstr "Activi această lună" msgid "Works" msgstr "Opere" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Activitatea instanței" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Interval:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Zile" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Săptămâni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Activitate de înscriere a utilizatorilor" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Activitate stare" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Opere create" @@ -5926,13 +6035,49 @@ msgid "Unable to save settings" msgstr "Incapabil de a salva setările" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6643,10 +6788,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7308,10 +7449,6 @@ msgstr "Citat:" msgid "An excerpt from '%(book_title)s'" msgstr "Un extras din „%(book_title)s”" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Poziție:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Pe pagină:" @@ -7324,12 +7461,12 @@ msgstr "Procent:" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Recenzia dvs. pentru „%(book_title)s”" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Recenzie:" @@ -7434,6 +7571,14 @@ msgstr[0] "a evaluat %(title)s: %(display_rati msgstr[1] "" msgstr[2] "a evaluat %(title)s: %(display_rating)s stele" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7647,35 +7792,35 @@ msgstr "Terminați de citit" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Arătați stare" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Deshideți imaginea într-o fereastră nouă" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Ascundeți starea" @@ -7734,16 +7879,22 @@ msgstr "a început să citească %(book)s de %(book)s" msgstr "a început să citească %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "a evaluat %(book)s de %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "a evaluat %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8025,15 +8176,23 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/ru_RU/LC_MESSAGES/django.po b/locale/ru_RU/LC_MESSAGES/django.po index d8c21672a4..c7705874da 100644 --- a/locale/ru_RU/LC_MESSAGES/django.po +++ b/locale/ru_RU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-06-08 03:17\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Russian\n" "Language: ru\n" @@ -19,7 +19,7 @@ msgstr "" #: bookwyrm/forms/admin.py:42 msgid "One Day" -msgstr "Один День" +msgstr "Один день" #: bookwyrm/forms/admin.py:43 msgid "One Week" @@ -99,7 +99,7 @@ msgstr "" #: bookwyrm/forms/lists.py:26 msgid "List Order" -msgstr "Список по-порядку" +msgstr "По порядку" #: bookwyrm/forms/lists.py:27 msgid "Book Title" @@ -107,7 +107,7 @@ msgstr "Название книги" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Оценка" @@ -121,7 +121,7 @@ msgstr "По возрастанию" #: bookwyrm/forms/lists.py:35 msgid "Descending" -msgstr "По убавынию" +msgstr "По убыванию" #: bookwyrm/models/announcement.py:12 msgid "Primary" @@ -175,55 +175,59 @@ msgstr "Удаление модератора" msgid "Domain block" msgstr "Доменная блокировка" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Аудиокнига" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Электронная книга" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Графический роман" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Твёрдая обложка" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Мягкая обложка" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 msgid "Comment" -msgstr "" +msgstr "Комментарий" #: bookwyrm/models/bookwyrm_import_job.py:152 #: bookwyrm/templates/import/import_status.html:127 #: bookwyrm/templates/import/manual_review.html:13 #: bookwyrm/templates/snippets/create_status.html:16 msgid "Review" -msgstr "" +msgstr "Рецензия" #: bookwyrm/models/bookwyrm_import_job.py:153 msgid "Quotation" -msgstr "" +msgstr "Цитата" #: bookwyrm/models/bookwyrm_import_job.py:181 #: bookwyrm/templates/snippets/follow_button.html:24 @@ -461,23 +465,23 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(display_name)s оценил(а) %(book_title)s: %(display_rating).1f звезда" +msgstr[1] "%(display_name)s оценил(а) %(book_title)s: %(display_rating).1f звезды" +msgstr[2] "%(display_name)s оценил(а) %(book_title)s: %(display_rating).1f звёзд" msgstr[3] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" -msgstr "Отзывы" +msgstr "Рецензии" #: bookwyrm/models/user.py:41 msgid "Comments" @@ -491,19 +495,19 @@ msgstr "Цитаты" msgid "Everything else" msgstr "Всё остальное" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" -msgstr "Главная Лента времени" +msgstr "Главная лента" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Главная" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Хронология книг" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -512,91 +516,91 @@ msgstr "Хронология книг" msgid "Books" msgstr "Книги" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (Английский)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Каталанский)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (немецкий)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Эсперанто)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (испанский)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Баскский)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Галицкий)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Итальянский)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Корейский)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Финский)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (французский)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (литовский)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Нидерланды (голландский)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (норвежский)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Польский)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Бразильский Португальский)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Европейский Португальский)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (румынский)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Шведский)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Украинский)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (упрощенный китайский)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Традиционный китайский)" @@ -845,7 +849,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -901,7 +905,7 @@ msgstr "" #: bookwyrm/templates/author/author.html:19 #: bookwyrm/templates/author/author.html:20 msgid "Edit Author" -msgstr "Изменить имя автора" +msgstr "Редактировать автора" #: bookwyrm/templates/author/author.html:36 msgid "Author details" @@ -910,7 +914,7 @@ msgstr "Об авторе" #: bookwyrm/templates/author/author.html:40 #: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" -msgstr "Алиасы:" +msgstr "Псевдонимы:" #: bookwyrm/templates/author/author.html:49 msgid "Born:" @@ -920,57 +924,62 @@ msgstr "Дата рождения:" msgid "Died:" msgstr "Дата смерти:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Цикл:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Внешние ссылки" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Википедия" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" -msgstr "" +msgstr "Посмотреть на Wikidata" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Сайт" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Просмотреть запись ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" -msgstr "" +msgstr "Посмотреть на ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Загрузить данные" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" -msgstr "Просмотреть на OpenLibrary" +msgstr "Посмотреть на OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Посмотреть на Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Посмотреть на LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Посмотреть на Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Книги по %(name)s" @@ -987,12 +996,12 @@ msgstr "Добавлено:" #: bookwyrm/templates/author/edit_author.html:14 #: bookwyrm/templates/book/edit/edit_book.html:28 msgid "Updated:" -msgstr "Обновленно:" +msgstr "Обновлено:" #: bookwyrm/templates/author/edit_author.html:16 #: bookwyrm/templates/book/edit/edit_book.html:32 msgid "Last edited by:" -msgstr "Последним редактировал:" +msgstr "Отредактировано:" #: bookwyrm/templates/author/edit_author.html:33 #: bookwyrm/templates/book/edit/edit_book_form.html:21 @@ -1007,8 +1016,8 @@ msgid "Name:" msgstr "Название:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Разделите несколько значений запятыми." @@ -1022,11 +1031,11 @@ msgstr "Ссылка на Википедию:" #: bookwyrm/templates/author/edit_author.html:58 msgid "Wikidata:" -msgstr "" +msgstr "Wikidata:" #: bookwyrm/templates/author/edit_author.html:62 msgid "Website:" -msgstr "" +msgstr "Сайт:" #: bookwyrm/templates/author/edit_author.html:67 msgid "Birth date:" @@ -1045,30 +1054,31 @@ msgid "Openlibrary key:" msgstr "Ключ OpenLibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" -msgstr "Идентификатор библио-сети Inventaire.io:" +msgstr "Inventaire ID:" #: bookwyrm/templates/author/edit_author.html:97 msgid "Librarything key:" msgstr "Ключ для Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads ключ:" #: bookwyrm/templates/author/edit_author.html:111 msgid "ISFDB:" -msgstr "" +msgstr "ISFDB:" #: bookwyrm/templates/author/edit_author.html:118 msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1080,7 +1090,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1092,10 +1102,10 @@ msgstr "Сохранить" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1105,7 +1115,7 @@ msgstr "Сохранить" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1122,7 +1132,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1139,101 +1150,120 @@ msgstr "Подтвердите" msgid "Unable to connect to remote source." msgstr "Не удается подключиться к удаленному источнику." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "Эта книга может входить в цикл %(series)s." + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "Отредактируйте страницу, чтобы подтвердить это." + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "Книга %(number)s в %(title)s" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Редактировать книгу" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Добавить обложку" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Ошибка загрузки обложки" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Нажмите, чтобы увеличить" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" -msgstr "" +msgstr "Посмотреть на Finna" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" -msgstr "" +msgstr "Посмотреть на Libris" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" -msgstr[0] "(Обзоров: %(review_count)s)" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "(%(review_count)s рецензия)" +msgstr[1] "(%(review_count)s рецензии)" +msgstr[2] "(%(review_count)s рецензий)" msgstr[3] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Добавить описание" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Описание:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" -msgstr[0] "%(count)s редакция" -msgstr[1] "%(count)s" -msgstr[2] "" +msgstr[0] "%(count)s издание" +msgstr[1] "%(count)s издания" +msgstr[2] "%(count)s изданий" msgstr[3] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Вы отложили это издание в:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Ваша активность по чтению" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Добавить даты прочтения" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "У вас нет активности по чтению для этой книги." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" -msgstr "Ваши отзывы" +msgstr "Мои рецензии" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Ваши комментарии" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" -msgstr "Ваши цитаты" +msgstr "Мои цитаты" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Жанры" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Места" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1246,17 +1276,17 @@ msgstr "Места" #: bookwyrm/templates/settings/celery.html:77 #: bookwyrm/templates/user/layout.html:101 bookwyrm/templates/user/lists.html:6 msgid "Lists" -msgstr "Списки" +msgstr "Подборки" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Добавить в список" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." -msgstr "" +msgstr "Создать список..." -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1279,28 +1309,29 @@ msgid "Copied ISBN!" msgstr "ISBN скопирован!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC номер:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN (Стандартный идентификационный номер Amazon):" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" -msgstr "" +msgstr "ISFDB ID:" #: bookwyrm/templates/book/book_identifiers.html:51 #: bookwyrm/templates/rss/edition.html:10 @@ -1308,28 +1339,28 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" -msgstr "" +msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" -msgstr "" +msgstr "Libris ID:" #: bookwyrm/templates/book/cover_add_modal.html:5 msgid "Add cover" msgstr "Добавить обложку" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Загрузить свою обложку:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" -msgstr "" +msgstr "Загрузить обложку по ссылке:" #: bookwyrm/templates/book/cover_show_modal.html:6 msgid "Book cover preview" @@ -1392,15 +1423,32 @@ msgstr "Это новый автор" msgid "Creating a new author: %(name)s" msgstr "Создание нового автора: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Является ли это изданием существующей работы?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Это новая работа" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1462,124 +1510,190 @@ msgstr "Сортировка по названию:" msgid "Subtitle:" msgstr "Подзаголовок:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Серии:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Номер серии:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Языки:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Жанры:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Добавить жанр" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Удалить жанр" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Добавить ещё жанр" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "Цикл" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "Изменить цикл" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "Добавить цикл" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "Название цикла:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Публикация" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Издатель:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Дата первой публикации:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Дата публикации:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Авторы" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Убрать %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Страница автора для %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Добавить авторов:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Добавить автора" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Джейн До" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Добавить другого автора" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Обложка" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Физические свойства" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Формат:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Детали формата:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" -msgstr "Страницы:" +msgstr "Страниц:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Идентификаторы книги" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Идентификатор OpenLibrary:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "Изменить «%(title)s»" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "Изменить «%(name)s»" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Название" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "Добавить альтернативное название:" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "Добавить альтернативное название" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "Wikidata ID:" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1614,7 +1728,7 @@ msgstr "Поиск редакций" #: bookwyrm/templates/book/file_links/add_link_modal.html:6 msgid "Add file link" -msgstr "" +msgstr "Добавить ссылку на файл" #: bookwyrm/templates/book/file_links/add_link_modal.html:19 msgid "Links from unknown domains will need to be approved by a moderator before they are added." @@ -1712,7 +1826,7 @@ msgstr "" #: bookwyrm/templates/book/file_links/links.html:9 msgid "Get a copy" -msgstr "" +msgstr "Получить копию" #: bookwyrm/templates/book/file_links/links.html:47 msgid "No links available" @@ -1766,18 +1880,10 @@ msgstr "Опубликовано %(date)s" msgid "rated it" msgstr "оценил(а) на" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" +msgstr "Книга %(series_number)s" #: bookwyrm/templates/book/sync_modal.html:15 #, python-format @@ -1786,15 +1892,15 @@ msgstr "" #: bookwyrm/templates/compose.html:7 bookwyrm/templates/compose.html:21 msgid "Edit review" -msgstr "" +msgstr "Редактировать рецензию" #: bookwyrm/templates/compose.html:9 bookwyrm/templates/compose.html:23 msgid "Edit quote" -msgstr "" +msgstr "Редактировать цитату" #: bookwyrm/templates/compose.html:11 bookwyrm/templates/compose.html:25 msgid "Edit comment" -msgstr "" +msgstr "Редактировать комментарий" #: bookwyrm/templates/compose.html:13 bookwyrm/templates/compose.html:27 msgid "Edit status" @@ -1823,7 +1929,7 @@ msgstr "Код подтверждения:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Отправить" @@ -1867,15 +1973,15 @@ msgstr "Федеративное сообщество" #: bookwyrm/templates/directory/directory.html:9 #: bookwyrm/templates/user_menu.html:34 msgid "Directory" -msgstr "Каталог" +msgstr "Каталог профилей" #: bookwyrm/templates/directory/directory.html:17 msgid "Make your profile discoverable to other BookWyrm users." -msgstr "Сделайте свой профиль обнаруживаемым для других пользователей BookWyrm." +msgstr "Сделайте свой профиль заметным для других пользователей BookWyrm." #: bookwyrm/templates/directory/directory.html:21 msgid "Join Directory" -msgstr "Войти в каталог" +msgstr "Присоединиться к Народу" #: bookwyrm/templates/directory/directory.html:24 #, python-format @@ -1884,7 +1990,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1939,7 +2045,7 @@ msgstr "" #: bookwyrm/templates/directory/user_card.html:61 msgid "last active" -msgstr "" +msgstr "последняя активность" #: bookwyrm/templates/directory/user_connection_filter.html:5 #: bookwyrm/templates/import/user_troubleshoot.html:65 @@ -1960,7 +2066,7 @@ msgstr "" #: bookwyrm/templates/directory/user_type_filter.html:8 msgid "BookWyrm users" -msgstr "" +msgstr "Пользователи BookWyrm" #: bookwyrm/templates/directory/user_type_filter.html:12 msgid "All known users" @@ -1974,7 +2080,7 @@ msgstr "%(username)s хочет прочитать #: bookwyrm/templates/discover/card-header.html:13 #, python-format msgid "%(username)s finished reading %(book_title)s" -msgstr "" +msgstr "%(username)s дочитал(а) %(book_title)s" #: bookwyrm/templates/discover/card-header.html:18 #, python-format @@ -1982,21 +2088,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" -msgstr "" +msgstr "%(username)s прокомментировал(а) %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s процитировал %(book_title)s" @@ -2005,12 +2112,12 @@ msgstr "%(username)s процитировал profile page" msgstr "" @@ -2202,7 +2309,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/home.html:127 #: bookwyrm/templates/layout.html:94 msgid "Your Books" -msgstr "Ваши книги" +msgstr "Мои Книги" #: bookwyrm/templates/feed/suggested_books.html:10 msgid "There are no books here right now! Try searching for a book to get started" @@ -2227,7 +2334,7 @@ msgstr "" #: bookwyrm/templates/feed/suggested_users.html:14 msgid "View directory" -msgstr "" +msgstr "Посмотреть народ" #: bookwyrm/templates/feed/summary_card.html:21 msgid "The end of the year is the best moment to take stock of all the books read during the last 12 months. How many pages have you read? Which book is your best-rated of the year? We compiled these stats, and more!" @@ -2245,7 +2352,7 @@ msgstr "" #: bookwyrm/templates/get_started/book_preview.html:7 msgid "Add to your books" -msgstr "" +msgstr "Добавить к моим книгам" #: bookwyrm/templates/get_started/book_preview.html:10 #: bookwyrm/templates/shelf/shelf.html:93 bookwyrm/templates/user/user.html:46 @@ -2445,11 +2552,11 @@ msgstr "Удалить" #: bookwyrm/templates/groups/edit_form.html:5 msgid "Edit Group" -msgstr "Править группу" +msgstr "Редактировать группу" #: bookwyrm/templates/groups/form.html:8 msgid "Group Name:" -msgstr "Имя группы:" +msgstr "Название группы:" #: bookwyrm/templates/groups/form.html:12 msgid "Group Description:" @@ -2467,7 +2574,7 @@ msgstr "Члены этой группы могут создавать кури #: bookwyrm/templates/lists/create_form.html:5 #: bookwyrm/templates/lists/lists.html:20 msgid "Create List" -msgstr "Создать список" +msgstr "Создать Подборку" #: bookwyrm/templates/groups/group.html:39 msgid "This group has no lists" @@ -2477,6 +2584,10 @@ msgstr "В этой группе нет списков" msgid "Edit group" msgstr "Править группу" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "Участники группы" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -2547,7 +2658,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_groups.html:19 #: bookwyrm/templates/guided_tour/user_profile.html:19 msgid "End Tour" -msgstr "" +msgstr "Завершить Тур" #: bookwyrm/templates/guided_tour/book.html:26 #: bookwyrm/templates/guided_tour/book.html:50 @@ -2596,7 +2707,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_profile.html:118 #: bookwyrm/templates/snippets/pagination.html:30 msgid "Next" -msgstr "Следующая" +msgstr "Далее" #: bookwyrm/templates/guided_tour/book.html:31 msgid "This is where you can set a reading status for this book. You can press the button to move to the next stage, or use the drop down button to select the reading status you want to set." @@ -2620,7 +2731,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/book.html:80 msgid "Other editions" -msgstr "" +msgstr "Другие издания" #: bookwyrm/templates/guided_tour/book.html:102 msgid "You can post a review, comment, or quote here." @@ -2692,7 +2803,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_groups.html:116 #: bookwyrm/templates/guided_tour/user_profile.html:141 msgid "Ok" -msgstr "" +msgstr "Понятно" #: bookwyrm/templates/guided_tour/group.html:10 msgid "Welcome to the page for your group! This is where you can add and remove users, create user-curated lists, and edit the group details." @@ -2728,11 +2839,11 @@ msgstr "" #: bookwyrm/templates/guided_tour/group.html:100 msgid "Congratulations, you've finished the tour! Now you know the basics, but there is lots more to explore on your own. Happy reading!" -msgstr "" +msgstr "Поздравляем, вы завершили тур! Теперь вы знаете основы, но вам ещё предстоит многое открыть для себя самостоятельно. Приятного чтения!" #: bookwyrm/templates/guided_tour/group.html:115 msgid "End tour" -msgstr "" +msgstr "Завершить Тур" #: bookwyrm/templates/guided_tour/home.html:16 msgid "Welcome to Bookwyrm!

      Would you like to take the guided tour to help you get started?" @@ -2742,16 +2853,16 @@ msgstr "" #: bookwyrm/templates/guided_tour/home.html:39 #: bookwyrm/templates/snippets/footer.html:20 msgid "Guided Tour" -msgstr "" +msgstr "Тур по сайту" #: bookwyrm/templates/guided_tour/home.html:25 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:36 msgid "No thanks" -msgstr "" +msgstr "Нет, спасибо" #: bookwyrm/templates/guided_tour/home.html:33 msgid "Yes please!" -msgstr "" +msgstr "Да, пожалуйста!" #: bookwyrm/templates/guided_tour/home.html:38 msgid "If you ever change your mind, just click on the Guided Tour link to start your tour" @@ -2771,7 +2882,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/home.html:80 msgid "Barcode reader" -msgstr "" +msgstr "Сканер штрих-кода" #: bookwyrm/templates/guided_tour/home.html:102 msgid "Use the Lists, Discover, and Your Books links to discover reading suggestions and the latest happenings on this server, or to see your catalogued books!" @@ -2779,7 +2890,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/home.html:103 msgid "Navigation Bar" -msgstr "" +msgstr "Панель навигации" #: bookwyrm/templates/guided_tour/home.html:126 msgid "Books on your reading status shelves will be shown here." @@ -2791,7 +2902,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/home.html:152 msgid "Timelines" -msgstr "" +msgstr "Ленты" #: bookwyrm/templates/guided_tour/home.html:176 msgid "The bell will light up when you have a new notification. When it does, click on it to find out what exciting thing has happened!" @@ -2815,7 +2926,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/home.html:201 msgid "Profile and settings menu" -msgstr "" +msgstr "Меню профиля и настроек" #: bookwyrm/templates/guided_tour/lists.html:13 msgid "This is the lists page where you can discover book lists created by any user. A List is a collection of books, similar to a shelf." @@ -2827,16 +2938,16 @@ msgstr "" #: bookwyrm/templates/guided_tour/lists.html:34 msgid "Let's see how to create a new list." -msgstr "" +msgstr "Давайте посмотрим, как создать подборку." #: bookwyrm/templates/guided_tour/lists.html:34 msgid "Click the Create List button, then Next to continue the tour" -msgstr "" +msgstr "Нажмите кнопку Создать Подборку, а затем Далее, чтобы продолжить тур" #: bookwyrm/templates/guided_tour/lists.html:35 #: bookwyrm/templates/guided_tour/lists.html:59 msgid "Creating a new list" -msgstr "" +msgstr "Создание подборки" #: bookwyrm/templates/guided_tour/lists.html:58 msgid "You must give your list a name and can optionally give it a description to help other people understand what your list is about." @@ -2864,7 +2975,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/lists.html:129 msgid "Next: Groups" -msgstr "" +msgstr "Далее: Группы" #: bookwyrm/templates/guided_tour/lists.html:143 msgid "Take me there" @@ -2922,7 +3033,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_books.html:11 #: bookwyrm/templates/user/books_header.html:4 msgid "Your books" -msgstr "" +msgstr "Мои книги" #: bookwyrm/templates/guided_tour/user_books.html:31 msgid "To Read, Currently Reading, Read, and Stopped Reading are default shelves. When you change the reading status of a book it will automatically be moved to the matching shelf. A book can only be on one default shelf at a time." @@ -2969,11 +3080,11 @@ msgstr "Группы" #: bookwyrm/templates/guided_tour/user_groups.html:31 msgid "Let's create a new group!" -msgstr "" +msgstr "Давайте создадим группу!" #: bookwyrm/templates/guided_tour/user_groups.html:31 msgid "Click the Create group button, then Next to continue the tour" -msgstr "" +msgstr "Нажмите кнопку Создать группу, а затем Далее, чтобы продолжить тур" #: bookwyrm/templates/guided_tour/user_groups.html:55 msgid "Give your group a name and describe what it is about. You can make user groups for any purpose - a reading group, a bunch of friends, whatever!" @@ -2981,7 +3092,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_groups.html:56 msgid "Creating a group" -msgstr "" +msgstr "Создание группы" #: bookwyrm/templates/guided_tour/user_groups.html:78 msgid "Groups have privacy settings just like posts and lists, except that group privacy cannot be Followers." @@ -2989,7 +3100,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_groups.html:79 msgid "Group visibility" -msgstr "" +msgstr "Видимость группы" #: bookwyrm/templates/guided_tour/user_groups.html:102 msgid "Once you're happy with how everything is set up, click the Save button to create your new group." @@ -3001,7 +3112,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_groups.html:103 msgid "Save your group" -msgstr "" +msgstr "Сохраните свою группу" #: bookwyrm/templates/guided_tour/user_profile.html:10 msgid "This is your user profile. All your latest activities will be listed here. Other Bookwyrm users can see parts of this page too - what they can see depends on your privacy settings." @@ -3010,7 +3121,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_profile.html:11 #: bookwyrm/templates/user/layout.html:20 bookwyrm/templates/user/user.html:14 msgid "User Profile" -msgstr "" +msgstr "Профиль пользователя" #: bookwyrm/templates/guided_tour/user_profile.html:31 msgid "This tab shows everything you have read towards your annual reading goal, or allows you to set one. You don't have to set a reading goal if that's not your thing!" @@ -3023,7 +3134,7 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_profile.html:54 msgid "Here you can see your groups, or create a new one. A group brings together Bookwyrm users and allows them to curate lists together." -msgstr "" +msgstr "Здесь вы можете просмотреть свои группы или создать новую. Группа объединяет пользователей Bookwyrm и позволяет им совместно составлять подборки." #: bookwyrm/templates/guided_tour/user_profile.html:77 msgid "You can see your lists, or create a new one, here. A list is a collection of books that have something in common." @@ -3096,31 +3207,31 @@ msgstr "Источник данных:" #: bookwyrm/templates/import/import.html:58 msgid "Goodreads (CSV)" -msgstr "" +msgstr "Goodreads (CSV)" #: bookwyrm/templates/import/import.html:61 msgid "Storygraph (CSV)" -msgstr "" +msgstr "Storygraph (CSV)" #: bookwyrm/templates/import/import.html:64 msgid "LibraryThing (TSV)" -msgstr "" +msgstr "LibraryThing (TSV)" #: bookwyrm/templates/import/import.html:67 msgid "OpenLibrary (CSV)" -msgstr "" +msgstr "OpenLibrary (CSV)" #: bookwyrm/templates/import/import.html:70 msgid "OpenReads (CSV)" -msgstr "" +msgstr "OpenReads (CSV)" #: bookwyrm/templates/import/import.html:73 msgid "Calibre (CSV)" -msgstr "" +msgstr "Calibre (CSV)" #: bookwyrm/templates/import/import.html:76 msgid "BookWyrm (CSV)" -msgstr "" +msgstr "BookWyrm (CSV)" #: bookwyrm/templates/import/import.html:82 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." @@ -3277,7 +3388,7 @@ msgstr "ISBN" #: bookwyrm/templates/import/import_status.html:117 msgid "Openlibrary key" -msgstr "" +msgstr "Ключ OpenLibrary" #: bookwyrm/templates/import/import_status.html:121 #: bookwyrm/templates/shelf/shelf.html:157 @@ -3294,7 +3405,7 @@ msgstr "Полка" #: bookwyrm/templates/import/user_troubleshoot.html:59 #: bookwyrm/templates/settings/link_domains/link_table.html:9 msgid "Book" -msgstr "" +msgstr "Книга" #: bookwyrm/templates/import/import_status.html:142 msgid "Import preview unavailable." @@ -3356,7 +3467,7 @@ msgstr "" #: bookwyrm/templates/import/import_user.html:56 msgid "Step 1:" -msgstr "" +msgstr "Шаг 1:" #: bookwyrm/templates/import/import_user.html:58 msgid "Select an export file generated from another BookWyrm account. The file format should be .tar.gz." @@ -3364,7 +3475,7 @@ msgstr "" #: bookwyrm/templates/import/import_user.html:73 msgid "Step 2:" -msgstr "" +msgstr "Шаг 2:" #: bookwyrm/templates/import/import_user.html:75 msgid "Deselect any checkboxes for data you do not wish to include in your import." @@ -3376,7 +3487,7 @@ msgstr "" #: bookwyrm/templates/user/relationships/followers.html:18 #: bookwyrm/templates/user/relationships/following.html:18 msgid "User profile" -msgstr "" +msgstr "Профиль пользователя" #: bookwyrm/templates/import/import_user.html:89 msgid "Overwrites display name, summary, and avatar" @@ -3412,7 +3523,7 @@ msgstr "" #: bookwyrm/templates/import/import_user.html:116 msgid "Your timezone" -msgstr "" +msgstr "Ваш часовой пояс" #: bookwyrm/templates/import/import_user.html:119 msgid "Your default post privacy setting" @@ -3438,12 +3549,12 @@ msgstr "" #: bookwyrm/templates/import/import_user.html:145 #: bookwyrm/templates/preferences/export-user.html:24 msgid "Shelves" -msgstr "" +msgstr "Полки" #: bookwyrm/templates/import/import_user.html:148 #: bookwyrm/templates/preferences/export-user.html:25 msgid "Reading history" -msgstr "" +msgstr "История чтения" #: bookwyrm/templates/import/import_user.html:151 #: bookwyrm/templates/preferences/export-user.html:26 @@ -3460,7 +3571,7 @@ msgstr "" #: bookwyrm/templates/import/import_user.html:163 msgid "Saved lists" -msgstr "" +msgstr "Сохранённые Подборки" #: bookwyrm/templates/import/manual_review.html:5 #: bookwyrm/templates/import/troubleshoot.html:4 @@ -3609,7 +3720,7 @@ msgstr "Подтвердить пароль:" #: bookwyrm/templates/landing/login.html:50 #: bookwyrm/templates/landing/reactivate.html:43 msgid "Create an Account" -msgstr "" +msgstr "Создать учётную запись" #: bookwyrm/templates/landing/invite.html:22 msgid "Sorry! This invite code is no longer valid." @@ -3625,7 +3736,7 @@ msgstr "Децентрализовано" #: bookwyrm/templates/landing/layout.html:23 msgid "Friendly" -msgstr "" +msgstr "Дружелюбный" #: bookwyrm/templates/landing/layout.html:29 msgid "Anti-Corporate" @@ -3725,6 +3836,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Сканировать штрих-код" @@ -3738,7 +3850,7 @@ msgstr "пароль" #: bookwyrm/templates/layout.html:136 msgid "Show/Hide password" -msgstr "" +msgstr "Показать/Скрыть пароль" #: bookwyrm/templates/layout.html:150 msgid "Join" @@ -3886,7 +3998,7 @@ msgstr "" #: bookwyrm/templates/lists/form.html:105 msgid "You don't have any Groups yet!" -msgstr "" +msgstr "У вас пока нет групп!" #: bookwyrm/templates/lists/form.html:107 msgid "Create a Group" @@ -3923,16 +4035,16 @@ msgstr "" #: bookwyrm/templates/lists/list.html:104 msgid "Edit notes" -msgstr "" +msgstr "Редактировать примечание" #: bookwyrm/templates/lists/list.html:119 msgid "Add notes" -msgstr "" +msgstr "Добавить примечание" #: bookwyrm/templates/lists/list.html:131 #, python-format msgid "Added by %(username)s" -msgstr "" +msgstr "Добавлено %(username)s" #: bookwyrm/templates/lists/list.html:146 msgid "List position" @@ -3943,13 +4055,13 @@ msgstr "" #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" -msgstr "" +msgstr "Задать" #: bookwyrm/templates/lists/list.html:167 #: bookwyrm/templates/snippets/remove_follower_button.html:4 #: bookwyrm/templates/snippets/remove_from_group_button.html:20 msgid "Remove" -msgstr "" +msgstr "Убрать" #: bookwyrm/templates/lists/list.html:181 #: bookwyrm/templates/lists/list.html:198 @@ -3974,7 +4086,7 @@ msgstr "поиск" #: bookwyrm/templates/lists/list.html:224 msgid "Clear search" -msgstr "" +msgstr "Очистить поиск" #: bookwyrm/templates/lists/list.html:229 #, python-format @@ -4000,19 +4112,19 @@ msgstr "" #: bookwyrm/templates/lists/list_items.html:50 msgid "No lists found." -msgstr "Списки не нашлись." +msgstr "Подборок не найдено." #: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:14 msgid "Your Lists" -msgstr "Ваши списки" +msgstr "Мои Подборки" #: bookwyrm/templates/lists/lists.html:36 msgid "All Lists" -msgstr "Все списки" +msgstr "Все Подборки" #: bookwyrm/templates/lists/lists.html:40 msgid "Saved Lists" -msgstr "Сохранённые списки" +msgstr "Сохранённые Подборки" #: bookwyrm/templates/moved.html:27 #, python-format @@ -4347,7 +4459,7 @@ msgstr[2] "" msgstr[3] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4378,11 +4490,11 @@ msgstr "" #: bookwyrm/templates/notifications/notifications_page.html:19 msgid "Delete notifications" -msgstr "" +msgstr "Удалить уведомления" #: bookwyrm/templates/notifications/notifications_page.html:31 msgid "All" -msgstr "" +msgstr "Все" #: bookwyrm/templates/notifications/notifications_page.html:35 msgid "Mentions" @@ -4624,7 +4736,7 @@ msgstr "" #: bookwyrm/templates/preferences/edit_user.html:7 #: bookwyrm/templates/preferences/layout.html:15 msgid "Edit Profile" -msgstr "" +msgstr "Изменить Профиль" #: bookwyrm/templates/preferences/edit_user.html:12 #: bookwyrm/templates/preferences/edit_user.html:25 @@ -4639,12 +4751,12 @@ msgstr "Профиль" #: bookwyrm/templates/settings/site.html:89 #: bookwyrm/templates/setup/config.html:85 msgid "Display" -msgstr "" +msgstr "Видимость" #: bookwyrm/templates/preferences/edit_user.html:14 #: bookwyrm/templates/preferences/edit_user.html:118 msgid "Privacy" -msgstr "" +msgstr "Приватность" #: bookwyrm/templates/preferences/edit_user.html:69 msgid "Show reading goal prompt in feed" @@ -4652,7 +4764,7 @@ msgstr "" #: bookwyrm/templates/preferences/edit_user.html:75 msgid "Show ratings" -msgstr "" +msgstr "Показать оценки" #: bookwyrm/templates/preferences/edit_user.html:81 msgid "Show suggested users" @@ -4685,7 +4797,7 @@ msgstr "Скрыть подписчиков и подписки в профил #: bookwyrm/templates/preferences/edit_user.html:134 msgid "Default post privacy:" -msgstr "" +msgstr "Приватность поста по умолчанию:" #: bookwyrm/templates/preferences/edit_user.html:142 #, python-format @@ -4816,13 +4928,13 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Загрузить файл" #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" -msgstr "" +msgstr "Учётная запись" #: bookwyrm/templates/preferences/layout.html:24 msgid "Security Settings" @@ -4961,19 +5073,19 @@ msgstr "" #: bookwyrm/templates/preferences/security.html:129 msgid "Web Browser" -msgstr "" +msgstr "Браузер" #: bookwyrm/templates/preferences/security.html:129 msgid "Browser" -msgstr "" +msgstr "Браузер" #: bookwyrm/templates/preferences/security.html:143 msgid "You" -msgstr "" +msgstr "Вы" #: bookwyrm/templates/preferences/security.html:147 msgid "Log Out" -msgstr "" +msgstr "Выйти" #: bookwyrm/templates/preferences/security.html:161 msgid "Currently your logged-in sessions are unable to be displayed." @@ -5009,9 +5121,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5066,6 +5177,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5076,41 +5192,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Сканировать штрих-код\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Запрос камеры..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Предоставьте доступ к камере для сканирования штрих-кода книги." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Не удалось получить доступ к камере" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Сканирую..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Соедините штрих-код вашей книги с камерой." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN просканирован" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Искать книгу:" @@ -5135,7 +5243,7 @@ msgstr "" #: bookwyrm/templates/search/book.html:89 msgid "Import book" -msgstr "" +msgstr "Импортировать книгу" #: bookwyrm/templates/search/book.html:113 msgid "Load results from other catalogues" @@ -5166,7 +5274,7 @@ msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:5 #: bookwyrm/templates/settings/users/user_admin.html:12 msgid "Users" -msgstr "" +msgstr "Пользователи" #: bookwyrm/templates/search/layout.html:63 #, python-format @@ -5215,13 +5323,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5447,7 +5555,7 @@ msgstr "Предлагаемые пользователи" #: bookwyrm/templates/settings/invites/manage_invite_requests.html:43 #: bookwyrm/templates/settings/users/email_filter.html:5 msgid "Email" -msgstr "" +msgstr "Электронная почта" #: bookwyrm/templates/settings/celery.html:89 msgid "Misc" @@ -5534,7 +5642,7 @@ msgstr "" #: bookwyrm/templates/settings/connectors/available.html:32 msgid "Create new connector" -msgstr "" +msgstr "Создать коннектор" #: bookwyrm/templates/settings/connectors/connector.html:35 #: bookwyrm/templates/settings/connectors/update.html:33 @@ -5555,7 +5663,7 @@ msgstr "" #: bookwyrm/templates/settings/connectors/connectors.html:4 #: bookwyrm/templates/settings/connectors/connectors.html:6 msgid "Connector Settings" -msgstr "" +msgstr "Настройки коннектора" #: bookwyrm/templates/settings/connectors/connectors.html:11 msgid "Connectors are sources of data about books and authors." @@ -5595,7 +5703,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5609,31 +5717,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Дни" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Недели" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5953,13 +6061,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6670,10 +6814,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -6921,7 +7061,7 @@ msgstr "Удаленные пользователи" #: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" -msgstr "" +msgstr "Имя пользователя" #: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" @@ -6929,7 +7069,7 @@ msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" -msgstr "" +msgstr "Последняя активность" #: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" @@ -7251,7 +7391,7 @@ msgstr[3] "" #: bookwyrm/templates/snippets/book_cover.html:63 msgid "No cover" -msgstr "" +msgstr "Без обложки" #: bookwyrm/templates/snippets/book_titleby.html:11 #, python-format @@ -7266,7 +7406,7 @@ msgstr "Продвинуть" #: bookwyrm/templates/snippets/boost_button.html:33 #: bookwyrm/templates/snippets/boost_button.html:34 msgid "Un-boost" -msgstr "" +msgstr "Задвинуть" #: bookwyrm/templates/snippets/create_status.html:36 msgid "Quote" @@ -7326,7 +7466,7 @@ msgstr "Комментарий:" #: bookwyrm/templates/snippets/create_status/post_options_block.html:21 msgid "Post" -msgstr "" +msgstr "Опубликовать" #: bookwyrm/templates/snippets/create_status/quotation.html:16 msgid "Quote:" @@ -7337,10 +7477,6 @@ msgstr "Цитата:" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7353,24 +7489,24 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Отзыв:" #: bookwyrm/templates/snippets/fav_button.html:16 #: bookwyrm/templates/snippets/fav_button.html:17 msgid "Like" -msgstr "Лайк" +msgstr "Любо" #: bookwyrm/templates/snippets/fav_button.html:30 #: bookwyrm/templates/snippets/fav_button.html:31 msgid "Un-like" -msgstr "Снять лайк" +msgstr "Уже не любо" #: bookwyrm/templates/snippets/filters_panel/filters_panel.html:5 msgid "Filters" @@ -7428,15 +7564,15 @@ msgstr "Исходный код BookWyrm находится в свободно #: bookwyrm/templates/snippets/form_rate_stars.html:20 #: bookwyrm/templates/snippets/stars.html:38 msgid "No rating" -msgstr "" +msgstr "Без оценки" #: bookwyrm/templates/snippets/form_rate_stars.html:28 #, python-format msgid "%(half_rating)s star" msgid_plural "%(half_rating)s stars" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(half_rating)s звезда" +msgstr[1] "%(half_rating)s звезды" +msgstr[2] "%(half_rating)s звёзд" msgstr[3] "" #: bookwyrm/templates/snippets/form_rate_stars.html:64 @@ -7444,42 +7580,51 @@ msgstr[3] "" #, python-format msgid "%(rating)s star" msgid_plural "%(rating)s stars" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "%(rating)s звезда" +msgstr[1] "%(rating)s звезды" +msgstr[2] "%(rating)s звёзд" msgstr[3] "" #: bookwyrm/templates/snippets/generated_status/goal.html:2 #, python-format msgid "set a goal to read %(counter)s book in %(year)s" msgid_plural "set a goal to read %(counter)s books in %(year)s" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "поставил(а) цель прочитать %(counter)s книгу в %(year)s" +msgstr[1] "поставил(а) цель прочитать %(counter)s книги в %(year)s" +msgstr[2] "поставил(а) цель прочитать %(counter)s книг в %(year)s" msgstr[3] "" #: bookwyrm/templates/snippets/generated_status/rating.html:3 #, python-format msgid "rated %(title)s: %(display_rating)s star" msgid_plural "rated %(title)s: %(display_rating)s stars" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "оценил(а) %(title)s: %(display_rating)s звезда" +msgstr[1] "оценил(а) %(title)s: %(display_rating)s звезды" +msgstr[2] "оценил(а) %(title)s: %(display_rating)s звёзд" +msgstr[3] "" + +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "Оценил(а) «%(book_title)s» %(display_rating)s звезда %(review_title)s" +msgstr[1] "Оценил(а) «%(book_title)s» %(display_rating)s звезды %(review_title)s" +msgstr[2] "Оценил(а) «%(book_title)s» %(display_rating)s звёзд %(review_title)s" msgstr[3] "" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "Рецензия на «%(book_title)s» (%(display_rating)s звезда): %(review_title)s" +msgstr[1] "Рецензия на «%(book_title)s» (%(display_rating)s звезды): %(review_title)s" +msgstr[2] "Рецензия на «%(book_title)s» (%(display_rating)s звёзд): %(review_title)s" msgstr[3] "" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:12 #, python-format msgid "Review of \"%(book_title)s\": %(review_title)s" -msgstr "" +msgstr "Рецензия на «%(book_title)s»: %(review_title)s" #: bookwyrm/templates/snippets/goal_form.html:4 #, python-format @@ -7492,7 +7637,7 @@ msgstr "" #: bookwyrm/templates/snippets/goal_form.html:21 msgid "books" -msgstr "" +msgstr "книги" #: bookwyrm/templates/snippets/goal_form.html:26 msgid "Goal privacy:" @@ -7643,19 +7788,19 @@ msgstr "Подробнее об этой жалобе:" #: bookwyrm/templates/snippets/shelf_selector.html:7 msgid "Move book" -msgstr "" +msgstr "Переместить книгу" #: bookwyrm/templates/snippets/shelf_selector.html:38 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:33 msgid "Start reading" -msgstr "" +msgstr "Начать чтение" #: bookwyrm/templates/snippets/shelf_selector.html:60 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:38 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:55 msgid "Want to read" -msgstr "" +msgstr "Хочу прочитать" #: bookwyrm/templates/snippets/shelf_selector.html:81 #: bookwyrm/templates/snippets/shelf_selector.html:95 @@ -7671,7 +7816,7 @@ msgstr "" #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:31 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48 msgid "Stop reading" -msgstr "Остановка чтения" +msgstr "Остановить чтение" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:40 msgid "Finish reading" @@ -7679,54 +7824,54 @@ msgstr "" #: bookwyrm/templates/snippets/stars.html:13 msgid "Show rating" -msgstr "" +msgstr "Показать оценку" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" #: bookwyrm/templates/snippets/status/header.html:45 #, python-format msgid "edited %(date)s" -msgstr "" +msgstr "изменено %(date)s" #: bookwyrm/templates/snippets/status/headers/comment.html:8 #, python-format msgid "commented on %(book)s by %(author_name)s" -msgstr "" +msgstr "прокомментировал(а) %(book)s от %(author_name)s" #: bookwyrm/templates/snippets/status/headers/comment.html:15 #, python-format msgid "commented on %(book)s" -msgstr "" +msgstr "прокомментировал(а) %(book)s" #: bookwyrm/templates/snippets/status/headers/note.html:8 #, python-format @@ -7736,27 +7881,27 @@ msgstr "" #: bookwyrm/templates/snippets/status/headers/quotation.html:8 #, python-format msgid "quoted %(book)s by %(author_name)s" -msgstr "" +msgstr "процитировал(а) %(book)s от %(author_name)s" #: bookwyrm/templates/snippets/status/headers/quotation.html:15 #, python-format msgid "quoted %(book)s" -msgstr "" +msgstr "процитировал(а) %(book)s" #: bookwyrm/templates/snippets/status/headers/rating.html:3 #, python-format msgid "rated %(book)s:" -msgstr "" +msgstr "оценил(а) %(book)s:" #: bookwyrm/templates/snippets/status/headers/read.html:10 #, python-format msgid "finished reading %(book)s by %(author_name)s" -msgstr "" +msgstr "дочитал(а) %(book)s от %(author_name)s" #: bookwyrm/templates/snippets/status/headers/read.html:17 #, python-format msgid "finished reading %(book)s" -msgstr "" +msgstr "дочитал(а) %(book)s" #: bookwyrm/templates/snippets/status/headers/reading.html:10 #, python-format @@ -7768,16 +7913,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "оценил(а) %(book)s" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7801,7 +7952,7 @@ msgstr "хочет прочитать %(book)s" #: bookwyrm/templates/snippets/status/layout.html:24 #: bookwyrm/templates/snippets/status/status_options.html:17 msgid "Delete status" -msgstr "" +msgstr "Удалить статус" #: bookwyrm/templates/snippets/status/layout.html:57 #: bookwyrm/templates/snippets/status/layout.html:58 @@ -7815,7 +7966,7 @@ msgstr "" #: bookwyrm/templates/snippets/status/status.html:10 msgid "boosted" -msgstr "" +msgstr "продвинул(а)" #: bookwyrm/templates/snippets/status/status_options.html:7 #: bookwyrm/templates/snippets/user_options.html:7 @@ -7905,12 +8056,12 @@ msgstr "" #: bookwyrm/templates/user/groups.html:14 msgid "Your Groups" -msgstr "Ваши Группы" +msgstr "Мои группы" #: bookwyrm/templates/user/groups.html:16 #, python-format msgid "Groups: %(username)s" -msgstr "" +msgstr "Группы: %(username)s" #: bookwyrm/templates/user/layout.html:59 msgid "Follow Requests" @@ -7920,7 +8071,7 @@ msgstr "" #: bookwyrm/templates/user/reviews_comments.html:6 #: bookwyrm/templates/user/reviews_comments.html:12 msgid "Reviews and Comments" -msgstr "" +msgstr "Рецензии и Комментарии" #: bookwyrm/templates/user/lists.html:16 #, python-format @@ -7960,7 +8111,7 @@ msgstr "" #: bookwyrm/templates/user/user.html:20 msgid "Edit profile" -msgstr "" +msgstr "Изменить профиль" #: bookwyrm/templates/user/user.html:29 msgid "Federation is currently disabled, so you will not be able to interact with this user." @@ -7998,15 +8149,15 @@ msgstr "" #: bookwyrm/templates/user/user.html:118 msgid "Reviews only" -msgstr "" +msgstr "Только Рецензии" #: bookwyrm/templates/user/user.html:123 msgid "Quotes only" -msgstr "" +msgstr "Только цитаты" #: bookwyrm/templates/user/user.html:128 msgid "Comments only" -msgstr "" +msgstr "Только комментарии" #: bookwyrm/templates/user/user.html:144 msgid "No activities yet!" @@ -8062,15 +8213,23 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/sk_SK/LC_MESSAGES/django.po b/locale/sk_SK/LC_MESSAGES/django.po index 1afd3524fe..a786b3f22d 100644 --- a/locale/sk_SK/LC_MESSAGES/django.po +++ b/locale/sk_SK/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-03-03 19:41\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Slovak\n" "Language: sk\n" @@ -107,7 +107,7 @@ msgstr "Názov knihy" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Hodnotenie" @@ -175,39 +175,43 @@ msgstr "Vymazanie moderátorom" msgid "Domain block" msgstr "Blokovanie domény" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Audiokniha" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "eKniha" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Tvrdá väzba" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Brožovaná väzba" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s nevyzerá ako ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "%(display_name)s komentár ku %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)s citácia z %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)s recenzia knihy %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -475,7 +479,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Recenzie" @@ -491,19 +495,19 @@ msgstr "Citácie" msgid "Everything else" msgstr "Všetko ostatné" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Domáca časová os" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Domov" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Časová os kníh" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -512,91 +516,91 @@ msgstr "Časová os kníh" msgid "Books" msgstr "Knihy" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Angličtina" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Nemecky" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Španielsky" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Taliansky" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "Kórejsky" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Fínsky" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Francúzky" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Dánsky" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Nórsky" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Poľsky" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Rumunsky" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Švédsky" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Ukrajinsky" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "Klasická čínština" @@ -845,7 +849,7 @@ msgstr "Ich najkratšie čítanie tohto roku…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -920,57 +924,62 @@ msgstr "Narodený/á:" msgid "Died:" msgstr "Úmrtie:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Séria:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Externé odkazy" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipédia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Zobraziť na Wikipédii" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Webstránka" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Zobraziť ISNI záznam" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Zobraziť na ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Načítať dáta" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Zobraziť na OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Zobraziť na Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Zobraziť na LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Zobraziť na Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Knihy od %(name)s" @@ -1007,8 +1016,8 @@ msgid "Name:" msgstr "Meno:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Oddeľte viacero položiek čiarkami." @@ -1045,7 +1054,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1054,7 +1064,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads kľúč:" @@ -1067,8 +1077,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1080,7 +1090,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1092,10 +1102,10 @@ msgstr "Uložiť" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1105,7 +1115,7 @@ msgstr "Uložiť" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1122,7 +1132,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1139,31 +1150,50 @@ msgstr "Potvrdiť" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Upraviť knihu" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Kliknite pre pridanie obalu" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Nepodarilo sa načítať obal" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Kliknite pre zväčšenie" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1172,17 +1202,17 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Pridať popis" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Popis:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1191,49 +1221,49 @@ msgstr[1] "%(count)s edícií" msgstr[2] "%(count)s edícií" msgstr[3] "%(count)s edície" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Túto edíciu ste dali do knihovníčky:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Vaša čitateľská aktivita" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Pridať dátumy čítania" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Nemáte žiadnu čítaciu činnosť pre túto knihu." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Vaše recenzie" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Vaše komentáre" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Vaše citácie" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Témy" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Miesta" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1248,15 +1278,15 @@ msgstr "Miesta" msgid "Lists" msgstr "Zoznamy" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Pridať do zoznamu" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1279,25 +1309,26 @@ msgid "Copied ISBN!" msgstr "ISBN skopírované!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1322,12 +1353,12 @@ msgid "Add cover" msgstr "Pridať obálku" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Nahrať obálku:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Načítať obálku z URL adresy:" @@ -1392,15 +1423,32 @@ msgstr "Toto je nový autor" msgid "Creating a new author: %(name)s" msgstr "Vytváranie nového autora: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Je toto edícia existujúceho diela?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Toto je nové dielo" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1462,124 +1510,190 @@ msgstr "" msgid "Subtitle:" msgstr "Podtitulok:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Séria:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Čislo série:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Jazyky:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Tematické okruhy:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Pridať tematický okruh" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Odstrániť tématický okruh" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Pridať ďalší tématický okruh" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Vydanie" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Vydavateľ:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Dátum prvého vydania:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Dátum vydania:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Autori" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Odobrať %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Autorova stránka pre %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Pridať autorov:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Pridať autora" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Pridať ďalšieho autora" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Obal" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Fyzické vlastnosti" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Formát:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Podrobnosti formátu:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Strán:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Identifikátory knihy" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1766,19 +1880,11 @@ msgstr "Vydaná %(date)s" msgid "rated it" msgstr "ohodnotil/a ju" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Séria od" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Kniha %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Nezaradená kniha" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1823,7 +1929,7 @@ msgstr "Potvrdzujúci kód:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Odoslať" @@ -1884,7 +1990,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1982,21 +2088,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2182,14 +2289,14 @@ msgstr "Práve teraz tu niesu žiadne činnosti! Pre začiatok skúste nasledova msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Čitateľský cieľ %(year)s" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Môžete nastaviť, alebo zmeniť váš čitateľský cieľ hocikedy zo svojho profilu" @@ -2477,6 +2584,10 @@ msgstr "Táto skupina nemá zoznamy" msgid "Edit group" msgstr "Upraviť skupinu" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Hľadať pre pridanie užívateľa" @@ -3725,6 +3836,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4347,7 +4459,7 @@ msgstr[2] "" msgstr[3] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4816,7 +4928,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -5009,9 +5121,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5066,6 +5177,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5076,39 +5192,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5213,13 +5323,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Počiatočný dátum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Konečný dátum:" @@ -5593,7 +5703,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Užívateľov celkom" @@ -5607,31 +5717,31 @@ msgstr "Aktívni tento mesiac" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Aktivita instancie" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Týždne" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Aktivita príspevkov" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Vytvorených diel" @@ -5951,13 +6061,49 @@ msgid "Unable to save settings" msgstr "Nemožno nastavenia uložiť" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6668,10 +6814,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7335,10 +7477,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7351,12 +7489,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7465,6 +7603,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7679,35 +7826,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7766,16 +7913,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8060,15 +8213,23 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/sl_SI/LC_MESSAGES/django.po b/locale/sl_SI/LC_MESSAGES/django.po index 1cf43397d2..9f3bf86e39 100644 --- a/locale/sl_SI/LC_MESSAGES/django.po +++ b/locale/sl_SI/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Slovenian\n" "Language: sl\n" @@ -107,7 +107,7 @@ msgstr "Naslov knjige" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Ocena" @@ -175,39 +175,43 @@ msgstr "Moderatorjev izbris" msgid "Domain block" msgstr "Blokirana domena" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Zvočna knjiga" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "e-knjiga" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Risoroman" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Trda vezava" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Mehka vezava" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -475,7 +479,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Recenzije" @@ -491,19 +495,19 @@ msgstr "Citati" msgid "Everything else" msgstr "Vse ostalo" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Domača časovnica" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Domov" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Knjižna časovnica" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -512,91 +516,91 @@ msgstr "Knjižna časovnica" msgid "Books" msgstr "Knjige" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "angleški (English)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "katalonski (Catalan)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "nemški (German)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "španski (Spanish)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "galicijski (Galician)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "italijanski (Italian)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "finski (Finnish)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "francoski (French)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "litovski (Lithuanian)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "norveški (Norwegian)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "polski (Polish)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "portugalski, brazilski (Brazilian Portuguese)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "portugalski, evropski (European Portuguese)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "romunski (Romanian)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "švedski (Swedish)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "kitajski, poenostavljen (Simplified Chinese)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "kitajski, tradicionalen (Traditional Chinese)" @@ -845,7 +849,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -920,57 +924,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedija" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Poglej ISNI zapis" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -1007,8 +1016,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1045,7 +1054,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1054,7 +1064,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1067,8 +1077,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1080,7 +1090,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1092,10 +1102,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1105,7 +1115,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1122,7 +1132,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1139,31 +1150,50 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1172,17 +1202,17 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1191,49 +1221,49 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1248,15 +1278,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1279,25 +1309,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1322,12 +1353,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1392,15 +1423,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1462,124 +1510,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1766,19 +1880,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1823,7 +1929,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1884,7 +1990,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1982,21 +2088,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2182,14 +2289,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2477,6 +2584,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3725,6 +3836,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4347,7 +4459,7 @@ msgstr[2] "" msgstr[3] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4816,7 +4928,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -5009,9 +5121,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5066,6 +5177,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5076,39 +5192,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5213,13 +5323,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5593,7 +5703,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5607,31 +5717,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5951,13 +6061,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6668,10 +6814,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7335,10 +7477,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7351,12 +7489,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7465,6 +7603,15 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7679,35 +7826,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7766,16 +7913,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8060,15 +8213,23 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/sr_SP/LC_MESSAGES/django.po b/locale/sr_SP/LC_MESSAGES/django.po index 8c0cb22ca6..7c05d72a9a 100644 --- a/locale/sr_SP/LC_MESSAGES/django.po +++ b/locale/sr_SP/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Serbian (Cyrillic)\n" "Language: sr\n" @@ -107,7 +107,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -175,39 +175,43 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -474,7 +478,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -490,19 +494,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -511,91 +515,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -842,7 +846,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -915,57 +919,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -1002,8 +1011,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1040,7 +1049,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1049,7 +1059,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1062,8 +1072,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1075,7 +1085,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1087,10 +1097,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1100,7 +1110,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1117,7 +1127,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1134,31 +1145,50 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1166,17 +1196,17 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1184,49 +1214,49 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1241,15 +1271,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1272,25 +1302,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1301,12 +1332,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1315,12 +1346,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1385,15 +1416,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1455,124 +1503,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1759,19 +1873,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1816,7 +1922,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1877,7 +1983,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1973,21 +2079,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2173,14 +2280,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2468,6 +2575,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3711,6 +3822,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4328,7 +4440,7 @@ msgstr[1] "" msgstr[2] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4796,7 +4908,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4989,9 +5101,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5046,6 +5157,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5056,39 +5172,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5191,13 +5301,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5571,7 +5681,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5585,31 +5695,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5925,13 +6035,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6642,10 +6788,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7307,10 +7449,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7323,12 +7461,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7433,6 +7571,14 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7646,35 +7792,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7733,16 +7879,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8024,15 +8176,23 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/sv_SE/LC_MESSAGES/django.po b/locale/sv_SE/LC_MESSAGES/django.po index 1d1ca1337d..1a6962c33a 100644 --- a/locale/sv_SE/LC_MESSAGES/django.po +++ b/locale/sv_SE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Swedish\n" "Language: sv\n" @@ -107,7 +107,7 @@ msgstr "Bokens titel" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Recension" @@ -175,39 +175,43 @@ msgstr "Borttagning av moderator" msgid "Domain block" msgstr "Domänblockering" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Ljudbok" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "E-bok" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Grafisk novell" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Inbunden" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Pocketbok" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)ss kommentar på %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)ss citat från %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)ss recension av %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s betygsatte %(book_title)s: %(display_rating).1f stjärna" msgstr[1] "%(display_name)s betygsatte %(book_title)s: %(display_rating).1f stjärnor" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Recensioner" @@ -489,19 +493,19 @@ msgstr "Citat" msgid "Everything else" msgstr "Allt annat" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Tidslinje för Hem" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Hem" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Tidslinjer för böcker" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Tidslinjer för böcker" msgid "Books" msgstr "Böcker" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Engelska" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (katalanska)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Tyska (Tysk)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Spanska (Spansk)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Baskiska)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italienska (Italiensk)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (koreanska)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Finland (Finska)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Franska (Fransk)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Litauiska (Litauisk)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederländerna (Holländska)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norska (Norska)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (polska)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português d Brasil (Brasiliansk Portugisiska)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisiska)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Rumänien (Rumänska)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Svenska)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainska)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Förenklad Kinesiska)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Traditionell Kinesiska)" @@ -839,7 +843,7 @@ msgstr "Det kortast lästa det här året…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Född:" msgid "Died:" msgstr "Dog:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Serie:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Externa länkar" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Wikipedia" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Webbplats" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Visa ISNI-samling" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Visa på ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Ladda data" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Visa i OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Visa i Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Visa i LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Visa i Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Böcker av %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "Namn:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Separera flera värden med kommatecken." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Nyckel för Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventarie-ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything-nyckel:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads-nyckel:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Spara" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Spara" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Att ladda in data kommer att ansluta till %(source_name)s och kontrollera eventuella metadata om den här författaren som inte finns här. Befintliga metadata kommer inte att skrivas över." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Bekräfta" msgid "Unable to connect to remote source." msgstr "Kunde inte ansluta till fjärrkälla." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Redigera bok" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Klicka för att lägga till omslag" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Misslyckades med att ladda omslaget" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Klicka för att förstora" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s recension)" msgstr[1] "(%(review_count)s recensioner)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Lägg till beskrivning" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Beskrivning:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s utgåva" msgstr[1] "%(count)s utgåvor" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Du har lagt den här utgåvan i hylla:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "En annorlunda utgåva av den här boken finns i din %(shelf_name)s hylla." -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Din läsningsaktivitet" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Lägg till läsdatum" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Du har ingen läsaktivitet för den här boken." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Dina recensioner" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Dina kommentarer" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Dina citat" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Ämnen" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Platser" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Platser" msgid "Lists" msgstr "Listor" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Lägg till i listan" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "Kopierade ISBN!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC-nummer:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible-ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB-ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Lägg till omslag" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Ladda upp omslag:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1378,15 +1409,32 @@ msgstr "Det här är en ny författare" msgid "Creating a new author: %(name)s" msgstr "Skapar en ny författare: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Är det här en version av ett redan befintligt verk?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Det här är ett nytt verk" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Sortera titel:" msgid "Subtitle:" msgstr "Undertitel:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Serie:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Serienummer:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Språk:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Ämnen:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Lägg till ämne" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Ta bort ämne" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Lägg till ett annat ämne" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Plats:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Publikation" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Utgivare:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Första publiceringsdatum:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Publiceringsdatum:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Författare" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Ta bort %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Författarsida för %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Lägg till författare:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Lägg till författare" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Jane Doe" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Lägg till en annan författare" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Omslag" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Fysiska egenskaper" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Formatets detaljer:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Sidor:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Bok-identifierare" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary-ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "Namn" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Publicerades %(date)s" msgid "rated it" msgstr "betygsatte den" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Serier av" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Bok %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Osorterad bok" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Bekräftelsekod:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Skicka in" @@ -1870,7 +1976,7 @@ msgstr "Du kan säga upp när som helst i din profils inst #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s började läsa %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)sbetygsatte%(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s recenserade %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s kommenterade på %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s citerade %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Det finns inga aktiviteter just nu! Försök att följa en användare f msgid "Alternatively, you can try enabling more status types" msgstr "Alternativt så kan du prova att aktivera fler status-typer" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s läsmål" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Du kan ställa in eller ändra ditt läsmål när som helst från din profilsida" @@ -2459,6 +2566,10 @@ msgstr "Den här gruppen har inga listor" msgid "Edit group" msgstr "Redigera grupp" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Sök för att lägga till en användare" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "Sök efter en bok, författare, användare eller lista" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Skanna streckkod" @@ -4309,7 +4421,7 @@ msgstr[0] "En ny rapport behöver moderering" msgstr[1] "%(display_count)s nya rapporter behöver moderering" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Innehållsvarning" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "Ladda ner fil" @@ -4969,10 +5081,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "Du tar bort den här genomläsningen och dess %(count)s associerade förloppsuppdateringar." #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "Uppdatera läsdatum för \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5026,6 +5137,11 @@ msgstr "Redigera läsdatum" msgid "Delete these read dates" msgstr "Ta bort de här läsdatumen" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "Uppdatera läsdatum för \"%(title)s\"" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,41 +5152,33 @@ msgstr "Lägg till läs-datum för \"%(title)s\"" msgid "Report" msgstr "Rapport" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -"Skanna streckkod\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Begär kamera..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Bevilja åtkomst till kameran för att skanna en boks streckkod." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Kunde inte komma åt kameran" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Skannar..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Justera din boks streckkod med kameran." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN skannades" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Söker efter bok:" @@ -5171,13 +5279,13 @@ msgstr "Falskt" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Startdatum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Slutdatum:" @@ -5551,7 +5659,7 @@ msgid "Dashboard" msgstr "Översiktspanel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Totalt antal användare" @@ -5565,31 +5673,31 @@ msgstr "Aktiva den här månaden" msgid "Works" msgstr "Verk" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Instansaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervall:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dagar" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Veckor" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Användarens registreringsaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Statusaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Skapade verk" @@ -5901,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Det gick inte att spara inställningarna" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6618,10 +6762,6 @@ msgstr "Schemalagda uppgifter" msgid "Tasks" msgstr "Uppgifter" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "Namn" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7281,10 +7421,6 @@ msgstr "Citat:" msgid "An excerpt from '%(book_title)s'" msgstr "Ett utdrag från '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Plats:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "På sidan:" @@ -7297,12 +7433,12 @@ msgstr "Vid procent:" msgid "to" msgstr "till" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Din recension av '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Recension:" @@ -7403,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "betygsatte %(title)s: %(display_rating)s stjärna" msgstr[1] "betygsatte %(title)s: %(display_rating)s stjärnor" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7615,35 +7758,35 @@ msgstr "Sluta läs" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Visa status" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Sida %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Öppna bild i nytt fönster" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Göm status" @@ -7702,16 +7845,22 @@ msgstr "började läsa %(book)s av %(book)s" msgstr "började läsa %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "recenserade %(book)s av %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "recenserade %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7990,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d bok - av %(user)s" msgstr[1] "%(num)d böcker - av %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "ett nytt användarkonto" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/tr_TR/LC_MESSAGES/django.po b/locale/tr_TR/LC_MESSAGES/django.po index 57131a6cae..4db55f2354 100644 --- a/locale/tr_TR/LC_MESSAGES/django.po +++ b/locale/tr_TR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-05-03 00:39\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Turkish\n" "Language: tr\n" @@ -107,7 +107,7 @@ msgstr "Kitap Adı" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Değerlendirme" @@ -175,39 +175,43 @@ msgstr "Moderatörün silinmesi" msgid "Domain block" msgstr "Alan adı engellemesi" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Sesli kitap" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "e-Kitap" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Grafik Roman" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Ciltli" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "Ciltsiz" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s bir ISBN gibi görünmüyor" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s geçerli bir ISBN kontrol toplamına sahip değil, beklenen: %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)s kullanıcısının %(book_title)s yorumu" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)s kullanıcısının %(book_title)s alıntısı" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)s kullanıcısının %(book_title)s incelemesi" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s %(book_title)s kitabına %(display_rating).1f yıldız verdi" msgstr[1] "%(display_name)s %(book_title)s kitabına %(display_rating).1f yıldız verdi" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "İncelemeler" @@ -489,19 +493,19 @@ msgstr "Alıntılar" msgid "Everything else" msgstr "Diğer" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Akış" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Ana Sayfa" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Kitap Akışı" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "Kitap Akışı" msgid "Books" msgstr "Kitaplar" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "İngilizce" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Katalanca)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Almanca)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (İspanyolca)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Baskça)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Galiçyaca)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (İtalyanca)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (Korece)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Fince)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Fransızca)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litovca)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (Felemenkçe)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Norveççe)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Lehçe)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brezilya Portekizcesi)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Avrupa Portekizcesi)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Rumence)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (İsveççe)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Ukraynaca)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Basitleştirilmiş Çince)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Geleneksel Çince)" @@ -839,7 +843,7 @@ msgstr "Bu yıl okudukları en kısa…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "Doğum:" msgid "Died:" msgstr "Ölüm:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Dizi:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Harici bağlantılar" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Vikipedi" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "Vikiveri'de görüntüle" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Web sitesi" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "ISNI kaydını gör" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "ISFDB'de gör" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Veri yükle" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "OpenLibrary'de aç" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Inventaire'de görüntüle" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "LibraryThing'de görüntüle" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Goodreads'te Görüntüle" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "%(name)s kitapları" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "İsim:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Birden fazla değeri virgülle ayırın." @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary anahtarı:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire hesabı:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything anahtarı:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads anahtarı:" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "Kaydet" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "Kaydet" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "Onayla" msgid "Unable to connect to remote source." msgstr "Uzaktaki kaynağa bağlanılamıyor." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Kitabı Düzenle" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Kapak eklemek için tıklayın" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Kapak yüklemesi başarısız" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Büyütmek için tıkla" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "(%(review_count)s incelemeler)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Açıklama Ekle" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Açıklama:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s baskı" msgstr[1] "%(count)s baskılar" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Bu baskıyı rafa kaldırdınız:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Okuma etkinliğiniz" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Okuma tarihlerini ekleyin" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Bu kitap için herhangi bir okuma etkinliğiniz yok." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Değerlendirmelerin" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Yorumların" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Alıntıların" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Konular" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Yerler" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "Yerler" msgid "Lists" msgstr "Listeler" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Listeye ekle" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN kopyalandı!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC Sayısı:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Sesli ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna hesabı:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "Kapak resmi ekle" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Kapak resmi yükle:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "URL ile kapak resmi yükle:" @@ -1378,15 +1409,32 @@ msgstr "Bu yeni bir yazar" msgid "Creating a new author: %(name)s" msgstr "Yeni yazar oluşturuluyor: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Bu zaten olan bir kitabın yeni bir edisyonu mu?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Bu yeni bir kitap" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "Başlığı sırala:" msgid "Subtitle:" msgstr "Alt başlık:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Dizi:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Seri numarası:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Diller:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Konular:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Konu ekle" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Konu kaldır" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Başka Konu Ekle" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Pozisyon:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Yayın" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Yayıncı:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "İlk yayınlanma tarihi:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Yayınlanma tarihi:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Yazarlar" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "%(name)s kaldır" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "%(name)s yazar sayfası" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Yazarlar Ekle:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Yazar Ekle" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Anonim" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Başka Yazar Ekle" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Kapak" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Fiziksel Özellikler" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Biçim:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Format detayları:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Sayfalar:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Kitap Tanıtıcıları" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary hesabı:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "İsim" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "Yayınlanma tarihi%(date)s:" msgid "rated it" msgstr "oylandı" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Seriler" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Kitap %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Sıralanmamış Kitap" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "Doğrulama kodu:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Gönder" @@ -1870,7 +1976,7 @@ msgstr "Profil ayarlarından istediğin zaman vazgeçeb #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s okumaya başladı %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s oy verdi %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s inceledi %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s yorum yaptı %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s alıntı yaptı %(book_title)s" @@ -2164,14 +2271,14 @@ msgstr "Şu anda herhangi bir etkinlik yok! Başlamak için bir kullanıcıyı t msgid "Alternatively, you can try enabling more status types" msgstr "Alternatif olarak, daha fazla durum türünü etkinleştirmeyi deneyebilirsin" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s okuma hedefi" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Okuma hedefini profil sayfandan istediğiniz zaman belirleyebilir veya değiştirebilirsin" @@ -2459,6 +2566,10 @@ msgstr "Bu grubun listesi yok" msgid "Edit group" msgstr "Grubu düzenle" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Kullanıcı eklemek için ara" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "Yeni bir rapor moderasyon bekliyor" msgstr[1] "%(display_count)s yeni rapor moderasyon bekliyor" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "İçerik uyarısı" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "Okuma tarihlerini ekleyin" msgid "Delete these read dates" msgstr "Bu okuma tarihlerini sil" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,40 +5152,33 @@ msgstr "\"%(title)s\" için okuma tarihleri ekle" msgid "Report" msgstr "Bildir" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -"Barkod Tara " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Kamera izni talep ediliyor..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "Bir kitabın barkodunu taramak için kameraya erişim izni verin." -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "Kameraya erişilemedi" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Taranıyor..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "Kitabınızın barkodunu kamera ile hizalayın." -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN tarandı" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "Kitap aranıyor:" @@ -5170,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5550,7 +5659,7 @@ msgid "Dashboard" msgstr "Kontrol Paneli" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Toplam kullanıcı sayısı" @@ -5564,31 +5673,31 @@ msgstr "Bu ay aktif" msgid "Works" msgstr "Çalışmalar" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Sunucu Etkinliği" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Aralık:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Günler" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Haftalar" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Kullanıcı kayıt etkinliği" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Durum etkinliği" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Oluşturulanlar" @@ -5900,13 +6009,49 @@ msgid "Unable to save settings" msgstr "Ayarlar kaydedilemiyor" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "Federasyonu devre dışı bırak" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "Sunucunuzun diğer federe hizmetler etkileşime girmesini engeller. Diğer örneklerden gelen mevcut veriler var olmaya devam edecektir." +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6617,10 +6762,6 @@ msgstr "Planlanmış görevler" msgid "Tasks" msgstr "Görevler" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "İsim" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "Celery görevi" @@ -7280,10 +7421,6 @@ msgstr "Alıntı:" msgid "An excerpt from '%(book_title)s'" msgstr "'%(book_title)s' eserinden bir alıntı" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Pozisyon:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Sayfada:" @@ -7296,12 +7433,12 @@ msgstr "Yüzdede:" msgid "to" msgstr "şu" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "'%(book_title)s' hakkındaki incelemeniz" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "İnceleme:" @@ -7402,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "%(title)s eserine %(display_rating)s yıldız puanı verdi" msgstr[1] "%(title)s eserine %(display_rating)s yıldız puanı verdi" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7614,35 +7758,35 @@ msgstr "Okumayı bitir" msgid "Show rating" msgstr "Puanlamayı göster" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Durumu göster" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Sayfa %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Görseli yeni pencerede aç" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Durumu gizle" @@ -7701,16 +7845,22 @@ msgstr "%(author_name)s yazarına ait %(book)s" msgstr "%(book)s kitabını okumaya başladı" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "%(author_name)s yazarına ait %(book)s kitabını inceledi" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "%(book)s kitabını inceledi" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7989,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d kitap - %(user)s tarafından" msgstr[1] "%(num)d kitaplar - %(user)s tarafından" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "yeni bir kullanıcı hesabı" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/uk_UA/LC_MESSAGES/django.po b/locale/uk_UA/LC_MESSAGES/django.po index ddb8cee917..5690a46a4d 100644 --- a/locale/uk_UA/LC_MESSAGES/django.po +++ b/locale/uk_UA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -107,7 +107,7 @@ msgstr "Назвою книги" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "Рейтингом" @@ -175,39 +175,43 @@ msgstr "Видалення модератором" msgid "Domain block" msgstr "Домен заблоковано" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "Аудіокнига" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "Електронна книга" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "Графічний роман" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "Тверда обкладинка" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "М'яка обкладинка" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,12 +465,12 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" @@ -475,7 +479,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "Рецензії" @@ -491,19 +495,19 @@ msgstr "Цитати" msgid "Everything else" msgstr "Все інше" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "Головна Стрічка" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "Головна" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "Книжкова Стрічка" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -512,91 +516,91 @@ msgstr "Книжкова Стрічка" msgid "Books" msgstr "Книги" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "Англійська" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (Каталонська)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (Німецька)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Есперанто)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (Іспанська)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (Баскська)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (Галісійська)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (Італійська)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (Фінська)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (Французька)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Литовська)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (Нідерландська)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (Норвезька)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (Польська)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Бразильська португальська)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Європейська португальська)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (Румунська)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (Шведська)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainian)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Спрощена китайська)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Традиційна китайська)" @@ -845,7 +849,7 @@ msgstr "Найшвидше прочитана книга цього року…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -920,57 +924,62 @@ msgstr "Дата народження:" msgid "Died:" msgstr "Дата смерті:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "Серії:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "Зовнішні посилання" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "Вікіпедія" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "Вебсайт" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "Переглянути запис ISNI" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "Переглянути на ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "Завантажити данні" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "Переглянути на OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "Переглянути на Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "Переглянути на LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "Переглянути на Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "Книги за авторством %(name)s" @@ -1007,8 +1016,8 @@ msgid "Name:" msgstr "Ім'я:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "Якщо значень багато, розділіть їх комами." @@ -1045,7 +1054,8 @@ msgid "Openlibrary key:" msgstr "Ключ Openlibrary:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1054,7 +1064,7 @@ msgid "Librarything key:" msgstr "Ключ Librarything:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Ключ Goodreads:" @@ -1067,8 +1077,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1080,7 +1090,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1092,10 +1102,10 @@ msgstr "Зберегти" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1105,7 +1115,7 @@ msgstr "Зберегти" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1122,7 +1132,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "Процес завантаження даних з'єднається з %(source_name)s та перевірить наявність метаданих про цього автора, яких тут немає. Наявні метадані не буде перезаписано." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1139,31 +1150,50 @@ msgstr "Підтвердити" msgid "Unable to connect to remote source." msgstr "Не вдалося під'єднатися до віддаленого джерела." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "Редагувати Книгу" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "Натисніть, щоб додати обкладинку" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "Не вдалося завантажити обкладинку" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "Натисніть для збільшення" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" @@ -1172,17 +1202,17 @@ msgstr[1] "(%(review_count)s рецензії)" msgstr[2] "(%(review_count)s рецензій)" msgstr[3] "(%(review_count)s рецензій)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "Додати Опис" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Опис:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" @@ -1191,49 +1221,49 @@ msgstr[1] "%(count)s видання" msgstr[2] "%(count)s видань" msgstr[3] "%(count)s видань" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "Ви відклали це видання на полицю:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "Ваша читацька активність" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "Додати дати коли прочитано" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "Ви не маєте жодної читацької активності для цієї книги." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "Ваші відгуки" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "Ваші коментарі" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "Ваші цитати" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "Теми" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "Місця" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1248,15 +1278,15 @@ msgstr "Місця" msgid "Lists" msgstr "Списки" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "Додати до списку" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1279,25 +1309,26 @@ msgid "Copied ISBN!" msgstr "ISBN скопійовано!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "Номер OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1308,12 +1339,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1322,12 +1353,12 @@ msgid "Add cover" msgstr "Додати обкладинку" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "Завантажити обкладинку:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "Завантажити обкладинку з посилання:" @@ -1392,15 +1423,32 @@ msgstr "Це новий автор" msgid "Creating a new author: %(name)s" msgstr "Створення нового автора: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "Це видання вже існуючого твору?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "Це новий твір" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1462,124 +1510,190 @@ msgstr "Назва Для Сортування:" msgid "Subtitle:" msgstr "Підзаголовок:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "Серії:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "Номер серії:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "Мови:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "Теми:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "Додати тему" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "Видалити тему" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "Додати іншу тему" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "Місце у книзі:" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "Видання" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "Видавець:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "Дата першого видання:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "Дата видання:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "Автори" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "Видалити %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "Сторінка автора для %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "Додати авторів:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "Додати автора" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "Ілона Павлюк" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "Додати іншого автора" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "Обкладинка" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "Фізичні властивості" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "Формат:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "Деталі формату:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "Сторінок:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "Ідентифікатори книги" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1766,19 +1880,11 @@ msgstr "Видано %(date)s" msgid "rated it" msgstr "оцінив у" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "Серія від" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "Книга %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "Несортована Книга" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1823,7 +1929,7 @@ msgstr "Код підтвердження:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Надіслати" @@ -1884,7 +1990,7 @@ msgstr "Ви можете від'єднатися будь-коли в наст #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1982,21 +2088,22 @@ msgid "%(username)s started reading %(username)s почав(-ла) читати %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s оцінив(-ла) %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s рецензував(-ла) %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s прокоментував(-ла) %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s процитував(-ла) %(book_title)s" @@ -2182,14 +2289,14 @@ msgstr "Немає жодних активностей! Для початку, msgid "Alternatively, you can try enabling more status types" msgstr "Або, ви можете спробувати увімкнути більше типів постів" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "Мета читання на %(year)s рік" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "Ви можете задати або змінити ціль читання у будь-який час на сторінці профілю " @@ -2477,6 +2584,10 @@ msgstr "Ця група не має списків" msgid "Edit group" msgstr "Редагувати групу" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "Пошук, щоб додати користувача" @@ -3725,6 +3836,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "Сканувати Штрих-код" @@ -4347,7 +4459,7 @@ msgstr[2] "%(display_count)s нових скарг по msgstr[3] "%(display_count)s нових скарг потребують модерації" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "Попередження про вміст" @@ -4816,7 +4928,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -5009,9 +5121,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5066,6 +5177,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5076,41 +5192,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" Сканувати Штрих-код\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "Запитуємо камеру..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "Сканування..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN відскановано" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5215,13 +5323,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5595,7 +5703,7 @@ msgid "Dashboard" msgstr "Панель керування" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Всього користувачів" @@ -5609,31 +5717,31 @@ msgstr "Активних у цьому місяці" msgid "Works" msgstr "Творів" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "Активність Інстансу" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Інтервал:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Дні" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Тижні" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Активність по реєстраціях" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Активність по статусах" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Творів створено" @@ -5953,13 +6061,49 @@ msgid "Unable to save settings" msgstr "Не вдалося зберегти налаштування" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6670,10 +6814,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7337,10 +7477,6 @@ msgstr "Цитата:" msgid "An excerpt from '%(book_title)s'" msgstr "Уривок з '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "Місце у книзі:" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "Сторінка:" @@ -7353,12 +7489,12 @@ msgstr "Відсоток:" msgid "to" msgstr "по" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Ваша рецензія на '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "Рецензія:" @@ -7467,6 +7603,15 @@ msgstr[1] "оцінив(-ла) %(title)s: %(di msgstr[2] "оцінив(-ла) %(title)s: %(display_rating)s зірок" msgstr[3] "оцінив(-ла) %(title)s: %(display_rating)s зірок" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7681,35 +7826,35 @@ msgstr "Відмітити прочитаним" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "Переглянути статус" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "(Сторінка %(page)s" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "%(endpage)s" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "(%(percent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr " - %(endpercent)s%%" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "Відкрити зображення в новому вікні" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "Приховати статус" @@ -7768,16 +7913,22 @@ msgstr "почав(-ла) читати %(book)s в msgid "started reading %(book)s" msgstr "почав(-ла) читати %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "залишив(-ла) рецензію на %(book)s від %(author_name)s" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "залишив(-ла) рецензію на %(book)s" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -8062,15 +8213,23 @@ msgstr[1] "%(num)d книги – від %(user)s" msgstr[2] "%(num)d книг – від %(user)s" msgstr[3] "%(num)d книг – від %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/vi_VN/LC_MESSAGES/django.po b/locale/vi_VN/LC_MESSAGES/django.po index 6e92729f9b..3666b7b7d8 100644 --- a/locale/vi_VN/LC_MESSAGES/django.po +++ b/locale/vi_VN/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Vietnamese\n" "Language: vi\n" @@ -107,7 +107,7 @@ msgstr "" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "" @@ -175,39 +175,43 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,18 +465,18 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "" @@ -488,19 +492,19 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -509,91 +513,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -836,7 +840,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -905,57 +909,62 @@ msgstr "" msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "" @@ -992,8 +1001,8 @@ msgid "Name:" msgstr "" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "" @@ -1030,7 +1039,8 @@ msgid "Openlibrary key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "" @@ -1039,7 +1049,7 @@ msgid "Librarything key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "" @@ -1052,8 +1062,8 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1065,7 +1075,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1077,10 +1087,10 @@ msgstr "" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1090,7 +1100,7 @@ msgstr "" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1107,7 +1117,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1124,95 +1135,114 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,15 +1257,15 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1258,25 +1288,26 @@ msgid "Copied ISBN!" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "" @@ -1287,12 +1318,12 @@ msgid "Goodreads:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1301,12 +1332,12 @@ msgid "Add cover" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1371,15 +1402,32 @@ msgstr "" msgid "Creating a new author: %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1441,124 +1489,190 @@ msgstr "" msgid "Subtitle:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1745,19 +1859,11 @@ msgstr "" msgid "rated it" msgstr "" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1802,7 +1908,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1863,7 +1969,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1955,21 +2061,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2155,14 +2262,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2450,6 +2557,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3683,6 +3794,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4290,7 +4402,7 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4756,7 +4868,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4949,9 +5061,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5006,6 +5117,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5016,39 +5132,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5147,13 +5257,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5527,7 +5637,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5541,31 +5651,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5873,13 +5983,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6590,10 +6736,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7251,10 +7393,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7267,12 +7405,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7369,6 +7507,12 @@ msgid "rated %(title)s: %(display_rating)s sta msgid_plural "rated %(title)s: %(display_rating)s stars" msgstr[0] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7580,35 +7724,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7667,16 +7811,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7952,15 +8102,23 @@ msgid "%(num)d book - by %(user)s" msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/yi_DE/LC_MESSAGES/django.po b/locale/yi_DE/LC_MESSAGES/django.po index 5147c2f5c8..496fc19d30 100644 --- a/locale/yi_DE/LC_MESSAGES/django.po +++ b/locale/yi_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-03-14 18:38\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Yiddish\n" "Language: yi\n" @@ -107,7 +107,7 @@ msgstr "בוכטיטל" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "שאַצונג" @@ -175,39 +175,43 @@ msgstr "שליש אָפּמעקונג" msgid "Domain block" msgstr "שטח־חרם" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "אױדיאָבוך" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "ע־בוך" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "גראַפֿישער ראָמאַן" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "באַטאָװלט" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "בראָשירט" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "%(value)s זעט נישט אױס װי אַן ISBN" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "%(value)s האָט נישט דער ריכטיקער ISBN טשעקסום, האָבם מיר דערװאַרטן אױף %(check_version)s" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,19 +465,19 @@ msgstr "%(display_name)sס קאָמענטאַר װעגן %(book_title)s" msgid "%(display_name)s's quote from %(book_title)s" msgstr "%(display_name)sס ציטאַט פֿון %(book_title)s" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "%(display_name)sס רעצענזיע פֿון %(book_title)s" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "%(display_name)s האָט געשאַצט %(book_title)s: %(display_rating).1f שטערן" msgstr[1] "%(display_name)s האָט געשאַצט %(book_title)s: %(display_rating).1f שטערן" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "רעצענזיעס" @@ -489,19 +493,19 @@ msgstr "ציטאַטן" msgid "Everything else" msgstr "איבעריקע" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "הײם־כראָנאָלאָגיע" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "הײם" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "ביכער־כראָנאָלאָגיע" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -510,91 +514,91 @@ msgstr "ביכער־כראָנאָלאָגיע" msgid "Books" msgstr "ביכער" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English (ענגליש)" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (קאַטאַלאַניש)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch (דײַטש)" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (עספּעראַנטאָ)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español (שפּאַניש)" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (באַסקיש)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (גאַליסיש)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (איטאַליעניש)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (קאָרעניש)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (פֿיניש)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français (פֿראַנצײזיש)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (ליטװיש)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (האָלענדיש)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (נאָרװעגיש)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (פּױליש)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (בראַזיליאַנער פּאָרטוגעזיש)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (אײראָפּעיש פּאָרטוגעזיש)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (רומעניש)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (שװעדיש)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (אוקראַיִניש)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (פֿאַרפּשוטערן כינעזיש)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (טראַדיציאָנעל כינעזיש)" @@ -839,7 +843,7 @@ msgstr "דאָס קורצסטע לײנונג הײַיאָר…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -910,57 +914,62 @@ msgstr "געבױרן׃" msgid "Died:" msgstr "געשטאָרבן׃" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "סעריע:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "דרױסנדיקע פֿאַרבינדונגען" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "װיקיפּעדיע" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "אָנקוקן אױפֿ װיקידאַטן" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "װעבזײַטל" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "אָנקוקן ISNI רעקאָרד" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "אָנקוקן אױף ISFDB" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "אַרײַנלאָדן דאַטן" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "אָנקוקן אױף OpenLibrary" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "אָנקוקן אױף Inventaire" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "אָנקוקן אױף LibraryThing" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "אָנקוקן אױף Goodreads" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "ביכער פֿון %(name)s" @@ -997,8 +1006,8 @@ msgid "Name:" msgstr "נאָמען׃" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "זונדערט אָפּ פֿאַרשידענע גרײסן מיט קאָמעס׃" @@ -1035,7 +1044,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary שליסל׃" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1044,7 +1054,7 @@ msgid "Librarything key:" msgstr "Librarything שליסל׃" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads שליסל׃" @@ -1057,8 +1067,8 @@ msgid "ISNI:" msgstr "ISNI:" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1070,7 +1080,7 @@ msgstr "ISNI:" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1082,10 +1092,10 @@ msgstr "אױפֿהיטן" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1095,7 +1105,7 @@ msgstr "אױפֿהיטן" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1112,7 +1122,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "אַרײַנלאָדן דאַטן װעט פֿאַרבינדן מיט %(source_name)s און זוכן װעסער מעטאַדאַטן װעגן דעם מחבר װאָס איז נאָך נישט דאָ. איציקע מעטאַדאַטן װעט נישט איבערגעשריבן װערן." #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1129,97 +1140,116 @@ msgstr "באַשטעטיקן" msgid "Unable to connect to remote source." msgstr "נישט געקענט פֿאַרבינדן זיך מיט װײַטן קװאַל." -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "רעדאַקטירן בוך" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "גיב אַ קװעטש צו שטעלן צו אַ טאָװל" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "נישט געקענט אַרײַנלאָדן טאָװל" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "גיב אַ קװעטש צו פֿאַרגרעסערן" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "זען אױף Finna" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "אָנקוקן אױף Libris" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s רעצענזיע)" msgstr[1] "(%(review_count)s רעצענזיעס)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "צוגעבן באַשרײַבן" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "באַשרײַבונג:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s אױסגאַבע" msgstr[1] "%(count)s אױסגאַבעס" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "האָסט געשטעלט דאָס אױסגאַבע אױף:" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "דײַנע לײען־טוענישן" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "צוגעבן לײען־דאַטעס" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "האָסט נישט קײן לײען־טוענישן פֿאַר דעם בוך." -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "דײַנע רעצענזיעס" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "דײַנע קאָמענטאַרן" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "דײַנע ציטאַטן" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "טעמעס" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "פּלאַצן" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1234,15 +1264,15 @@ msgstr "פּלאַצן" msgid "Lists" msgstr "רשימות" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "צושטעלן אױף דער רשימה" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "מאַכן אַ נײַע רשימה..." -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1265,25 +1295,26 @@ msgid "Copied ISBN!" msgstr "ISBN קאָפּירט!" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC-צאָל:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB-אידענטיפֿיקאַציע:" @@ -1294,12 +1325,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "Libris-ID:" @@ -1308,12 +1339,12 @@ msgid "Add cover" msgstr "צושטעלן טאָװל" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "אַרױפֿלאָדן טאָװל:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "אַרײַנלאָדן טאָװל פֿון URL:" @@ -1378,15 +1409,32 @@ msgstr "דאָס איז אַ נײַע(ר) מחבר" msgid "Creating a new author: %(name)s" msgstr "שאַפֿנדיק אַ נײַע(ם) מחבר׃ %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "איז דאָס אַן אױסגאַבע פֿון אַ װערק װאָס איז שױן פֿאַראַנען?" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "דאָס איז אַ נײַ װערק" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1448,124 +1496,190 @@ msgstr "סאָרטירן־טיטל:" msgid "Subtitle:" msgstr "אונטערטיטל:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "סעריע:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "סעריע־נומער:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "שפּראַכן:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "טעמעס:" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "צוגעבן טעמע" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "אַראָפּנעמען טעמע" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "צוגעבן נאָך אַ טעמע" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "אױסגאַבע" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "פֿאַרלעגער:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "ערשטע אַרױסגעבן־דאַטע:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "אַרױסגעבן־דאַטע:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "מחברים" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "אַראָפּנעמען %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "מחבר־בלאַט פֿון %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "צוגעבן מחברים:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "צוגעבן מחבר" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "פּלוניסטע־אַלמוני" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "צוגעבן נאָך אַ מחבר" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "טאָװל" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "פֿיזישע אײגנקײַטן" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "פֿאָרמאַט:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "פֿאָרמאַט־פּרטים:" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "זײַטלעך:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "בוך־אידענטיפֿיצירערס" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1752,19 +1866,11 @@ msgstr "אַרױסגעגעבן %(date)s" msgid "rated it" msgstr "האָט עס געשאַצט" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "סעריע פֿון" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "בוך %(series_number)s" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "אומסאָרטירטע בוך" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1809,7 +1915,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "" @@ -1870,7 +1976,7 @@ msgstr "" #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1964,21 +2070,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2164,14 +2271,14 @@ msgstr "" msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "" @@ -2459,6 +2566,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3697,6 +3808,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4309,7 +4421,7 @@ msgstr[0] "" msgstr[1] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4776,7 +4888,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4969,9 +5081,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5026,6 +5137,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5036,39 +5152,33 @@ msgstr "" msgid "Report" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5169,13 +5279,13 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "" @@ -5549,7 +5659,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5563,31 +5673,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5899,13 +6009,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6616,10 +6762,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7279,10 +7421,6 @@ msgstr "" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7295,12 +7433,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "" @@ -7401,6 +7539,13 @@ msgid_plural "rated %(title)s: %(display_ratin msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" +msgstr[1] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7613,35 +7758,35 @@ msgstr "" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7700,16 +7845,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7988,15 +8139,23 @@ msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 6432515e4c..5572d8aa37 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -107,7 +107,7 @@ msgstr "书名" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "评价" @@ -175,39 +175,43 @@ msgstr "仲裁员删除" msgid "Domain block" msgstr "域名屏蔽" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "有声书籍" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "电子书" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "图像小说" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "精装" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "平装" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,18 +465,18 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "书评" @@ -488,19 +492,19 @@ msgstr "引用" msgid "Everything else" msgstr "所有其它内容" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "主页时间线" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "主页" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "书目时间线" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -509,91 +513,91 @@ msgstr "书目时间线" msgid "Books" msgstr "书目" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English（英语）" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (加泰罗尼亚语)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch（德语）" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (世界语)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español（西班牙语）" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (巴斯克语)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego（加利西亚语）" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano（意大利语）" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "한국어 (韩语)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi （Finnish/芬兰语）" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français（法语）" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių（立陶宛语）" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (荷兰语)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk（挪威语）" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (波兰语)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil（巴西葡萄牙语）" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu（欧洲葡萄牙语）" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română （罗马尼亚语）" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska（瑞典语）" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "Українська (乌克兰语)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文（繁体中文）" @@ -836,7 +840,7 @@ msgstr "TA 今年阅读最短的…" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -905,57 +909,62 @@ msgstr "出生:" msgid "Died:" msgstr "逝世:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "系列:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "外部链接" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "维基百科" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "网站" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "查看 ISNI 记录" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "在 ISFDB 查看" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "加载数据" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "在 OpenLibrary 查看" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "在 Inventaire 查看" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "在 LibraryThing 查看" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "在 Goodreads 查看" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "%(name)s 所著的书" @@ -992,8 +1001,8 @@ msgid "Name:" msgstr "名称:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "请用英文逗号(,)分隔多个值。" @@ -1030,7 +1039,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary key:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1039,7 +1049,7 @@ msgid "Librarything key:" msgstr "Librarything key:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads key:" @@ -1052,8 +1062,8 @@ msgid "ISNI:" msgstr "ISNI：" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1065,7 +1075,7 @@ msgstr "ISNI：" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1077,10 +1087,10 @@ msgstr "保存" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1090,7 +1100,7 @@ msgstr "保存" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1107,7 +1117,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "加载数据会连接到 %(source_name)s 并检查这里还没有记录的与作者相关的元数据。现存的元数据不会被覆盖。" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1124,95 +1135,114 @@ msgstr "确认" msgid "Unable to connect to remote source." msgstr "无法联系远程资源。" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "编辑书目" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "点击添加封面" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "加载封面失败" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "点击放大" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 则书评)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "添加描述" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s 版次" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "此版本已在你的书架上：" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "你的阅读活动" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "添加阅读日期" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "你还没有任何这本书的阅读活动。" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "你的书评" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "你的评论" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "主题" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "地点" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,15 +1257,15 @@ msgstr "地点" msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "添加到列表" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1258,25 +1288,26 @@ msgid "Copied ISBN!" msgstr "已复制 ISBN！" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC 号:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID:" @@ -1287,12 +1318,12 @@ msgid "Goodreads:" msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1301,12 +1332,12 @@ msgid "Add cover" msgstr "添加封面" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "上传封面:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "从 URL 加载封面：" @@ -1371,15 +1402,32 @@ msgstr "这是一位新的作者" msgid "Creating a new author: %(name)s" msgstr "正在创建新的作者: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "这是已存在的作品的一个版本吗？" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "这是一个新的作品。" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1441,124 +1489,190 @@ msgstr "" msgid "Subtitle:" msgstr "副标题:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "系列:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "系列编号:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "语言:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "主题：" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "添加主题" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "移除主题" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "添加新用户" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "位置：" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "出版" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "出版社:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "初版时间:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "出版时间:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "作者" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "移除 %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "%(name)s 的作者页面" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "添加作者:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "添加作者" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "张三" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "添加其他作者" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "封面" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "实体性质" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "格式:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "装订细节：" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "页数:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "书目标识号" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1745,19 +1859,11 @@ msgstr "于 %(date)s 出版" msgid "rated it" msgstr "评价了" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1802,7 +1908,7 @@ msgstr "确认代码:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "提交" @@ -1863,7 +1969,7 @@ msgstr "你可以在任何时候从你的 个人资料设 #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1955,21 +2061,22 @@ msgid "%(username)s started reading %(username)s 开始阅读 %(book_title)s" #: bookwyrm/templates/discover/card-header.html:23 +#: bookwyrm/templates/discover/card-header.html:32 #, python-format msgid "%(username)s rated %(book_title)s" msgstr "%(username)s 对 %(book_title)s 留下了评分" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s 已评价 %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "%(username)s 评论了 %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "%(username)s 引用了 %(book_title)s" @@ -2155,14 +2262,14 @@ msgstr "现在还没有任何活动！尝试从关注一个用户开始吧" msgid "Alternatively, you can try enabling more status types" msgstr "或者，您可以尝试启用更多的状态种类" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s 阅读目标" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "你可以在任何时候从你的个人资料页面 中设置或改变你的阅读目标" @@ -2450,6 +2557,10 @@ msgstr "这个群组没有任何列表" msgid "Edit group" msgstr "编辑群组" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "搜索或添加用户" @@ -3683,6 +3794,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "扫描条形码" @@ -4290,7 +4402,7 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "内容警告" @@ -4756,7 +4868,7 @@ msgstr "导出书单" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "下载文件" @@ -4949,10 +5061,9 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "你正要删除这篇阅读经过以及与之相关的 %(count)s 次进度更新。" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" -msgstr "更新 “%(title)s” 的阅读日期" +msgid "Update read dates for \"%(title)s\"" +msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 #: bookwyrm/templates/readthrough/readthrough_modal.html:38 @@ -5006,6 +5117,11 @@ msgstr "编辑阅读日期" msgid "Delete these read dates" msgstr "删除这些阅读日期" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "更新 “%(title)s” 的阅读日期" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5016,41 +5132,33 @@ msgstr "添加 “%(title)s” 的阅读日期" msgid "Report" msgstr "报告" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "\n" -" 扫描条码\n" -" " - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "正在启用摄像头..." -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "允许访问相机以扫描书条码。" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "无法使用摄像头" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "正在扫描..." -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "使您的书条码与相机对齐。" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "ISBN 扫描" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "搜索书目：" @@ -5149,13 +5257,13 @@ msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "开始日期:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "结束日期:" @@ -5529,7 +5637,7 @@ msgid "Dashboard" msgstr "仪表盘" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "用户总数" @@ -5543,31 +5651,31 @@ msgstr "今月活跃" msgid "Works" msgstr "作品" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "实例活动" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "区段：" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "天" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "周" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "用户注册活动" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "状态动态" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "创建的作品" @@ -5875,13 +5983,49 @@ msgid "Unable to save settings" msgstr "无法保存设置" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6592,10 +6736,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7253,10 +7393,6 @@ msgstr "引用:" msgid "An excerpt from '%(book_title)s'" msgstr "摘自《%(book_title)s》的节录" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "位置：" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "页码：" @@ -7269,12 +7405,12 @@ msgstr "百分比：" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "你对《%(book_title)s》的书评" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "书评:" @@ -7371,6 +7507,12 @@ msgid "rated %(title)s: %(display_rating)s sta msgid_plural "rated %(title)s: %(display_rating)s stars" msgstr[0] "为 %(title)s 打了分: %(display_rating)s 星" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7582,35 +7724,35 @@ msgstr "完成阅读" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "显示状态" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "在新窗口中打开图像" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "隐藏状态" @@ -7669,16 +7811,22 @@ msgstr "开始阅读 %(author_name)s 的 %(book)s" msgstr "开始阅读 %(book)s" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "写了 %(author_name)s 的 %(book)s 的书评" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "为 %(book)s 撰写了书评" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7954,15 +8102,23 @@ msgid "%(num)d book - by %(user)s" msgid_plural "%(num)d books - by %(user)s" msgstr[0] "%(num)d 本书 - 来自 %(user)s" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "%(title)s：%(subtitle)s" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index 27cbc7c81e..6a759a68ee 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-02-06 17:47+0000\n" -"PO-Revision-Date: 2026-02-06 18:48\n" +"POT-Creation-Date: 2026-05-23 18:40+0000\n" +"PO-Revision-Date: 2026-05-23 19:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -107,7 +107,7 @@ msgstr "書名" #: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" msgstr "評價" @@ -175,39 +175,43 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:500 +#: bookwyrm/models/book.py:532 msgid "Audiobook" msgstr "有聲書" -#: bookwyrm/models/book.py:501 +#: bookwyrm/models/book.py:533 msgid "eBook" msgstr "電子書" -#: bookwyrm/models/book.py:502 +#: bookwyrm/models/book.py:534 msgid "Graphic novel" msgstr "圖像小說" -#: bookwyrm/models/book.py:503 +#: bookwyrm/models/book.py:535 msgid "Hardcover" msgstr "精裝書" -#: bookwyrm/models/book.py:504 +#: bookwyrm/models/book.py:536 msgid "Paperback" msgstr "平裝書" -#: bookwyrm/models/book.py:513 bookwyrm/models/book.py:520 -#: bookwyrm/models/book.py:526 bookwyrm/models/book.py:531 -#: bookwyrm/models/book.py:536 bookwyrm/models/book.py:554 -#: bookwyrm/models/book.py:560 bookwyrm/models/book.py:565 +#: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 +#: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 +#: bookwyrm/models/book.py:568 bookwyrm/models/book.py:586 +#: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" msgstr "" -#: bookwyrm/models/book.py:542 bookwyrm/models/book.py:582 +#: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" msgstr "" +#: bookwyrm/models/book.py:797 +msgid "Book is already in this series" +msgstr "" + #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:85 #: bookwyrm/templates/settings/reports/report.html:115 #: bookwyrm/templates/snippets/create_status.html:26 @@ -461,18 +465,18 @@ msgstr "" msgid "%(display_name)s's quote from %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:452 +#: bookwyrm/models/status.py:456 #, python-format msgid "%(display_name)s's review of %(book_title)s" msgstr "" -#: bookwyrm/models/status.py:484 +#: bookwyrm/models/status.py:488 #, python-format msgid "%(display_name)s rated %(book_title)s: %(display_rating).1f star" msgid_plural "%(display_name)s rated %(book_title)s: %(display_rating).1f stars" msgstr[0] "" -#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:343 +#: bookwyrm/models/user.py:40 bookwyrm/templates/book/book.html:359 msgid "Reviews" msgstr "書評" @@ -488,19 +492,19 @@ msgstr "引用" msgid "Everything else" msgstr "所有其他內容" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home Timeline" msgstr "主頁時間線" -#: bookwyrm/settings.py:236 +#: bookwyrm/settings.py:245 msgid "Home" msgstr "主頁" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 msgid "Books Timeline" msgstr "書目時間線" -#: bookwyrm/settings.py:237 +#: bookwyrm/settings.py:246 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -509,91 +513,91 @@ msgstr "書目時間線" msgid "Books" msgstr "書目" -#: bookwyrm/settings.py:316 +#: bookwyrm/settings.py:325 msgid "English" msgstr "English（英語）" -#: bookwyrm/settings.py:317 +#: bookwyrm/settings.py:326 msgid "Català (Catalan)" msgstr "Català (加泰羅尼亞語)" -#: bookwyrm/settings.py:318 +#: bookwyrm/settings.py:327 msgid "Deutsch (German)" msgstr "Deutsch（德語）" -#: bookwyrm/settings.py:319 +#: bookwyrm/settings.py:328 msgid "Esperanto (Esperanto)" msgstr "Esperanto (世界語)" -#: bookwyrm/settings.py:320 +#: bookwyrm/settings.py:329 msgid "Español (Spanish)" msgstr "Español（西班牙語）" -#: bookwyrm/settings.py:321 +#: bookwyrm/settings.py:330 msgid "Euskara (Basque)" msgstr "Euskara (巴斯克語)" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:331 msgid "Galego (Galician)" msgstr "Galego (加利西亞語)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:332 msgid "Italiano (Italian)" msgstr "Italiano (意大利語)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:333 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:334 msgid "Suomi (Finnish)" msgstr "Suomi (芬蘭語)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:335 msgid "Français (French)" msgstr "Français（法語）" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:336 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (立陶宛語)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:337 msgid "Nederlands (Dutch)" msgstr "Nederlands (荷蘭語)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:338 msgid "Norsk (Norwegian)" msgstr "Norsk (挪威語)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:339 msgid "Polski (Polish)" msgstr "Polski (波蘭語)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:340 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (巴西葡萄牙語)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:341 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (歐洲葡萄牙語)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:342 msgid "Română (Romanian)" msgstr "Română (羅馬尼亞語)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:343 msgid "Svenska (Swedish)" msgstr "Svenska (瑞典語)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:344 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:345 msgid "简体中文 (Simplified Chinese)" msgstr "簡體中文" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:346 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文" @@ -836,7 +840,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:73 +#: bookwyrm/templates/book/book.html:89 bookwyrm/templates/book/series.html:21 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -905,57 +909,62 @@ msgstr "出生:" msgid "Died:" msgstr "逝世:" -#: bookwyrm/templates/author/author.html:66 +#: bookwyrm/templates/author/author.html:63 +msgid "Series:" +msgstr "系列:" + +#: bookwyrm/templates/author/author.html:78 +#: bookwyrm/templates/book/series.html:41 msgid "External links" msgstr "外部連結" -#: bookwyrm/templates/author/author.html:71 +#: bookwyrm/templates/author/author.html:83 msgid "Wikipedia" msgstr "維基百科" -#: bookwyrm/templates/author/author.html:79 +#: bookwyrm/templates/author/author.html:91 msgid "View on Wikidata" msgstr "" -#: bookwyrm/templates/author/author.html:87 +#: bookwyrm/templates/author/author.html:99 msgid "Website" msgstr "網站" -#: bookwyrm/templates/author/author.html:95 +#: bookwyrm/templates/author/author.html:107 msgid "View ISNI record" msgstr "查看 ISNI 記錄" -#: bookwyrm/templates/author/author.html:103 -#: bookwyrm/templates/book/book.html:183 +#: bookwyrm/templates/author/author.html:115 +#: bookwyrm/templates/book/book.html:199 msgid "View on ISFDB" msgstr "在 ISFDB 查看" -#: bookwyrm/templates/author/author.html:108 +#: bookwyrm/templates/author/author.html:120 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:166 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "載入資料" -#: bookwyrm/templates/author/author.html:112 -#: bookwyrm/templates/book/book.html:154 +#: bookwyrm/templates/author/author.html:124 +#: bookwyrm/templates/book/book.html:170 msgid "View on OpenLibrary" msgstr "在 OpenLibrary 檢視" -#: bookwyrm/templates/author/author.html:127 -#: bookwyrm/templates/book/book.html:168 +#: bookwyrm/templates/author/author.html:139 +#: bookwyrm/templates/book/book.html:184 msgid "View on Inventaire" msgstr "在 Inventaire 檢視" -#: bookwyrm/templates/author/author.html:143 +#: bookwyrm/templates/author/author.html:155 msgid "View on LibraryThing" msgstr "在 LibraryThing 查看" -#: bookwyrm/templates/author/author.html:151 +#: bookwyrm/templates/author/author.html:163 msgid "View on Goodreads" msgstr "在 Goodreads 查看" -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:178 #, python-format msgid "Books by %(name)s" msgstr "%(name)s 所著的書" @@ -992,8 +1001,8 @@ msgid "Name:" msgstr "名稱:" #: bookwyrm/templates/author/edit_author.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:68 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Separate multiple values with commas." msgstr "請用逗號(,)分隔多個值。" @@ -1030,7 +1039,8 @@ msgid "Openlibrary key:" msgstr "Openlibrary key:" #: bookwyrm/templates/author/edit_author.html:90 -#: bookwyrm/templates/book/edit/edit_book_form.html:336 +#: bookwyrm/templates/book/edit/edit_book_form.html:386 +#: bookwyrm/templates/book/edit/edit_series.html:54 msgid "Inventaire ID:" msgstr "Inventaire ID:" @@ -1039,7 +1049,7 @@ msgid "Librarything key:" msgstr "Librarything key:" #: bookwyrm/templates/author/edit_author.html:104 -#: bookwyrm/templates/book/edit/edit_book_form.html:345 +#: bookwyrm/templates/book/edit/edit_book_form.html:395 msgid "Goodreads key:" msgstr "Goodreads key:" @@ -1052,8 +1062,8 @@ msgid "ISNI:" msgstr "ISNI：" #: bookwyrm/templates/author/edit_author.html:128 -#: bookwyrm/templates/book/book.html:256 -#: bookwyrm/templates/book/edit/edit_book.html:150 +#: bookwyrm/templates/book/book.html:272 +#: bookwyrm/templates/book/edit/edit_book.html:186 #: bookwyrm/templates/book/file_links/add_link_modal.html:60 #: bookwyrm/templates/book/file_links/edit_links.html:86 #: bookwyrm/templates/groups/form.html:32 @@ -1065,7 +1075,7 @@ msgstr "ISNI：" #: bookwyrm/templates/settings/announcements/edit_announcement.html:120 #: bookwyrm/templates/settings/federation/edit_instance.html:98 #: bookwyrm/templates/settings/federation/instance.html:105 -#: bookwyrm/templates/settings/federation/settings.html:45 +#: bookwyrm/templates/settings/federation/settings.html:78 #: bookwyrm/templates/settings/registration.html:96 #: bookwyrm/templates/settings/registration_limited.html:76 #: bookwyrm/templates/settings/site.html:144 @@ -1077,10 +1087,10 @@ msgstr "儲存" #: bookwyrm/templates/author/edit_author.html:129 #: bookwyrm/templates/author/sync_modal.html:23 -#: bookwyrm/templates/book/book.html:257 +#: bookwyrm/templates/book/book.html:273 #: bookwyrm/templates/book/cover_add_modal.html:33 -#: bookwyrm/templates/book/edit/edit_book.html:152 -#: bookwyrm/templates/book/edit/edit_book.html:155 +#: bookwyrm/templates/book/edit/edit_book.html:188 +#: bookwyrm/templates/book/edit/edit_book.html:191 #: bookwyrm/templates/book/file_links/add_link_modal.html:59 #: bookwyrm/templates/book/file_links/verification_modal.html:26 #: bookwyrm/templates/book/sync_modal.html:23 @@ -1090,7 +1100,7 @@ msgstr "儲存" #: bookwyrm/templates/preferences/disable-2fa.html:19 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27 #: bookwyrm/templates/readthrough/readthrough_modal.html:80 -#: bookwyrm/templates/search/barcode_modal.html:43 +#: bookwyrm/templates/search/barcode_modal.html:41 #: bookwyrm/templates/settings/federation/instance.html:106 #: bookwyrm/templates/settings/files.html:193 #: bookwyrm/templates/settings/files.html:354 @@ -1107,7 +1117,8 @@ msgid "Loading data will connect to %(source_name)s and check f msgstr "" #: bookwyrm/templates/author/sync_modal.html:24 -#: bookwyrm/templates/book/edit/edit_book.html:137 +#: bookwyrm/templates/book/edit/edit_book.html:173 +#: bookwyrm/templates/book/edit/edit_series.html:84 #: bookwyrm/templates/book/sync_modal.html:24 #: bookwyrm/templates/groups/members.html:29 #: bookwyrm/templates/landing/force_password_reset.html:94 @@ -1124,95 +1135,114 @@ msgstr "確認" msgid "Unable to connect to remote source." msgstr "無法連接到遠程數據源。" -#: bookwyrm/templates/book/book.html:81 bookwyrm/templates/book/book.html:82 +#: bookwyrm/templates/book/book.html:52 +#, python-format +msgid "This book might be part of the %(series)s series." +msgstr "" + +#: bookwyrm/templates/book/book.html:56 +msgid "Edit it to confirm." +msgstr "" + +#: bookwyrm/templates/book/book.html:69 +#, python-format +msgid "Book %(number)s in %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:75 +#, python-format +msgid "Part of %(title)s" +msgstr "" + +#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" msgstr "編輯書目" -#: bookwyrm/templates/book/book.html:107 bookwyrm/templates/book/book.html:110 +#: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" msgstr "點擊添加封面" -#: bookwyrm/templates/book/book.html:116 +#: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" msgstr "載入封面失敗" -#: bookwyrm/templates/book/book.html:127 +#: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" msgstr "點擊放大" -#: bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/book/book.html:206 msgid "View on Finna" msgstr "" -#: bookwyrm/templates/book/book.html:205 +#: bookwyrm/templates/book/book.html:221 msgid "View on Libris" msgstr "" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 則書評)" -#: bookwyrm/templates/book/book.html:245 +#: bookwyrm/templates/book/book.html:261 msgid "Add Description" msgstr "新增描述" -#: bookwyrm/templates/book/book.html:252 +#: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:268 +#: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" msgstr[0] "%(count)s 版次" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" msgstr "此版本已在你的書架上：" -#: bookwyrm/templates/book/book.html:297 +#: bookwyrm/templates/book/book.html:313 #, 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:308 +#: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" msgstr "你的閱讀活動" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" msgstr "新增閱讀日期" -#: bookwyrm/templates/book/book.html:322 +#: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." msgstr "你還未閱讀這本書。" -#: bookwyrm/templates/book/book.html:348 +#: bookwyrm/templates/book/book.html:364 msgid "Your reviews" msgstr "你的書評" -#: bookwyrm/templates/book/book.html:354 +#: bookwyrm/templates/book/book.html:370 msgid "Your comments" msgstr "你的評論" -#: bookwyrm/templates/book/book.html:360 +#: bookwyrm/templates/book/book.html:376 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:396 +#: bookwyrm/templates/book/book.html:412 msgid "Subjects" msgstr "主題" -#: bookwyrm/templates/book/book.html:408 +#: bookwyrm/templates/book/book.html:424 msgid "Places" msgstr "地點" -#: bookwyrm/templates/book/book.html:419 +#: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 @@ -1227,15 +1257,15 @@ msgstr "地點" msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:431 +#: bookwyrm/templates/book/book.html:447 msgid "Add to list" msgstr "新增到列表" -#: bookwyrm/templates/book/book.html:438 +#: bookwyrm/templates/book/book.html:454 msgid "Create new list..." msgstr "" -#: bookwyrm/templates/book/book.html:442 +#: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:255 @@ -1258,25 +1288,26 @@ msgid "Copied ISBN!" msgstr "已複製ISBN！" #: bookwyrm/templates/book/book_identifiers.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:354 +#: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" msgstr "OCLC 號:" #: bookwyrm/templates/book/book_identifiers.html:30 -#: bookwyrm/templates/book/edit/edit_book_form.html:363 +#: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 -#: bookwyrm/templates/book/edit/edit_book_form.html:372 +#: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" msgstr "Audible ASIN：" #: bookwyrm/templates/book/book_identifiers.html:44 -#: bookwyrm/templates/book/edit/edit_book_form.html:381 +#: bookwyrm/templates/book/edit/edit_book_form.html:431 +#: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" msgstr "ISFDB ID：" @@ -1287,12 +1318,12 @@ msgid "Goodreads:" msgstr "Goodreads：" #: bookwyrm/templates/book/book_identifiers.html:58 -#: bookwyrm/templates/book/edit/edit_book_form.html:390 +#: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" msgstr "" #: bookwyrm/templates/book/book_identifiers.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:399 +#: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" msgstr "" @@ -1301,12 +1332,12 @@ msgid "Add cover" msgstr "新增封面" #: bookwyrm/templates/book/cover_add_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:246 +#: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" msgstr "上載封面:" #: bookwyrm/templates/book/cover_add_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:252 +#: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" msgstr "" @@ -1371,15 +1402,32 @@ msgstr "這是一位新的作者" msgid "Creating a new author: %(name)s" msgstr "正在建立新的作者: %(name)s" -#: bookwyrm/templates/book/edit/edit_book.html:122 +#: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" msgstr "這是已存在的作品的另一個版本嗎？" -#: bookwyrm/templates/book/edit/edit_book.html:130 +#: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" msgstr "這是一個新的作品。" -#: bookwyrm/templates/book/edit/edit_book.html:139 +#: bookwyrm/templates/book/edit/edit_book.html:142 +msgid "Are you sure this is a new series? The following series have similar names and a matching author." +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:148 +msgid "Is this book part of one of these series?" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:160 +msgid "This is a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:165 +msgid "Creating a new series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book.html:175 +#: bookwyrm/templates/book/edit/edit_series.html:86 #: bookwyrm/templates/feed/status.html:17 #: bookwyrm/templates/guided_tour/book.html:44 #: bookwyrm/templates/guided_tour/book.html:68 @@ -1441,124 +1489,190 @@ msgstr "" msgid "Subtitle:" msgstr "副標題:" -#: bookwyrm/templates/book/edit/edit_book_form.html:66 -msgid "Series:" -msgstr "系列:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:76 -msgid "Series number:" -msgstr "系列編號:" - -#: bookwyrm/templates/book/edit/edit_book_form.html:87 +#: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" msgstr "語言:" -#: bookwyrm/templates/book/edit/edit_book_form.html:99 +#: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" msgstr "主旨：" -#: bookwyrm/templates/book/edit/edit_book_form.html:103 +#: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" msgstr "新增主旨" -#: bookwyrm/templates/book/edit/edit_book_form.html:121 +#: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" msgstr "移除主旨" -#: bookwyrm/templates/book/edit/edit_book_form.html:144 +#: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" msgstr "新增另一個主旨" -#: bookwyrm/templates/book/edit/edit_book_form.html:152 +#: bookwyrm/templates/book/edit/edit_book_form.html:130 +msgid "Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:138 +#: bookwyrm/templates/book/series.html:12 +#: bookwyrm/templates/book/series.html:13 +msgid "Edit Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:141 +msgid "To edit details of a series itself, click the series name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:150 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:164 +#, python-format +msgid "Remove this book from %(series_name)s" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:175 +msgid "Add Series" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:178 +msgid "Series name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:186 +#: bookwyrm/templates/book/edit/edit_series.html:75 +msgid "Series position:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:189 +msgid "This field was previously called \"Series number\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" msgstr "出版品" -#: bookwyrm/templates/book/edit/edit_book_form.html:157 +#: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" msgstr "出版社:" -#: bookwyrm/templates/book/edit/edit_book_form.html:169 +#: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" msgstr "初版時間:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" msgstr "出版時間:" -#: bookwyrm/templates/book/edit/edit_book_form.html:188 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" msgstr "作者" -#: bookwyrm/templates/book/edit/edit_book_form.html:199 +#: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:202 +#: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" msgstr "%(name)s 的作者頁面" -#: bookwyrm/templates/book/edit/edit_book_form.html:210 +#: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" msgstr "新增作者:" -#: bookwyrm/templates/book/edit/edit_book_form.html:213 -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:263 +#: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" msgstr "新增作者" -#: bookwyrm/templates/book/edit/edit_book_form.html:214 -#: bookwyrm/templates/book/edit/edit_book_form.html:217 +#: bookwyrm/templates/book/edit/edit_book_form.html:264 +#: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" msgstr "陳大文" -#: bookwyrm/templates/book/edit/edit_book_form.html:223 +#: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" msgstr "新增其他作者" -#: bookwyrm/templates/book/edit/edit_book_form.html:233 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" msgstr "封面" -#: bookwyrm/templates/book/edit/edit_book_form.html:265 +#: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" msgstr "實體性質" -#: bookwyrm/templates/book/edit/edit_book_form.html:272 +#: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "格式:" -#: bookwyrm/templates/book/edit/edit_book_form.html:282 +#: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" msgstr "裝訂詳情：" -#: bookwyrm/templates/book/edit/edit_book_form.html:293 +#: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" msgstr "頁數:" -#: bookwyrm/templates/book/edit/edit_book_form.html:304 +#: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" msgstr "書目標識號" -#: bookwyrm/templates/book/edit/edit_book_form.html:309 +#: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:318 +#: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:327 +#: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" +#: bookwyrm/templates/book/edit/edit_series.html:9 +#, python-format +msgid "Edit \"%(title)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:20 +#, python-format +msgid "Edit \"%(name)s\"" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:30 +#: bookwyrm/templates/settings/schedules.html:22 +msgid "Name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:36 +#: bookwyrm/templates/book/series.html:29 +msgid "Alternative names" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:39 +#: bookwyrm/templates/book/edit/edit_series.html:42 +msgid "Add Alternative name:" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:48 +msgid "Add an Alternative name" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_series.html:57 +msgid "Wikidata ID:" +msgstr "" + #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" @@ -1745,19 +1859,11 @@ msgstr "於 %(date)s 出版" msgid "rated it" msgstr "評價了" -#: bookwyrm/templates/book/series.html:11 -msgid "Series by" -msgstr "" - -#: bookwyrm/templates/book/series.html:28 +#: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:28 -msgid "Unsorted Book" -msgstr "" - #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." @@ -1802,7 +1908,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:107 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "提交" @@ -1863,7 +1969,7 @@ msgstr "你可以在任何時候從你的 使用者資料 #: bookwyrm/templates/directory/directory.html:29 #: bookwyrm/templates/directory/directory.html:31 -#: bookwyrm/templates/feed/goal_card.html:17 +#: bookwyrm/templates/feed/goal_card.html:19 #: bookwyrm/templates/feed/summary_card.html:12 #: bookwyrm/templates/feed/summary_card.html:14 #: bookwyrm/templates/snippets/announcement.html:31 @@ -1955,21 +2061,22 @@ msgid "%(username)s started reading %(username)s rated %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:27 +#: bookwyrm/templates/discover/card-header.html:28 #, python-format msgid "%(username)s reviewed %(book_title)s" msgstr "%(username)s 已評論 %(book_title)s" -#: bookwyrm/templates/discover/card-header.html:31 +#: bookwyrm/templates/discover/card-header.html:37 #, python-format msgid "%(username)s commented on %(book_title)s" msgstr "" -#: bookwyrm/templates/discover/card-header.html:35 +#: bookwyrm/templates/discover/card-header.html:41 #, python-format msgid "%(username)s quoted %(book_title)s" msgstr "" @@ -2155,14 +2262,14 @@ msgstr "現在還沒有任何活動！嘗試著從關注一個使用者開始吧 msgid "Alternatively, you can try enabling more status types" msgstr "" -#: bookwyrm/templates/feed/goal_card.html:6 +#: bookwyrm/templates/feed/goal_card.html:8 #: bookwyrm/templates/feed/layout.html:14 #: bookwyrm/templates/user/goal_form.html:6 #, python-format msgid "%(year)s Reading Goal" msgstr "%(year)s 閱讀目標" -#: bookwyrm/templates/feed/goal_card.html:18 +#: bookwyrm/templates/feed/goal_card.html:20 #, python-format msgid "You can set or change your reading goal any time from your profile page" msgstr "你可以在任何時候從你的使用者資料頁面 中設定或改變你的閱讀目標" @@ -2450,6 +2557,10 @@ msgstr "" msgid "Edit group" msgstr "" +#: bookwyrm/templates/groups/members.html:6 +msgid "Group Members" +msgstr "" + #: bookwyrm/templates/groups/members.html:11 msgid "Search to add a user" msgstr "" @@ -3683,6 +3794,7 @@ msgid "Search for a book, author, user, or list" msgstr "" #: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 +#: bookwyrm/templates/search/barcode_modal.html:5 msgid "Scan Barcode" msgstr "" @@ -4290,7 +4402,7 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:62 +#: bookwyrm/templates/snippets/status/content_status.html:64 msgid "Content warning" msgstr "" @@ -4756,7 +4868,7 @@ msgstr "" msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity.
      Use this to import into a service like Goodreads." msgstr "" -#: bookwyrm/templates/preferences/export.html:20 +#: bookwyrm/templates/preferences/export.html:19 msgid "Download file" msgstr "" @@ -4949,9 +5061,8 @@ msgid "You are deleting this readthrough and its %(count)s associated progress u msgstr "你正要刪除這篇閱讀經過以及與之相關的 %(count)s 次進度更新。" #: bookwyrm/templates/readthrough/readthrough.html:6 -#: bookwyrm/templates/readthrough/readthrough_modal.html:8 #, python-format -msgid "Update read dates for \"%(title)s\"" +msgid "Update read dates for \"%(title)s\"" msgstr "" #: bookwyrm/templates/readthrough/readthrough_form.html:10 @@ -5006,6 +5117,11 @@ msgstr "編輯閱讀日期" msgid "Delete these read dates" msgstr "刪除這些閱讀日期" +#: bookwyrm/templates/readthrough/readthrough_modal.html:8 +#, python-format +msgid "Update read dates for \"%(title)s\"" +msgstr "" + #: bookwyrm/templates/readthrough/readthrough_modal.html:12 #, python-format msgid "Add read dates for \"%(title)s\"" @@ -5016,39 +5132,33 @@ msgstr "" msgid "Report" msgstr "舉報" -#: bookwyrm/templates/search/barcode_modal.html:5 -msgid "\n" -" Scan Barcode\n" -" " -msgstr "" - -#: bookwyrm/templates/search/barcode_modal.html:21 +#: bookwyrm/templates/search/barcode_modal.html:19 msgid "Requesting camera..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:22 +#: bookwyrm/templates/search/barcode_modal.html:20 msgid "Grant access to the camera to scan a book's barcode." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:27 +#: bookwyrm/templates/search/barcode_modal.html:25 msgid "Could not access camera" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:31 +#: bookwyrm/templates/search/barcode_modal.html:29 msgctxt "barcode scanner" msgid "Scanning..." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:32 +#: bookwyrm/templates/search/barcode_modal.html:30 msgid "Align your book's barcode with the camera." msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:36 +#: bookwyrm/templates/search/barcode_modal.html:34 msgctxt "barcode scanner" msgid "ISBN scanned" msgstr "" -#: bookwyrm/templates/search/barcode_modal.html:37 +#: bookwyrm/templates/search/barcode_modal.html:35 msgctxt "followed by ISBN" msgid "Searching for book:" msgstr "" @@ -5147,13 +5257,13 @@ msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:85 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "開始日期:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:91 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "結束日期:" @@ -5527,7 +5637,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:114 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -5541,31 +5651,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:79 +#: bookwyrm/templates/settings/dashboard/dashboard.html:78 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:97 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:101 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:102 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:120 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:126 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:132 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -5873,13 +5983,49 @@ msgid "Unable to save settings" msgstr "" #: bookwyrm/templates/settings/federation/settings.html:37 +msgid "Require signed GET requests" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:38 +msgid "Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:42 +msgid "Prevents anonymous requests from federated instances. Roughly equivalent to Mastodon's 'secure mode' or 'AUTHORIZED_FETCH'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:48 +msgid "Prevent unauthenticated views" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:51 +msgid "Prevents anonymous users from seeing most pages. To block JSON requests as well, enable 'Require signed GET requests'" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:57 msgid "Disable federation" msgstr "" -#: bookwyrm/templates/settings/federation/settings.html:40 +#: bookwyrm/templates/settings/federation/settings.html:58 +msgid "Caution" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:61 msgid "Prevents your instance from interacting with other federated services. Existing data from other instances will still be present." msgstr "" +#: bookwyrm/templates/settings/federation/settings.html:67 +msgid "Block incoming search" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:68 +msgid "Not Recommended" +msgstr "" + +#: bookwyrm/templates/settings/federation/settings.html:71 +msgid "Prevents other servers from searching your instance. It is strongly recommended you do NOT enable this setting." +msgstr "" + #: bookwyrm/templates/settings/files.html:7 #: bookwyrm/templates/settings/files.html:11 msgid "Files maintenance" @@ -6590,10 +6736,6 @@ msgstr "" msgid "Tasks" msgstr "" -#: bookwyrm/templates/settings/schedules.html:22 -msgid "Name" -msgstr "" - #: bookwyrm/templates/settings/schedules.html:25 msgid "Celery task" msgstr "" @@ -7251,10 +7393,6 @@ msgstr "引用:" msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:31 -msgid "Position:" -msgstr "" - #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" msgstr "" @@ -7267,12 +7405,12 @@ msgstr "" msgid "to" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:24 +#: bookwyrm/templates/snippets/create_status/review.html:23 #, python-format msgid "Your review of '%(book_title)s'" msgstr "你對《%(book_title)s》的書評" -#: bookwyrm/templates/snippets/create_status/review.html:39 +#: bookwyrm/templates/snippets/create_status/review.html:38 msgid "Review:" msgstr "書評:" @@ -7369,6 +7507,12 @@ msgid "rated %(title)s: %(display_rating)s sta msgid_plural "rated %(title)s: %(display_rating)s stars" msgstr[0] "" +#: bookwyrm/templates/snippets/generated_status/rating_pure_name.html:3 +#, python-format +msgid "Rated \"%(book_title)s\" %(display_rating)s star %(review_title)s" +msgid_plural "Rated \"%(book_title)s\" %(display_rating)s stars %(review_title)s" +msgstr[0] "" + #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:4 #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" @@ -7580,35 +7724,35 @@ msgstr "完成閱讀" msgid "Show rating" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:69 +#: bookwyrm/templates/snippets/status/content_status.html:71 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:91 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:93 +#: bookwyrm/templates/snippets/status/content_status.html:95 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:116 +#: bookwyrm/templates/snippets/status/content_status.html:118 msgid "Open image in new window" msgstr "在新視窗中開啟圖片" -#: bookwyrm/templates/snippets/status/content_status.html:137 +#: bookwyrm/templates/snippets/status/content_status.html:139 msgid "Hide status" msgstr "" @@ -7667,16 +7811,22 @@ msgstr "" msgid "started reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:8 +#: bookwyrm/templates/snippets/status/headers/review.html:10 +#: bookwyrm/templates/snippets/status/headers/review.html:26 #, python-format msgid "reviewed %(book)s by %(author_name)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/review.html:15 +#: bookwyrm/templates/snippets/status/headers/review.html:17 #, python-format msgid "reviewed %(book)s" msgstr "" +#: bookwyrm/templates/snippets/status/headers/review.html:33 +#, python-format +msgid "rated %(book)s" +msgstr "" + #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" @@ -7952,15 +8102,23 @@ msgid "%(num)d book - by %(user)s" msgid_plural "%(num)d books - by %(user)s" msgstr[0] "" -#: bookwyrm/templatetags/utilities.py:50 +#: bookwyrm/templatetags/utilities.py:52 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/templatetags/utilities.py:133 +#: bookwyrm/templatetags/utilities.py:153 msgid "a new user account" msgstr "" +#: bookwyrm/views/books/edit_book.py:80 bookwyrm/views/books/edit_book.py:484 +msgid "There is another book in the series with the same value" +msgstr "" + +#: bookwyrm/views/books/series.py:95 +msgid "Series position must be unique for each book" +msgstr "" + #: bookwyrm/views/updates.py:46 #, python-format msgid "Load %(count)d unread status" From e6c097843e66689b55e95b8a584e8b68ab010e10 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 9 Jun 2026 07:32:36 -0700 Subject: [PATCH 744/962] New translations django.po (Indonesian) [ci skip] --- locale/id_ID/LC_MESSAGES/django.po | 102 ++++++++++++++--------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/locale/id_ID/LC_MESSAGES/django.po b/locale/id_ID/LC_MESSAGES/django.po index 527639dff4..c4026fa92f 100644 --- a/locale/id_ID/LC_MESSAGES/django.po +++ b/locale/id_ID/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2026-05-23 18:40+0000\n" -"PO-Revision-Date: 2026-06-07 05:49\n" +"PO-Revision-Date: 2026-06-09 14:32\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -1147,100 +1147,100 @@ msgstr "Edit ini untuk mengonfirmasi." #: bookwyrm/templates/book/book.html:69 #, python-format msgid "Book %(number)s in %(title)s" -msgstr "" +msgstr "Buku %(number)s di %(title)s" #: bookwyrm/templates/book/book.html:75 #, python-format msgid "Part of %(title)s" -msgstr "" +msgstr "Bagian dari %(title)s" #: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:98 msgid "Edit Book" -msgstr "" +msgstr "Edit Buku" #: bookwyrm/templates/book/book.html:123 bookwyrm/templates/book/book.html:126 msgid "Click to add cover" -msgstr "" +msgstr "Klik untuk menambahkan kover" #: bookwyrm/templates/book/book.html:132 msgid "Failed to load cover" -msgstr "" +msgstr "Gagal memuat kover" #: bookwyrm/templates/book/book.html:143 msgid "Click to enlarge" -msgstr "" +msgstr "Klik untuk membesarkan" #: bookwyrm/templates/book/book.html:206 msgid "View on Finna" -msgstr "" +msgstr "Lihat di Finna" #: bookwyrm/templates/book/book.html:221 msgid "View on Libris" -msgstr "" +msgstr "Lihat di Libris" #: bookwyrm/templates/book/book.html:245 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" -msgstr[0] "" +msgstr[0] "(%(review_count)s ulasan)" #: bookwyrm/templates/book/book.html:261 msgid "Add Description" -msgstr "" +msgstr "Tambahkan Deskripsi" #: bookwyrm/templates/book/book.html:268 #: bookwyrm/templates/book/edit/edit_book_form.html:55 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" -msgstr "" +msgstr "Deskripsi:" #: bookwyrm/templates/book/book.html:284 #, python-format msgid "%(count)s edition" msgid_plural "%(count)s editions" -msgstr[0] "" +msgstr[0] "%(count)s edisi" #: bookwyrm/templates/book/book.html:298 msgid "You have shelved this edition in:" -msgstr "" +msgstr "Anda sudah menyimpan edisi ini di:" #: bookwyrm/templates/book/book.html:313 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." -msgstr "" +msgstr "Edisi berbeda dari buku ini di rak %(shelf_name)s." #: bookwyrm/templates/book/book.html:324 msgid "Your reading activity" -msgstr "" +msgstr "Aktivitas membaca Anda" #: bookwyrm/templates/book/book.html:330 #: bookwyrm/templates/guided_tour/book.html:56 msgid "Add read dates" -msgstr "" +msgstr "Tambahkan tanggal baca" #: bookwyrm/templates/book/book.html:338 msgid "You don't have any reading activity for this book." -msgstr "" +msgstr "Anda tidak memiliki aktivitas membaca untuk buku ini." #: bookwyrm/templates/book/book.html:364 msgid "Your reviews" -msgstr "" +msgstr "Ulasan Anda" #: bookwyrm/templates/book/book.html:370 msgid "Your comments" -msgstr "" +msgstr "Komentar Anda" #: bookwyrm/templates/book/book.html:376 msgid "Your quotes" -msgstr "" +msgstr "Kutipan Anda" #: bookwyrm/templates/book/book.html:412 msgid "Subjects" -msgstr "" +msgstr "Subjek" #: bookwyrm/templates/book/book.html:424 msgid "Places" -msgstr "" +msgstr "Tempat" #: bookwyrm/templates/book/book.html:435 #: bookwyrm/templates/groups/group.html:19 @@ -1255,15 +1255,15 @@ msgstr "" #: bookwyrm/templates/settings/celery.html:77 #: bookwyrm/templates/user/layout.html:101 bookwyrm/templates/user/lists.html:6 msgid "Lists" -msgstr "" +msgstr "Daftar" #: bookwyrm/templates/book/book.html:447 msgid "Add to list" -msgstr "" +msgstr "Tambahkan ke daftar" #: bookwyrm/templates/book/book.html:454 msgid "Create new list..." -msgstr "" +msgstr "Buat daftar baru..." #: bookwyrm/templates/book/book.html:458 #: bookwyrm/templates/book/cover_add_modal.html:32 @@ -1272,78 +1272,78 @@ msgstr "" #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 #: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 msgid "Add" -msgstr "" +msgstr "Tambah" #: bookwyrm/templates/book/book_identifiers.html:8 msgid "ISBN:" -msgstr "" +msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:12 #: bookwyrm/templates/book/book_identifiers.html:13 msgid "Copy ISBN" -msgstr "" +msgstr "Salin ISBN" #: bookwyrm/templates/book/book_identifiers.html:16 msgid "Copied ISBN!" -msgstr "" +msgstr "ISBN disalin!" #: bookwyrm/templates/book/book_identifiers.html:23 #: bookwyrm/templates/book/edit/edit_book_form.html:404 #: bookwyrm/templates/rss/edition.html:6 msgid "OCLC Number:" -msgstr "" +msgstr "Nomor OCLC:" #: bookwyrm/templates/book/book_identifiers.html:30 #: bookwyrm/templates/book/edit/edit_book_form.html:413 #: bookwyrm/templates/rss/edition.html:7 msgid "ASIN:" -msgstr "" +msgstr "ASIN:" #: bookwyrm/templates/book/book_identifiers.html:37 #: bookwyrm/templates/book/edit/edit_book_form.html:422 #: bookwyrm/templates/rss/edition.html:8 msgid "Audible ASIN:" -msgstr "" +msgstr "Audible ASIN:" #: bookwyrm/templates/book/book_identifiers.html:44 #: bookwyrm/templates/book/edit/edit_book_form.html:431 #: bookwyrm/templates/book/edit/edit_series.html:60 #: bookwyrm/templates/rss/edition.html:9 msgid "ISFDB ID:" -msgstr "" +msgstr "ISFDB ID:" #: bookwyrm/templates/book/book_identifiers.html:51 #: bookwyrm/templates/rss/edition.html:10 msgid "Goodreads:" -msgstr "" +msgstr "Goodreads:" #: bookwyrm/templates/book/book_identifiers.html:58 #: bookwyrm/templates/book/edit/edit_book_form.html:440 msgid "Finna ID:" -msgstr "" +msgstr "Finna ID:" #: bookwyrm/templates/book/book_identifiers.html:65 #: bookwyrm/templates/book/edit/edit_book_form.html:449 msgid "Libris ID:" -msgstr "" +msgstr "Libris ID:" #: bookwyrm/templates/book/cover_add_modal.html:5 msgid "Add cover" -msgstr "" +msgstr "Tambahkan kover" #: bookwyrm/templates/book/cover_add_modal.html:17 #: bookwyrm/templates/book/edit/edit_book_form.html:296 msgid "Upload cover:" -msgstr "" +msgstr "Unggah kover:" #: bookwyrm/templates/book/cover_add_modal.html:23 #: bookwyrm/templates/book/edit/edit_book_form.html:302 msgid "Load cover from URL:" -msgstr "" +msgstr "Muat kover dari URL:" #: bookwyrm/templates/book/cover_show_modal.html:6 msgid "Book cover preview" -msgstr "" +msgstr "Pratinjau kover buku" #: bookwyrm/templates/book/cover_show_modal.html:11 #: bookwyrm/templates/components/inline_form.html:8 @@ -1353,49 +1353,49 @@ msgstr "" #: bookwyrm/templates/get_started/layout.html:27 #: bookwyrm/templates/get_started/layout.html:60 msgid "Close" -msgstr "" +msgstr "Tutup" #: bookwyrm/templates/book/edit/edit_book.html:8 #: bookwyrm/templates/book/edit/edit_book.html:18 #, python-format msgid "Edit \"%(book_title)s\"" -msgstr "" +msgstr "Edit \"%(book_title)s\"" #: bookwyrm/templates/book/edit/edit_book.html:10 #: bookwyrm/templates/book/edit/edit_book.html:20 msgid "Add Book" -msgstr "" +msgstr "Tambah Buku" #: bookwyrm/templates/book/edit/edit_book.html:43 msgid "Failed to save book, see errors below for more information." -msgstr "" +msgstr "Gagal menyimpan buku, lihat eror di bawah ini untuk informasi lebih banyak." #: bookwyrm/templates/book/edit/edit_book.html:70 msgid "Confirm Book Info" -msgstr "" +msgstr "Konfirmasi Info Buku" #: bookwyrm/templates/book/edit/edit_book.html:78 #, python-format msgid "Is \"%(name)s\" one of these authors?" -msgstr "" +msgstr "Benarkah \"%(name)s\" salah satu penulisnya?" #: bookwyrm/templates/book/edit/edit_book.html:89 #, python-format msgid "Author of %(book_title)s" -msgstr "" +msgstr "Penulis %(book_title)s" #: bookwyrm/templates/book/edit/edit_book.html:93 #, python-format msgid "Author of %(alt_title)s" -msgstr "" +msgstr "Penulis %(alt_title)s" #: bookwyrm/templates/book/edit/edit_book.html:95 msgid "Find more information at isni.org" -msgstr "" +msgstr "Temukan lebih banyak informasi di isni.org" #: bookwyrm/templates/book/edit/edit_book.html:105 msgid "This is a new author" -msgstr "" +msgstr "Ini adalah penulis baru" #: bookwyrm/templates/book/edit/edit_book.html:115 #, python-format From 53d926f469b4491d161812f8518930ea90388db0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 9 Jun 2026 09:38:31 -0700 Subject: [PATCH 745/962] Fixes migration chain for author dates --- ...3_author_born_precision_author_died_precision_and_more.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename bookwyrm/migrations/{0232_author_born_precision_author_died_precision_and_more.py => 0233_author_born_precision_author_died_precision_and_more.py} (89%) diff --git a/bookwyrm/migrations/0232_author_born_precision_author_died_precision_and_more.py b/bookwyrm/migrations/0233_author_born_precision_author_died_precision_and_more.py similarity index 89% rename from bookwyrm/migrations/0232_author_born_precision_author_died_precision_and_more.py rename to bookwyrm/migrations/0233_author_born_precision_author_died_precision_and_more.py index e7c986dd17..b03016338d 100644 --- a/bookwyrm/migrations/0232_author_born_precision_author_died_precision_and_more.py +++ b/bookwyrm/migrations/0233_author_born_precision_author_died_precision_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.14 on 2026-06-06 19:42 +# Generated by Django 5.2.14 on 2026-06-09 16:38 import bookwyrm.models.fields from django.db import migrations, models @@ -7,7 +7,7 @@ class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0231_sitesettings_block_incoming_search_and_more'), + ('bookwyrm', '0232_user_readwise_api_key'), ] operations = [ From 157c17bd7f35d8c11fc9da8cccf64ecb7a7f2a52 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 9 Jun 2026 09:49:45 -0700 Subject: [PATCH 746/962] Re-orders migration files for list item raw notes --- ...{0230_listitem_raw_notes.py => 0234_listitem_raw_notes.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename bookwyrm/migrations/{0230_listitem_raw_notes.py => 0234_listitem_raw_notes.py} (70%) diff --git a/bookwyrm/migrations/0230_listitem_raw_notes.py b/bookwyrm/migrations/0234_listitem_raw_notes.py similarity index 70% rename from bookwyrm/migrations/0230_listitem_raw_notes.py rename to bookwyrm/migrations/0234_listitem_raw_notes.py index 1175588815..d878beeb20 100644 --- a/bookwyrm/migrations/0230_listitem_raw_notes.py +++ b/bookwyrm/migrations/0234_listitem_raw_notes.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.14 on 2026-05-22 19:24 +# Generated by Django 5.2.14 on 2026-06-09 16:49 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0229_series_mergedseries_seriesbook'), + ('bookwyrm', '0233_author_born_precision_author_died_precision_and_more'), ] operations = [ From c7022076649256036f246bda9a2bd065e5a0093a Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Wed, 10 Jun 2026 19:40:52 +0700 Subject: [PATCH 747/962] Fix test failures --- bookwyrm/tests/importers/test_importer.py | 11 +++++++++++ bookwyrm/tests/models/test_shelf_model.py | 11 +++++++++++ bookwyrm/tests/models/test_user_model.py | 12 ++++++++++++ bookwyrm/tests/views/books/test_links.py | 10 ++++++++++ 4 files changed, 44 insertions(+) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 4e3386b99b..08a1a3e22d 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -48,6 +48,17 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + cls.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) + cls.local_user.followers.add(cls.remote_user) work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py index fe75af3f7f..04b0b88990 100644 --- a/bookwyrm/tests/models/test_shelf_model.py +++ b/bookwyrm/tests/models/test_shelf_model.py @@ -26,6 +26,17 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + cls.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) + cls.local_user.followers.add(cls.remote_user) work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create(title="test book", parent_work=work) diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index 26508735f0..0cbd774f73 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -40,6 +40,18 @@ def setUpTestData(cls): name="hi", bookwyrm_user=False, ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + cls.remote_user = models.User.objects.create_user( + "badger", + "badger@badger.badger", + "badgerword", + local=False, + remote_id="https://example.com/users/badger", + inbox="https://example.com/users/badger/inbox", + outbox="https://example.com/users/badger/outbox", + bookwyrm_user=False, + ) + cls.user.followers.add(cls.remote_user) initdb.init_groups() initdb.init_permissions() diff --git a/bookwyrm/tests/views/books/test_links.py b/bookwyrm/tests/views/books/test_links.py index e92345db8e..8cb78a05bd 100644 --- a/bookwyrm/tests/views/books/test_links.py +++ b/bookwyrm/tests/views/books/test_links.py @@ -31,6 +31,16 @@ def setUpTestData(cls): localname="mouse", remote_id="https://example.com/users/mouse", ) + with patch("bookwyrm.models.user.set_remote_server.delay"): + cls.remote_user = models.User.objects.create_user( + "rat", + "rat@rat.com", + "ratword", + local=False, + remote_id="https://example.com/users/rat", + inbox="https://example.com/users/rat/inbox", + outbox="https://example.com/users/rat/outbox", + ) group = Group.objects.create(name="editor") group.permissions.add( Permission.objects.create( From e877a5a61df217b66591a1cbd81e0f82ac7e4562 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Wed, 10 Jun 2026 21:07:44 +0700 Subject: [PATCH 748/962] Fix some tests by patching the first broadcast call --- bookwyrm/tests/importers/test_importer.py | 13 +-------- bookwyrm/tests/models/test_shelf_model.py | 28 ++++++-------------- bookwyrm/tests/models/test_user_model.py | 18 ++----------- bookwyrm/tests/views/admin/test_reports.py | 5 ++-- bookwyrm/tests/views/books/test_book.py | 4 +-- bookwyrm/tests/views/books/test_edit_book.py | 2 +- bookwyrm/tests/views/books/test_links.py | 15 ++--------- bookwyrm/tests/views/lists/test_list.py | 20 +++++++------- 8 files changed, 28 insertions(+), 77 deletions(-) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 08a1a3e22d..8c97d34249 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -48,17 +48,6 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "password", local=True ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - cls.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - cls.local_user.followers.add(cls.remote_user) work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create( title="Example Edition", @@ -164,7 +153,7 @@ def test_import_item_task(self, *_): resolve.return_value = self.book with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: import_item_task(import_item.id) kwargs = mock.call_args.kwargs diff --git a/bookwyrm/tests/models/test_shelf_model.py b/bookwyrm/tests/models/test_shelf_model.py index 04b0b88990..18a5d49d53 100644 --- a/bookwyrm/tests/models/test_shelf_model.py +++ b/bookwyrm/tests/models/test_shelf_model.py @@ -1,6 +1,5 @@ """testing models""" -import json from unittest.mock import patch from django.test import TestCase @@ -26,17 +25,6 @@ def setUpTestData(cls): cls.local_user = models.User.objects.create_user( "mouse", "mouse@mouse.mouse", "mouseword", local=True, localname="mouse" ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - cls.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) - cls.local_user.followers.add(cls.remote_user) work = models.Work.objects.create(title="Test Work") cls.book = models.Edition.objects.create(title="test book", parent_work=work) @@ -67,22 +55,22 @@ def test_create_update_shelf(self, *_): """create and broadcast shelf creation""" with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: shelf = models.Shelf.objects.create( name="Test Shelf", identifier="test-shelf", user=self.local_user ) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Create") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual(activity["object"]["name"], "Test Shelf") shelf.name = "arthur russel" with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: shelf.save() - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Update") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual(activity["object"]["name"], "arthur russel") @@ -96,13 +84,13 @@ def test_shelve(self, *_): ) with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: shelf_book = models.ShelfBook.objects.create( shelf=shelf, user=self.local_user, book=self.book ) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Add") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual(activity["object"]["id"], shelf_book.remote_id) @@ -110,11 +98,11 @@ def test_shelve(self, *_): self.assertEqual(shelf.books.first(), self.book) with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: shelf_book.delete() self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Remove") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual(activity["object"]["id"], shelf_book.remote_id) diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index 0cbd774f73..22b9780695 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -1,7 +1,5 @@ """testing models""" -import json - from unittest.mock import patch from django.contrib.auth.models import Group from django.db import IntegrityError @@ -40,18 +38,6 @@ def setUpTestData(cls): name="hi", bookwyrm_user=False, ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - cls.remote_user = models.User.objects.create_user( - "badger", - "badger@badger.badger", - "badgerword", - local=False, - remote_id="https://example.com/users/badger", - inbox="https://example.com/users/badger/inbox", - outbox="https://example.com/users/badger/outbox", - bookwyrm_user=False, - ) - cls.user.followers.add(cls.remote_user) initdb.init_groups() initdb.init_permissions() @@ -245,7 +231,7 @@ def test_delete_user(self, _): self.assertEqual(self.user.email, "mouse@mouse.mouse") with ( patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as broadcast_mock, patch( "bookwyrm.models.user.User.erase_user_statuses" @@ -257,7 +243,7 @@ def test_delete_user(self, _): # make sure the deletion is broadcast self.assertEqual(broadcast_mock.call_count, 1) - activity = json.loads(broadcast_mock.call_args[1]["args"][1]) + activity = broadcast_mock.call_args[0][0] self.assertEqual(activity["type"], "Delete") self.assertEqual(activity["object"], self.user.remote_id) diff --git a/bookwyrm/tests/views/admin/test_reports.py b/bookwyrm/tests/views/admin/test_reports.py index 6c91f40483..ebde4d6469 100644 --- a/bookwyrm/tests/views/admin/test_reports.py +++ b/bookwyrm/tests/views/admin/test_reports.py @@ -1,6 +1,5 @@ """test for app action functionality""" -import json from unittest.mock import patch from django.contrib.auth.models import Group @@ -159,11 +158,11 @@ def test_delete_user(self, *_): # de-activate with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: views.moderator_delete_user(request, self.rat.id) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Delete") self.rat.refresh_from_db() diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index 7df079ce30..d8aba6f4cd 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -172,7 +172,7 @@ def test_upload_cover_file(self): request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as delay_mock: views.upload_cover(request, self.book.id) self.assertEqual(delay_mock.call_count, 1) @@ -191,7 +191,7 @@ def test_upload_cover_url(self): request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as delay_mock: views.upload_cover(request, self.book.id) self.assertEqual(delay_mock.call_count, 1) diff --git a/bookwyrm/tests/views/books/test_edit_book.py b/bookwyrm/tests/views/books/test_edit_book.py index e776abc8f8..8a0ab69039 100644 --- a/bookwyrm/tests/views/books/test_edit_book.py +++ b/bookwyrm/tests/views/books/test_edit_book.py @@ -360,7 +360,7 @@ def test_create_book_upload_cover_url(self): request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as delay_mock: views.upload_cover(request, self.book.id) self.assertEqual(delay_mock.call_count, 1) diff --git a/bookwyrm/tests/views/books/test_links.py b/bookwyrm/tests/views/books/test_links.py index 8cb78a05bd..1533dd022c 100644 --- a/bookwyrm/tests/views/books/test_links.py +++ b/bookwyrm/tests/views/books/test_links.py @@ -1,6 +1,5 @@ """test for app action functionality""" -import json from unittest.mock import patch from django.contrib.auth.models import Group, Permission @@ -31,16 +30,6 @@ def setUpTestData(cls): localname="mouse", remote_id="https://example.com/users/mouse", ) - with patch("bookwyrm.models.user.set_remote_server.delay"): - cls.remote_user = models.User.objects.create_user( - "rat", - "rat@rat.com", - "ratword", - local=False, - remote_id="https://example.com/users/rat", - inbox="https://example.com/users/rat/inbox", - outbox="https://example.com/users/rat/outbox", - ) group = Group.objects.create(name="editor") group.permissions.add( Permission.objects.create( @@ -86,12 +75,12 @@ def test_add_link_post(self, *_): request = self.factory.post("", form.data) request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: view(request, self.book.id) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Update") self.assertEqual(activity["object"]["type"], "Edition") self.assertIsInstance(activity["object"]["fileLinks"], list) diff --git a/bookwyrm/tests/views/lists/test_list.py b/bookwyrm/tests/views/lists/test_list.py index 43f8b9c7ba..0109940dc2 100644 --- a/bookwyrm/tests/views/lists/test_list.py +++ b/bookwyrm/tests/views/lists/test_list.py @@ -248,14 +248,14 @@ def test_list_edit(self): with ( patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock, patch("bookwyrm.lists_stream.remove_list_task.delay"), ): result = view(request, self.list.id) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Update") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual(activity["object"]["id"], self.list.remote_id) @@ -289,13 +289,13 @@ def test_delete_list(self): request.user = self.local_user with ( patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock, patch("bookwyrm.lists_stream.remove_list_task.delay") as redis_mock, ): views.delete_list(request, self.list.id) self.assertTrue(redis_mock.called) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Delete") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual(activity["object"]["id"], self.list.remote_id) @@ -618,11 +618,11 @@ def test_add_book_outsider(self): request.user = self.rat with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: views.add_book(request) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Add") self.assertEqual(activity["actor"], self.rat.remote_id) self.assertEqual(activity["target"], self.list.remote_id) @@ -647,12 +647,12 @@ def test_add_book_pending(self): request.user = self.rat with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: views.add_book(request) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Add") self.assertEqual(activity["actor"], self.rat.remote_id) @@ -680,11 +680,11 @@ def test_add_book_self_curated(self): request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: views.add_book(request) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Add") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual(activity["target"], self.list.remote_id) From 0f31fd0a0405c78b9c320f6349139376a98a0ad0 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Wed, 10 Jun 2026 21:33:12 +0700 Subject: [PATCH 749/962] Fix the remaining test failures --- bookwyrm/tests/views/lists/test_curate.py | 5 ++--- bookwyrm/tests/views/lists/test_list.py | 5 ++--- bookwyrm/tests/views/lists/test_list_item.py | 2 +- bookwyrm/tests/views/lists/test_lists.py | 5 ++--- bookwyrm/tests/views/preferences/test_delete_user.py | 5 ++--- bookwyrm/tests/views/preferences/test_edit_user.py | 4 ++-- bookwyrm/tests/views/shelf/test_shelf_actions.py | 9 ++++----- bookwyrm/tests/views/test_get_started.py | 4 ++-- bookwyrm/tests/views/test_interaction.py | 5 ++--- bookwyrm/tests/views/test_reading.py | 2 +- bookwyrm/tests/views/test_status.py | 9 ++++----- 11 files changed, 24 insertions(+), 31 deletions(-) diff --git a/bookwyrm/tests/views/lists/test_curate.py b/bookwyrm/tests/views/lists/test_curate.py index adc040ea3e..c36d449123 100644 --- a/bookwyrm/tests/views/lists/test_curate.py +++ b/bookwyrm/tests/views/lists/test_curate.py @@ -1,6 +1,5 @@ """test for app action functionality""" -import json from unittest.mock import patch from django.contrib.auth.models import AnonymousUser @@ -92,12 +91,12 @@ def test_curate_approve(self): request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: view(request, self.list.id) self.assertEqual(mock.call_count, 2) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Add") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual(activity["target"], self.list.remote_id) diff --git a/bookwyrm/tests/views/lists/test_list.py b/bookwyrm/tests/views/lists/test_list.py index 0109940dc2..03487e6b6e 100644 --- a/bookwyrm/tests/views/lists/test_list.py +++ b/bookwyrm/tests/views/lists/test_list.py @@ -1,6 +1,5 @@ """test for app action functionality""" -import json from unittest.mock import patch from django.contrib.auth.models import AnonymousUser @@ -325,11 +324,11 @@ def test_add_book(self): request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: views.add_book(request) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Add") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual(activity["target"], self.list.remote_id) diff --git a/bookwyrm/tests/views/lists/test_list_item.py b/bookwyrm/tests/views/lists/test_list_item.py index d5637ff1ad..d03d2d0998 100644 --- a/bookwyrm/tests/views/lists/test_list_item.py +++ b/bookwyrm/tests/views/lists/test_list_item.py @@ -65,7 +65,7 @@ def test_add_list_item_notes(self): ) request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: view(request, self.list.id, item.id) self.assertEqual(mock.call_count, 1) diff --git a/bookwyrm/tests/views/lists/test_lists.py b/bookwyrm/tests/views/lists/test_lists.py index ca052a11fb..36576fb0bb 100644 --- a/bookwyrm/tests/views/lists/test_lists.py +++ b/bookwyrm/tests/views/lists/test_lists.py @@ -1,6 +1,5 @@ """test for app action functionality""" -import json from unittest.mock import patch from django.contrib.auth.models import AnonymousUser @@ -176,14 +175,14 @@ def test_lists_create(self): request.user = self.local_user with ( patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock, patch("bookwyrm.lists_stream.remove_list_task.delay"), ): result = view(request) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Create") self.assertEqual(activity["actor"], self.local_user.remote_id) diff --git a/bookwyrm/tests/views/preferences/test_delete_user.py b/bookwyrm/tests/views/preferences/test_delete_user.py index fdcf8469c5..97dc5a2f10 100644 --- a/bookwyrm/tests/views/preferences/test_delete_user.py +++ b/bookwyrm/tests/views/preferences/test_delete_user.py @@ -1,6 +1,5 @@ """test for app action functionality""" -import json from unittest.mock import patch from django.contrib.auth.models import AnonymousUser @@ -81,11 +80,11 @@ def test_delete_user(self, *_): self.assertIsNone(self.local_user.name) with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as delay_mock: view(request) self.assertEqual(delay_mock.call_count, 1) - activity = json.loads(delay_mock.call_args[1]["args"][1]) + activity = delay_mock.call_args[0][0] self.assertEqual(activity["type"], "Delete") self.assertEqual(activity["actor"], self.local_user.remote_id) self.assertEqual( diff --git a/bookwyrm/tests/views/preferences/test_edit_user.py b/bookwyrm/tests/views/preferences/test_edit_user.py index a31ee08f5f..ae21b106a2 100644 --- a/bookwyrm/tests/views/preferences/test_edit_user.py +++ b/bookwyrm/tests/views/preferences/test_edit_user.py @@ -80,7 +80,7 @@ def test_edit_user(self, _): self.assertIsNone(self.local_user.name) with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as delay_mock: view(request) self.assertEqual(delay_mock.call_count, 1) @@ -106,7 +106,7 @@ def test_edit_user_avatar(self, _): request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as delay_mock: view(request) self.assertEqual(delay_mock.call_count, 1) diff --git a/bookwyrm/tests/views/shelf/test_shelf_actions.py b/bookwyrm/tests/views/shelf/test_shelf_actions.py index b78da18885..bc4cd2be18 100644 --- a/bookwyrm/tests/views/shelf/test_shelf_actions.py +++ b/bookwyrm/tests/views/shelf/test_shelf_actions.py @@ -1,6 +1,5 @@ """test for app action functionality""" -import json from unittest.mock import patch from django.core.exceptions import PermissionDenied @@ -65,12 +64,12 @@ def test_shelve(self, *_): ) request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: views.shelve(request) self.assertEqual(mock.call_count, 1) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Add") item = models.ShelfBook.objects.get() @@ -156,10 +155,10 @@ def test_unshelve(self, *_): request = self.factory.post("", {"book": self.book.id, "shelf": self.shelf.id}) request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: views.unshelve(request) - activity = json.loads(mock.call_args[1]["args"][1]) + activity = mock.call_args[0][0] self.assertEqual(activity["type"], "Remove") self.assertEqual(activity["object"]["id"], item.remote_id) self.assertEqual(self.shelf.books.count(), 0) diff --git a/bookwyrm/tests/views/test_get_started.py b/bookwyrm/tests/views/test_get_started.py index 5f9b35201c..85d6380970 100644 --- a/bookwyrm/tests/views/test_get_started.py +++ b/bookwyrm/tests/views/test_get_started.py @@ -70,7 +70,7 @@ def test_profile_view_post(self, *_): self.assertIsNone(self.local_user.name) with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as delay_mock: view(request) self.assertEqual(delay_mock.call_count, 1) @@ -112,7 +112,7 @@ def test_books_view_post(self, *_): self.assertFalse(self.local_user.shelfbook_set.exists()) with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as delay_mock: view(request) self.assertEqual(delay_mock.call_count, 1) diff --git a/bookwyrm/tests/views/test_interaction.py b/bookwyrm/tests/views/test_interaction.py index ead7a37167..fef65cbe68 100644 --- a/bookwyrm/tests/views/test_interaction.py +++ b/bookwyrm/tests/views/test_interaction.py @@ -1,6 +1,5 @@ """test for app action functionality""" -import json from unittest.mock import patch from django.test import TestCase from django.test.client import RequestFactory @@ -116,12 +115,12 @@ def test_self_boost(self, *_): status = models.Status.objects.create(user=self.local_user, content="hi") with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as broadcast_mock: view(request, status.id) self.assertEqual(broadcast_mock.call_count, 1) - activity = json.loads(broadcast_mock.call_args[1]["args"][1]) + activity = broadcast_mock.call_args[0][0] self.assertEqual(activity["type"], "Announce") boost = models.Boost.objects.get() diff --git a/bookwyrm/tests/views/test_reading.py b/bookwyrm/tests/views/test_reading.py index 5cf3006b40..965368db0f 100644 --- a/bookwyrm/tests/views/test_reading.py +++ b/bookwyrm/tests/views/test_reading.py @@ -91,7 +91,7 @@ def test_start_reading(self, *_): ) request.user = self.local_user with patch( - "bookwyrm.models.activitypub_mixin.broadcast_task.apply_async" + "bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast" ) as mock: views.ReadingStatus.as_view()(request, "start", self.book.id) diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index d9753f52dc..4582324e03 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -1,6 +1,5 @@ """test for app action functionality""" -import json from unittest.mock import patch import dateutil from django.core.exceptions import PermissionDenied @@ -74,7 +73,7 @@ def test_create_status_saves(self, *_): @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.lists_stream.populate_lists_task.delay") @patch("bookwyrm.activitystreams.remove_status_task.delay") -@patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") +@patch("bookwyrm.models.activitypub_mixin.ActivitypubMixin.broadcast") class StatusViews(TestCase): """viewing and creating statuses""" @@ -591,7 +590,7 @@ def test_delete_status(self, mock, *_): with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock: view(request, status.id) self.assertTrue(redis_mock.called) - activity = json.loads(mock.call_args_list[1][1]["args"][1]) + activity = mock.call_args_list[1][0][0] self.assertEqual(activity["type"], "Delete") self.assertEqual(activity["object"]["type"], "Tombstone") status.refresh_from_db() @@ -625,7 +624,7 @@ def test_delete_status_moderator(self, mock, *_): with patch("bookwyrm.activitystreams.remove_status_task.delay") as redis_mock: view(request, status.id) self.assertTrue(redis_mock.called) - activity = json.loads(mock.call_args_list[1][1]["args"][1]) + activity = mock.call_args_list[1][0][0] self.assertEqual(activity["type"], "Delete") self.assertEqual(activity["object"]["type"], "Tombstone") status.refresh_from_db() @@ -677,7 +676,7 @@ def test_edit_status_success(self, mock, *_): request.user = self.local_user view(request, "comment", existing_status_id=status.id) - activity = json.loads(mock.call_args_list[1][1]["args"][1]) + activity = mock.call_args_list[1][0][0] self.assertEqual(activity["type"], "Update") self.assertEqual(activity["object"]["id"], status.remote_id) From bbda9b4b6d5de8849703fedfee5e3bb562e53ef6 Mon Sep 17 00:00:00 2001 From: Ian Young Date: Wed, 10 Jun 2026 23:09:15 -0500 Subject: [PATCH 750/962] Fix formatting and linting --- .eslintrc.js | 11 +++++++++++ bookwyrm/static/js/xhr_files.js | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index b65fe9885a..abdeffbad5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -86,5 +86,16 @@ module.exports = { }, ], "space-before-blocks": "error", + }, + "globals": { + "gettext": "readonly", + "ngettext": "readonly", + "interpolate": "readonly", + "get_format": "readonly", + "gettext_noop": "readonly", + "pgettext": "readonly", + "npgettext": "readonly", + "pluralidx": "readonly", + "django": "readonly" } }; diff --git a/bookwyrm/static/js/xhr_files.js b/bookwyrm/static/js/xhr_files.js index 6d0bff0ca6..3ed78392de 100644 --- a/bookwyrm/static/js/xhr_files.js +++ b/bookwyrm/static/js/xhr_files.js @@ -35,10 +35,10 @@ let XhrFiles = new (class { const file = item.getAsFile(); if (file.size > event.currentTarget.dataset.maxUpload) { - const errStr = interpolate( - gettext("File exceeds maximum size: %s"), - [event.currentTarget.dataset.maxUploadHuman] - ) + const errStr = interpolate(gettext("File exceeds maximum size: %s"), [ + event.currentTarget.dataset.maxUploadHuman, + ]); + alert(errStr); return; From c4bb8150bb31dc11cd2d30f7582aa667ca647e2f Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 13 Jun 2026 10:52:13 +1000 Subject: [PATCH 751/962] fix migrations --- bookwyrm/migrations/0232_merge_20260524_0901.py | 14 -------------- ...blocked_books.py => 0235_user_blocked_books.py} | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 bookwyrm/migrations/0232_merge_20260524_0901.py rename bookwyrm/migrations/{0231_user_blocked_books.py => 0235_user_blocked_books.py} (76%) diff --git a/bookwyrm/migrations/0232_merge_20260524_0901.py b/bookwyrm/migrations/0232_merge_20260524_0901.py deleted file mode 100644 index 70a112c072..0000000000 --- a/bookwyrm/migrations/0232_merge_20260524_0901.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 5.2.14 on 2026-05-24 09:01 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bookwyrm', '0231_sitesettings_block_incoming_search_and_more'), - ('bookwyrm', '0231_user_blocked_books'), - ] - - operations = [ - ] diff --git a/bookwyrm/migrations/0231_user_blocked_books.py b/bookwyrm/migrations/0235_user_blocked_books.py similarity index 76% rename from bookwyrm/migrations/0231_user_blocked_books.py rename to bookwyrm/migrations/0235_user_blocked_books.py index ebfbc77f5b..92c773a0bf 100644 --- a/bookwyrm/migrations/0231_user_blocked_books.py +++ b/bookwyrm/migrations/0235_user_blocked_books.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.14 on 2026-05-22 21:53 +# Generated by Django 5.2.14 on 2026-06-13 00:51 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0230_merge_20260522_2105'), + ('bookwyrm', '0234_listitem_raw_notes'), ] operations = [ From 644e6a2bdd986484834f4c817dae692ec83367ca Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 13 Jun 2026 11:27:13 +1000 Subject: [PATCH 752/962] fix author covers overflowing --- bookwyrm/templates/author/author.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index c022d0dd4d..7b00afabfd 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -30,7 +30,7 @@

      {{ author.name }}

      {% firstof author.aliases author.born author.died as details %} {% firstof author.wikipedia_link author.website author.openlibrary_key author.inventaire_id author.isni author.isfdb author.wikidata as links %} {% if details or links %} -
      +
      {% if details %}

      {% trans "Author details" %}

      @@ -170,7 +170,7 @@

      {% trans "External links" %}

      {% endif %} -
      +
      {% if author.bio %} {% include "snippets/trimmed_text.html" with full=author.bio trim_length=200 %} {% endif %} From f971bd22a72c44c4e99dc6c9746467652cde6b61 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Sun, 19 Apr 2026 18:49:23 +0300 Subject: [PATCH 753/962] dependencies: pump django-storages to 1.14.6 --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7d05482758..ee969a154c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,8 +15,7 @@ main = [ "django-oauth-toolkit==3.2.0", "django-pgtrigger==4.17.0", "django-sass-processor==1.4.2", - "django-storages==1.14.2", - "django-storages[azure]", + "django-storages[azure,s3]==1.14.6", "environs==14.5.0", "flower==2.0.1", "gunicorn==25.0.3", From 173935e9384ee2c0462f99eda75705bcf8f45dcc Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Sat, 13 Jun 2026 15:05:50 +0300 Subject: [PATCH 754/962] tweak(celery): reduce celery concurrency to 20 100 is also max-connections default in postgresql, so 100 default could cause db-connections to run out if there is lot of jobs in celery queue. --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 737935fa72..98fd7c77ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -144,7 +144,7 @@ services: build: . networks: - main - command: celery -A celerywyrm worker --pool=threads --concurrency=100 -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc + command: celery -A celerywyrm worker --pool=threads --concurrency=20 -l info -Q high_priority,medium_priority,low_priority,streams,images,suggested_users,email,connectors,lists,inbox,imports,import_triggered,broadcast,misc healthcheck: test: celery -A celerywyrm status interval: 10s From 042b05b9a0442c398efcc1bc5183225016406e55 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 13 Jun 2026 06:36:49 -0700 Subject: [PATCH 755/962] New translations django.po (Indonesian) [ci skip] --- locale/id_ID/LC_MESSAGES/django.po | 64 +++++++++++++++--------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/locale/id_ID/LC_MESSAGES/django.po b/locale/id_ID/LC_MESSAGES/django.po index c4026fa92f..0140b12311 100644 --- a/locale/id_ID/LC_MESSAGES/django.po +++ b/locale/id_ID/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2026-05-23 18:40+0000\n" -"PO-Revision-Date: 2026-06-09 14:32\n" +"PO-Revision-Date: 2026-06-13 13:36\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -1400,31 +1400,31 @@ msgstr "Ini adalah penulis baru" #: bookwyrm/templates/book/edit/edit_book.html:115 #, python-format msgid "Creating a new author: %(name)s" -msgstr "" +msgstr "Buat penulis baru: %(name)s" #: bookwyrm/templates/book/edit/edit_book.html:123 msgid "Is this an edition of an existing work?" -msgstr "" +msgstr "Apakah ini edisi dari yang sudah ada?" #: bookwyrm/templates/book/edit/edit_book.html:131 msgid "This is a new work" -msgstr "" +msgstr "Ini buku baru" #: bookwyrm/templates/book/edit/edit_book.html:142 msgid "Are you sure this is a new series? The following series have similar names and a matching author." -msgstr "" +msgstr "Yakin ini serial baru? Serial berikutnya memiliki nama sama dan penulis sama." #: bookwyrm/templates/book/edit/edit_book.html:148 msgid "Is this book part of one of these series?" -msgstr "" +msgstr "Apakah buku ini bagian dari serial ini?" #: bookwyrm/templates/book/edit/edit_book.html:160 msgid "This is a new series" -msgstr "" +msgstr "Ini serial baru" #: bookwyrm/templates/book/edit/edit_book.html:165 msgid "Creating a new series" -msgstr "" +msgstr "Membuat serial baru" #: bookwyrm/templates/book/edit/edit_book.html:175 #: bookwyrm/templates/book/edit/edit_series.html:86 @@ -1474,109 +1474,109 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_profile.html:135 #: bookwyrm/templates/user/user.html:102 bookwyrm/templates/user_menu.html:18 msgid "Back" -msgstr "" +msgstr "Kembali" #: bookwyrm/templates/book/edit/edit_book_form.html:26 #: bookwyrm/templates/snippets/create_status/review.html:15 msgid "Title:" -msgstr "" +msgstr "Judul:" #: bookwyrm/templates/book/edit/edit_book_form.html:36 msgid "Sort Title:" -msgstr "" +msgstr "Urutkan Judul:" #: bookwyrm/templates/book/edit/edit_book_form.html:46 msgid "Subtitle:" -msgstr "" +msgstr "Subjudul:" #: bookwyrm/templates/book/edit/edit_book_form.html:64 msgid "Languages:" -msgstr "" +msgstr "Bahasa:" #: bookwyrm/templates/book/edit/edit_book_form.html:76 msgid "Subjects:" -msgstr "" +msgstr "Subjek:" #: bookwyrm/templates/book/edit/edit_book_form.html:80 msgid "Add subject" -msgstr "" +msgstr "Tambahkan subjek" #: bookwyrm/templates/book/edit/edit_book_form.html:98 msgid "Remove subject" -msgstr "" +msgstr "Hapus subjek" #: bookwyrm/templates/book/edit/edit_book_form.html:121 msgid "Add Another Subject" -msgstr "" +msgstr "Tambahkan Subjek Lain" #: bookwyrm/templates/book/edit/edit_book_form.html:130 msgid "Series" -msgstr "" +msgstr "Serial" #: bookwyrm/templates/book/edit/edit_book_form.html:138 #: bookwyrm/templates/book/series.html:12 #: bookwyrm/templates/book/series.html:13 msgid "Edit Series" -msgstr "" +msgstr "Edit Serial" #: bookwyrm/templates/book/edit/edit_book_form.html:141 msgid "To edit details of a series itself, click the series name" -msgstr "" +msgstr "Untuk mengedit rincian serial, klik nama serial" #: bookwyrm/templates/book/edit/edit_book_form.html:150 #: bookwyrm/templates/snippets/create_status/quotation.html:31 msgid "Position:" -msgstr "" +msgstr "Posisi:" #: bookwyrm/templates/book/edit/edit_book_form.html:164 #, python-format msgid "Remove this book from %(series_name)s" -msgstr "" +msgstr "Hapus buku ini dari %(series_name)s" #: bookwyrm/templates/book/edit/edit_book_form.html:175 msgid "Add Series" -msgstr "" +msgstr "Tambahkan Serial" #: bookwyrm/templates/book/edit/edit_book_form.html:178 msgid "Series name:" -msgstr "" +msgstr "Nama serial:" #: bookwyrm/templates/book/edit/edit_book_form.html:186 #: bookwyrm/templates/book/edit/edit_series.html:75 msgid "Series position:" -msgstr "" +msgstr "Posisi serial:" #: bookwyrm/templates/book/edit/edit_book_form.html:189 msgid "This field was previously called \"Series number\"" -msgstr "" +msgstr "Bidang ini sebelumnya disebut \"Nomor serial\"" #: bookwyrm/templates/book/edit/edit_book_form.html:202 msgid "Publication" -msgstr "" +msgstr "Publikasi" #: bookwyrm/templates/book/edit/edit_book_form.html:207 msgid "Publisher:" -msgstr "" +msgstr "Penerbit:" #: bookwyrm/templates/book/edit/edit_book_form.html:219 msgid "First published date:" -msgstr "" +msgstr "Tanggal terbit pertama kali:" #: bookwyrm/templates/book/edit/edit_book_form.html:227 msgid "Published date:" -msgstr "" +msgstr "Tanggal terbit:" #: bookwyrm/templates/book/edit/edit_book_form.html:238 #: bookwyrm/templates/import/user_import_status.html:155 #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:47 msgid "Authors" -msgstr "" +msgstr "Penulis" #: bookwyrm/templates/book/edit/edit_book_form.html:249 #, python-format msgid "Remove %(name)s" -msgstr "" +msgstr "Hapus %(name)s" #: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format From 69765eae089076d2547a38a44a00c4ad93dbc628 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 13 Jun 2026 08:13:04 -0700 Subject: [PATCH 756/962] New translations django.po (Indonesian) [ci skip] --- locale/id_ID/LC_MESSAGES/django.po | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/locale/id_ID/LC_MESSAGES/django.po b/locale/id_ID/LC_MESSAGES/django.po index 0140b12311..e9a8d39769 100644 --- a/locale/id_ID/LC_MESSAGES/django.po +++ b/locale/id_ID/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2026-05-23 18:40+0000\n" -"PO-Revision-Date: 2026-06-13 13:36\n" +"PO-Revision-Date: 2026-06-13 15:13\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -1581,89 +1581,89 @@ msgstr "Hapus %(name)s" #: bookwyrm/templates/book/edit/edit_book_form.html:252 #, python-format msgid "Author page for %(name)s" -msgstr "" +msgstr "Hapus halaman untuk %(name)s" #: bookwyrm/templates/book/edit/edit_book_form.html:260 msgid "Add Authors:" -msgstr "" +msgstr "Tambahkan Penulis:" #: bookwyrm/templates/book/edit/edit_book_form.html:263 #: bookwyrm/templates/book/edit/edit_book_form.html:266 msgid "Add Author" -msgstr "" +msgstr "Tambahkan Penulis" #: bookwyrm/templates/book/edit/edit_book_form.html:264 #: bookwyrm/templates/book/edit/edit_book_form.html:267 msgid "Jane Doe" -msgstr "" +msgstr "Jane Doe" #: bookwyrm/templates/book/edit/edit_book_form.html:273 msgid "Add Another Author" -msgstr "" +msgstr "Tambahkan Penulis Lain" #: bookwyrm/templates/book/edit/edit_book_form.html:283 #: bookwyrm/templates/shelf/shelf.html:155 msgid "Cover" -msgstr "" +msgstr "Kover" #: bookwyrm/templates/book/edit/edit_book_form.html:315 msgid "Physical Properties" -msgstr "" +msgstr "Properti Fisik" #: bookwyrm/templates/book/edit/edit_book_form.html:322 #: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" -msgstr "" +msgstr "Format:" #: bookwyrm/templates/book/edit/edit_book_form.html:332 msgid "Format details:" -msgstr "" +msgstr "Rincian format:" #: bookwyrm/templates/book/edit/edit_book_form.html:343 msgid "Pages:" -msgstr "" +msgstr "Halaman:" #: bookwyrm/templates/book/edit/edit_book_form.html:354 msgid "Book Identifiers" -msgstr "" +msgstr "Pengidentifikasi Buku" #: bookwyrm/templates/book/edit/edit_book_form.html:359 #: bookwyrm/templates/rss/edition.html:5 msgid "ISBN 13:" -msgstr "" +msgstr "ISBN 13:" #: bookwyrm/templates/book/edit/edit_book_form.html:368 msgid "ISBN 10:" -msgstr "" +msgstr "ISBN 10:" #: bookwyrm/templates/book/edit/edit_book_form.html:377 msgid "Openlibrary ID:" -msgstr "" +msgstr "Openlibrary ID:" #: bookwyrm/templates/book/edit/edit_series.html:9 #, python-format msgid "Edit \"%(title)s\"" -msgstr "" +msgstr "Edit \"%(title)s\"" #: bookwyrm/templates/book/edit/edit_series.html:20 #, python-format msgid "Edit \"%(name)s\"" -msgstr "" +msgstr "Edit \"%(name)s\"" #: bookwyrm/templates/book/edit/edit_series.html:30 #: bookwyrm/templates/settings/schedules.html:22 msgid "Name" -msgstr "" +msgstr "Nama" #: bookwyrm/templates/book/edit/edit_series.html:36 #: bookwyrm/templates/book/series.html:29 msgid "Alternative names" -msgstr "" +msgstr "Nama alternatif" #: bookwyrm/templates/book/edit/edit_series.html:39 #: bookwyrm/templates/book/edit/edit_series.html:42 msgid "Add Alternative name:" -msgstr "" +msgstr "Tambahkan nama Alternatif:" #: bookwyrm/templates/book/edit/edit_series.html:48 msgid "Add an Alternative name" From 5563400fc38506207aa2aebf37439e6724059696 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 13 Jun 2026 10:05:08 -0700 Subject: [PATCH 757/962] Adds allow_external_connections to Flag aciton --- bookwyrm/activitypub/verbs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/activitypub/verbs.py b/bookwyrm/activitypub/verbs.py index 0cdac2d01f..6f74bfa957 100644 --- a/bookwyrm/activitypub/verbs.py +++ b/bookwyrm/activitypub/verbs.py @@ -282,7 +282,7 @@ class Flag(Verb): type: str = "Flag" content: str = None - def action(self): + def action(self, allow_external_connections=True): """Create the report and attach reported statuses""" report = self.to_model() # go through "objects" and figure out what they are From febc4d9437894727585c10be5ecff6366ecdac58 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 14 Jun 2026 08:16:44 -0700 Subject: [PATCH 758/962] New translations django.po (Indonesian) [ci skip] --- locale/id_ID/LC_MESSAGES/django.po | 102 ++++++++++++++--------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/locale/id_ID/LC_MESSAGES/django.po b/locale/id_ID/LC_MESSAGES/django.po index e9a8d39769..f0c199c796 100644 --- a/locale/id_ID/LC_MESSAGES/django.po +++ b/locale/id_ID/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2026-05-23 18:40+0000\n" -"PO-Revision-Date: 2026-06-13 15:13\n" +"PO-Revision-Date: 2026-06-14 15:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -1667,95 +1667,95 @@ msgstr "Tambahkan nama Alternatif:" #: bookwyrm/templates/book/edit/edit_series.html:48 msgid "Add an Alternative name" -msgstr "" +msgstr "Tambahkan nama Alternatif" #: bookwyrm/templates/book/edit/edit_series.html:57 msgid "Wikidata ID:" -msgstr "" +msgstr "Wikidata ID:" #: bookwyrm/templates/book/editions/editions.html:4 #, python-format msgid "Editions of %(book_title)s" -msgstr "" +msgstr "Edisi %(book_title)s" #: bookwyrm/templates/book/editions/editions.html:8 #, python-format msgid "Editions of %(work_title)s" -msgstr "" +msgstr "Edisi %(work_title)s" #: bookwyrm/templates/book/editions/editions.html:55 msgid "Can't find the edition you're looking for?" -msgstr "" +msgstr "Tidak menemukan edisi yang Anda cari?" #: bookwyrm/templates/book/editions/editions.html:76 msgid "Add another edition" -msgstr "" +msgstr "Tambahkan edisi lain" #: bookwyrm/templates/book/editions/format_filter.html:9 #: bookwyrm/templates/book/editions/language_filter.html:9 msgid "Any" -msgstr "" +msgstr "Apapun" #: bookwyrm/templates/book/editions/language_filter.html:6 #: bookwyrm/templates/preferences/edit_user.html:101 msgid "Language:" -msgstr "" +msgstr "Bahasa:" #: bookwyrm/templates/book/editions/search_filter.html:6 msgid "Search editions" -msgstr "" +msgstr "Cari edisi" #: bookwyrm/templates/book/file_links/add_link_modal.html:6 msgid "Add file link" -msgstr "" +msgstr "Tambahkan tautan berkas" #: bookwyrm/templates/book/file_links/add_link_modal.html:19 msgid "Links from unknown domains will need to be approved by a moderator before they are added." -msgstr "" +msgstr "Tautan dari domain yang tidak dikenal harus melewati persetujuan moderator sebelum ditambahkan." #: bookwyrm/templates/book/file_links/add_link_modal.html:24 msgid "URL:" -msgstr "" +msgstr "URL:" #: bookwyrm/templates/book/file_links/add_link_modal.html:29 msgid "File type:" -msgstr "" +msgstr "Tipe berkas:" #: bookwyrm/templates/book/file_links/add_link_modal.html:48 msgid "Availability:" -msgstr "" +msgstr "Ketersediaan:" #: bookwyrm/templates/book/file_links/edit_links.html:5 #: bookwyrm/templates/book/file_links/edit_links.html:21 #: bookwyrm/templates/book/file_links/links.html:53 msgid "Edit links" -msgstr "" +msgstr "Edit tautan" #: bookwyrm/templates/book/file_links/edit_links.html:11 #, python-format msgid "Links for \"%(title)s\"" -msgstr "" +msgstr "Tautan untuk \"%(title)s\"" #: bookwyrm/templates/book/file_links/edit_links.html:32 #: bookwyrm/templates/settings/link_domains/link_table.html:6 msgid "URL" -msgstr "" +msgstr "URL" #: bookwyrm/templates/book/file_links/edit_links.html:33 #: bookwyrm/templates/settings/link_domains/link_table.html:7 msgid "Added by" -msgstr "" +msgstr "Ditambahkan oleh" #: bookwyrm/templates/book/file_links/edit_links.html:34 #: bookwyrm/templates/settings/link_domains/link_table.html:8 msgid "Filetype" -msgstr "" +msgstr "Tipe berkas" #: bookwyrm/templates/book/file_links/edit_links.html:35 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:25 #: bookwyrm/templates/settings/reports/report_links_table.html:5 msgid "Domain" -msgstr "" +msgstr "Domain" #: bookwyrm/templates/book/file_links/edit_links.html:36 #: bookwyrm/templates/import/import.html:149 @@ -1774,137 +1774,137 @@ msgstr "" #: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:35 msgid "Status" -msgstr "" +msgstr "Status" #: bookwyrm/templates/book/file_links/edit_links.html:37 msgid "Availability" -msgstr "" +msgstr "Ketersediaan" #: bookwyrm/templates/book/file_links/edit_links.html:48 #: bookwyrm/templates/settings/link_domains/link_table.html:21 msgid "Unknown user" -msgstr "" +msgstr "Pengguna tidak dikenal" #: bookwyrm/templates/book/file_links/edit_links.html:57 #: bookwyrm/templates/book/file_links/verification_modal.html:22 msgid "Report spam" -msgstr "" +msgstr "Laporkan spam" #: bookwyrm/templates/book/file_links/edit_links.html:102 msgid "No links available for this book." -msgstr "" +msgstr "Tidak ada tautan tersedia untuk buku ini." #: bookwyrm/templates/book/file_links/edit_links.html:113 #: bookwyrm/templates/book/file_links/links.html:18 msgid "Add link to file" -msgstr "" +msgstr "Tambahkan tautan ke berkas" #: bookwyrm/templates/book/file_links/file_link_page.html:6 msgid "File Links" -msgstr "" +msgstr "Tautan Berkas" #: bookwyrm/templates/book/file_links/links.html:9 msgid "Get a copy" -msgstr "" +msgstr "Dapatkan salinan" #: bookwyrm/templates/book/file_links/links.html:47 msgid "No links available" -msgstr "" +msgstr "Tautan tidak tersedia" #: bookwyrm/templates/book/file_links/verification_modal.html:5 msgid "Leaving BookWyrm" -msgstr "" +msgstr "Meninggalkan BookWyrm" #: bookwyrm/templates/book/file_links/verification_modal.html:11 #, python-format msgid "This link is taking you to: %(link_url)s.
      Is that where you'd like to go?" -msgstr "" +msgstr "Tautan ini membawa Anda ke: %(link_url)s.
      Benarkan Anda akan ke sini?" #: bookwyrm/templates/book/file_links/verification_modal.html:27 #: bookwyrm/templates/setup/config.html:134 msgid "Continue" -msgstr "" +msgstr "Lanjutkan" #: bookwyrm/templates/book/publisher_info.html:23 #, python-format msgid "%(format)s, %(pages)s pages" -msgstr "" +msgstr "%(format)s, %(pages)s halaman" #: bookwyrm/templates/book/publisher_info.html:25 #, python-format msgid "%(pages)s pages" -msgstr "" +msgstr "%(pages)s halaman" #: bookwyrm/templates/book/publisher_info.html:38 #, python-format msgid "%(languages)s language" -msgstr "" +msgstr "%(languages)s halaman" #: bookwyrm/templates/book/publisher_info.html:63 #, python-format msgid "Published %(date)s by %(publisher)s." -msgstr "" +msgstr "Diterbitkan %(date)s oleh %(publisher)s." #: bookwyrm/templates/book/publisher_info.html:65 #, python-format msgid "Published by %(publisher)s." -msgstr "" +msgstr "Diterbitkan oleh %(publisher)s." #: bookwyrm/templates/book/publisher_info.html:67 #, python-format msgid "Published %(date)s" -msgstr "" +msgstr "Diterbitkan %(date)s" #: bookwyrm/templates/book/rating.html:19 msgid "rated it" -msgstr "" +msgstr "nilai ini" #: bookwyrm/templates/book/series.html:72 #, python-format msgid "Book %(series_number)s" -msgstr "" +msgstr "Buku %(series_number)s" #: bookwyrm/templates/book/sync_modal.html:15 #, python-format msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." -msgstr "" +msgstr "Memuat data akan menyambungkan ke %(source_name)s dan memeriksa metadata buku yang tidak ditampilkan di sini. Metadata yang sudah ada tidak akan ditimpa." #: bookwyrm/templates/compose.html:7 bookwyrm/templates/compose.html:21 msgid "Edit review" -msgstr "" +msgstr "Edit ulasan" #: bookwyrm/templates/compose.html:9 bookwyrm/templates/compose.html:23 msgid "Edit quote" -msgstr "" +msgstr "Edit kutipan" #: bookwyrm/templates/compose.html:11 bookwyrm/templates/compose.html:25 msgid "Edit comment" -msgstr "" +msgstr "Edit komentar" #: bookwyrm/templates/compose.html:13 bookwyrm/templates/compose.html:27 msgid "Edit status" -msgstr "" +msgstr "Edit status" #: bookwyrm/templates/confirm_email/confirm_email.html:4 msgid "Confirm email" -msgstr "" +msgstr "Konfirmasi surel" #: bookwyrm/templates/confirm_email/confirm_email.html:7 msgid "Confirm your email address" -msgstr "" +msgstr "Konfirmasi alamat surel Anda" #: bookwyrm/templates/confirm_email/confirm_email.html:13 msgid "A confirmation code has been sent to the email address you used to register your account." -msgstr "" +msgstr "Kode konfirmasi telah dikirimkan ke alamat surel yang Anda pakai untuk mendaftarkan akun." #: bookwyrm/templates/confirm_email/confirm_email.html:15 msgid "Sorry! We couldn't find that code." -msgstr "" +msgstr "Maaf! Kami tidak menemukan kodenya." #: bookwyrm/templates/confirm_email/confirm_email.html:19 #: bookwyrm/templates/settings/users/user_info.html:92 msgid "Confirmation code:" -msgstr "" +msgstr "Kode konfirmasi:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 From 1ea01fabceaf87b72602889e84de815e7f6fb63d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 14 Jun 2026 09:16:27 -0700 Subject: [PATCH 759/962] New translations django.po (Hebrew) [ci skip] --- locale/he_IL/LC_MESSAGES/django.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/locale/he_IL/LC_MESSAGES/django.po b/locale/he_IL/LC_MESSAGES/django.po index 6ab0723429..d646e779f2 100644 --- a/locale/he_IL/LC_MESSAGES/django.po +++ b/locale/he_IL/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2026-05-23 18:40+0000\n" -"PO-Revision-Date: 2026-06-07 19:46\n" +"PO-Revision-Date: 2026-06-14 16:16\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Hebrew\n" "Language: he\n" @@ -227,7 +227,7 @@ msgstr "ביקורת" #: bookwyrm/models/bookwyrm_import_job.py:153 msgid "Quotation" -msgstr "" +msgstr "ציטוט" #: bookwyrm/models/bookwyrm_import_job.py:181 #: bookwyrm/templates/snippets/follow_button.html:24 @@ -243,15 +243,15 @@ msgstr "חסום" #: bookwyrm/models/bookwyrm_import_job.py:395 msgid "Unknown error importing book" -msgstr "" +msgstr "שגיאה לא ידועה בייבוא ספר" #: bookwyrm/models/bookwyrm_import_job.py:490 msgid "unauthorized" -msgstr "" +msgstr "לא מורשה" #: bookwyrm/models/bookwyrm_import_job.py:496 msgid "Unknown error importing book status" -msgstr "" +msgstr "שגיאה לא ידועה בייבוא סטטוס ספר" #: bookwyrm/models/bookwyrm_import_job.py:686 #: bookwyrm/models/bookwyrm_import_job.py:711 @@ -335,11 +335,11 @@ msgstr "פרטי" #: bookwyrm/models/housekeeping.py:117 msgid "Missing" -msgstr "" +msgstr "חסר" #: bookwyrm/models/housekeeping.py:118 msgid "Wrong Path" -msgstr "" +msgstr "נתיב שגוי" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 #: bookwyrm/templates/import/import.html:184 @@ -428,7 +428,7 @@ msgstr "משתמש שהשעייתו בוטלה" #: bookwyrm/models/report.py:92 msgid "Changed user permission level" -msgstr "" +msgstr "שונתה רמת הרשאת משתמש" #: bookwyrm/models/report.py:93 msgid "Deleted user account" @@ -448,7 +448,7 @@ msgstr "פריט שנמחק" #: bookwyrm/models/session.py:43 msgid "Unknown" -msgstr "" +msgstr "לא ידוע" #: bookwyrm/models/status.py:191 #, python-format @@ -639,7 +639,7 @@ msgstr "הקובץ שאתם מעלים גדול מדי." #: bookwyrm/templates/413.html:11 msgid "You you can try using a smaller file, or ask your BookWyrm server administrator to increase the DATA_UPLOAD_MAX_MEMORY_SIZE setting." -msgstr "" +msgstr "ניתן לנסות להשתמש בקובץ קטן יותר, או לבקש ממנהל שרת ה-Bookwyrm שלך להעלות את הגדרת DATA_UPLOAD_MAX_MEMORY_SIZE." #: bookwyrm/templates/500.html:4 msgid "Oops!" @@ -819,7 +819,7 @@ msgstr "לצערנו %(display_name)s לא סיים אף ספר ב-%(year)s" #, python-format msgid "In %(year)s, %(display_name)s read %(books_total)s book
      for a total of %(pages_total)s pages!" msgid_plural "In %(year)s, %(display_name)s read %(books_total)s books
      for a total of %(pages_total)s pages!" -msgstr[0] "ב-%(year)s %(display_name)s קרא ספר %(books_total)s book
      ובו %(pages_total)s עמודים!" +msgstr[0] "ב-%(year)s %(display_name)s קרא ספר %(books_total)s אחד
      ובו %(pages_total)s עמודים!" msgstr[1] "" msgstr[2] "" msgstr[3] "ב-%(year)s %(display_name)s קרא %(books_total)s book
      ספרים ובהם %(pages_total)s עמודים!" From f6a5f1b0599135e759ed118c7b76e90e8928573e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 14 Jun 2026 10:28:28 -0700 Subject: [PATCH 760/962] New translations django.po (Hebrew) [ci skip] --- locale/he_IL/LC_MESSAGES/django.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locale/he_IL/LC_MESSAGES/django.po b/locale/he_IL/LC_MESSAGES/django.po index d646e779f2..3cae68175b 100644 --- a/locale/he_IL/LC_MESSAGES/django.po +++ b/locale/he_IL/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2026-05-23 18:40+0000\n" -"PO-Revision-Date: 2026-06-14 16:16\n" +"PO-Revision-Date: 2026-06-14 17:28\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Hebrew\n" "Language: he\n" @@ -1445,7 +1445,7 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book.html:165 msgid "Creating a new series" -msgstr "" +msgstr "יצירת סדרה חדשה" #: bookwyrm/templates/book/edit/edit_book.html:175 #: bookwyrm/templates/book/edit/edit_series.html:86 From 4ab6bf0eea132f14d2a3ac017fe59903783214cb Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Mon, 15 Jun 2026 22:40:10 +0700 Subject: [PATCH 761/962] Add is_private field to User --- bookwyrm/migrations/0234_user_is_private.py | 18 ++++++++++++++++++ bookwyrm/models/user.py | 1 + 2 files changed, 19 insertions(+) create mode 100644 bookwyrm/migrations/0234_user_is_private.py diff --git a/bookwyrm/migrations/0234_user_is_private.py b/bookwyrm/migrations/0234_user_is_private.py new file mode 100644 index 0000000000..770921945c --- /dev/null +++ b/bookwyrm/migrations/0234_user_is_private.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.14 on 2026-06-15 15:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0232_user_readwise_api_key'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='is_private', + field=models.BooleanField(default=False), + ), + ] diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index ece1a88d20..27784fc4fa 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -143,6 +143,7 @@ class User(OrderedCollectionPageMixin, AbstractUser): manually_approves_followers = fields.BooleanField(default=False) theme = models.ForeignKey("Theme", null=True, blank=True, on_delete=models.SET_NULL) hide_follows = fields.BooleanField(default=False) + is_private = models.BooleanField(default=False) # migration fields moved_to = fields.RemoteIdField( From 94875edb0b4fc320794f7e9532235e476b7a397b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 15 Jun 2026 09:38:06 -0700 Subject: [PATCH 762/962] Adds merge migration --- bookwyrm/migrations/0235_merge_20260615_1637.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 bookwyrm/migrations/0235_merge_20260615_1637.py diff --git a/bookwyrm/migrations/0235_merge_20260615_1637.py b/bookwyrm/migrations/0235_merge_20260615_1637.py new file mode 100644 index 0000000000..6a9cc21484 --- /dev/null +++ b/bookwyrm/migrations/0235_merge_20260615_1637.py @@ -0,0 +1,14 @@ +# Generated by Django 5.2.14 on 2026-06-15 16:37 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0232_merge_20260606_0829'), + ('bookwyrm', '0234_listitem_raw_notes'), + ] + + operations = [ + ] From c4e0041ffcb622082cea224f9bf4fe4712b6f380 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 15 Jun 2026 11:45:17 -0700 Subject: [PATCH 763/962] Updates migration file --- ...{0235_user_blocked_books.py => 0236_user_blocked_books.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename bookwyrm/migrations/{0235_user_blocked_books.py => 0236_user_blocked_books.py} (76%) diff --git a/bookwyrm/migrations/0235_user_blocked_books.py b/bookwyrm/migrations/0236_user_blocked_books.py similarity index 76% rename from bookwyrm/migrations/0235_user_blocked_books.py rename to bookwyrm/migrations/0236_user_blocked_books.py index 92c773a0bf..7262d47be4 100644 --- a/bookwyrm/migrations/0235_user_blocked_books.py +++ b/bookwyrm/migrations/0236_user_blocked_books.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.14 on 2026-06-13 00:51 +# Generated by Django 5.2.14 on 2026-06-15 18:45 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0234_listitem_raw_notes'), + ('bookwyrm', '0235_merge_20260615_1637'), ] operations = [ From de38da4128d6688ca42c3b7bbf68a8d367cfe363 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 15 Jun 2026 12:21:11 -0700 Subject: [PATCH 764/962] Fixes merge regression and migration order --- bookwyrm/forms/lists.py | 4 ++-- ...37_alter_list_options_alter_listitem_options_and_more.py} | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) rename bookwyrm/migrations/{0232_alter_list_options_alter_listitem_options_and_more.py => 0237_alter_list_options_alter_listitem_options_and_more.py} (95%) diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py index 850a9a7c91..b6cc3bf56a 100644 --- a/bookwyrm/forms/lists.py +++ b/bookwyrm/forms/lists.py @@ -17,7 +17,7 @@ class Meta: class ListItemForm(CustomForm): class Meta: model = models.ListItem - fields = ["user", "book", "book_list", "notes", "raw_notes"] + fields = ["user", "edition", "book_list", "notes", "raw_notes"] class SuggestionListForm(CustomForm): @@ -29,7 +29,7 @@ class Meta: class SuggestionListItemForm(CustomForm): class Meta: model = models.SuggestionListItem - fields = ["user", "book", "book_list", "notes", "raw_notes"] + fields = ["user", "work", "book_list", "notes", "raw_notes"] class SortListForm(forms.Form): diff --git a/bookwyrm/migrations/0232_alter_list_options_alter_listitem_options_and_more.py b/bookwyrm/migrations/0237_alter_list_options_alter_listitem_options_and_more.py similarity index 95% rename from bookwyrm/migrations/0232_alter_list_options_alter_listitem_options_and_more.py rename to bookwyrm/migrations/0237_alter_list_options_alter_listitem_options_and_more.py index 6d4b61cbcf..e883dd21fe 100644 --- a/bookwyrm/migrations/0232_alter_list_options_alter_listitem_options_and_more.py +++ b/bookwyrm/migrations/0237_alter_list_options_alter_listitem_options_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.14 on 2026-05-25 16:12 +# Generated by Django 5.2.14 on 2026-06-15 19:21 import bookwyrm.models.activitypub_mixin import bookwyrm.models.fields @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ - ('bookwyrm', '0231_sitesettings_block_incoming_search_and_more'), + ('bookwyrm', '0236_user_blocked_books'), ] operations = [ @@ -66,6 +66,7 @@ class Migration(migrations.Migration): ('updated_date', models.DateTimeField(auto_now=True)), ('remote_id', bookwyrm.models.fields.RemoteIdField(max_length=255, null=True, validators=[bookwyrm.models.fields.validate_remote_id])), ('notes', bookwyrm.models.fields.HtmlField(blank=True, max_length=300, null=True)), + ('raw_notes', models.TextField(blank=True, max_length=300, null=True)), ('book_list', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bookwyrm.suggestionlist')), ('endorsement', models.ManyToManyField(related_name='suggestion_endorsers', to=settings.AUTH_USER_MODEL)), ('user', bookwyrm.models.fields.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)), From ee02ff98eb1d04d7babab1a4c86abb61cc505704 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 15 Jun 2026 12:34:58 -0700 Subject: [PATCH 765/962] Use raw_notes field when adding suggestion list items --- bookwyrm/views/suggestion_list.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bookwyrm/views/suggestion_list.py b/bookwyrm/views/suggestion_list.py index c40c7d645b..a97e0b305c 100644 --- a/bookwyrm/views/suggestion_list.py +++ b/bookwyrm/views/suggestion_list.py @@ -18,6 +18,7 @@ from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.settings import PAGE_LENGTH from bookwyrm.views import Book +from bookwyrm.views.helpers import convert_to_markdown from bookwyrm.views.helpers import get_user_from_username from bookwyrm.views.helpers import is_api_request, redirect_to_referer from bookwyrm.views.list.list import get_list_suggestions @@ -138,7 +139,11 @@ def book_add_suggestion(request: HttpRequest, book_id: int) -> Any: if not form.is_valid(): return Book().get(request, book_id, add_failed=True) - form.save(request) + item = form.save(request, commit=False) + if item.notes: + item.raw_notes = item.notes + item.notes = convert_to_markdown(item.notes) + item.save() return redirect_to_referer(request) From cddcc8378992778815ea5874134579a77486532d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 15 Jun 2026 12:36:59 -0700 Subject: [PATCH 766/962] Fixes ruff complaints --- bookwyrm/views/list/list.py | 7 ++----- bookwyrm/views/list/list_item.py | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index 9ed0cdea6a..f42aa18a91 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -130,9 +130,7 @@ def get_list_suggestions( suggestions = ( user.shelfbook_set.filter(~Q(book__in=book_list.editions.all())) .exclude(book__parent_work=ignore_book) - .exclude( - book__parent_work__in=user.blocked_books.values_list("id", flat=True) - ) + .exclude(book__parent_work__in=user.blocked_books.values_list("id", flat=True)) .distinct()[:num_suggestions] ) suggestions = [s.book for s in suggestions[:num_suggestions]] @@ -142,9 +140,8 @@ def get_list_suggestions( for s in models.Work.objects.filter( ~Q(editions__in=book_list.editions.all()), ~Q(id=ignore_book.id if ignore_book else None), - ).exclude( - id__in=user.blocked_books.values_list("id", flat=True) ) + .exclude(id__in=user.blocked_books.values_list("id", flat=True)) .distinct() .order_by("-updated_date")[:num_suggestions] ] diff --git a/bookwyrm/views/list/list_item.py b/bookwyrm/views/list/list_item.py index 6442ce6e63..46defe2f5f 100644 --- a/bookwyrm/views/list/list_item.py +++ b/bookwyrm/views/list/list_item.py @@ -50,4 +50,4 @@ def edit_list_item(request, list_id, list_item, item_model, form): else: raise Exception(form.errors) - return redirect_to_referer(request) \ No newline at end of file + return redirect_to_referer(request) From d3d490c6d1dbecfc79278468f3f5950ba61a363d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 15 Jun 2026 13:00:17 -0700 Subject: [PATCH 767/962] Updates list tests --- bookwyrm/tests/views/lists/test_list.py | 4 ++-- bookwyrm/tests/views/lists/test_suggestion_list.py | 2 +- bookwyrm/views/list/list.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/tests/views/lists/test_list.py b/bookwyrm/tests/views/lists/test_list.py index f5521407e3..402d8af635 100644 --- a/bookwyrm/tests/views/lists/test_list.py +++ b/bookwyrm/tests/views/lists/test_list.py @@ -768,7 +768,7 @@ def test_list_page_excludes_blocked_items(self): list_item_one = models.ListItem.objects.create( book_list=self.list, user=self.local_user, - book=self.book, + edition=self.edition, approved=True, notes="hello", order=1, @@ -777,7 +777,7 @@ def test_list_page_excludes_blocked_items(self): list_item_two = models.ListItem.objects.create( book_list=self.list, user=self.local_user, - book=self.book_two, + edition=self.book_two, approved=True, notes="goodbye", order=2, diff --git a/bookwyrm/tests/views/lists/test_suggestion_list.py b/bookwyrm/tests/views/lists/test_suggestion_list.py index df40e00312..bc297815bc 100644 --- a/bookwyrm/tests/views/lists/test_suggestion_list.py +++ b/bookwyrm/tests/views/lists/test_suggestion_list.py @@ -118,7 +118,7 @@ def test_book_add_suggestion(self, *_): item = suggestion_list.suggestionlistitem_set.first() self.assertEqual(item.work, self.another_book.parent_work) self.assertEqual(item.user, self.local_user) - self.assertEqual(item.notes, "hello") + self.assertEqual(item.raw_notes, "hello") def test_book_remove_suggestion(self, *_): """Remove a book from the recommendation list""" diff --git a/bookwyrm/views/list/list.py b/bookwyrm/views/list/list.py index f42aa18a91..bdc95b98eb 100644 --- a/bookwyrm/views/list/list.py +++ b/bookwyrm/views/list/list.py @@ -53,7 +53,7 @@ def get(self, request, list_id, **kwargs): items = ( book_list.listitem_set.filter(approved=True) - .exclude(book__parent_work__in=blocked) + .exclude(edition__parent_work__in=blocked) .prefetch_related("user", "edition", "edition__authors") ) From e245c5529fa9c782bf9ccc976ec7a4f6bbbae320 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 15 Jun 2026 13:08:03 -0700 Subject: [PATCH 768/962] Update blocked book filter to handle list field name variants --- bookwyrm/templatetags/book_display_tags.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templatetags/book_display_tags.py b/bookwyrm/templatetags/book_display_tags.py index 4455626bc8..88a8107713 100644 --- a/bookwyrm/templatetags/book_display_tags.py +++ b/bookwyrm/templatetags/book_display_tags.py @@ -1,6 +1,7 @@ """template filters""" from django import template +from django.core.exceptions import FieldError from bookwyrm import models @@ -44,4 +45,12 @@ def blocked_book_filter(queryset, viewer): return queryset blocked = viewer.blocked_books.all().values_list("id", flat=True) - return queryset.exclude(book__parent_work__in=blocked) + try: + return queryset.exclude(book__parent_work__in=blocked) + except FieldError: + pass + + try: + return queryset.exclude(work__in=blocked) + except FieldError: + return queryset.exclude(edition__parent_work__in=blocked) From e36d2628996b28c8d7bffac1877d5be16f47d407 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 15 Jun 2026 13:09:37 -0700 Subject: [PATCH 769/962] Removes unused imoprt --- bookwyrm/views/list/list_item.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bookwyrm/views/list/list_item.py b/bookwyrm/views/list/list_item.py index 46defe2f5f..9033f19a08 100644 --- a/bookwyrm/views/list/list_item.py +++ b/bookwyrm/views/list/list_item.py @@ -7,7 +7,6 @@ from bookwyrm import forms, models from bookwyrm.views.helpers import convert_to_markdown, redirect_to_referer -from bookwyrm.views.status import to_markdown @method_decorator(login_required, name="dispatch") From fd84281644279df88ca1a62c7f9884c87b0a7eea Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 15 Jun 2026 13:12:48 -0700 Subject: [PATCH 770/962] Updates block book form identifier to avoid clashes --- .../snippets/shelve_button/shelve_button_dropdown_options.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html index 00dbc2a42c..bc2f478b91 100644 --- a/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html +++ b/bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html @@ -76,7 +76,7 @@ {% endif %}
      {% block tabs %} - {% if not user.moved_to %} + {% if not user.moved_to and not is_locked %} {% with user|username as username %}
      diff --git a/bookwyrm/templates/book/sections/reading.html b/bookwyrm/templates/book/sections/reading.html index 2ebbd10cc7..be5ad4304e 100644 --- a/bookwyrm/templates/book/sections/reading.html +++ b/bookwyrm/templates/book/sections/reading.html @@ -8,7 +8,7 @@

      {% trans "Your reading" %}

      {% if readthroughs.exists %}
      {% for readthrough in readthroughs %} -
      +
      {% include 'readthrough/readthrough_list.html' with readthrough=readthrough %}
      {% endfor %} diff --git a/bookwyrm/templates/book/sections/reviews.html b/bookwyrm/templates/book/sections/reviews.html index 433115cb98..3f7fa9601c 100644 --- a/bookwyrm/templates/book/sections/reviews.html +++ b/bookwyrm/templates/book/sections/reviews.html @@ -8,7 +8,7 @@

      {% trans "Reviews" %}

      {% trans "Add your thoughts" %}

      - +
      {% with 0|uuid as controls_uid %} diff --git a/bookwyrm/templates/book/sections/subjects.html b/bookwyrm/templates/book/sections/subjects.html index 8f1386481c..da16a27ea7 100644 --- a/bookwyrm/templates/book/sections/subjects.html +++ b/bookwyrm/templates/book/sections/subjects.html @@ -1,27 +1,27 @@ {% load i18n %} {% if book.subjects or book.subject_places %}
      -
      +

      {% trans "Subjects" %}

       {% if book.subjects %} -
        - {% for subject in book.subjects %} -
      • {{ subject }}
        • - {% endfor %} -
      +
        + {% for subject in book.subjects %} +
      • {{ subject }}
        • + {% endfor %} +
      {% endif %} {% if book.subject_places %} -

      {% trans "Places" %}

      -
        - {% for place in book.subject_places %} -
      • {{ place }}
        • - {% endfor %} -
      +

      {% trans "Places" %}

      +
        + {% for place in book.subject_places %} +
      • {{ place }}
        • + {% endfor %} +
      {% endif %}
      diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 3ed36af39d..637f538a05 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -29,20 +29,20 @@

      {% endfor %} -
      +
      {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True %}
      {% endif %} {% else %}
      -
      - {% csrf_token %} - - -

      {% trans "Have a recommendation for someone who liked this book?" %}

      - -
      -
      +
      + {% csrf_token %} + + +

      {% trans "Have a recommendation for someone who liked this book?" %}

      + +
      + {% endif %} {% endif %} From e509f2330abc6e3edc271f08c9dbbf1f0a4e8c58 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 24 Jun 2026 16:16:04 -0700 Subject: [PATCH 837/962] Make suggestion search an inline form --- bookwyrm/templates/book/book.html | 2 ++ .../templates/book/suggestion_list/list.html | 25 ++++++++++++------- .../book/suggestion_list/search.html | 16 ++++++------ 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index caacc7c12f..952ef56ebc 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -68,6 +68,8 @@ {% include "book/suggestion_list/list.html" %} + +
      {% include "book/sections/reviews.html" %}
      diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 637f538a05..b0eac4bf57 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -2,15 +2,22 @@ {% load humanize %} {% if request.user.is_authenticated or suggestion_list %} -

      - {% trans "Readers also recommend:" %} - {% if suggestion_list and items|length > 0 %} - - {% trans "View all suggestions" %} ({{ item_count }}) - - {% endif %} -

      +
      +

      + {% trans "Readers also recommend:" %} + {% if suggestion_list and items|length > 0 %} + + {% trans "View all suggestions" %} ({{ item_count }}) + + {% endif %} +

      +
      + {% trans "Add suggestion" as button_text %} + {% include 'snippets/toggle/open_button.html' with class="is-small" controls_text="suggestion_search" icon_with_text="plus" text=button_text focus="suggestion_search_header" %} +
      +
      +
      {% if suggestion_list %} {% if items|length == 0 %} @@ -30,7 +37,7 @@

      - {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True %} + {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True controls_text="suggestion_search" %}
      {% endif %} {% else %} diff --git a/bookwyrm/templates/book/suggestion_list/search.html b/bookwyrm/templates/book/suggestion_list/search.html index f5e28b5ff3..451dd12d0f 100644 --- a/bookwyrm/templates/book/suggestion_list/search.html +++ b/bookwyrm/templates/book/suggestion_list/search.html @@ -1,17 +1,17 @@ +{% extends 'components/inline_form.html' %} {% load i18n %} {% load utilities %} +{% block header %} + {% trans "Add suggestions" %} +{% endblock %} + +{% block form %} + {% if request.user.is_authenticated %} -
      - - - {% trans "Add suggestions" %} - - - {% with search_url=request.path|add:"#add-suggestions" %} {% include "lists/suggestion_search.html" with is_suggestion=True query_param="suggestion_query" columns=True %} {% endwith %} -
      {% endif %} +{% endblock %} From 6c10c024a7e757737aeb76639ed9e5149ecf5c2f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 24 Jun 2026 16:48:59 -0700 Subject: [PATCH 838/962] Re-generated migration files --- bookwyrm/migrations/0217_userupload.py | 45 ----------------- ..._file_userupload_original_file_and_more.py | 48 ------------------- .../migrations/0228_merge_20260222_0352.py | 13 ----- .../0229_userupload_status_and_more.py | 44 ----------------- .../migrations/0230_merge_20260326_0357.py | 13 ----- .../migrations/0232_merge_20260527_0333.py | 13 ----- .../0240_userupload_useruploadversion.py | 36 ++++++++++++++ 7 files changed, 36 insertions(+), 176 deletions(-) delete mode 100644 bookwyrm/migrations/0217_userupload.py delete mode 100644 bookwyrm/migrations/0218_rename_file_userupload_original_file_and_more.py delete mode 100644 bookwyrm/migrations/0228_merge_20260222_0352.py delete mode 100644 bookwyrm/migrations/0229_userupload_status_and_more.py delete mode 100644 bookwyrm/migrations/0230_merge_20260326_0357.py delete mode 100644 bookwyrm/migrations/0232_merge_20260527_0333.py create mode 100644 bookwyrm/migrations/0240_userupload_useruploadversion.py diff --git a/bookwyrm/migrations/0217_userupload.py b/bookwyrm/migrations/0217_userupload.py deleted file mode 100644 index b1cde14d1c..0000000000 --- a/bookwyrm/migrations/0217_userupload.py +++ /dev/null @@ -1,45 +0,0 @@ -# Generated by Django 5.2.3 on 2025-09-08 02:52 - -import bookwyrm.models.user_upload -import django.db.models.deletion -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0216_alter_edition_shelves_alter_list_books_and_more"), - ] - - operations = [ - migrations.CreateModel( - name="UserUpload", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("original_name", models.TextField()), - ("original_content_type", models.TextField()), - ( - "file", - models.ImageField( - upload_to=bookwyrm.models.user_upload.user_upload_directory_path - ), - ), - ( - "user", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - ), - ), - ], - ), - ] diff --git a/bookwyrm/migrations/0218_rename_file_userupload_original_file_and_more.py b/bookwyrm/migrations/0218_rename_file_userupload_original_file_and_more.py deleted file mode 100644 index 8bbbe57a12..0000000000 --- a/bookwyrm/migrations/0218_rename_file_userupload_original_file_and_more.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 5.2.3 on 2025-09-19 03:44 - -import bookwyrm.models.user_upload -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0217_userupload"), - ] - - operations = [ - migrations.RenameField( - model_name="userupload", - old_name="file", - new_name="original_file", - ), - migrations.CreateModel( - name="UserUploadVersion", - fields=[ - ( - "id", - models.AutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("max_dimension", models.TextField()), - ( - "file", - models.ImageField( - upload_to=bookwyrm.models.user_upload.user_upload_version_directory_path - ), - ), - ( - "user_upload", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to="bookwyrm.userupload", - ), - ), - ], - ), - ] diff --git a/bookwyrm/migrations/0228_merge_20260222_0352.py b/bookwyrm/migrations/0228_merge_20260222_0352.py deleted file mode 100644 index 208b241124..0000000000 --- a/bookwyrm/migrations/0228_merge_20260222_0352.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 5.2.9 on 2026-02-22 03:52 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0218_rename_file_userupload_original_file_and_more"), - ("bookwyrm", "0227_edition_bookwyrm_ed_parent__c4f87c_idx_and_more"), - ] - - operations = [] diff --git a/bookwyrm/migrations/0229_userupload_status_and_more.py b/bookwyrm/migrations/0229_userupload_status_and_more.py deleted file mode 100644 index bada32ee41..0000000000 --- a/bookwyrm/migrations/0229_userupload_status_and_more.py +++ /dev/null @@ -1,44 +0,0 @@ -# Generated by Django 5.2.9 on 2026-02-22 05:14 - -import django.db.models.deletion -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0228_merge_20260222_0352"), - ] - - operations = [ - migrations.AddField( - model_name="userupload", - name="status", - field=models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="user_image_uploads", - to="bookwyrm.status", - ), - ), - migrations.AlterField( - model_name="userupload", - name="user", - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="user_uploads", - to=settings.AUTH_USER_MODEL, - ), - ), - migrations.AlterField( - model_name="useruploadversion", - name="user_upload", - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="versions", - to="bookwyrm.userupload", - ), - ), - ] diff --git a/bookwyrm/migrations/0230_merge_20260326_0357.py b/bookwyrm/migrations/0230_merge_20260326_0357.py deleted file mode 100644 index 9b4492fe6a..0000000000 --- a/bookwyrm/migrations/0230_merge_20260326_0357.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 5.2.9 on 2026-03-26 03:57 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0228_remove_user_bookwyrm_us_is_acti_972dc4_idx_and_more"), - ("bookwyrm", "0229_userupload_status_and_more"), - ] - - operations = [] diff --git a/bookwyrm/migrations/0232_merge_20260527_0333.py b/bookwyrm/migrations/0232_merge_20260527_0333.py deleted file mode 100644 index b9ea5aece8..0000000000 --- a/bookwyrm/migrations/0232_merge_20260527_0333.py +++ /dev/null @@ -1,13 +0,0 @@ -# Generated by Django 5.2.9 on 2026-05-27 03:33 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("bookwyrm", "0230_merge_20260326_0357"), - ("bookwyrm", "0231_sitesettings_block_incoming_search_and_more"), - ] - - operations = [] diff --git a/bookwyrm/migrations/0240_userupload_useruploadversion.py b/bookwyrm/migrations/0240_userupload_useruploadversion.py new file mode 100644 index 0000000000..260beafa2f --- /dev/null +++ b/bookwyrm/migrations/0240_userupload_useruploadversion.py @@ -0,0 +1,36 @@ +# Generated by Django 5.2.14 on 2026-06-24 23:45 + +import bookwyrm.models.user_upload +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0239_alter_list_options_alter_listitem_options_and_more'), + ] + + operations = [ + migrations.CreateModel( + name='UserUpload', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('original_name', models.TextField()), + ('original_content_type', models.TextField()), + ('original_file', models.ImageField(upload_to=bookwyrm.models.user_upload.user_upload_directory_path)), + ('status', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='user_image_uploads', to='bookwyrm.status')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_uploads', to=settings.AUTH_USER_MODEL)), + ], + ), + migrations.CreateModel( + name='UserUploadVersion', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('max_dimension', models.TextField()), + ('file', models.ImageField(upload_to=bookwyrm.models.user_upload.user_upload_version_directory_path)), + ('user_upload', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='versions', to='bookwyrm.userupload')), + ], + ), + ] From a948adf080bcc9c7ba56156b3c90bc3f2750f475 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 24 Jun 2026 16:55:34 -0700 Subject: [PATCH 839/962] Fixes misplaced if statement in template --- bookwyrm/templates/book/suggestion_list/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index b0eac4bf57..f0a133fac7 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -17,8 +17,8 @@

      -
      {% if suggestion_list %} +
      {% if items|length == 0 %}
      From 95a8637d4488331a3f44fa0f3f55b909a5387d24 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Thu, 25 Jun 2026 14:19:03 +0300 Subject: [PATCH 840/962] backup-job: fix database user and database name variables We don't define all .env file to backup-job, only specific ones. So use those specific env-variables in backup-job. --- postgres-docker/backup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/postgres-docker/backup.sh b/postgres-docker/backup.sh index fdcb251d2c..c978596818 100755 --- a/postgres-docker/backup.sh +++ b/postgres-docker/backup.sh @@ -1,14 +1,14 @@ #!/bin/bash info() { echo >&2 "[$(date --iso-8601=seconds)] $*"; } -if [ -z "$POSTGRES_DB" ]; then +if [ -z "$PGDATABASE" ]; then info "backup: Database not specified, defaulting to bookwyrm" fi -if [ -z "$POSTGRES_USER" ]; then +if [ -z "$PGUSER" ]; then info "backup: Database user not specified, defaulting to bookwyrm" fi -BACKUP_DB=${POSTGRES_DB:-bookwyrm} -BACKUP_USER=${POSTGRES_USER:-bookwyrm} +BACKUP_DB=${PGDATABASE:-bookwyrm} +BACKUP_USER=${PGUSER:-bookwyrm} filename=backup_${BACKUP_DB}_$(date +%F) pg_dump -U "${BACKUP_USER}" "${BACKUP_DB}" --file "/backups/$filename.sql" info "backup: completed backup of $BACKUP_DB to /backups/$filename.sql" From e9d1cfa7de1e66c57963fa2e810a78d6b23afe9d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 25 Jun 2026 09:34:57 -0700 Subject: [PATCH 841/962] Suggestion list in the sidebar --- bookwyrm/templates/book/book.html | 30 +++++----- bookwyrm/templates/book/file_links/links.html | 2 +- bookwyrm/templates/book/sections/lists.html | 2 + bookwyrm/templates/book/sections/reviews.html | 4 -- .../book/suggestion_list/book_card.html | 58 +++++++++++-------- .../templates/book/suggestion_list/list.html | 34 +++++------ bookwyrm/templates/lists/list_item_notes.html | 2 - 7 files changed, 66 insertions(+), 66 deletions(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 952ef56ebc..b6804d4ff6 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -32,14 +32,19 @@
      -
      +
      {% include "book/sections/cover.html" %}
      {% include 'snippets/shelve_button/shelve_button.html' %}
      + + {% include "book/sections/lists.html" %} +
      + {% include "book/file_links/links.html" %} +
      -
      +
      {% include "book/sections/description.html" %}
      @@ -52,28 +57,21 @@
      {% include "book/sections/reading.html" %}
      + +
      + {% include "book/sections/reviews.html" %} +
      -
      - {% include "book/sections/lists.html" %} -
      - {% include "book/file_links/links.html" %} +
      +
      + {% include "book/suggestion_list/list.html" %}
      -
      -{% include "book/suggestion_list/list.html" %} -
      - - - -
      -{% include "book/sections/reviews.html" %} -
      - {% endwith %} {% endblock %} diff --git a/bookwyrm/templates/book/file_links/links.html b/bookwyrm/templates/book/file_links/links.html index febc39e56c..f1d53952e3 100644 --- a/bookwyrm/templates/book/file_links/links.html +++ b/bookwyrm/templates/book/file_links/links.html @@ -6,7 +6,7 @@ {% if links.exists or request.user.is_authenticated %}
      -

      {% trans "Get a copy" %}

      +

      {% trans "Get a copy" %}

      {% if can_edit_book %}
      diff --git a/bookwyrm/templates/book/sections/lists.html b/bookwyrm/templates/book/sections/lists.html index a797bf9ade..a8e2e25d76 100644 --- a/bookwyrm/templates/book/sections/lists.html +++ b/bookwyrm/templates/book/sections/lists.html @@ -2,12 +2,14 @@ {% if lists.exists or list_options.exists %}
      + {% if lists.exists %}

      {% trans "Lists" %}

      + {% endif %} {% if list_options.exists %}
      diff --git a/bookwyrm/templates/book/sections/reviews.html b/bookwyrm/templates/book/sections/reviews.html index 3f7fa9601c..bb99e52f4e 100644 --- a/bookwyrm/templates/book/sections/reviews.html +++ b/bookwyrm/templates/book/sections/reviews.html @@ -1,8 +1,6 @@ {% load i18n %} {% load utilities %} - -

      {% trans "Reviews" %}

      {% if user_authenticated %}
      @@ -73,5 +71,3 @@

      {% trans "Add your thoughts" %}

      {% include 'snippets/pagination.html' with page=statuses path=request.path anchor="#reviews" %}
      - -
      diff --git a/bookwyrm/templates/book/suggestion_list/book_card.html b/bookwyrm/templates/book/suggestion_list/book_card.html index fdcdf4b81f..4628956ca6 100644 --- a/bookwyrm/templates/book/suggestion_list/book_card.html +++ b/bookwyrm/templates/book/suggestion_list/book_card.html @@ -2,43 +2,51 @@ {% load book_display_tags %} {% load utilities %} -
      -
      +
      +
      +
      + +
      + {% url 'user-feed' item.user|username as user_path %} + + {% if item.notes %} + {% blocktrans trimmed with user_link=item.user|user_link %} + {{ user_link }} says: + {% endblocktrans %} + {% else %} + {% blocktrans trimmed with user_link=item.user|user_link %} + {{ user_link }} recommends: + {% endblocktrans %} + {% endif %} +
      +
      + {% with item_book=item.work.default_edition %} -
      +
      +
      -
      -

      - {% include 'snippets/book_titleby.html' with book=item_book %} -

      - {% if item.notes %} - {% include "lists/list_item_notes.html" with list=book.suggestion_list hide_edit=True no_trim=False trim_length=15 %} - {% else %} -
      - {% with full=item_book|book_description %} - {% include 'snippets/trimmed_text.html' with trim_length=15 hide_more=True %} - {% endwith %} -
      - {% endif %} + {% if item.notes %} +
      + {% include 'snippets/trimmed_text.html' with full=item.notes trim_length=15 %}
      + {% endif %} +
      + {% include 'snippets/book_titleby.html' with book=item_book %} +
      +
      {% endwith %}
      -
      +
      {% include "snippets/shelve_button/shelve_button.html" with book=item.work.default_edition %}
      -
      -

      - {% blocktrans trimmed with user_link=item.user|user_link user_path=item.user.local_path %} - Added by {{ user_link }} - {% endblocktrans %} -

      -
      {% include "book/suggestion_list/endorsement_button.html" %}
      diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index f0a133fac7..76b1743654 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -2,20 +2,14 @@ {% load humanize %} {% if request.user.is_authenticated or suggestion_list %} -
      -

      - {% trans "Readers also recommend:" %} - {% if suggestion_list and items|length > 0 %} - - {% trans "View all suggestions" %} ({{ item_count }}) - - {% endif %} -

      -
      - {% trans "Add suggestion" as button_text %} - {% include 'snippets/toggle/open_button.html' with class="is-small" controls_text="suggestion_search" icon_with_text="plus" text=button_text focus="suggestion_search_header" %} -
      -
      +

      + {% trans "Readers also recommend:" %} + {% if suggestion_list and items|length > 0 %} + + {% trans "View all suggestions" %} ({{ item_count }}) + + {% endif %} +

      {% if suggestion_list %}
      @@ -28,17 +22,21 @@

      {% else %} -
        +
          {% for item in items %} -
        1. +
        2. {% include "book/suggestion_list/book_card.html" with list=suggestion_list %}
          3. {% endfor %}
        -
        - {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True controls_text="suggestion_search" %} +
        + {% trans "Add suggestion" as button_text %} + {% include 'snippets/toggle/open_button.html' with class="is-small" controls_text="suggestion_search" icon_with_text="plus" text=button_text focus="suggestion_search_header" %}
        + + {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True controls_text="suggestion_search" %} + {% endif %} {% else %} diff --git a/bookwyrm/templates/lists/list_item_notes.html b/bookwyrm/templates/lists/list_item_notes.html index f49f62ac0f..5a497266cb 100644 --- a/bookwyrm/templates/lists/list_item_notes.html +++ b/bookwyrm/templates/lists/list_item_notes.html @@ -3,7 +3,6 @@ {% if item.notes %}
        - {% if not no_header %}
        - {% endif %}
        {% include 'snippets/trimmed_text.html' with no_trim=no_trim full=item.notes %} From f5d82988368f18ebe77de64032fd9801b3e1c9ec Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 25 Jun 2026 10:09:16 -0700 Subject: [PATCH 842/962] Show subtitle below title --- bookwyrm/templates/book/sections/title.html | 25 +++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/bookwyrm/templates/book/sections/title.html b/bookwyrm/templates/book/sections/title.html index f5a710a8a3..f69b58fd8d 100644 --- a/bookwyrm/templates/book/sections/title.html +++ b/bookwyrm/templates/book/sections/title.html @@ -5,24 +5,25 @@

        {{ book.title }}

        + {% if book.subtitle %} +

        + + + {{ book.subtitle }} + +

        + {% endif %} + {% if book.authors.exists %}
        {% include 'snippets/authors.html' with book=book %}
        {% endif %} - {% if book.subtitle or book.series or book.parent_work.seriesbooks %} - {% if book.subtitle %} -

        - - - {{ book.subtitle }} - -

        - {% endif %} + {% if book.series or book.parent_work.seriesbooks %} {% if book.series %} {% spaceless %}
        From 42debbdffc730fab098d0ad38964f5f03dd6ac2e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 25 Jun 2026 10:13:20 -0700 Subject: [PATCH 843/962] Move editions link out of details panel --- .../templates/book/sections/metadata.html | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bookwyrm/templates/book/sections/metadata.html b/bookwyrm/templates/book/sections/metadata.html index adf32b248b..31faa32c19 100644 --- a/bookwyrm/templates/book/sections/metadata.html +++ b/bookwyrm/templates/book/sections/metadata.html @@ -1,7 +1,7 @@ {% load i18n %} {% load humanize %}
        -
        +

        {% trans "Edition details" %}

        @@ -14,18 +14,6 @@

        {% trans "Edition details" %}

        {% include 'book/book_identifiers.html' %}
        - {% with work=book.parent_work editions_count=book.parent_work.editions.count %} -

        - - {% blocktrans trimmed count counter=editions_count with count=editions_count|intcomma %} - {{ count }} edition - {% plural %} - {{ count }} editions - {% endblocktrans %} - -

        - {% endwith %} - {% trans "Load data" as button_text %} {% if book.openlibrary_key %}

        @@ -91,4 +79,16 @@

        {% trans "Edition details" %}

        {% endif %} + + {% with work=book.parent_work editions_count=book.parent_work.editions.count %} +
        + + {% blocktrans trimmed count counter=editions_count with count=editions_count|intcomma %} + {{ count }} edition + {% plural %} + {{ count }} editions + {% endblocktrans %} + +

        + {% endwith %} From 92fbb82d3f3db7e9b8f1d016110a85669bc8ee5f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 25 Jun 2026 10:17:58 -0700 Subject: [PATCH 844/962] Fixes title/notes display on suggestion card --- bookwyrm/templates/book/suggestion_list/book_card.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/book/suggestion_list/book_card.html b/bookwyrm/templates/book/suggestion_list/book_card.html index 4628956ca6..3b34203cd1 100644 --- a/bookwyrm/templates/book/suggestion_list/book_card.html +++ b/bookwyrm/templates/book/suggestion_list/book_card.html @@ -33,11 +33,11 @@
        {% if item.notes %} -
        +
        {% include 'snippets/trimmed_text.html' with full=item.notes trim_length=15 %}
        {% endif %} -
        +
        {% include 'snippets/book_titleby.html' with book=item_book %}
        From 8277e34a436e2126780bc7dfa07904410e1d7291 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 25 Jun 2026 10:21:47 -0700 Subject: [PATCH 845/962] Adds missing section tag --- bookwyrm/templates/book/suggestion_list/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index 76b1743654..f8acc0b907 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -38,8 +38,8 @@

        {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True controls_text="suggestion_search" %} {% endif %} + {% else %} -
        {% csrf_token %} From 388d7173a368d52ef87fe658ac3b0307eaa3a209 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 25 Jun 2026 10:39:57 -0700 Subject: [PATCH 846/962] Incorrect div tag --- bookwyrm/templates/book/sections/metadata.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/sections/metadata.html b/bookwyrm/templates/book/sections/metadata.html index 31faa32c19..8e8ced7337 100644 --- a/bookwyrm/templates/book/sections/metadata.html +++ b/bookwyrm/templates/book/sections/metadata.html @@ -89,6 +89,6 @@

        {% trans "Edition details" %}

        {{ count }} editions {% endblocktrans %} -

        +

        {% endwith %} From d013a710bc16aef82e4c3373e317f50601694ce3 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 25 Jun 2026 11:39:53 -0700 Subject: [PATCH 847/962] Adds tests to replicate garbled avatar activitypub json --- bookwyrm/tests/models/test_user_model.py | 66 +++++++++++++++--------- bookwyrm/tests/views/test_user.py | 59 +++++++++++++++------ 2 files changed, 84 insertions(+), 41 deletions(-) diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index 187dae4118..c675b7c827 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -1,4 +1,5 @@ """testing models""" +import pathlib from unittest.mock import patch from django.contrib.auth.models import Group @@ -14,30 +15,25 @@ class User(TestCase): @classmethod def setUpTestData(cls): - with ( - patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), - patch("bookwyrm.activitystreams.populate_stream_task.delay"), - patch("bookwyrm.lists_stream.populate_lists_task.delay"), - ): - cls.user = models.User.objects.create_user( - f"mouse@{DOMAIN}", - "mouse@mouse.mouse", - "mouseword", - local=True, - localname="mouse", - name="hi", - summary="a summary", - bookwyrm_user=False, - ) - cls.another_user = models.User.objects.create_user( - f"nutria@{DOMAIN}", - "nutria@nutria.nutria", - "nutriaword", - local=True, - localname="nutria", - name="hi", - bookwyrm_user=False, - ) + cls.user = models.User.objects.create_user( + f"mouse@{DOMAIN}", + "mouse@mouse.mouse", + "mouseword", + local=True, + localname="mouse", + name="hi", + summary="a summary", + bookwyrm_user=False, + ) + cls.another_user = models.User.objects.create_user( + f"nutria@{DOMAIN}", + "nutria@nutria.nutria", + "nutriaword", + local=True, + localname="nutria", + name="hi", + bookwyrm_user=False, + ) initdb.init_groups() initdb.init_permissions() @@ -122,6 +118,28 @@ def test_activitypub_serialize(self): self.assertEqual(activity["discoverable"], False) self.assertEqual(activity["type"], "Person") + def test_activitypub_serialize_avatar(self): + """Make sure the avatar is rendered correctly in the activity""" + avatar_path = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + with open(avatar_path, "rb") as avatar_file: + self.user.avatar.save("mouse-avatar.jpg", avatar_file) + activity = self.user.to_activity() + self.assertEqual(activity["icon"], + { + "type": "Image", + "url": f"{BASE_URL}{self.user.avatar.url}", + "name": "avatar for mouse", + "@context": [ + "https://www.w3.org/ns/activitystreams", + { + "Hashtag": "as:Hashtag" + } + ] + } + ) + def test_activitypub_outbox(self): activity = self.user.to_outbox() self.assertEqual(activity["type"], "OrderedCollection") diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 1b442adeed..8afb22cef7 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -1,8 +1,9 @@ """test for app action functionality""" -from unittest.mock import patch - import datetime +import json +import pathlib +from unittest.mock import patch from django.contrib.auth.models import AnonymousUser from django.http.response import Http404 @@ -13,6 +14,7 @@ from bookwyrm import models, views from bookwyrm.activitypub import ActivitypubResponse from bookwyrm.tests.validate_html import validate_html +from bookwyrm.settings import BASE_URL def make_date(*args): @@ -26,21 +28,16 @@ class UserViews(TestCase): @classmethod def setUpTestData(cls): """we need basic test data and mocks""" - with ( - patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), - patch("bookwyrm.activitystreams.populate_stream_task.delay"), - patch("bookwyrm.lists_stream.populate_lists_task.delay"), - ): - cls.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - ) - cls.rat = models.User.objects.create_user( - "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" - ) + cls.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + ) + cls.rat = models.User.objects.create_user( + "rat@local.com", "rat@rat.rat", "password", local=True, localname="rat" + ) cls.book = models.Edition.objects.create( title="test", parent_work=models.Work.objects.create(title="test work") ) @@ -107,6 +104,34 @@ def test_user_page(self): self.assertIsInstance(result, ActivitypubResponse) self.assertEqual(result.status_code, 200) + def test_user_page_activitypub(self): + """Make sure the avatar is rendered correctly in the activity""" + avatar_path = pathlib.Path(__file__).parent.joinpath( + "../../static/images/default_avi.jpg" + ) + with open(avatar_path, "rb") as avatar_file: + self.local_user.avatar.save("mouse-avatar.jpg", avatar_file) + view = views.User.as_view() + request = self.factory.get("") + request.user = self.local_user + with patch("bookwyrm.views.user.is_api_request") as is_api: + is_api.return_value = True + result = view(request, username="mouse") + activity = json.loads(result.content) + self.assertEqual(activity["icon"], + { + "type": "Image", + "url": f"{BASE_URL}{self.local_user.avatar.url}", + "name": "avatar for mouse", + "@context": [ + "https://www.w3.org/ns/activitystreams", + { + "Hashtag": "as:Hashtag" + } + ] + } + ) + def test_user_page_domain(self): """when the user domain has dashes in it""" with patch("bookwyrm.models.user.set_remote_server"): From 2b980ee069b2b229a83aefe13f976a5a7c2bc0b4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 25 Jun 2026 12:14:48 -0700 Subject: [PATCH 848/962] Make add suggestion a modal --- bookwyrm/templates/book/book_identifiers.html | 20 ++++++++------- bookwyrm/templates/book/sections/title.html | 4 +-- .../templates/book/suggestion_list/list.html | 25 +++++++++++-------- .../book/suggestion_list/search.html | 6 ++--- .../templates/lists/suggestion_search.html | 2 +- 5 files changed, 32 insertions(+), 25 deletions(-) diff --git a/bookwyrm/templates/book/book_identifiers.html b/bookwyrm/templates/book/book_identifiers.html index 73b513ebf0..bd54b7a2ee 100644 --- a/bookwyrm/templates/book/book_identifiers.html +++ b/bookwyrm/templates/book/book_identifiers.html @@ -6,15 +6,17 @@ {% if book.isbn_13 %}
        {% trans "ISBN:" %}
        -
        {{ book.hyphenated_isbn13 }}
        -
        - - {% trans "Copied ISBN!" %} -
        +
        + {{ book.hyphenated_isbn13 }} +
        + + {% trans "Copied ISBN!" %} +
        +
        {% endif %} diff --git a/bookwyrm/templates/book/sections/title.html b/bookwyrm/templates/book/sections/title.html index f69b58fd8d..391a7ee470 100644 --- a/bookwyrm/templates/book/sections/title.html +++ b/bookwyrm/templates/book/sections/title.html @@ -67,8 +67,8 @@

        {% if user_authenticated and can_edit_book %}
        - - {% trans "Edit Book" %} + + {% trans "Edit Book" %}
        {% endif %} diff --git a/bookwyrm/templates/book/suggestion_list/list.html b/bookwyrm/templates/book/suggestion_list/list.html index f8acc0b907..2b710d1b61 100644 --- a/bookwyrm/templates/book/suggestion_list/list.html +++ b/bookwyrm/templates/book/suggestion_list/list.html @@ -15,12 +15,17 @@

        {% if items|length == 0 %} -
        +
        -

        {% trans "Have a recommendation for someone who liked this book?" %}

        - {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True %} +

        {% trans "Have a recommendation for someone who liked this book?" %}

        +
        + +
        -
        +

        {% else %}
          {% for item in items %} @@ -31,13 +36,13 @@

        - {% trans "Add suggestion" as button_text %} - {% include 'snippets/toggle/open_button.html' with class="is-small" controls_text="suggestion_search" icon_with_text="plus" text=button_text focus="suggestion_search_header" %} +
        - - {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True controls_text="suggestion_search" %} - {% endif %} + {% include "book/suggestion_list/search.html" with list=suggestion_list is_suggestion=True id="suggestion_search" %} {% else %}
        @@ -46,7 +51,7 @@

        {% trans "Have a recommendation for someone who liked this book?" %}

        - +

        {% endif %} diff --git a/bookwyrm/templates/book/suggestion_list/search.html b/bookwyrm/templates/book/suggestion_list/search.html index 451dd12d0f..73603866ad 100644 --- a/bookwyrm/templates/book/suggestion_list/search.html +++ b/bookwyrm/templates/book/suggestion_list/search.html @@ -1,12 +1,12 @@ -{% extends 'components/inline_form.html' %} +{% extends 'components/modal.html' %} {% load i18n %} {% load utilities %} -{% block header %} +{% block modal-title %} {% trans "Add suggestions" %} {% endblock %} -{% block form %} +{% block modal-body %} {% if request.user.is_authenticated %} {% with search_url=request.path|add:"#add-suggestions" %} diff --git a/bookwyrm/templates/lists/suggestion_search.html b/bookwyrm/templates/lists/suggestion_search.html index a77b6f9c30..428f23d2ff 100644 --- a/bookwyrm/templates/lists/suggestion_search.html +++ b/bookwyrm/templates/lists/suggestion_search.html @@ -29,7 +29,7 @@ {% if suggested_books|length > 0 %} {% for book in suggested_books %} -
        +
        Date: Thu, 25 Jun 2026 12:52:08 -0700 Subject: [PATCH 849/962] Reformats reading activity --- .../book/file_links/verification_modal.html | 2 +- .../templates/book/sections/metadata.html | 24 +++++------ bookwyrm/templates/book/sections/reading.html | 17 ++++---- .../readthrough/readthrough_list.html | 42 ++++++++++--------- bookwyrm/templatetags/utilities.py | 2 +- 5 files changed, 46 insertions(+), 41 deletions(-) diff --git a/bookwyrm/templates/book/file_links/verification_modal.html b/bookwyrm/templates/book/file_links/verification_modal.html index 4f2f96a4a9..121572dea0 100644 --- a/bookwyrm/templates/book/file_links/verification_modal.html +++ b/bookwyrm/templates/book/file_links/verification_modal.html @@ -24,7 +24,7 @@ {% endif %} -{% trans "Continue" %} +{% trans "Continue" %} {% endblock %} diff --git a/bookwyrm/templates/book/sections/metadata.html b/bookwyrm/templates/book/sections/metadata.html index 8e8ced7337..2bd7df4e46 100644 --- a/bookwyrm/templates/book/sections/metadata.html +++ b/bookwyrm/templates/book/sections/metadata.html @@ -1,6 +1,18 @@ {% load i18n %} {% load humanize %}
        + {% with work=book.parent_work editions_count=book.parent_work.editions.count %} + + {% endwith %} +

        {% trans "Edition details" %}

        @@ -79,16 +91,4 @@

        {% trans "Edition details" %}

        {% endif %}
        - - {% with work=book.parent_work editions_count=book.parent_work.editions.count %} - - {% endwith %}
        diff --git a/bookwyrm/templates/book/sections/reading.html b/bookwyrm/templates/book/sections/reading.html index be5ad4304e..cb9de76508 100644 --- a/bookwyrm/templates/book/sections/reading.html +++ b/bookwyrm/templates/book/sections/reading.html @@ -2,17 +2,18 @@ {% load shelf_tags %} {% if user_authenticated %} -
        -

        {% trans "Your reading" %}

        - +
        {% if readthroughs.exists %} -
        +
        + +

        {% trans "Your reading" %}

        + +         + {% for readthrough in readthroughs %} -
        {% include 'readthrough/readthrough_list.html' with readthrough=readthrough %} -
        {% endfor %} -
        + {% endif %}
        @@ -24,7 +25,7 @@

        {% trans "Your reading" %}

        {% include "readthrough/readthrough_modal.html" with id="add-readthrough" %} -
        + {% endif %} {% if other_edition_shelves %} diff --git a/bookwyrm/templates/readthrough/readthrough_list.html b/bookwyrm/templates/readthrough/readthrough_list.html index 532ae4b9a7..447b02023d 100644 --- a/bookwyrm/templates/readthrough/readthrough_list.html +++ b/bookwyrm/templates/readthrough/readthrough_list.html @@ -2,25 +2,11 @@ {% load humanize %} {% load tz %} {% load utilities %} -
        -
          +
          +
            {% if readthrough.start_date %} -
          • {% trans "Started:" %} {{ readthrough.start_date | localtime | naturalday }}
            • - {% endif %} - {% if readthrough.finish_date or readthrough.stopped_date or readthrough.progress %} -
          • - {% if readthrough.finish_date %} - {% trans "Finished:" %} {{ readthrough.finish_date | localtime | naturalday }} - {% elif readthrough.stopped_date %} - {% trans "Stopped:" %} {{ readthrough.stopped_date | localtime | naturalday }} - {% else %} - - {% if readthrough.progress_mode == 'PG' %} - {% include 'snippets/page_text.html' with page=readthrough.progress total_pages=book.pages %} - {% else %} - {{ readthrough.progress }}% - {% endif %} - {% endif %} +
          • + {% trans "Started:" %} {{ readthrough.start_date | localtime | naturalday }} {% if readthrough.progress %} {% trans "Show all updates" as button_text %} @@ -49,8 +35,23 @@ {% endif %}
            • {% endif %} + {% if readthrough.finish_date or readthrough.stopped_date or readthrough.progress %} +
          • + {% if readthrough.finish_date %} + {% trans "Finished:" %} {{ readthrough.finish_date | localtime | naturalday }} + {% elif readthrough.stopped_date %} + {% trans "Stopped:" %} {{ readthrough.stopped_date | localtime | naturalday }} + {% else %} -
          + {% if readthrough.progress_mode == 'PG' %} + {% include 'snippets/page_text.html' with page=readthrough.progress total_pages=book.pages %} + {% else %} + {{ readthrough.progress }}% + {% endif %} + {% endif %} + + {% endif %} +
        • {% trans "Edit read dates" as button_text %} @@ -69,6 +70,9 @@
          +
          • + +
        {% join "edit_readthrough" readthrough.id as edit_modal_id %} diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index a400743236..d27f3aa744 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -39,7 +39,7 @@ def get_link_to_user(user): """get a link to a user profile, or display if the user has been deleted""" username = user.display_name if user.is_active: - return mark_safe(f"{username}") + return mark_safe(f'{username}') text = _("deactivated user") return mark_safe(f"{text}") From ce0a9a668678e6a2602357e7150cab36156ec27f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 25 Jun 2026 15:10:03 -0700 Subject: [PATCH 850/962] Removes header elements from summaries --- bookwyrm/templates/book/sections/metadata.html | 2 +- bookwyrm/templates/book/sections/reading.html | 2 +- bookwyrm/templates/book/sections/reviews.html | 4 ++-- bookwyrm/templates/book/sections/subjects.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/book/sections/metadata.html b/bookwyrm/templates/book/sections/metadata.html index 2bd7df4e46..9d6dbf54d6 100644 --- a/bookwyrm/templates/book/sections/metadata.html +++ b/bookwyrm/templates/book/sections/metadata.html @@ -15,7 +15,7 @@
        -

        {% trans "Edition details" %}

        + {% trans "Edition details" %}
        diff --git a/bookwyrm/templates/book/sections/reading.html b/bookwyrm/templates/book/sections/reading.html index cb9de76508..c83a953d0f 100644 --- a/bookwyrm/templates/book/sections/reading.html +++ b/bookwyrm/templates/book/sections/reading.html @@ -6,7 +6,7 @@ {% if readthroughs.exists %}
        -

        {% trans "Your reading" %}

        + {% trans "Your reading" %}         diff --git a/bookwyrm/templates/book/sections/reviews.html b/bookwyrm/templates/book/sections/reviews.html index bb99e52f4e..9ae7a9a81d 100644 --- a/bookwyrm/templates/book/sections/reviews.html +++ b/bookwyrm/templates/book/sections/reviews.html @@ -1,11 +1,11 @@ {% load i18n %} -{% load utilities %} +{% load utilities %}

        {% trans "Reviews" %}

        {% if user_authenticated %}
        -

        {% trans "Add your thoughts" %}

        + {% trans "Add your thoughts" %}
        diff --git a/bookwyrm/templates/book/sections/subjects.html b/bookwyrm/templates/book/sections/subjects.html index da16a27ea7..93fd6316f4 100644 --- a/bookwyrm/templates/book/sections/subjects.html +++ b/bookwyrm/templates/book/sections/subjects.html @@ -3,7 +3,7 @@
        -

        {% trans "Subjects" %}

        + {% trans "Subjects" %}         From 6df54fda4e51dff44285676e8da9cf8c59b81492 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Fri, 26 Jun 2026 09:01:35 +0700 Subject: [PATCH 851/962] add shelf selector to the book import form --- bookwyrm/templates/import/import.html | 19 +++++++++++++++++++ bookwyrm/views/imports/import_data.py | 1 + 2 files changed, 20 insertions(+) diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html index a78dc30f6a..e213c2a326 100644 --- a/bookwyrm/templates/import/import.html +++ b/bookwyrm/templates/import/import.html @@ -1,6 +1,7 @@ {% extends 'preferences/layout.html' %} {% load i18n %} {% load humanize %} +{% load shelf_tags %} {% block title %}{% trans "Import Book List" %}{% endblock %} {% block header %}{% trans "Import Book List" %}{% endblock %} @@ -104,6 +105,24 @@ {% trans "Create new shelves if they do not exist" %}
        +
        + + +
        + +
        + +

        + {% trans "Useful when your file has no shelf column." %} +

        +
        {% endif %} +
        +
        +

        {% trans 'Latest successfull request' %}

        +

        {{ connector.most_recent_success }}

        +
        +
        + {% if connector.most_recent_error %} +
        +
        +

        {% trans 'Latest error' %}

        +

        {{ connector.most_recent_error}}

        +

        {{ connector.latest_error }}

        +
        +
        + {% endif %} {% if connector.active %}
        Date: Fri, 26 Jun 2026 17:37:09 +0300 Subject: [PATCH 854/962] connectors: use django timezone and naturaltime to show timestamps --- bookwyrm/connectors/abstract_connector.py | 6 +++--- bookwyrm/templates/settings/connectors/connector.html | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index c82ddf70e2..f6f61b0d2c 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -5,7 +5,6 @@ from typing import Optional, TypedDict, Any, Callable, Union, Iterator from urllib.parse import quote_plus -from datetime import datetime, UTC import logging import re import asyncio @@ -16,6 +15,7 @@ from django.contrib.postgres.search import SearchRank, SearchVector from django.core.files.base import ContentFile +from django.utils import timezone from django.db import transaction from django.db.models import Subquery @@ -586,10 +586,10 @@ def update_connector_status( connector = models.Connector.objects.get(pk=connector_id) if error_message: connector.latest_error = error_message - connector.most_recent_error = datetime.now(UTC) + connector.most_recent_error = timezone.now() connector.save(update_fields=["latest_error", "most_recent_error"]) else: - connector.most_recent_success = datetime.now(UTC) + connector.most_recent_success = timezone.now() connector.save(update_fields=["most_recent_success"]) except Exception as err: logger.exception(err) diff --git a/bookwyrm/templates/settings/connectors/connector.html b/bookwyrm/templates/settings/connectors/connector.html index 5f126fe8a1..8a0edde86d 100644 --- a/bookwyrm/templates/settings/connectors/connector.html +++ b/bookwyrm/templates/settings/connectors/connector.html @@ -1,4 +1,5 @@ {% load i18n %} +{% load humanize %}
      1. @@ -40,14 +41,14 @@

        {% trans 'Deactivation reason:' %}

        {% trans 'Latest successfull request' %}

        -

        {{ connector.most_recent_success }}

        +

        {{ connector.most_recent_success|naturaltime }}

        {% if connector.most_recent_error %}

        {% trans 'Latest error' %}

        -

        {{ connector.most_recent_error}}

        +

        {{ connector.most_recent_error|naturaltime}}

        {{ connector.latest_error }}

        From 4c8ffd554359f5a2f97222db4913cd08b72c032d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 26 Jun 2026 09:46:45 -0700 Subject: [PATCH 855/962] Fixes automod detection of existing user reports --- bookwyrm/models/antispam.py | 2 +- bookwyrm/tests/models/test_automod.py | 63 +++++++++++++++++---------- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/bookwyrm/models/antispam.py b/bookwyrm/models/antispam.py index 9c28f91638..f6bae08326 100644 --- a/bookwyrm/models/antispam.py +++ b/bookwyrm/models/antispam.py @@ -102,7 +102,7 @@ def automod_users(reporter): reduce(operator.or_, (Q(**f) for f in filters)), is_active=True, local=True, - report__isnull=True, # don't flag users that already have reports + reported_user__isnull=True, # don't flag users that already have reports ).distinct() report_model = apps.get_model("bookwyrm", "Report", require_ready=True) diff --git a/bookwyrm/tests/models/test_automod.py b/bookwyrm/tests/models/test_automod.py index 96b03c90b2..a6de9c8ef5 100644 --- a/bookwyrm/tests/models/test_automod.py +++ b/bookwyrm/tests/models/test_automod.py @@ -1,7 +1,4 @@ """test for app action functionality""" - -from unittest.mock import patch - from django.test import TestCase from django.test.client import RequestFactory @@ -9,40 +6,39 @@ from bookwyrm.models.antispam import automod_task -@patch("bookwyrm.models.Status.broadcast") -@patch("bookwyrm.activitystreams.add_status_task.delay") -@patch("bookwyrm.activitystreams.remove_status_task.delay") class AutomodModel(TestCase): """every response to a get request, html or json""" @classmethod def setUpTestData(cls): """we need basic test data and mocks""" - with ( - patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), - patch("bookwyrm.activitystreams.populate_stream_task.delay"), - patch("bookwyrm.lists_stream.populate_lists_task.delay"), - ): - cls.local_user = models.User.objects.create_user( - "mouse@local.com", - "mouse@mouse.mouse", - "password", - local=True, - localname="mouse", - is_superuser=True, - ) + cls.local_user = models.User.objects.create_user( + "mouse@local.com", + "mouse@mouse.mouse", + "password", + local=True, + localname="mouse", + is_superuser=True, + ) + cls.another_user = models.User.objects.create_user( + "rat@local.com", + "rat@mouse.mouse", + "password", + local=True, + localname="rat", + ) def setUp(self): self.factory = RequestFactory() - def test_automod_task_no_rules(self, *_): + def test_automod_task_no_rules(self): """nothing to see here""" self.assertFalse(models.Report.objects.exists()) automod_task() self.assertFalse(models.Report.objects.exists()) self.assertFalse(models.Notification.objects.exists()) - def test_automod_task_user(self, *_): + def test_automod_task_user(self): """scan activity""" self.assertFalse(models.Report.objects.exists()) models.AutoMod.objects.create( @@ -62,7 +58,30 @@ def test_automod_task_user(self, *_): self.assertEqual(reports.first().user, self.local_user) self.assertEqual(models.Notification.objects.count(), 1) - def test_automod_status(self, *_): + def test_automod_task_user_existing_reports(self): + """scan activity""" + self.assertFalse(models.Report.objects.exists()) + models.AutoMod.objects.create( + string_match="hi", + flag_users=True, + flag_statuses=True, + created_by=self.local_user, + ) + models.Report.objects.create( + user=self.local_user, + reported_user=self.another_user, + allow_broadcast=False, + ) + + self.another_user.name = "okay hi" + self.another_user.save(broadcast=False, update_fields=["name"]) + + automod_task() + + reports = models.Report.objects.all() + self.assertEqual(reports.count(), 1) + + def test_automod_status(self): """scan activity""" self.assertFalse(models.Report.objects.exists()) models.AutoMod.objects.create( From 4704cc78652de9a1ffa37fb65631036f9defd2f2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 26 Jun 2026 09:49:51 -0700 Subject: [PATCH 856/962] Fixes filtering on reports page --- bookwyrm/templates/settings/users/user_info.html | 2 +- bookwyrm/tests/models/test_automod.py | 1 + bookwyrm/views/admin/reports.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/settings/users/user_info.html b/bookwyrm/templates/settings/users/user_info.html index e07a7e4396..934281d836 100644 --- a/bookwyrm/templates/settings/users/user_info.html +++ b/bookwyrm/templates/settings/users/user_info.html @@ -56,7 +56,7 @@

        {% trans "User details" %}

        {{ user.email }}
        {% endif %} - {% with report_count=user.report_set.count %} + {% with report_count=user.reported_user.count %}
        {% trans "Reports:" %}
        {{ report_count|intcomma }} diff --git a/bookwyrm/tests/models/test_automod.py b/bookwyrm/tests/models/test_automod.py index a6de9c8ef5..a69d2614c7 100644 --- a/bookwyrm/tests/models/test_automod.py +++ b/bookwyrm/tests/models/test_automod.py @@ -1,4 +1,5 @@ """test for app action functionality""" + from django.test import TestCase from django.test.client import RequestFactory diff --git a/bookwyrm/views/admin/reports.py b/bookwyrm/views/admin/reports.py index 23762034fb..49772eda37 100644 --- a/bookwyrm/views/admin/reports.py +++ b/bookwyrm/views/admin/reports.py @@ -39,10 +39,10 @@ def get(self, request): server = request.GET.get("server") if server: - filters["user__federated_server__server_name"] = server + filters["reported_user__federated_server__server_name"] = server username = request.GET.get("username") if username: - filters["user__username__icontains"] = username + filters["reported_user__username__icontains"] = username if resolved != "all": filters["resolved"] = resolved From 7dffa6ba79ace1f4504da159c15b9fa82eef9f3f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 26 Jun 2026 09:59:31 -0700 Subject: [PATCH 857/962] Update bookwyrm/templates/settings/connectors/connector.html --- bookwyrm/templates/settings/connectors/connector.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/settings/connectors/connector.html b/bookwyrm/templates/settings/connectors/connector.html index 8a0edde86d..f797e9fc91 100644 --- a/bookwyrm/templates/settings/connectors/connector.html +++ b/bookwyrm/templates/settings/connectors/connector.html @@ -40,7 +40,7 @@

        {% trans 'Deactivation reason:' %}

        {% endif %}
        -

        {% trans 'Latest successfull request' %}

        +

        {% trans 'Latest successful request' %}

        {{ connector.most_recent_success|naturaltime }}

        From 63f61d989f73da9de093995a2285b71d5dcda693 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 26 Jun 2026 10:10:34 -0700 Subject: [PATCH 858/962] Adds new translation strings --- locale/af_ZA/LC_MESSAGES/django.mo | Bin 557 -> 557 bytes locale/ar_SA/LC_MESSAGES/django.mo | Bin 21117 -> 21070 bytes locale/ba_RU/LC_MESSAGES/django.mo | Bin 997 -> 997 bytes locale/bg_BG/LC_MESSAGES/django.mo | Bin 4467 -> 4467 bytes locale/bn_BD/LC_MESSAGES/django.mo | Bin 2663 -> 2663 bytes locale/bn_IN/LC_MESSAGES/django.mo | Bin 2676 -> 2676 bytes locale/ca_ES/LC_MESSAGES/django.mo | Bin 172040 -> 171834 bytes locale/cdo/LC_MESSAGES/django.mo | Bin 31657 -> 31502 bytes locale/cs_CZ/LC_MESSAGES/django.mo | Bin 82520 -> 82403 bytes locale/cy_GB/LC_MESSAGES/django.mo | Bin 35874 -> 35874 bytes locale/da_DK/LC_MESSAGES/django.mo | Bin 36691 -> 36691 bytes locale/de_DE/LC_MESSAGES/django.mo | Bin 177396 -> 177172 bytes locale/el_GR/LC_MESSAGES/django.mo | Bin 85448 -> 85200 bytes locale/en_Oulipo/LC_MESSAGES/django.mo | Bin 21495 -> 21423 bytes locale/en_US/LC_MESSAGES/django.po | 24 ++++++++++++++++-------- locale/eo_UY/LC_MESSAGES/django.mo | Bin 145733 -> 145527 bytes locale/es_ES/LC_MESSAGES/django.mo | Bin 163618 -> 163407 bytes locale/eu_ES/LC_MESSAGES/django.mo | Bin 162526 -> 162318 bytes locale/fa_IR/LC_MESSAGES/django.mo | Bin 180283 -> 180031 bytes locale/fi_FI/LC_MESSAGES/django.mo | Bin 146797 -> 146553 bytes locale/fo_FO/LC_MESSAGES/django.mo | Bin 555 -> 555 bytes locale/fr_FR/LC_MESSAGES/django.mo | Bin 185793 -> 185538 bytes locale/ga_IE/LC_MESSAGES/django.mo | Bin 594 -> 594 bytes locale/gl_ES/LC_MESSAGES/django.mo | Bin 176306 -> 179304 bytes locale/he_IL/LC_MESSAGES/django.mo | Bin 93105 -> 92936 bytes locale/hu_HU/LC_MESSAGES/django.mo | Bin 4609 -> 4609 bytes locale/id_ID/LC_MESSAGES/django.mo | Bin 29826 -> 34498 bytes locale/it_IT/LC_MESSAGES/django.mo | Bin 167263 -> 167056 bytes locale/ja_JP/LC_MESSAGES/django.mo | Bin 91342 -> 91059 bytes locale/ko_KR/LC_MESSAGES/django.mo | Bin 60119 -> 60033 bytes locale/lt_LT/LC_MESSAGES/django.mo | Bin 175517 -> 175296 bytes locale/nl_NL/LC_MESSAGES/django.mo | Bin 174478 -> 177336 bytes locale/no_NO/LC_MESSAGES/django.mo | Bin 161268 -> 160986 bytes locale/pl_PL/LC_MESSAGES/django.mo | Bin 150252 -> 150020 bytes locale/pt_BR/LC_MESSAGES/django.mo | Bin 108823 -> 108588 bytes locale/pt_PT/LC_MESSAGES/django.mo | Bin 138946 -> 138704 bytes locale/ro_RO/LC_MESSAGES/django.mo | Bin 122879 -> 122592 bytes locale/ru_RU/LC_MESSAGES/django.mo | Bin 65131 -> 64952 bytes locale/sk_SK/LC_MESSAGES/django.mo | Bin 42716 -> 42716 bytes locale/sl_SI/LC_MESSAGES/django.mo | Bin 7153 -> 7153 bytes locale/sr_SP/LC_MESSAGES/django.mo | Bin 690 -> 690 bytes locale/sv_SE/LC_MESSAGES/django.mo | Bin 140078 -> 139857 bytes locale/tr_TR/LC_MESSAGES/django.mo | Bin 131448 -> 131269 bytes locale/uk_UA/LC_MESSAGES/django.mo | Bin 169112 -> 168926 bytes locale/vi_VN/LC_MESSAGES/django.mo | Bin 551 -> 551 bytes locale/yi_DE/LC_MESSAGES/django.mo | Bin 35037 -> 35037 bytes locale/zh_Hans/LC_MESSAGES/django.mo | Bin 101957 -> 101757 bytes locale/zh_Hant/LC_MESSAGES/django.mo | Bin 42529 -> 42294 bytes 48 files changed, 16 insertions(+), 8 deletions(-) diff --git a/locale/af_ZA/LC_MESSAGES/django.mo b/locale/af_ZA/LC_MESSAGES/django.mo index b44a8eaf605609630d7b329f2c220506d0cba2c9..10d32c40a4e8172a28fcb11222d7ac56f93951a0 100644 GIT binary patch delta 21 ccmZ3>vX*5+E0>wBp@o8hft8`f#{PMX07ec5Pyhe` delta 21 ccmZ3>vX*5+E0?LRk+FiIrIn%4#{PMX07eJ~PXGV_ diff --git a/locale/ar_SA/LC_MESSAGES/django.mo b/locale/ar_SA/LC_MESSAGES/django.mo index 071b685f6708156c7d28e87f97c78e785f0c0f4e..792d9a6b60fb1b54d9fc0cfd6cf3665a083fbd95 100644 GIT binary patch delta 6277 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 CxPEc~ delta 6312 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 diff --git a/locale/bn_BD/LC_MESSAGES/django.mo b/locale/bn_BD/LC_MESSAGES/django.mo index 5425b1b4b15719bdc5dabbfc0984acb8b3fb347f..4a2137e14b20d1130e5ae9ae7b0a345d5ac5aa79 100644 GIT binary patch delta 23 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 P(`Sj#R^L265nBI0=w^$x delta 35540 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 Bq)q?; diff --git a/locale/cdo/LC_MESSAGES/django.mo b/locale/cdo/LC_MESSAGES/django.mo index 1d1217a21308ffa0ed2f2796da7699f7ddf467da..78426e49490fb8809991d3644ebf23f0921002ec 100644 GIT binary patch delta 11245 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 WYTA`ngG18Z>oOob?ZKc;VgCcl2Ij;7 delta 11315 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 diff --git a/locale/cs_CZ/LC_MESSAGES/django.mo b/locale/cs_CZ/LC_MESSAGES/django.mo index 2e8b152dc597c61066aae4c2d8fd80751ed517f8..8e3f7638ffae0a90dbdb4807734e856e5655fa1d 100644 GIT binary patch delta 18455 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 aL`IhiDN>|Nbg8XRcizvnHQlB7?*9kCD0OH6 delta 18486 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 diff --git a/locale/cy_GB/LC_MESSAGES/django.mo b/locale/cy_GB/LC_MESSAGES/django.mo index e8d18e71d70ba7ca3016deede563cafbd0e86858..d86946e57365344780f071579ca6f930e97e4b8b 100644 GIT binary patch delta 25 hcmZ29gK5zWrVYuVTxPn4777LiR)&_Fb3?b90RV3-2s;1( delta 25 hcmZ29gK5zWrVYuVT&B84#tMd(R))r#b3?b90RV3$2s!`& diff --git a/locale/da_DK/LC_MESSAGES/django.mo b/locale/da_DK/LC_MESSAGES/django.mo index 76c3f775f4398526fae152fbcd1ddb03f955d415..8cb550cd5eb76b95896d8a3b4d2d7ff23a981fcc 100644 GIT binary patch delta 25 hcmcaSkLmI}rVX>hxXg47Effq4tPCwSFAZB~0RVmr2^9bU delta 25 hcmcaSkLmI}rVX>hxJ-48j1>$mtqhGfFAZB~0RVmq2^9bU diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index fd5b7118b9007561474ddfc9cac3f45229c52dfc..6d29e927a25d4123a964ea6424a2c8d1ec4c9cc1 100644 GIT binary patch delta 36199 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 P@mb@u{d+l||Jwf_#TW*2 delta 36310 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 ZSEzq&74E56?=EdayKGBQ(feP={{!=^7i<6k diff --git a/locale/el_GR/LC_MESSAGES/django.mo b/locale/el_GR/LC_MESSAGES/django.mo index 922227ad75af334e894dc4e6774f3282574b2c3a..faaf0a87cb6f82ce2e0a768ce374f3f1d8bc5d60 100644 GIT binary patch delta 18187 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 UC+lx`kluC4Yr_*i*XgqV1Hg_;2mk;8 delta 18309 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 diff --git a/locale/en_Oulipo/LC_MESSAGES/django.mo b/locale/en_Oulipo/LC_MESSAGES/django.mo index dabfc67e932f28116d929173e28bcce7d3f18935..c986d686ce8956c4a1a42277614fd2eeb3903172 100644 GIT binary patch delta 7195 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\n" "Language-Team: English \n" @@ -4114,7 +4114,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5325,7 +5325,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5659,7 +5659,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5706,18 +5706,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7500,14 +7508,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/eo_UY/LC_MESSAGES/django.mo b/locale/eo_UY/LC_MESSAGES/django.mo index c32db3fddde1564754bd64a98e58620fff6201d6..3b4ca7cd3318c0284bd935ab698c7b3bf9c964f6 100644 GIT binary patch delta 31592 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 delta 31696 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 HWL5qTRXBf% diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo index 2bd9da8cd7327c00c6394319b100acd5afcd7e77..974d763e52cfb1fb0e067355012a8aa9f9e5de8b 100644 GIT binary patch delta 34215 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 diff --git a/locale/eu_ES/LC_MESSAGES/django.mo b/locale/eu_ES/LC_MESSAGES/django.mo index 9c699f9ec73ccb312fa61766086bc265d7874c3f..6da201b3ef3a25e269d7847d66d477bf3cc29749 100644 GIT binary patch delta 33369 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

        ya@G%+H4D+L^XT~_1yl0 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 diff --git a/locale/fa_IR/LC_MESSAGES/django.mo b/locale/fa_IR/LC_MESSAGES/django.mo index a7851e1f15bed3e86d08d53aec771a34fef613da..261c3a14ab95af8e947fe0c873b9ba2171ff6d45 100644 GIT binary patch delta 30168 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 delta 30309 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 diff --git a/locale/fi_FI/LC_MESSAGES/django.mo b/locale/fi_FI/LC_MESSAGES/django.mo index 79347199a86f04735c63dba252a7f8b9bfe4b152..d7890aeddcb584f4fedc3d7b47d0e13cff4af385 100644 GIT binary patch delta 31938 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 delta 32129 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 P6h5%et`*Nc*J}Jf?R1qs diff --git a/locale/fo_FO/LC_MESSAGES/django.mo b/locale/fo_FO/LC_MESSAGES/django.mo index a6cee7492fc2e17a6626370eb84b7d5d5669f647..48b1d924fac917225e62e0765a3484d7b36a3e87 100644 GIT binary patch delta 21 ccmZ3@vYKT=E0>wBp@o8hft8`<#{M~s07btBO8@`> delta 21 ccmZ3@vYKT=E0?LRk+FiIrIn${#{M~s07bqAO8@`> diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 27f5e94ce447d45298db1efb5002eca8d354ab28..b1437f53104e25a84ab46ee8c92b7f7d3d29d2d6 100644 GIT binary patch delta 37086 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 delta 37250 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 diff --git a/locale/ga_IE/LC_MESSAGES/django.mo b/locale/ga_IE/LC_MESSAGES/django.mo index 1feab44e1744d81fb1556f3648d92163bbf04a65..b335923471eeac034cc0b92ba0042e124cb927ff 100644 GIT binary patch delta 21 ccmcb_a*1U^E0>wBp@o8hft8`f#{R>M08AhTzW@LL delta 21 ccmcb_a*1U^E0?LRk+FiIrIn%a#{R>M08AeSzW@LL diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo index e7b6fd9e4fd45fd66d973d7eea17e42ef59851e9..0016a1bab8be601bdca34ad89ff039e7492921fe 100644 GIT binary patch delta 40214 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 HwfO%Bks1s+ delta 37548 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 diff --git a/locale/he_IL/LC_MESSAGES/django.mo b/locale/he_IL/LC_MESSAGES/django.mo index cc69b36d93b37c1a99877456b97bea682da4bc51..3655a7798dd7a8a53a782ac6d612267df07c4cd7 100644 GIT binary patch delta 21913 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 E0G#b_vj6}9 diff --git a/locale/hu_HU/LC_MESSAGES/django.mo b/locale/hu_HU/LC_MESSAGES/django.mo index b563b8f359fc98fc2876c13978e6401561565eca..f92004537affb0abd0f5ffed1e91c5d0997184e3 100644 GIT binary patch delta 23 ecmZovX;j(J$i-!*YiOZhU|?lvvALV8j2!?@cLqcN delta 23 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 M-@zQiza}2|A50kl=Kufz delta 8677 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 S9PV9@v~K)=XVHA==Klh#h#j;5 diff --git a/locale/it_IT/LC_MESSAGES/django.mo b/locale/it_IT/LC_MESSAGES/django.mo index 3222d0ad641690ae6e1e00bed39406d5ed8e1668..9b7672a792880c8ea085e28e7ae3ae1996c5d4a4 100644 GIT binary patch delta 34900 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 delta 34983 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 delta 22770 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 diff --git a/locale/ko_KR/LC_MESSAGES/django.mo b/locale/ko_KR/LC_MESSAGES/django.mo index 3601dd378b36cb2b34bc091d142030e0073ffff1..09ff56b8cc663e57c2fb4ab049d9bb8996e2babd 100644 GIT binary patch delta 17804 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 diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo index 1dabd2142cc2b10f3b773288f683a42e28c9d296..a5f0fa416faaeba1dd7fcc5f20f53f2cc5722698 100644 GIT binary patch delta 35565 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 KKS2s?@qYl9wPdaU delta 35703 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 TW=Gd_3-1`VePU^E_Llz-#5!(? diff --git a/locale/nl_NL/LC_MESSAGES/django.mo b/locale/nl_NL/LC_MESSAGES/django.mo index 5208ae232e5fa7c865beba4e7a2b3af09f7453b0..9187df809d7e8e7b5ccce2c4bdc285cfc97745a1 100644 GIT binary patch delta 39271 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 delta 36850 zcmZAA1$Y!m!>-|;A-D&EOR%5`!QFzp26uON8{FN3`{HiF-Q5>hba8iB{5lMFxPbew;pIL_%dN_CvP;~gg+=EJmD z5&f_$CdW}&9+zQme1{>Jaf0I%#P%43E3qbC!$z2OqT?KN9FH@Rzz`CuO>&%Pcm=cI z{>jFdn3;HzDUOpEOJQ_uj7hOQX2(%j0(W61bf%htXGRUU2qwT#OpWa^2mLz}2^1ya z5LQ8-X^s<&p_md!pq^|Q#>QKi5MQD{Mr8h~VE_hTAJmgC#0q!|RX)=U$I0(vb}&Bi z0b!1_o&KFE1XQ5>Of#j;umXCjQsSGfwdXm`65>DRG5@0oESm2)qcPJ0rWLo~a$LNSb$2t;MP~D~pw>pxcjId8 zNUJi*Uyid1k0RU2>9UN$p^HXn%4vryG5QMQR^wfEx;+=;blRr;=R zoE>-u8KX0Dt>g5@fOU?;|92MfpY2#_y)p6z#|bCCA9+}(H>1@|_-!)I!Xdj6X1~%W*m%VmXLUKWqm2 z5;f3tM;xawwm}W-0T#u=N6k6+U_atBun+nkqYoU1mGLKL)cLP;+#IvsSe1+g7!luE zKVv-NKQI!;J;BpqB8-WtFfwLEoq{|zy$q^+O`G2URj-B3@2GtGclr~EfkRPKHOUrO zjB0oTs^WHxfCn%g9zkDxjvC-kjE24^O?$~v^)g{p%z=7=6~b6p5j`qUpMW2>z?9ez z)!-ad#r4)57>)QL)RUh@4g4nR$)8%kqUuFIWjgZ1^u*Jm`m2D^G4vGkueEDJf-3B? z8AnhvaRF7~K4!xgs3}cx+N^OpRL2ETGgT3_bfFjn>tQr(je6p4sP=}S%8xzG{3~H9 z37K#%YKo7c26W1L1vPbdFb2NHtoR*OF3TA+z}%Rfcx!Bpb5JwubJi?X63j(B5Eo-J z4*`DykLqc0mnfDyrU5)DvGu z)w_v$aL;oBu?c*@>F9I8e0a>pmc)0UUKIWpc{gAqm1$8Ac!x3CmC;+=rU7W7b>PnfQB5fz7X&nHh@ea1zGB`KXT8 zquM!$K6nz<{yEfxK0yuSKW{$kANi_zf*7dHlL$5SDNqe%Ms<_}<6<#X1J$ifQ5|)` z1lSWbpz)}7=A%y2YSd=jhZ^Wf#dZE~5zv%9K~;E%>fjgV$5?;U8J0z*&%`4hK)Z)_4g7z%J@t`PwI2sJZTKnX-I;8SQ53C^-vu&MV0T4 znwkC>9mk-icm}H7Wtbc{V+Xu|d9cV0Gr(RqSpOL$Y#gbe>U&l?vAE7=AX5He%;4N%~1#g@Bb5TpN9yJsDQ4ewyHPAD+nST|yWedEr1wNpj z@EhuwM7U#&f$@p^p$3!*HI;d7euzykZ`13b+G&QGxpp>x0BR46_1J{@w!j)pLdISU z!t0m-quezWQsQ9Z*=>9aZXtdQwYmD=GgCYg)xkcTh!;@qXQ)2uFW(jhl+RtzFIHd{b zc+@~mX=~JG>WSLzLr?>pjDffW)xZT*x!b5Ed4^ikU#KUK{m^{qq(+r5hZ<-tRDYek zdU$dII%Z+0DZhw%mAW38z0m>n1OrhO=VK(?gqoopsDU3q4fLG#9u_D59xGs;$9(kS zFx-s?(fj%Dd19t`1p1IM3AL8fQ6pby)7RScO*Vax^(1Nlf7|?rsF`_V^S`5JDC$!) zqbX4R1foYBWhbC1D`c&Ls?ZG8P;XQR!%**oDX6txVdIBUOLYSy;ZqxbgL;5psCHsJ zGwmiqEmhz%&c6y2B0(LLL#DQ)w72m-7@G!$p*o&s(-+$KYSc`Gqn_wE z>X_X}EoG`VrhaP~tOCoAm`M|1D<3@2G(Vd@|{|FfQ?;)@q-a{{Rx2lc0f&wHeb;BVC3X z$U4*#97KOSi+aM>Hvcm=NcqM!wCaA3>EnhkAfJs2O^LD)${VfaqV1{-^=uLe(pe^y_iz5zrbp zL#<&?)YSAt4QLo@q%%+rtU}Geew>J>Py?v<&CF1H)C}}Rb+iCAp!KMFd$A{;z?}5& z6#Z^0_CUQbhN1>E8udhTtt(JVum!W@K~%>dQA-i&2OAS(qMm#>s{U;BE-fY}z5$2g zS*7dzSNmzcsnkbR7>4R-5^6@~+xQaH6Kq5cbT?|C2QeF7!9a}si*?6b*1V_z6+pFL z1=UV{^r(YY1T^LCtvyg33`C8580rZp*!1aGgZLcmi*L|_?Hrf)S1!-74DnVjm-n|^ z8}L2xL~fV&H>EKmxV*pgY81icacYyXhy<3=`HE~@=cA9ysfe#4y1c*BEf~q=Od>uQ zH4xv(F7KvHjEZNo=0z<@5o;CH=52yHu6TI;E(0WCwFhHWS!A3$yZr-p&B@idZHWF2dMU5p_b+cYQR1*T;5F>A2lNxF^#rO zHUjBM2*pY`0M+qn)RW&q&BR006TL!p{NCz{X*!IJDwhJ)VS3ckfL?|)xa-Q`KYnXE>D0di8n&+2@h%p=Af2z6>8?T zVPZUnn$dfhM#tte0X=cj*k%Ahs1X*$W>_AzX6sQ;aun6@Da?$2V=jyk#|$7Js$3{) zpmlLQw!##cFs{q{EjTxN>X0ymfI7U1n%c*xC-`XNKE9?QU(}MMM7@&JVFApCdcpKS z&CnRsOishpxC~YP1a81vxDF@8Itu*I(lsjxDuJo z7Y((hSx^JYhFY?GsHrW1n)=$Pz0?%FOM-2PkFoI&r~yY!Y#!7TU;{Z&6^o+wKy{nm z1l4dy)KvFIJ?TKyfNt9Kd#I&*jB4i-YJgFbm;uJeF~l>V+TV-}#N!+wkb#8Ts1710 zH4Vo^rTe0mqyXv|mO;%>Th!F{M_we(I8?_QP&0W5HJ}@)J@XU;F-kHs^|>**&VLaC znvw?AzNlRrhWhZ>iCVjhs1EL<8vJDAe#yKBIPV)D$l7mqkC+Cd-ZLxSF*Es)61%e+X(o^HCk`vH9mv1G$dc3r|rG^b@sb z5~Sq(YcpjcpsCM}I&OJUYg7dFeyE6{xEurU2Wm;u`n$YeG_s-U<+SkvsP+nDZY+WM zv7e1^v+ob(k)V**lq0 z-*SUdGg1~c6ZNd^to_n>%-W76L2Eo0)$v-)fm^XCK1B^66MrJ5O_c*Rg&~*)YhqCx zidw?Ms2MqrTB^S>C*DIXL4tH9J;*~q9p*(%c~NU6)aI#=s?ZD7;Y8FEEwS;fsE$sc zK3vYDp7a@N2EL+ZCSHI!O^H#T86l{Fc{&o%Iqr>mvH_@pj6<#QZ0mB&PJ9b$Gd;#Z z_#O2C1Jaur8jgxju<;o-z5vz!a?}8~VK$xrqqe|*Rwsjbk|?MtPmOxw%%~9;LOpS5 z)KphOosPPg7CWF$%@kBe>rgMEy{PghQ0-j7NIL&_Y{DZ{!8fQW`{pgcSE!7pVieSX z;-h9PIcgxOQBRx^wTH5yo-_pY=~xxDm&T(8dcb-aeRTdG6VOz@z+n7>L6|9%S&BN= zR;VZHf$Cs5>PJ4`bHL&QJO}oCR@+qxBsCEjWM^jRffCf;<+7k6d-E6#{ zbrfooO~(wl9<^7lp*nnoYUia*|BBU#N6BLH>!UhuX5-zmaQ>ChmjrF9F{lO>*!UXM z01u#^;Ec_`iQ3&yQA_0xG#x}iZPM7NS9l2OJ*f_mZ&Hogrt^@nWyBu*gyH)g?>!KS^b);XwwEkU*C*-k(& zmLnJeuVYobg&IiKY-S*NupsfGsNFvRRc{DtfHP17TZWp+HP-E@jt--y{sQ*FC&&YO zoTk}Lg?6}as*nY>$%><?UgTiIsbZsUnI!L`OHr|u~DzeZm0o{u!f-qw8FXxHDkL` zGjJUJ@d|37pKQJ>zgfDNn3nX^sF^ICpYyMdI*_0N3_?A@DAbhCKt0(U)RV44t=(qS zK#pKdJcpSupn!QpR>dmB+o8TK@5T^JQqcUc+W<2YAMPQbwb_Uoz-3g!H&IXa2sH!m zP#s4oWCrAiT7tBwrOJsqEtN4PwnWXq2vj?hQ4cl`)z4~Fea~hB-WP~XIEnhgaRXKG z9qP%y+WZKG&4A*e^3z(gpx&f8F#xNfI_`s7n&H+dsCo;K0eGC{Cg6mlp7fY4a1B-Q zE@}WTQ8V)iHDITRiAP2?7#CG8G3rg48r5D2)B}a0Ucntuuj&!#{r*3ffTnP#H-XKA zYT!NkqhC?eL2lF<7e-BG8`OY$p{8=Mbuwz;i%@#yBO-6fZ{Q??iumfO?>arOd$MqaGxs zHJ}vdzZ?mHB*@;_8xLU+7A$R#5!N8S8w+9FGG?zz}?mYA}0MGvfBRnD}7a zf@!OnwZD#9^ZTeh@Cr4>A5f>_n@x{U-JFJ~s8@0l)baEL5t!xTosQZRmur|e-vbOK z{uDL!MMBLcorZ~tFT$L-3-w|12KC1LfZC*AtnQj79v!2S9v?NZ6h@B|KtLl2LJc54 zYWJ5z{Wx78b$$n7e4L4Tg0-jy51=|cg*q*lZTvZ^qYtPV{*G!daV_&8g)ogi|H~0j zLmg2K^+rwQVANEOL>;#Ys1D|$2D%w_ybhu2y+U>P8MWztq3Ug_ZPNGS5#q;DnTqQ#}mz-WZLlHv{#CTZ-D zVf})d@ksSK|H|+s&=XT)Yn*|q_zRVvw1Md$18NC!qh_o;24E=aiTYz|9B%Vhpk{It zX2tDT4WFQvq(DQ?zdEkn&`k9?Oi%nOs)L`XhNCnxyEiT>o*K1BGNWEFg-{(=u<=f) z<2(>G;AyDekgP<_)N#~|Uv1>_Grzjz2}(?n`wMidK+5>Je3ur4aUC90v0s44Ab(+8lA z<8aj8Sb!t&8){%fn!3DyN;VUP9!324fTHaFi$T4Q$N)6gG}VLyC= zTB_zP%#8hmTB4`c_o!3x12y27EzLmvP*a{1D`7^=i@lL0@HiU@=t*~@UL?mcH=f2S z7@?K<@>v5l(7`weSKge+RJ)Q=g%!kt|JV^R=?1FPUyS#r1Emjxv2M-;v z4C$Lt`QNZFcIaw0;}guT^B=jJ`OcOfixIDjIwo^55MSH;JSPUi}jv@F2HN%;EasCSuXi8u*E)BDTQDBTae-RC*6=q4U3rfTljqD6_WlP#ycDo**M;$E?^4o1#A+Ma{rt z)F%9jsWI7TlU@X0yZCyKIwc`vO@2*OybmVU`5#X}4KGJ^6n&goio(`$s8{9D!6XVh0#EIq@E}3LJkJ?i|P@6I9WV3|j(c@1-Edn{PHY5cn@_oBSd}LnfNJR64D$zy4^RzG4>QMfE!HD`2GxGXnP$KhQ02Oz zUT9-=F8vAIBq0s{zzmpbmU$nPL(M=N)K{y1sQ1A%)c1i^sHNF~^Y9(&bWECUj_q93 zht^uu%w0i!Tt7iAh1)a7Y`PSv0c6G=SQ#hb5ln|Q=bBe%e_TsEXrB2q-J3X(__+Dz z=YwPmT+SEb`)~{HSjhXp&G&{y=2LI!5|?wF^jJ&Hhnweb0-Hz}|Ch_zj7683FA5*9 z6Y;UjUCuK6h8uA43YW76tFJVFhU=_y>0jD8>+vcUUu`~SldN$$`-$JigScR=`So7Y zb>?F`@_O$Bd7R+{^eL8SgUi{4pKuRu+URl?VdqWeM={^c#<@6_^nfkqw_BUA6mkEp zrr}mNo%ll>f&I1_-Qh0pzmOV@ZAtgtuHTe${swph{BXF#{OWWLcBMe3on}+cLti%C z2RuW1fT|KNk> zUEc^B5I>083;u`907_s2;&X5yZo=%C?XdX+hUVCx_(IfPNq)rqQEPFm#K6y@K24J! zGXw2~rHOAtPagt53Fs?P@8jmD-+xi>@+>D@&TPz&n$jz%DQ$Ps4D21|BwqHE`Me*9 zjfk&Dy*Xo_Hb1ENp>}@~jD~@zPtm-mIsf|fDoKLg*`c;z15|ovR6~PM$7%%XOXn0+ zgL5$wu15`c8|t_o#&~!Y)$TJ?$L~<}f1qA)k>iY#-{$&!O76Z_~e`UR2S}o0%+*DTsS26VNNMBWkKgpr&XXYCtnk z9d1NT^?uY+9K$Gh303|k=Eg_pgUK(LHBOBxpB2?l0aSa{F~2_ln-b8-=V4)7i$(AS zcEc26hUy7jB?- z{R7m4d_=9i>!#@^G3tQ=Z*ulB;50`)Pv3Dv=A)IhGG zI=*lHfZFvDZ<#k>Vbp`p#8bHD7Uy46-21kf5)bMLCt^NaikgwzsLk^TwRzs7I{c1$ z^2m2gxdf;sOo2KLSui;^Lp{)7)Bwh!+FjrwpbE>aTWx_uHvTtijUS@Ud6c{6`+IM! zO#B$G$AtIz#>3`1h8lR9`(_CnpdP3*YM{eWGc*m)pyw|F+MV4Vn2*o>*1`|XcfQ@I z2Ckz<{0cP#pHNf(3pF#*ADO+92sNWAP*0o=HB(tp<@2NVLMi0fdz^+gqa&)}zNnE7 zwecya2Iipl#xm<3R700h1AJk1JvQkHum}Z_;VSgg`Oophd;uwo8ex>D z=1)4~V_M=>aSrxGJ(=$_yNgjz7>Ih8=RtkWS4T~8II6wls0X@?TI&0#P5&0V==}RU zHzV$e>Tm*P!OfTn@1njBM1NrhkQMbLxls+5L2as9s3&b_(+626+VuHYlKjm!{R?{3 zK$Mr}JSMaTqQ31G$3U!a<73dD_!3lyhppF8ujCh)1A||g-*_}fwSN`;@geHiMtW`b zlK*SYzcy6{5>zl4)o>BiR8>cfxCvIm<*42L30GtA8#5y}QA=?jwTE7!>VLBOyfvHC z7nPm}wL}5>v0GD_hXk!jS({NGmEHl_rH%)+`6k-*WvDmfcGMd0MGgF<^)_mAzC*p~ zqP;Wi`J-kayS0LcfX;VI)QCo-8k~)4a2aXe`VG{8U!gj1y*Kp}qBdg&)Gr`P zpa#;!+6VO+Fd22KJR1q9gWaeKr%_M(6epnb!A$8y)YQ$y>bMNGbYE@0`=eHNzL-$Q z^Ao1WALxAneKrHjit4xsYKF_8_x#r&z&8=6E$U777iu$ZLJi;ms^RN4{VuA**QllY zj9R)R|CuGpY%PrHuqvvZx~L`Xikit0=>7A*X*OYrb)zyUun#q$v#1XKL9O`<>n~I} z-!H~gs7)J;Dj$Mc+Ulr|o1xwhy-@9pLytzXfPgm9TGV&GLs$rJqnrP%|_RHAB-dBZi}v_8w}<|NF}M*T-X$Z>GV#r~#EkO<8r+8n#1i zsvb6d5UQh@sDZCU?fQMFj{d>k81cLL4ml9j&O6iten$-~;SbKgo+$qh^Tw-$Iv%Z1 z0~v{WvgxRfmZPR_kM%rihVJ8E_{^qH`f1jF32LU+pz7~H4d5K=!Jl~u^dJ!Bm+5dI zdZ!Mxw$o5+wgk)KcGRYF^Z(RwbX43Iy~hrDogMYUDT{igH$%-tf1B?aL7)W* z^H3c}aJju5M#qB0{ZUih05u~WQ8UsXwL}vz8!kgV={3}oK18+m4K!UGwRdv9O_9wSbtfgMKI<4uon3#Q3LFSS#ct2>Gq+P z{33e){@)`4dZL$D7k{BfSl7o?7=U{6NvJ28k7{@;s@@sYlisoM$JQ@4J$gh_E*@%0 z)1k`e#CZDrFQ@=kK|OJE)C_b)t)0g@3$+(EqmJEi)Y@M|4dfnbPrOI%fv>11jugqv zaAMTJbD`R)h@Ke)niA0F_=0*;-^gYl{-};Jq0;lCroIez#_Cua58Lz@QQY27#e}E_ zN{$*xHdOsWHeMd}qh75jZjZO%3=%XYt8gf8LT#elQB4CCP#xDsz5AQtA{>JHxgl*d zxA)vi4zj!)^NXXdW}gb4VygfvuPsKcgGdL^lSY);=R@iHf48 zz8q=*)or}CwF#=@wy5%*QA^X;rVqv@#7BAv3?T3nhhVE1Zf7Ju!>ZUdrrZ06M~CqT z@!YZ8-ro`BjP3S*|DS?t=wI}6@p&JI8N<49-QHitw)8dbz;MdNh-YT{F!~esoF<@i z`w}%pUs0PRVtlg%$x&~t9H^id5d0y-uoPz}_w@s_By?Sncl15p*Hq6WC!#`mD=U9jnQZTu7J zR7Ff|_D%}a4Cb}B^ib4a4KpkR-$I=FzV-miPf>;53m}wbX!r!bT05aI>?QB!g81o8(C+eX5bR4qerNLBn&VQmpHK0;CO@3w6!0O^aY>q9^bDw}3ESt-8I2JX4 z$*9lq8K}*(12q$;tpA`+$8*#Y{6dwBpWD2U0S&g**w%S-C*;d zV1KREcLEx5pZunyv8cT;1+})bZTv6P=3I*!;4akCokR^VMgdbV9%_b?qGm8JY5*aq z_Ciq)+!($8{;v%IO-&cn6OKfG+=zOji>QX~qXza8)!|1}gWqj>x0rjMpP*dwy$e0n;K_OJbB{2{yVQ%b? zYIifL!#$`6I&S0F3vvE+jvtVa9eYKJ zpyH!uFbnDpS{StnLs0{1Ve|W;Ud^8I1k~{gR0kU|KW;~zhWA(i6BaWsqUxv_7>eq6 zCTgixqXu>YwaagyHmh%lnL&TlQe;KVSUzNvdYlpjGLz5*b==0Io@_a4tv92l>KN*U z^Z_-635%Qj9H`x18dG6&)B}yMPDIVfOw>}YLe0ny^nU+8K|mGmp`PFw&cJV&6{nOi zBR^<8joLF;QRQEw2I`b_I}sp0hGHVrp6G~bzaQ$0%P`auAHoDW|ECCOME|0u<{fHk ze^}#`GVwI1C(n)Ju^MX0?xLplG495OBPDC*Po zWqFTz;`bzI(|tuvQKSl{LM-e?JP~HWaj4zD1N9_lQ8V!l^`sFinoaDB`a+WhwMVL< zW~v#cz-g#~ZuSsR#UrRM7#C4b{LB{kYK>9JyqZ&>j#nAffCr%lG!Av#7U3XVkD8I- z%BH;%sP{n))PUNdmc-MafTn6JY5ix+V?I>9R;cnG)RT=x z&E!1PK>k9l`3}?o4kAn9aV`<4Pr@zCiTSIVDe8nxiBG`J_!f&|(`x3NFTrfYkD%7{ zGwSrDsBUH=BkIBOpaxLU+5|NdJ-qq){3no-gvB=FAZl%|qZ<5yda@`r%v8olJxN;B z+6SUGaZ%Khl}0T|ZPW~OKyAJrsDXHF{#51b{I5^|H=qWx9kto6p(;cSH4P?4tyvJN zd?D0Sm$cSG4WNz9?~B@7Lr@Pe(Z=VX2DAdb|NeIq0X@-Pn{f=aOD~{0c!T<|aMv^@ zM@?Z~RJqDFy(9V)AB}o*u0oxH8>j&|wamBe7^s;mP>b`gDXv6Ob8S8+mKiK9^LCx42)Prt8ow7Z(IsZyHLxNriS5YIq ziR$W0?2=gkvuG{&En^8--sh->WC!}{Uh=JSPtJ}X7m(n?Dqb9+}7BDgnv;_T(pV#TyKk~iI2kb7~0fKeLypFyoz9BrK6T^ z8|u^VEKb9;&E4L=u($*DfUR1%y?=B&8Y}Dk=W6Np{>8)LSeOF&TDiS{L$Nn%gvDB$ z-+*?&Zp81P-V4>+n5o@{dSTs1eGzfmy1jounF6a4?TY$daTvGYZ9Ich+i6BQe@)t( zi7$4&E1{Nu8xU11*uTSF$h(zENU-QL(N2e)J*h2EoGQZ zKY;$kZ=>q}LXV~$&2{nK(r~yXkY91&K zDm^~xw4^}ok*uitrMq(ewZ`>G(6JkdI;T@{FU~=|@#=On4Y$F6iT6aM*XeF-jXKZ0 zP!BK?ui`vBi`{#e_e=4f=GS$hsDbV6=`kZaPJ-6tI_e2up+=gpm-%qXikhjKs25dd zRQ?bfpN%t!ufdU6ytmu?C#a`T<)ij7dnPIB$+M##pp=Jz-ua<6p$F<4%P`avtwimC z9he6XV+;Il<4yaTUrx#8K{m|qBh4_ z)NX%@dJ#qJZ%m6CSaH-^SGV!Ts3+@eGDKk8Odkwm{qg zri0X|fn-O`Kt&s`jrw@*hFZfg)Ib)Y2CxqGhC7I=7jvMQfkddy?2kI;8PWUae_07= zZF6H4tb(&~kxehi9+^YDCa%DDsBb`X2ALPl3Dg&m;}&Yl9;4RmJL*N`Gt_LN=%@iE$AZ`q^__1udiMzGJ#rYeiI1bo zzr~CgGR(Xe+N0h(W2C-LM;q?;{vEIp*opWhjL#db_z3f9R(quRkeQ69$$yUBaQi5? z_kYJL%V@WAk@!ETfvp>3K8&7YIPvmh*#oo}VVs$p67m{)I3)J)XGF*s-n zYk7}A^r@!eOVo!(=4ozcAr8P?m}0s)el@Td@o}j1vseUuX1JXNSOT@XAE1ucSJbif z4Rd?{n7s?2I9EOgoz~4sp*u0-BQZSQEdZPD9nX=G?YJZLT30isMno?>?%- z$n(tJ2t=KNk*LkJ4mH4_`Q}&_Kz)W(Mx}Q(dK?b{eQJ$E?e>+ZC)i*LI6qJWh_=8S zFF#bdVyGD@gE}oW&dNo<0>a5?Ifq+Dq715x#}du6Ek2gWn2zK}ZFAD<{!i1Z6KZ-lL1qC12 zG*g@p5%TmYr|T7UV{q%cUI=BQ5YB2FK0#-hiQgbznKo+JcJ@+^ed@iMpl3M=y2|n- zU2!;mrgApI&uzi(G?JSJ#&QRcKAwDCVU$h4-GcN&v@@CX@x-;H$EY)vaB=dc;C$lO z37@CU(uD65=JN2@ZkTdHZYnn-b1UJhr1?=P6oc&mPgpPDLCW5z9AD+VR~5tm{Wm^k zLTs!nWfRa&BFg?EEuF2S?APo+=PHGLDBy29P{v6{m=rHlITv{;iJ#&=MrHj^=JGf1 zoQd46Dbs?qB9u!@ysT~GENRt==OZ42yx&)50)ezQfV}NW*ZF@*;lVs@GwwgH2^82# z!3m@Xaqpnw@9RBv%G>xj%4MOWHaMCB`Ee7r;{L|n#13i);Xkj~)b}){p-MDfk4jtV ztid0hsPH)A{1s1!&mX5P4e8TS*FoaZY{SC{>pN8u%Elw@mQ8<2S`+Re#DnQ0n0Dq< zbPs8|QbyqUuaT&$CyflE5Pu8XxvB=a{-WR(8lA^Ig7lHZ^Vz&3_#b5&az`cq8Ac~< zF%os|+Ck_G$Q{yKQ1=jR#3a3#?UPR*8lZGzJ0i+DD+s41tviF6LE)jK4WYt%(ofKk zt}omJxJPogCT%EXXHiC<{kon|KNV?D$!kWu4Y$4zOs2gbq)o)bYD??yqT)sFN>tJ{ z#}4KoX%#3~60dM~ylqF{ANFwPBp#jnvBH!oN4+ex zahtgMcV-hgK!JrcG>6O};w?xoKw7srm2-AG;y%KRX00clli z9X`38zleY4j!jy5;`b29jpu^Z$ef`Vnct zor=ucbe^8OE;oOP*?X1F3RcKOJ3Va82SHFPuDie z-RAZso|p9Wl+_gn534t!xKVMwPe~qLP1wvirD4bN@qLVZHx{lBuhmRX^D@qrffO z&{S_On~Ss{I-JA(hP>+doHSiCZRe#3-yyuu#`n|a7s}S=o=SOLzX;#wUP75H-tS)~ z-TU8DREWihb*1HAY6s;_;6K!Jev$T;j<;fK+h_yobSG^)@#~c7L3{xnWWa;Ob7=5X z_9v`gR1_pWh`4wC%aKr#g1ObYz3LO!6;6X0D6DG?;a#{EOX5iEOP!A7x1h7acCfE- zH~Bfp+e~;E_gve?3etaHvGwzJZW{T&i$>ycuO^{C>9y@3_S%M3u9Yp%zcq2v65dT- zG~4*^cKE5y;cw-8uiG}Sh;3^GsXwUG)7vJ`UzCJ_ws2P}>Plw|7bHD|f;UL7f$44f zV;apvT1Q*HHg&dBHVS2qb3Y@T19gQ`W&q(!q;(-2#Uwi=X(K>iCT0^zOv611uOjn0 z1;5#bZCPi5eG0|DllQ~ULIKj}6ZTN&6?s{?R}ubw@dL0ko&2&S6k`yb>1QixrKrcx zy8Pe&Bykh>KJJnfTtmUZm=cFkXb(3(%6YG2gliGLM~olkok?`0AF*_8C2u8d>>_1heqr=8!|5IPPZO;-`p=bE5*|2f;J5Y1+0p@A^s-)XQV4kmsU+fre@spS1{RJ#-# zXsi==HOgP4Y+TAFqAfq-e-YPpp0s}0nzSZ_SEH`w+W+los0on>REk1o3fr&>q^98# z6uxO2nn(U4((mD2jLWTS3-=r9-=OSR{7OB3SK*YQ+-%ybPnxc2gzHjf1osQ2>G?B} zIFW>LR2oLSIdM0)uJWYi`CXZKPSV%X=r+phsz$gAcUl`asdP-e#N64*D`D%8B^=J3 zmv|BiHlmJa0|{dY{LOuc3R&%w)}l~a8&;#e$@}w4MPxX2b;YEtA7ww-GF|LoZrYCT zk~f~bE|i@~nu|L*bvNtzqZ3&~W<;K>7!_|&C_R~7ZR6@7Kk2JzWWpb56R2~7yld2d zPktie@3{Z>%0=2wJD@rk&(3T$+RLx^zpl(A7N+s@G^WePc65qDk%`x~@i;V)i?rX@ z4qLvFO}O&M02a5iIH>N-`BL926q2NcG_z&UVS55*Ki2MGLro68-s%tBqR>z`t5d5=Hr}zJq zT|wRz%2bSK*MA_DXR0<=MW%if16s#jk%DuGf58JZ@`~{9Ym;rXneDh7)+cQ>#-dz8 z?iAGPOj-&mE&88_+@N~u|2i3eQz$h)Ah9^%Y=jH^QQ?aX-=jhPaTEU>hp*Jsoy4uH zw;JP`j&muSoT*Mg+22<$2GfeX{G^xXPC_^_ncnArMZvKo{=QPtcn0o4w$r9IFENcw zB<&>SCt=b*I!HpEu36S))Gtk$n$(R$XOC=KQ%NsEye4%|ss9ivM6{Wv2{sa$Z7GHpG~u5#op_qN0Q*R%z?(a<{* zJ8}27ovH9#;)`iGGj{>XRzY2TxXajbnJDuQcSAZzV+W%$b4ZIxyoe%Po2Z+c_z>#t zrmXk>{^My9W7tMjsI)TZs5gaLbFbz;O*|dx>F@|;n&I!O2X)8MXiMA1SKMpEiEN=_ zPHfUQaWCawMFYXM z@u=hvCtjU+Q99aAJTLbG%Kg4B5NJhyRon4L@-i|YUE}%pr_N3ie%KC`cz}Y-s8EPI zGPkY}%A6;?FYyVs@uq}R(@;s`|B)9!8>#F})FJIEas7$P?<)a;!8UT5avQlj>U;Z5 zZe8~=6pxZolUv^ns&kJbZ8CY;=;SC3Pbb`zdoSUv4B!D}eqV)1??L1+_cHFp#C5f% z+$YRQ8<|M!%HYp%d;a~Saw`hGrcggy=^J@7D5R?>d9$dzgIm{L?p5Se^Aks@wr=G2+y2rWaa8ICrCpv|Xllj4RRF8Ob8rsIKt2pt0{-~_92&Cy+ zYzG>VvfU`NhInC{x0~>Ko8RS+hg7{f`VZGnef~eA;yoI;W753;ok2YKe=1F5fJtrR zwXn1uU{#yekn-=jFHvp@t?Z(6Kki1PwZglk&$MOrPxO8f_rCu#5*VlmS9GEd)m26`bDXZ%ydHqOxZsS#{lg4Cu{~Yll`K5`M zBE21LeYf>DQoiHw&)F?kFCZT~-WcHy_F2YACRF`;j!oBUF)bJ$Ie_&JcbcIv?Id^^1lToe?=_d(SrSV(j z=jP5tyb5J>ts~rqGMBj9c~dz532kHEIRCj!Jd_IkXk<9IuG3hC%6;f$I(dP_YvXzH zKHB;z$e%*IF@t_d+7a^eqnrB)<;#ewjpr{;ZPbnM1!Tgg;bC)jHEZR9TcDuT{B5LN149Fuh}P6x{n=n zNnFC6j50}a8RcG(-`wW!)9?QV|ItZCGP4n%PQ#-ql!Nda%3S9zOq#CbxQ@>Hk$;r* znd?mQ{KN(xTb)q}I69ze1TNSV{9gnv5+p^iVap!fXQp zO!aEpK}E`}q{8p3kX?p`3}PFJugMFi%xvz<8a!7X?t;X1#j)*Fpx$A^UAdc*uD^fe zxF}SgNG+A*I!0z*+lWcwWnmkdWe0bJGJpLsprn*fXvO@{m@OyoI*Y=r&zMwS&50-GDiG(yO-YBkD~h{1(e$ zPx6*x4+i6@!GE4np$(bU2-hXE3tpz-9(20Yb`%XC6CXmkNtF3S1A{21>m+G?Y}lJX z{$%o>koJ;5PySHCU$GVq zkD+W&%9Ox%q(?y)>dHv@IK*`w<*q;-U4HnJJY7p|*=hRz*M|o4*n|>frnHqSQ21Z+ zDw6gN|KUEM+V<*8xr@}R&7GOSG`DS>wO*inJnk8kOJ>t@QMWwzJMK~%%%AJunGsf^ zq2E_)!kO*pPti~t?n=bdV|FUnq2d4V5cdo2;iSJK{}yhx9rhz!jkE#e>)LDEPh<1F zKVh9C(#t+|OA2-&{Lof-N`+mvuo~D%I57=or(s=FY+gxQpROlN%n^O_mDy?1ZBDko zc!a5k4&|Tfe|U0O%~P&qn-d-h_Srn*geT%uzjKqOPCk%f^QLpY?#=&Qa7A&qXudh| zjfhD%7ymdgM)-d&SB_ZWdE>aIL<+x>z*Qwec>W}=#F4@~`MYAq3O^F$O5qBN6YP2w zy?vAJZ8~-A*1ApSZsFg8UCrF#jdQr_yTeZAa_v~o|LLTNVX+IkvWC|z=yFF3A6Uv& zFh=;#YOW|g;iYT28paCW*}~N?X?Ur@u2&JmOOABij}k3cVD_B;+4AKN&K911k}Gc8JFJnd1}=m=r)PP%f3^*QO963%m-@Ck2s-gPNbSoObMr^5Ib zYZ=3{Tysrvhd;dG@{byp=z%M7c*zH@F)71eM{u8w8SeIV$BYx6G`0I@8oxs$uXE|zxxic+nGp0P!@aQ?m3^oU{oD!C7Zm#ysH z8!>D~sJmqNk5Kp7=;3dgxP6$f&hC*u;gNc{$HWa^HNu@MMfmHb?s}2Jo2_<-M*V-P CF=SW( diff --git a/locale/no_NO/LC_MESSAGES/django.mo b/locale/no_NO/LC_MESSAGES/django.mo index 0c7ed187ad063262bf71ee93ce4e8a05e803358b..a21923069ec710dab8f74b72946e32d1191fb845 100644 GIT binary patch delta 34814 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 delta 35056 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 Y>z>J;NcFd#_{US;XKVWRo`W_29|95TjsO4v delta 30867 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 Sx2^+B1HE<>dh0n;|9=2ewE7nS diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo index a11e023a5b1cce04e14440cc9f090c2a22ccafce..7c9dd275630c9280d3dcf5f9b2a526cc12bf83d9 100644 GIT binary patch delta 26023 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 Hij@2x|FMPH delta 26177 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 delta 30189 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�Lk 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 delta 26641 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 JyR@w6{{bOn5M}@X delta 15167 zcmYk?2YgT0|HttgAxI)35g}HlAXX3~YQ>5XyGHC46g8_TzD5lthT{~*Wmp<_B3(GwF)u#DV9fQF5WkSga_ ztcoS-I8Ht6irw*3?2Ybq84LSi55{-CCKF6SM4aP{!G_oo52995m|jX@Mbrd4V-B2b zosRy*bI=1i$&JxEmU<|GHrp1tGWxE8GJ`d@U2Dkx>rnklfo}9@WGV__cH$6JM( zV^i;edNcv3@4cHIW*qN75K|*hZiSCZq13hid0qO-5V#IqEe$h=cGNmdAu9 z=Gl!y-H>eKC74FM7Q14HrjFAMccB&(*vzc7G-{$XP!p(&8ZX||yPOVWH1qzL3x`_A zpaz_bxpAH?{{+>34QeG@Q0?|xkK6J~7)1FWn6<+Rjx&)s2oVGqOF}{;YMxS_x zP&2z|8~lNKpPwV2woaZFjxzw`QHLl4HQ-@XyIZIUKSvGZ*3#&Ydx;}ZkKhLCaQ=oa zPcrw(XhzRbGxlg@8u+2&K+J<-SQw*GhbjSmuotT1VKyF(>TeqA{za$-rea>)Y3q-) zV*l0g849%W>zEIp*ajZ0&5i!3b|tY7RzXcX1vSum^u-L+)*nU<^d0KaT}D0HTekc@ zYNuYcX8+Z(M;o)n`B8BTR0my9D;tCwXoRhwh}wZUsCH{n6WD=T@ex$})2IntLrwTM z8$Yr2uUuqwgI8PAAP{w9sEx~`KXI&$n_D}g+V!^aP*gu-Z9L7!3s7&tO5}^y*^Szv zXQ)T#dPPQCljm(?0c&y87L`OltYEE&0mSW4D;|j2fpMq~XQ6g11@q%-`W-v2lLqY{h8Qvz&_RcmZm~YfvlMZ0o;7t>idP#`88#JhBRFx-Y((HYc@FHjTq>10+Gh`KKV zRbCnO2x_7hl7MN zLI`SrN>~7Ep|<{QYa;6RjBcoQ<53fy?jobDS%P}DD^L?iM-99WwG-c<9>otfzJR*# zXWWaoQHOFhzh&qV?7*sc1avSD8;isq_`46=azixb`Va^ZMHGGVE zR?kq6Do1xS!2s06i(xS=k9vg7QSFAH2AqJwn2d@yqjq2i=F|KC0~uA^L=AioHQ)=> zmgnlhcRl7sZKWToeGqD=!tos}i{)?$>d_oU?cDdM30<>3u>Oa>jPK;_X*vo$s< zngVUn28_l`EQ`OR&O*T?vl9`hGg21SaShacaj2bZjoP8Um;*=J^0BB1&O?0yF1O|B zE?aR7)zMk>z+Z4S-o-LFrmva6dh0gSfV)r=JdS$y7j6AL)JmV)@_$hM`}8vtDQ0z* zCZi6jpjK87wdJi)6X}Gyu_x-84zqrUTIph}glld2MN~g`Q4@NO5tygH>8}!MyjaYs z_rH-XXo2ojbjCs09YgU1=E6s)iTs1wT2J0NI&geZTU!v-aX4zgXw+eAk81Z0YQn=% z3z>+KdjA)Y(Lj4p4X>g)yp0<0PtQB=Dq)DBfbeGtXk@}|}{Sd{WkSOQ0* zCb-JhZ^gWN|92>Zhfy7!vkh*eR(>CIGIR&R7x$Vp&{-n!wlC1i!^{81SwcxIV@b_e6ddah9V# zxc)*NR-eJb`#HkME=Un}Pb^NkL644Yd=l17y6&9JK{!P&2%Yn$Rz{{CCu6{GX_fyhrf3 zFch`orKpbAqZX85-H&;RkD_&WAiteCzuLIo`(}d8F^cles6##tz4ZR4lhKL}pgKN>TG0*E;e3et zg(1%QYTUQ>lVO5OASnP=dQIF&#Y6owicHj=i;4@6Za-;dM()+)Nj8?E4HSiG( z##Xw#1l~yzJZnTckF}3`4GtZ{eKD> zZTW2Mg$FShBgUC6Z-_dr{ZK2Lfs0xC3T#RoGl7GK6Y(E>jz#gwMDsoGH;LbbiK}7( zoP`B(%_R1}A(?#?RLAU-`FCD7etpJ4SYV3za{2HhzFMiz#6a|#YPK*8h+t7dM%e=VO(#^zjl$)X*_ES{=?eDzH`j? zeoG7{9*5e}6*k_B>gXrybJPw5%r$RORV+l@4r}2MEQ#At_g%o^=z2mXicJ1_W}rG4 zLEHn&;8avc8MgiemLh(DItzv7o4@bNpg(ax48pOfx9Vd|z^&+kFHny#+k&hQGM5uX zMgx>VPi%<6*viJkuo>|58XK! zA$tD<$b?c*70Y5GdgC;#hKsNWp1?eK7uDf&494t>&B`NCE3a;CYaNVQU@~d~YcOj< zScLJNi)8fL{e_X3__0~pB-Dylpbzdxt^9ke?8YNNbrinToQ?9R)1QD^c@kMU=d=JBjv#&BM zEs1`_HBs$bVs-3`+R;?hqx=TLF2r~%p>^#^~jcD2%bQljfYqSbFViGaFrnQh=N+EEv&%DoX$c$ z%-TxSzVwiCXau)DAkInX^?K)xMEr zd}olYSb*wa4{C-#qITkMYrbvf7mX-XyDr!PN2A)G#`5^5jYGGa0pn0R^bV@O#aI@% zqf0klB~u4qp=MtDbMvfwptf*4>c+X&O{f(eLJfEmwNn2yQyz`l@|LLk2B0Q91#@94 zmcdPFy#K?<{78Yewn@5~SuYGFo`-&zf%)(#`rt*>MDL(J7d$h}M{6jmeKTt}%uPHD zwF6^Ohk64}!UGxXe<@mjomU$9E{$S*FjA* z0SjP1)FW}BhZ}#2p(eiO3-dvghT2KjOEQ|V*KSh~f!T>Gqn=fDYaHevZi?E{R;bT` zPPV)!1`+o|o$krjji?2kM2+(ZA7h4#2j!12vH6KC{JTuq5$YsKeF=i{O0JPHw~8`u;yjM$hIVM&d1Np8cj_3?@+i zHU{HrRJ%i16#qcIPM!zMM{zaOqnnJXUyORh8CVPtpmz2udb`N{N=7q%f;tpMzck-c z(Wsqihn2A}7RMCSY2J(K_>T3l^%ZJ>+z0u!+>ObgCX)P>IqVy781ZRzX@CY_^S3y* z!>Tw7we^Rw7XF7ru+|~-c5FkvHHT0g-?!!7ht1gtL7jmp)K0Xrac|U4B_p3{PUd0u zzZ{vqN6fQZjG9m;>V5wPwc^XD8(&~SEOpeZJPs8nU??VG08U5Uw-Sfq0n`Uo^f5EB z9;lt3ddy`$`97gQhw2K}#mA__67!8|*cw%zgqq+u)R~!$dX1K$CcF{V@gCGfPU4?< z3;W}RZ_S@#ao?HtOfSoT);Z$x=BXwW%&1|K`m@Z+#BO@Gir;UpxWg*VI~-f+KIPNJClGh z*c*LtnRO#Z5oe;>|AHm(DRMUW_n(ud!}1tHMSX0FNvIu3L%lYaP+R;Q1JUc0S#cQp z5J#go*0Cno`b5;k`=Q!R!hdlddh7k4^Mg4&DX7zW0Q=x+?2FY-n@6w;Rle66dd6(+ zH1wr>9cm|bp(b(y^$0Ix5I#ap-21F)AC6Is@5GSN3VUEFoPaufn^0SI6mm`n)-e15x#(ury9bJ^KvnY1CWs5VcU>AK8C33?ow#o1?b;ed|hFeiSQG z{t&gIunXo8RYy&%J_cfU)FB&%8fXP}!2PHN23|C0sS2vU78lun9kNLj*#B@c@mI_t z9E8EdlTe=ntFb=b!opbkCv%z`VleSA)Z4NE3*jZyM4wpQu9`>agIZ9GwKkR`ZtNmc zgUl!l!3->b=TVR1o;Bc_dA2oC12jjiv=e$^5^5)gp(ZlL*002t#G6nnet|k;C4M%) zOS)Q;QHPUI1JA*JxDKN+?{#x}>tZG1&Zq(Aq7L6C?2WfjXQRmtbANZ#+wu+8!SXlF zpYcO*CGkFF2V7269cP5G8jQ!30Vlx4?;3-%{@Be%<+PZC+AHPDK<{z;tK0uw~$lp!<1k|HhgynG` zYGU`W6nfn?1I3^w7>oYc6r->k>i!v$@tt%s33wTcW2ryPp=*r6#Ivy=Zo`sz4E4G2 z2-UveJ!3TtBko}1u^3LAf@*&dgYgbVVD9_ue<+#qWVF)Os8gPdn)y2P!CjaOk6>;* ziQae-HG$ixv*Gc;+#icah})qiQ1qc`ABVcX1!~7TK4kwjlYtay;Q5#xKSOUfb_Uak zzkFn7Jp51d&udGu4CVK*ECxL`k0Ks*21cRI#BB7(Rj5arfm`u7s(#E9_FpTQ`NaGK z;T9Z1ob#!WAb0{NGZ&5|mLKs1b3HoBd-{y5M z;Uc5gDITk0PkaZLp`Lk;XXdaJL$zy&<*+;I5zN85n1UnlD#l=&=jKFCE!eu)8; zpZUj3^f%;x{QDn23y^v6!u($D@sg8C+!(dOa~OwD@ja~euQ|n^VHM&_7>oH{nVo5d zjQ9VS78Rb2^F!e{9E!6@ZHXtcNTMHSBgu!b$Qa>GC1&OKL{GR#u7mk%yaFko_J@k?xXo zg&`jn&Sg?*@_kjvwT^rpQfuOVNYa1Q(dCEc&E#jMDRTzXpaK;GP*+Li zu{25F4p%7ein{n*&bnUOwhBVXe?jU+emR!1gPkI7Nj?uPSmBef@G&0-9h&g9qH z8^}6eQP%y9_zUti--ui3X09gI`PAhg)hC`|+fBgvrkRsUc^lid1ZDb~(&b8^(GfBa zsQlbEP(=Xcqp<8o)mW`?6 z{~t@x@P7r)97;WitCB{N*VT>mepc>(KlGczUOOrM*Mfe;he$<86G^|2bWO5tl#e98 z1#9BJS>@&wICX8KkFnbulUb&_xc;{Fb4{4_o8J=3?hvoEWtT9VG>VkpmWhM3TaCNv zw=y=jeVxMy7eAh;71w?myu|lx15fhrlTXC+q#UGh;&{?uez4s9= zwiShFyN%R`ltOtCETE^E$ITOFlAFoy1pXu z+pE)ONM)(7K|Fzc2>EQbE<15Y@>MA7K>h{!+T`cp zX3~1{sg&1!eg2A47)?PrlHQ1tBwdS0+sXez>T1iTQ&yi2D&YxRM%GzRel0#H{rpDx zMdEU_FHQ<2KL$6G3X|6A`@c4gr;~Qso1WuHo2Px&6-(np$_9}>wPmlYpIK{B*M)XP ziKEExCBKGz9a~?3vY|E~M?UM)`&URelE#yk5^pCBV`dCedIIX#?@=YXI>;f_{|k z#T4QhIDt4!<;0O#6x*P#MdV*!ACph8!RMyj<$TD^XDPgid2Qo-^Q{LE1t3j?|EJiKJ@* z-F{~C%}r6(&w2a|q%Irj5%~je)cMfQ#1 zrle`4+1xOP6hL`nQZPwZMS~Me8-MB>5QmWF5eJeElYS)WDnk7-QU>X^Da!i!yBnjo zr*NDa(ReO-Z;VYJ7dzB5dvMRu!3$ERmrTD?|7oz-z#b#|4}N!ezy3ppr(f!m7MQC- zwcrYsVxz03FC5n-znf|K-Mm(H1LmLFb!z*m%u{<$?f+rosk9&F5ND(gWH0flf05&!@I delta 25 gcmca}mg&w}rVXX(T&B84#tMd(R))r#>(gWH0flJ^5dZ)H diff --git a/locale/sl_SI/LC_MESSAGES/django.mo b/locale/sl_SI/LC_MESSAGES/django.mo index fe1c5839ad681c5c5be8a60cef58859be39aae8b..78d1d0edfcf76e30ecd8dd79224ca003fe0ce62e 100644 GIT binary patch delta 23 ecmexp{?U9xu^^Y3uAzm3fq|8w<>p$!5-tE_G6y~Y delta 23 ecmexp{?U9xu^^YJu92~Vp{13f@#b2=5-tE_D+fIQ diff --git a/locale/sr_SP/LC_MESSAGES/django.mo b/locale/sr_SP/LC_MESSAGES/django.mo index 9ab3bd69b147f0e033a91a4fa0b192bc2766e878..57c07215fc1e18b4fa4a9b9ff830ba004065c48e 100644 GIT binary patch delta 21 ccmdnQx`}ndQZ6%HLkk5111m$zjq91207xtb0{{R3 delta 21 ccmdnQx`}ndQZ7?nBVz?aODjX;jq91207xbV0ssI2 diff --git a/locale/sv_SE/LC_MESSAGES/django.mo b/locale/sv_SE/LC_MESSAGES/django.mo index 229bc1259c867646bf8a454660365c2838dbe08d..a9c40638aa40ca19e494a0ee0819d0fe4f960fe2 100644 GIT binary patch delta 31185 zcmZAA1AHCdqW1CGsoT_clG;sE+qP}nZg*|lcK@|)+cs0%cz@5Vm3#Z%`P@0*WzAZ% zcaolS*B%Xj;c$5G-58;#I$X=cI8Gw0n!#~KhjW}UwUz2P+j}}rOx%IV@eIbs511Ik z_i~&vm=d#NXDo~>F)zNtjF_gk<5b6**Z|kzLC5hrQTsT~AQCR(3#``HanfVKe#Ul~ zj`%E$k4G^Q-p7Ra3bSDN{*F@=^I%#WfN^j&2H-&q!Y5b|<9i*aBKJJI zO8Rg%+Kd~hieFJ9_8sCl{+J1qU?tSjcSNnkFdJWhQHXEFtat=F;}498?S`8Co|uC8 za2sEP-gqSJCZMIfg3<6jwnm>}j>A}-c9=}*xCCPlH}1s6#2buo9RAMJI*RhJ;8AZI+w5&Hks%+ z^YIL>#CDU6aVI;@3gQQlHl5Z}9A`g%!=1Q;tu4DwBaE4*JI*`|M)t2WVg~EKmVjrb zc~o7Xr!EX2#bqt&FT(qesVQV~wewgJy-UlAX zse(C(_gq8gxE_1sC)5Bsu)GEF1jfOL>l~*K`eQGh|G5M@kq~#i<5a+rmW;P2| zVXbvLs^NpEft^8ha0{d1bL)3hy@;Dk2eB{}@noohl)*??74>KuqE{7m+Kj^(o%nfF zg@>r6dx?5>A5a}e*lboN0qW5Npazs0HPCFR85TsXU+h8{Aj~pClGx}kTt>#tU6LkvKq1yH3Y{$a* z+gN`sX+{z>)4ZsW7eS4%GPc3$=#K|c19*(87nc{jW|#t1F9T|(c~KK7hEuT`e#Mu_ z9Gpix%!Frnc|GZwEJ8K77PS()Q3E=Pn&BB#2lvqr-=YQ-ZI|Q3!z`$Ql)>0o1v_FZ zOoBI2?SDr-!f?AyyWV&NR52Zf#voLKIZ-pHgzC7F&F_dBa5vPmABbAg;iz_|pgNj^ z+DofY^>?yBvkAOz>1!H2kJ!TUnM9n;dXAjT1sFa^gGUykZ1$5At*0;mC1 zKy_Rbt6*!?itR;}KZTmWC7XT+wIVODEB?T^*x{J@!ZZ9B>#t+9n1rNw1hu43Pz}FC zZOU(`N923l?EVC(O_&ljplp}{OQ7m?L!FXAHa-s3&TQ*C)aE_pC7`AGgL=_qIANac zOw@o@p(>uluy_~4;Sinm)358J&*F?>< zg^jmIjkq61!cnM(r=gzhYE=F%R0qdV&-g0pMfL_YuyCi%N+m!#cG6=wo&S;qd`YN? zYPcS%q0ZP02Vg{eioW;lG9f^_X-C&L3Q*6RqiiFM*p*>d?r-60;u#7sP{uP)Fx|g(-)%JUx!+OedyIv z-y)!yJw!G17IkjFq8f~G&O91F)HBb7dNXE4ZNAbN3G1TTX^EO?H>(%5f+KBw3aZ?^ zbF9BIR@;QFw%{S_S?dj({}`iE{=H52oHrf&q6Qof^$3Dc<#M4;PbrLo^{j0%8u32o zS%1xN3<+9^S*WF7h}t}RQ5CPD-ds;nkK(sA>;)5#ikfje8xKIOWIEJ9f>56kMKB#U zLOsf{UIN;k>rk8TAjZdQr~$pV`QK1W9_gYPxj$;jv!FW2k2A46s^jO@cc|0w4KLFL#VxR4fRNGqdI(M<6lti zcrKgvBVtUQ{}==`la#0tWkD@X0aQbcP%F_EHIpvrhoey){D*3I7e>RwsFk{cdbBT5 z?R-bI6Z(o7cqFW$^PiMJax!{gES!T{(haCRZ~z&pa}%{PZ!kK3L6r-C)joUF00U41 z%Wcz3p(a?xrZ>RY#M@(3o&O;O)bJFHfpbtxxehh6&8QCdpayad)xaZkXNKd6hrVW3 zUU~9TcLF}w&ChtfP!-prp8amrfDWQ&aK-unRqi!r!Jnw5 z&v?TuaRKZ>yf|t__oC`wLhYe@sM8R9gY_RwAlyxpF&a}5pNgum2i4IDbT^lc-$u>g z1!|z5Q3L&nJ{aYeF*<4hu~6-$LDkEKYOmle)?Z6pj09O8)nEJb*bZGNgfj3tQ|ykmYZFcK>he~*P!?ymVI)i9hu{FIk~I;eZkY@Q~lcpvK^ z)Y6VbosL|dCs8xJgPQRp)Fyg`8t8lLUsOktADeQCP%DuFi()p^z^J>%J^l~{qQxD);HB&y;oRJkvh6hl2R&omjT;{vGm%A;1MHpa&`s1+NE$#6D$ zHM4yL)Zs~jM|E%=vth8!Px{KFr$#-ZT&RXCqUtxsh}Z@r zV0YA`9e|p^WNd{iY&^zmGXQTY0={GvwN|p$M>W(2wIbb6&%Te14?r#PFjPlVQ3F_k zdW4%WG9E+C^a{F<7}d@)Pf^S_jUmV6JYgR`gxAK19_&I~LjY9QG#D%L_h z(^jYf55Y`04YhJdZTflZLyScFC-g(-J$pgt-=Baw&S$NNYM_YB zdbWo#F5W06XDH)By5+G6O7%dKBeRYxZ}AQez6Q`6?xL(QluY7ewU&8#2lvtkTtV8^YuQ1#!SR`MfeM(2mwgn<}Y=f5EV zHPjyCU_T7RDX169QPjvkp&I&$Dj)u*nQ>gyz*3>|GgZlQF3EQDoU><7bYfz7D3nsw5sP=APYz+0s?1A{G zi6q06nDY4kZ55NfmSL)ANs z8sK%*z@DQf_{RDJ)lXQj$D==kIWbWM#-cXKOw_Sij%sLw^?*&kfSTbgR6`H3557em zuQooWUU$@S9){Y4Gf;crfKB&)B9N1Wu%S#t1yGNmENVsSpa#|vHK4xeHi)V>1N92N zfEq}c(58M2R5^dtgo02jQwY^wHDqF5rxAffBy>V8;W$izlTk~(1J&>W425U09bQE3 z;(}p3?)#t#s-3Q=M>7%C;VjgqT#K5(2~3ZdFrv=C6V@zMBvi$Os1-<#?#OL^Ayk8v zP)peibsEN@p7B1^fR9+uU=!k3P%oxj;mknGTI*p1_1|6r?1_Fj2=xpXqn2td>QU^( zcy7d zOF#`ZM9riV>Ww%O_3B)N8tHb_(p|Oj_oxPk>Gns(iNLx`O4aTzg9S30Xs2(R59>WXhiDr)9B~7v~4M(DXY>)eIM^>57_B`nVqVkHpQfHt~e<%(3f^dc(~` z?TM|ZV|p3YaoqSG_pjgSF#_>(sF~hCJ&MPuP5A<~8Q-H<8Q%$L6aGb=f@ldmd;qa~ zQIBM6Li0j7iq(jp!m8+>$n25ssQ1TU%!+eSuj-4a7tvMJ9=TZh;7v0^S#0)4oYWHSE)oXxixFu>2bVSulmeiyN;t}GxQ04zx!~2;> z6WvQd6%yezOpA5!0BY$H`XF4u;camYS&*t4d?-?!(i0PyhVNG`i&Z3_SEK>6~^qu zi(^IXhk8_JaR7e7Y}g}>8R!~(Ogutb&cAl^8v<1@emakH2;1Q(3{3Cgn=F3^!0I?K zgLySyN4*hKWc0W{_gBUG#E)W0rDrmav_0z8J{FVWek_Fdu`&i^=KNXMF+I)= z@|xpyk_0{bYpA7tXyb2CFP`sM3lnGcxc{`W2kM!>K-DXr%{-z?sFiGhdQojc<)1>$ z_$q1wX|kL5NHs5kN+b+Gb$k&uqr0dj`-FO9#mZqi@JF43OsHd781-pc3ia7A4fQ_Q zglX{{Y7hNDweRFKd&?JnhjRFAPaCdg&J zoDRg)#Ft@tJcp$*Np6q(k6Kz`IpS+f-0S=#ppFXUF%1_(o$vCf5jQ~%r~~@pAk=AC zY~veH^)I3Zb{*Z*W7C6COa2z?V#2&8-V-P3^M45eRm_pkeB2g9ZOYlGU3~(z)T#4( zoQ9YQ)xiYJiZieop0Vjc1x$J#RC-6$QeQ>&a|5&BLu{hY|JVi1%zB|_Itz6Q)}UUU z=WO~1{N&+BtU_iN|0ryhJW3H04??|=N?-$QgnC2=um*m`B3PlQ`JOQuy-i3sL!cW5 z7V|h)a5+xFe#Je`PmEE*ocAat&9TXcTA|jcFRL?9k7@&I^X<4o8=4YLn)wwIgW);9o0a+I0m3*x&}3) z6Q~Yvp*s44`t*xX(c}JdDjs$vUKRB|IDyK)>?NQEAE7=*qg65u`=g#^KGbQbft|4} z4#j(@7gMv!9`~PEkHlrf1FIOX<7DFAsvc(|#;oRXKH^ebgEOo18NsgfmZ)KlMTc4* z_g|}@Mim%Z+vEI)L3NDxaVGJxbv^FCcurN%U-RO!hPF1qJhVmL3-AP z9_Kio!96&wk;mDMRU5l{o#;(G?!W0ii#^Eb+0^6yQRyA3;DTlzXBXCMZj9f;#hw{w>XlglT0QjasSbtvyab9D+UZ2x{f>w=o{ZAv*u1+bX~@!%kSWoyQrCM{y)p zZg0Ge`uuL*!MqplU@SIQ-i{vUEa{axd7OGIsb6Q0`%kg^cQx;eN2nK1(Qd|tsN?wu zGwb}V41>wadF=7#xf`z9Ug@!kPU!|2htfNYE}{V+$TcHFzBLg1Lb@Rv%EW z-Y^_nbrcy@KQ0Dh04Bw%sN>ibnaY61CJ}hnWGzN5zxacp&OLXU8144$I&(RJowxW@g1vD_OzD8=wZz5|`j8)bF31 zOd~w*ACYs9G!=tUGyi~Ey1%GR7kQLfnb@e$27lDb6hy6H4b*3Z7Zc$M)Jh&fJ*o?+ z)AiQIyNqT<>ED@1K+k#+s==+Oif2&I^aiHD`>4$nc8poEB&bK08THJwp`K|`)XdAF zPDwqCjV(}*rXOmhCZSgyFC`EPcc2RHK|PX7sQf3W75R>uN!YQb;pC{5$%q<2cGP#h zVyJo(@CYtJm1{lDOrSF=f7CeEKP!QGBxoj=P)mLtHS?!7{u(n9|B2coX~&!VVyGFF zMXgvP)Uj%Z$*@1R#YI>aqfRj259;D};;SZb-t+UyY%rv&lcnRnk?MA)Hj-qCA0riaT z*!*|aAE+6Jo@(mFw!fb^c2e&~e#-I#y>< z9lu8H`WQ3KQsqQ7SOE2kErS|x3!B~()xi+d04Af}4~uR7E$cJuM_10@Ujk|<(kzdY z4-;V~tc~q(6sqBGsAnB+wpoF+sArfLwGu^8?UX}3qWY+MT~N<_5Ncq8rp{H;5ce;oI{=eo2b3f&4bVvQ2Mf;~h|stUv1gF$=Zl zw$J7KYeW}GNQEy^OBr*XS*paS{0yiiEsnjh4(d&J74>4eXXCF>^*`J6zo@16oo`km zI_4st%*N}@=lpAC9Y|2Y9;j#57xe-ejhfjy^ut4_@{dsic!k=epHTxzxWJT8jcPA1 zYNZOHj%5YRkIilRQZE5L%T3m!sAqlywFmB_I((0Q_#M??f`zst)Ijp0mb4gZsT-hH ztPkqAO+XEB8LIv!RQuio1T^D|sJ-yO#^0j`<}9+$991Cz)nE{+d?{49TBvr~+VnoC z7tLsNJ4UU*Ce(_aLV=Je#Dx0(A8LtdC@H3=Knc{d?~3Vg1}4YDs87jY)JnWYt;8SH zz+){n@l>b*<-;{t61C)CPy-0P%uFOQy8r$+B>^o_c2q+}Py?ur#jrQ3f&HkxaTe9k z71T`cTA!ny`3KYzhg)t2oDemjq^K22i#q?g(f#-T#R;h4a;PP)iW*QmRL8wh?}ZVl znXg7|%H62)hf!ax?w~sQiyBzO6{dbH)LsZc4Im%t5tduQ`PUn(0STIUGt`etJy8u_ zLCxeVYN;cwG#&b*(sQE*ULLiFs#%+&R;UYVMf##To`@RwLevVZT^j~e#3!_%1vW?gE63|k#MJ-)_ z)OW&>SP&!pXJ%F!wNkZEE78EFcSFr&h>cIcg2dY%bsuZ4ApH^5%F3%g*p^&a=Xl)e(15YMu~ zI^2sIz!B7LK8JdAFVNj1s8?|0 z%_ct;>hu&wKdgv(u@mZJd@Z`?|0n@9col2md(={w*fE%57o{W)I`ES??=YJ(nl%}!pX{g=D~5V>6?bs{%MoZyf-0`JZbx;z-xfTB zn&CZE$DdIH@!e_9HEKmFqrSv8M@?iXYUT@2?QO8}y{Nr%&PzZ`7>ubf%q}zX45&v? z&{_?33RWHe>&!*2rJ(~Hr6W5{MpsjbCH|iK{OgtF1x61A@?RaYv(8!yic55$G z$HP&ZXO4|8#)8DRqn7YHY6(N{HJ^@g@Eq|xcnu@%GXs8vDi@6E_$Ru1V86QpUMCuX z>|~@xWi&!{&>A(3~_u(ilj*9_sxv9<@oQ zU;>^0{|KnTW2iUaBh-pG2aT~%Z?e>w3yY%$HUPC!V{Q5()F!=+nn>6~W+G8hn=}FH z*d<5pp?uh0@A|3)w7CwUUX3?U&+9b-s!$a%%9nkqDEd3HPBX=3B5MH4*iH9vGJ#v zlK3ywDM@zJOrRE~C*B-0;N+v6e-%7HLJ&SjjXcpYvqZU2&#EG-VoTJqnu;30dek$& zj~ZCa<7U^Vv6ewSvUaG=w;XlsHlZeT=D629!>1(Z`2EDxnCyhRL1 zOo7`_OL_-&dS0WR?N3w(F;1FIn+~;Sa-+(XKndJSB=$$|B?5&BR6b)erlLBShuSnt zQOE26YNnU0k5GH$BWk8$&zb=w#oWZxVhL=9n(-Rc@!f@L|0FUXuXBNbmh2X41|O`y zQ5}arXLfZ0R7dGhySFH6cQ-~g+#NNbp{Ua_1NF6i0czk!P|yAf>a@JYbXu#=1TvD~ zf8LC&BC3HJs0JHYJEI0V)W+wacK15e9(jT~em_x<(D#CACq8QF{ZSK4hniS+jG<>$ zl7N<^jC82!*<6CJ=zCmkl+50;ma= zM)&+zCZHv$X|0dypebr5ZBP|^S_h*V9ETdf4AcOZpdQg~EQ(i9k0`+G0fT&c6!$Btfszh*wMlQBfmJY~#sMOO^%IQEt?dm$CVcPS7owJS5BlL%)BwI>HjI4DyvT~6W?mDu zl8sSs)OM&Dk3xNDZAA^tdy0T&bRG2wf>BG9=(>4kc~KozL_Oo?m=^n^R%|6|rPiX_ z*@9Zpqo_x51$FEmp$7Kb=7+oC(f_g%-~S2dUA_r5;zy`W^#(QaAE-?f_of+0I@Avy zg|IRfLoMYD>jEr8dgMY5sl<;I~{6x~-YY9g0VoAw!I*ZKcWK*uHX9rKL4VG-ivP%Cl~ z^{nn-Dtv*ONsPN@CIP6ukp}hZEsR;QA8I8xq8`a!)C=tlY5@1qt7rPbCPchvW|Rn% zlb!`N@*1d)8={`|2-FP6TW4Y);)^jQCcSS?Lvc(&ydG)*gHd~H66yuF@jmBYBRWrl zPQfG8rb+t1EO`c0#lomfRLREMpq8>X>XD7Z)HokA<8jop|BhOzzo>yneduw9V;s~9 z%zNlH4Xr0ZD{&aLWVcZ>e~wy-_clGwBabgHo^b$H$4saf$}p^lbFl>eMEzt`;zsIOLy&=32fW-u4EA}de>+-&0qP#v5>E$wa8Qa?g%#*e5O z`#v)>jfEOWV${-SMDo2(K@)IFq6ShCwd8G49ZWqS%t_fdQ5 zJ!)W~pPPY1LT%cZs0k&;FgpKfY(^&3?#+c-nue$jx}#=31U0~ks8{tG)J)G~8Vtrv z7&F*(R0Q>5RSq@dfvAorqc-n+jHC0viGVsfiJIwk)J&eE3VyfwkzbgBB}8r3Kvct} zPy?%jnsE=*O7*vnM6Ki$)Cw#{ZPGR9Rl$PcMoh0a)oYA6~%C_yP4zX!(1yxsRecet>E>><7;OECRJYm|u^5!ji;C zeDt{gE%ytkZ^tt}d7Kk?3srIHXLIhqp=Olwi`fGeP{+3yx_bkc5)VeL^!Tsl5zj(R zbd{HYp4ocTv)N|j2T%J+8W=F%*l&VM-q8o3ws0vU^X1ba{&p2nPb4Vz&!A0Kz6 zx})CxgHQumhdMz-kWV%qF0`qa5cOzNqgFU8>a(F-Xdkb;)YVAPx$K0R@ibdt zp^dLZHLw{qqy0AhBD<<686$>*F5#U17aG?!Wb_ z9?m?&ho}xdSbw2r95%dJ+PJ7q>4#d86sV8oEH=M4`Vb$C+LXgkFRsm~6^<6c$Ne{C znNjbRR=S>kd>$`%!Peqo{L#3$x&3Y=Uw5-`v&l?1S!m1zB=u z50=7630b+q1ga6xv!8(~@C68pGc7<%9m;ww-~S1yT<`;SWMqP|dU!$$ZVbqq@<^>Kgj zsDK*SDGb8v*c5&JOvjxtJMmtq)3F{^Kc2tWj6AWwS)z2L$hr3a4wmYa-=6g(m zu>;Je&4V7|l{8(h1XitPdwM9r^9)AqkFDI=xY{!#L-F@w?uhj71QR%jW6038*f!FD z^i5Q*X5+Vsf8ge42d4^Y>8SI9@LUMiE>#<&qw$#9z$J`NuN)9 z#fS$H-eFEIA0R{)afe)^LjpL|hHH{vla3zZNYXOW&}dudDh=v?z+BfFJD5w@iq0Q% zeG@Zok}kgFy4PmXh7i`pdV>*Y?&BV?Yss!bcc8LSU?E5aeyGssO#VyU#XXfW6|feTBs~)rB|eVuH99;@JczKa{B*jFG<`?B6Po^gNzkQF z!F6=P&lXNcTlgmhr;*lyv>W7Cp&?zpiAN$_-1|4>IkbMBTIFeZo2{h^d>A+jNsne*tbq+E^NJSc zlQ)PspM1_A$}Sw8K@6^UAL*fo3w`^hukFp?|=R#Gvt~d z62OskqAMJ(3MoTlf9#-d5$3h)biqla>66HZa2dk<4B+hGZbn$2FheM}EDW3cnOfv( zVjEXD9tCx6rSdflPy8@pT^+eoQFa*(tRk$>S6%HXGYvE74w+?SL+je%z+bpj=eaBa=3qw62u@NZLu-;Cq~Vr6KJh_apA- zl+!hyI(tpf=|wm%Wv7wn^`Ve1ev$A$R|CR)4!c)u!q;q>x1{X*pHlxD(6`e*G8pvS;eJd5$0)bYrq3f@gYqlv0G<(VWW#QQ{0BdHxZhZ2l9!nKiSp^6pON?j z4VnCE#l7@(WCm$Vh({w`R~X`p2-l*MqTF8M)o7qBdA~?MK-ub~g5{ z|5^De?rfm$cWg$zRfLxl-fHr_PF_0GHJ8k+WM<}0MB{%bFq`!Dge#FYkMMZ>O}X2u zz{Rgz+$#rVCy}1b4p50RN!vl%Lh2;cZOhgq?>+Y^cK}*{u7)-1Gq+{nN;H zDzv4-I4b0`0}Sc2xQ%b2%q7YcA!7)2lM>c-g7na|J%RXF(qC{#BMuHff;$(vW6_3p zCJ7ZueMUk!T&CJw{4nXHrNAZb^xWOK^`pu?8oW=qom%2*Mwp*q|G%pXd7DUChVRHP zMws80IcunU-q!2RU}}akUozav^(o*_C^v=PaMvL|o%^}15T6Q(iSMMdjogO_N1@za z!lx<2Z@=81Lc81Yx3DGoy8Ngca^0hRE6VogcF*6+kR0qlW)C-mSyA~D@dd=gVJ7Z> zuK*g2XggR=nS5k=D3g?M3-0oS2agA%0mtS`}*-0!<;u^x? z2tTuxo73qx(ic-_C>2@|jzIni;t>glT>A+h=Uz;i#@r#-Is#)zKdDZ+@?lyNbn277 zRA2IR4JHzDt)uf+#M6*a#LhYlX~n7hm$ZqtU^e3I>1=|Hx1mfs+fhF|i1oC?uVI}Y zww>Xmmm=KTmg}O={{ke`Ct;o~l!rnEs1(6AEGm&!fyVd?rSppTNACExk%6QaBfTiM zE`Q>aY3rJe7bhH>`n53ybz0i=29%Ah_qeWZB$ne2Ae@)9@Dz?fyaW}d+6wwzOd`T{ zNE@Uu<>C>3Limm?6PNfNI?HO~`q6kQx2_eW=ODcXWi}I!PTZ_NkwhxN)r10R=v-G$ z+elL?yrQ!L+=~g1Fxk#g!Wl?wMnjKCi$YjeUt8ao{E(|8Z7m|ch=dX3pQTRUkmsL* zNXWI*R$4;B0m4P77=eZlao4aN)FxfOzR;DIa8$~C!I#{}2>&E~5N)=kd^y5p2q&Y{ z=j4T47f9R0FBzP)6!NtV|0XvM;T9AgPho#TQKYs-Yh2kVEthQuD*l+`qJidpm^y)}(|CaxpI1e>5aNmQSdEjU>fP zl-1Rld^MU5OOcnGdX357OZfj@Z}s!vY%)Wxu2jm!J)2usSt_R`T#Uv$5ua=usY;!i zwnLT6L;7n>iHmJ}`KddUx}|MfDtDec6lJQC_aEWRdjDskzzHgiC7}fwkGOT|Z)$UG z*rf2frED3}TXXj#@ytJie@VEW9aMAbO(dS4c-emjaQdJ24p4ucmjd%CI2u2YP?$TA zcz2wRJxL$Rtt%~+AJ_&8l6Ho)GYrH-xwcr7j#?8QjD3htAY6)aF)7!Wdo^`C;BxMF zq(|p=pMOFU3RB@Y3A%<;QCC76-${Hb;rCdG#&;7gNn>jeztZzB^4ccW|@Za>P! zrp~`tuYc<0CSO-_%3kNz)fQvu`PU$lhdUApmiMarz?oe-$`88UdndCair-38igDF2X}p zf~zNay7rMbkGrXfy8oHfhF{Rpcft#7d?DqcGl2NS`*7!`j}qKtC>L@yr(O5?ZzSV1 z8NuZ2r(!bhc--emYtFrdyE26@+kvQoX#a#?Qg$Wxb<)mI_9o#YSeDUgV8ISN<81$fXlHp&i8(e~V5i08C< z-{_zx@!Ph{2;$|b|A)B7HeLV0)tNM1Pf5>D_ziu&_EI>I#I7WKayei5usURUyN*|MFn4r%YnFNjAdQvwSU z*OGLhti8NW5+Y-$P>GZk+yjXRQm_P-JgUGomNXyR_$<<*6CXu>7SeLi;49*DF*~-g zbyROOWn3wDfj|=CwM>$;i?Z(i4)s>O5Q!t41vxIMup4#>khxFR|{{Mr-RAk<=jpV0++JqC3mxKGe zt)K=|k?!H1^-o$E%Gcu_!~L4{^|YmHE%!Cru1i`B?(M|ya(^W)D|bc0-dI%9wUtJ- z8JBYRunmNwQdX1g^dX#@vi(q3EXwSrP5|*s#M9e$22fwW)X>YNWG=pS1G@ccB7J)M&JK+^&!!Z%o^Aj+fiT=_fzu1Q!o>j#0@m;M|g#8nBf0h za|zY4=})m1?d+#~JkpC3Z$x{aiGQJw&g30J^Zv!&MEY_Mr%+{OaHZz{K)5}XJ90lz zoCac&)`xQ23F~S}dto8^(5~#32-TZ{wTD97g4P zw$Z6Jy%7FKxzeN$#N#&oDCV+Zwbh95FWgRtxhPkc+sAgkhj266&JyzbpSWc7C$TlR zuIm3Zw3B!f?rhwV?O+JH*J;~eTpIg9-3i1CQ#Ur@iKGQ#RV=|hk-UhQo0>~#=LYu- zeg5l;#+{GM@pb@83rm4sG!~kQg9v}&)|H(!KRduE#AA|wh5HBj*|;l`7nOGQaW~|S zPFiGJUiBwYwm*H%Mz`Yuw&4>LJ~H`1d7V#wA6t!3UJez87 z-d|!<>R+LJHs$#h%!J9YC|1CRm>XAPaeROUF-;%G3Bd@gjT5mEKEXqd<8{jPb)3N@MDOP~&v6_E zW3T?kWtf@xMNEu8&>s^GaGa!=21BtZmc*`@33p%ue2A&=3+BM&Udm!MtV;jRWbSMv zJj9e3Z=jh;PK-^wEhfai7>H9)Guw(4@eL}!@F2&@?_ri0kN6~JwF8%<@*52?E7lWh z5}$_Y=+k*_GXjR1idj)3E{Q?d5>wzP)Y7j+t;9YXzmBnpzrvjO9lK!YFjf_pq4GCk zTHJ5rkI|cmg!crrlre`p&Tp6z+hBfVY|b)Ft@II&vlJ^?-{KPDGe$ZN|8okAVvu-* zKVD+x(T=kM3yyJ|BtDMw2(<@(j&qz%SbIF{zlK2636ASlTur?3M8_fM_)l`2);I?j zpx~S#6Kf#I*X?|&H>EEmfnSLtZSz`&Q9VjXE@G$44TRQ!UHo||Mdj& z%`(sGsddq8$JtJLy*Z9E7vu1UR$_xS$2_xXw_{7v^V4cET#P;N5e~#~M$L9`Zd)5J zH0k%TIq4DJMP|v4TdOTLOL+_1Q=l2^TNy9nPYh!HHItxaY&e$m7B(iHgk@-keX$_Va5ToosTd2FDxdzHEd+F~_n;cOh^p|H z^);&DFQ|d}Z806hMIF~bYj#w<;;0TPVtNcm4P*%V<5<+AnTcLicxyAhp;jR3R#PDf zW+$E+wS=`$uhjaej=Q2(XejCtjYZ9TGHSpJPy<mcZ0QX>9Jb*zM%!^$EsEn#N2sOhAsCqL{GhL2)<{NMt?#F+z z)=oY@u#%V8lxFU;+dP{Xs0I_E($k>^lnph*Jg5%JV<6T=4X6($!nvq{Y{U4t7dzo4 zOo1i$nD(2Z9-+500W~}rRdE{n;yhG?i%~P!jq3Qc&A*A-O!rXF{%_QhzCpF~12vJz zd(EDThpL~>nhWX2>y#vrfQ)je5jDoR*cr8nhM@*H(Z-jcR%Sh_!5x?%kK4GULCbd8>5zT4C+xVLN&A!Rc;q*g-&2{ zypHYhBj&+o2TX@^aXRrUn1eTGyMt_MF9{0|nE{+fHF(Fy|3YSpKX3vD95Wp)Ld|Fu zYM?t&9UsCPcp3EwGw|Rwuw1AK6hft!LDjE`-LM%Z#2d$1|D*)okf37}^Mv^hm=*nq zS3xyU3$-bmpjM~{YWELCZLW!^0WH8RxCvG79;)068~=oA$M2*uv6p~$Zx#%}R;U-v z4AirWbjp4yMODm+k+CdB!78W$g`oz}+}aaWZWKntiRg>7F*+_l4bZ#VW^A_^du+yW z>t$324{ZKFs2P1h%{=mH({Ox@PCN3=Cc#;Y zYWNUp1{ZAnI%>pE&>!EU8g|Z@XB!`tpBB|YDC!v(MZL)Cpa#|%wNgVdsm}j&0$R$= z7z1~q8a|F{=r%UT=cpN0{lk0nu?h*8Sw(Bj_RN~YK$t^8e`%ZR7bN=PwV7t2-i-56OS%;`kz=TKE}~|7&-x6tg70kn z$2rzt1*4uf8Szo^KpW3u&1)@T^DAR)%7xqXwy2JKpawh`^$6yn$}K^io-L>e9JgLQ z&-(vH!ebIN!;h$y@V#J`-XFDjGN39JL%q4Gq8>#{YbR@O)Qkt)_*m3RPD2f39_lk< z9cISUUIKcS|Dtwh;)`bU1!H33#ZUtZ$2iyowdCDV10RE$`CL>7D{&U?Ky_UGlCd7@ zG&Dg?qz|fH?f>OP)qp{HRErn8Twr|#>TkB6I-*O_C_((vo4M5 zu$qlGMzzxxY2WK~BcKNQp=L4>HK4hum05*q=rn4?S5Y&$gMs(~)j@(Qrs1@xl?g$u zR1wspt%Yi*DXN_g7+2@NJAp6~MqwI!fblT$RkNf?QF|aWYM>=iD^mvpurX@syP*5* zQ3D){8rV{sz6CYGy*B+M#@G43PCyO3LN)vY<6z`#W+@Y+mMjIT!}O?uDUKRgb@ZxY1c4sd4s+r|RK-L$%(G928c;B521TqDQ02lf z6q}ee>J$81TFCf>kd?d2T>zEj+)U0n|>W@ z62FUmFvo3eWxkYRUktg!M>MX+miP{Qp=He-xOW=1(tGc1Ezu}bKRwNV|0TU(<#>WL~h9M#VREQt%y{rrDKKuh`x zwUnPx&)Dy=nQ0tU#WWa%IZ-pJjVjj|Q(}A6GaZNOconL>9jKK#f{F18YQ_FRuV(1? zmzh~c)Y2A2Eq!J5#pbAn+Mqh1$Z%55^uZ^EX4eT6hZ`?)=;0K(=;cm=hRuT@ar@nXC%n#e)3Cr}MtL9Ng|)Sh^3P5&elb#6bFY+7QrY7=!9~g>@Hd>Ho0#*H8m`hXEMp zt;tV=dbS~`iIhNXx^UD|H%0CK)~H9(33V(7ptlx*>jbp)A@9t`W&u=%!ZuzC)lgZ? zjg>J!4nr;R0c?XOu`}j;Zw9a&HG%c0aywAv4q^xfe_;L9aQFwasUk2D@fN5VdQnR} z$-2n834bH~AZn%;F$dnnq8RI=>97iFZ`46es3mGZ9Z)OP>m%#0goz}mq1mVeZ$e1jUG-@hiF5Y<6u)GIa=HSmh43DrkUv^#3E_r=V()Js4EIFCA3H&G+L zhZ@K$)T8-kjrPgBa1vlV(#xR+-Vn9KEo{7_jrX+ifv9#zq6Rj@rh8Y|zy{RFx1$=m zfSTb=)Bs)}aQn6SXpjZ2oc7jL)L>z*W@Do}fM}KB5K|`o&lZRlg2uB^zKiY=a>>|8odv zsZXIAx{e9(31-J1m<6+aH6w3`YN$D?d>7P=2cZTw$>z_pF2}^AZ$Ul#KT!RB#K=1T zzTZrP{-}&Zs3l5=YB-CH7qan^sApdjHIUXe-UGFAV^9N|Ve^+`BH~+6D}4sl{zdeL z61YJ?AEz;aaHpL0}#71dBaYdM=<7d6AC zsCL?5U+jrGj_*+QexQ!GH&!H%yDI}xd!ZaEqaWtQ@u-H5qaML!)QUVr4g3>oK)$}F zUMy6-K-4R_E~@@GRQ=hg_E#aB-RtZoprtv9YVZzfgwHS;enu@}0zZ%Y*KSEsOI-}r za5>bYsEzHh9%?h6K)oOSMz!+|^=J}DHvOf-Bs%}O31|k@Fc`y8OEnTTkSVB&OHead zi#n#eZT?Br1a4pke2F?038I*1Tn07ZO4eG~lz0P-L;ub}0vhRM>tob_K3biq9w(4^ zbkx8yqgE<6>QNNOG#G|yu^;LUxER&(Hq?OkqE_-WY9i;+{r&$v0(vG-Q5}E5+UOh2 z=|M=f~+REGmm?TkbXbTVp!^HKe5Kn>tvbdT3v;`1cv z1#uts!ug6RF^<2PaVV;xLa3RPLv<8}dPI#-yS}51_rQe2hoj2PM?J#jHh%+ZK>Pi@ zroeey@H*-ZcOUg4`hn^=Z49&7vRezI8m@pEKn-hCRKs0Sn{z0t<4LF$nT;CgQX606 zC7_13p$hIrz1fbT8hVPF$!F9XF(9VLeRXC+4YVj~;}Z&dvmsCIW^COn8*xfkd@ zV${IBzOhUo9%{sCPy@+s)AOS$mPb9aI;e6jZM+-mnGQicx@o8xu0^%81yz3!s^e3r zH{WGsGkcwzCg40qjr28YGbN2}UPy&eBkhb8aS#r~vzQO7{N`~k;3&+1;Q=OnC}t$S z53}G?)Ji6ZW70z~Q0Ko60nMy8>UfPr&0vakHkK#8$oc|%5ziCX<9>_XhP{%YVzB!h;QJ;S0u$<0+BLbsv6%NK62|P|I{2jOBH`GkGCiJ*}Y5WT7 z5nqzXtke(G8!jlZ8AxH&F|Cj4cmXcPt*A#3mc&dn0=;?`?FeYbT~M2*H!6J)Y7>q? zor0M-%fs$PJ(9x7%nPM5)*@a5YvL-@9{GX#=Hs8-HPQj70gbdyM0Gq9wdq!3YTSid^1G-Re?+~K{Zp8BQli?=h}xu~HeN1;J^$57 z(1`1yI&NtTbVjX2AJhsBMD6Ag=_Onp!twU|z z!`5@C`nNEu&i_jSI=>%LD-kcPS=s`qXIK{1aaB}9;WoV`YNj1gE7Z%T4?yku;iyNp z5QpP8)PRPh^SHmJpM}$P{xhaGOL_n`(>xi>QkJq-L2a_Sr~$P`b=VnIz9;G{*D%xo z_o0s2Da?&$u`2pyG>@t_4kSJRy}1bdB%qPz%H(k#;Uv^etA z9_I*_%woPLL<=#m=EfL8`a0~4x3M8s&gyZ08@>)x5dVmw7(W~5KP7>(**s1$Y=zZv zHD?&8J!g97w!9s{AYLgV{pO7m+oXjrcXxQb)~URxSmmB_4uWiJBOQ%W`o3 z%M&<8f;LS+PV*fwE$VnxM?L#SsHJUV<2_I>oq zi>g3wlV8J2Kr?QLnQ;?p>F;1QjGD)ETn{y)7N`~JhZ^8qR0pdt4sJ&s%TrhpFQ7gf zQsg!7g951b!%%z3JD7lGHWIbDrlJqd#q78Mo8Sdh2RZYZie;>oP@A&`>NGS(?WuOy z0vBT%jF#VgJcnRq;$g_jd!6M3N|5jdD`BnzCO!l;!sDoh|3IDZtEd70jT+Fu7>Lme znw7|miswVsuZODN7~Ruj(>r5ko&TN$>Qi8en?RtD$C(VlsEYehAGaq^n=*A_v#YD2 zmU<&L#_gyM5*0C@c7fQOcr8@=ZkvACrhh^o`ga-@H62A@DDgJf6z5?edWxBurotfN zxlpg@Fq_^7-+TBG3$=*{moQ5{9Tne=dLf;|M)(Z%h{~1Z{D%?n63`>KhWRjQDKmgt z*q!)Jyn|bh1_z@CdJ6TXOI5+FL^$Rl-XFCIx1l;diW%@Omcl3%&EBen z`nEg=8N2g)MXy=fAC)}L9WnwcoAdb(>P;1;is?8V>Ua)7rLV^LcoNmoJq*UERn1Iu zp(a!f)nQZAW*va~^qYhQaG{q#Hv+d&FPduAOo95S2HT=OMrWdya24uV9z~sod)Niv z<1lPl-MpAy;tJvcH9XF8+-YrG)8kAb9;KGYnS|as1l|$IQrqLK!=NxeBzOUwL!F9$ z>w4UO#a^?X$&VTCan_Q)+uEu=-wBDwZ{TtNrgH->AfB+HDYqTh5O3DV_*-L-Gn4op zJfZVnE5hUKB_Txb~BIrm&i_YkNcNQy-?*cwD35)@v(JLOON|+ z!5g$PAGeWPn-v*njoZeo)GRDYy%=rvHJ#o&PfmV8$Ni zd=5u_iv5L6Fkw&Aa34%X{03@MeM9Y?guTo$9E(MW??%0PzhWRZ>1_ry1a-V;_VKuX z0eKOf$4ry&z+m*+y2E01chD(aj^pa$9p^@<&b z>S!9O{sPp8*lJ9Px6xfWOh7#0Kmz(a4jE`hR2toxqYAV_4Zw@)cq-}`F0&p)mA`{J z@2{;sgUqWp9x6Wrs$K!q@eM=u+u2J%9gM=PI3Lx~S?fLQMEo^sg(3!roTFfCY5^|01AsoNAbPr{Be##GT=0_vb>* zU?%F>twt^BQPhC0+xQ(De~rCJ|A6{z=rF>3*eplYdyATw-$<<}=PwokC8WS0Opi;k z97g9HzryvzKaVoyR*p6^--KGZeW=ZM2DLJmQJ)d_Q7iKkwSo!8n9qvBn2dN!^rwGk zC;>gIiKt_?-o``6+TD(ENsmA^*d5i;SkxDgnV1$Apf=S})Qa6ftkZT?c!Uf6+}$WhcWe27|^m#6`J zK)&-izT-{1RmOAvkCM=o1QpCU!OS2#s^fB~z0d$PlgX$hpMjeBG8o^<$RD+0fv8OyjH$8EM9zOZ0udxs#IslllTI?9dabcAdmz*fYYJU^Pt)07veGtQ z8+Bg8Q8Q?Ue%J{$pdP3WMxge_c+~lyh1wgNtVd9f^ct%ETU7Z^=+#Ig%`+p8kNQ|m zkLs`}YCsiHZ>;*L8TQ7MI2Uya_Mmq2Dbz|_wCNA5|Dg83cbgwD-_#47&-qt{5EAsv z3ZY&gby1tHCu%^GFg>nDE#*bjz;4_87pNumTVQ@4kOZ}I(@=YBzKyRz)!%B<_vs6Q zmi{yeT8ZHThXld!`s_ zx3@-h+zqt{hPvsTzwtI>7HX+h+4yGEraXjd=q?6h)Y1D8n98|ndS0N+s0IL0dT#!7*jc^cGDN_kKX zPDRb+chpj!LUnlGrhi6FAm(bbhvHdNqgE(XKNx693Xq_VtD;8U7_|beP#ttbZO)N4 zz5rEj3u?x@Q5~H@)w^WV@1g3wMy*hkHKw0TxQuvyFM&V;_ict}ty!7?)PRzrRw6TM z=?bCtOj#_7Cs3y&+B&mRiBKz%0+pTSA>y=kB^ zYNI zI12Tst8F*dMXyF4K|rUV73$gdM;)UnsNKI7b>0uy_#de94^T7vXyZ|Km;on4)eAUb+^Ag57}(6igDNC4_fY+BSrN_q)s=8aGdcCzvQsLe7SwS+4%Jsv>~_yy__ z{Itf~V|IH+R6AKw^$ObbI;ep(#9i0{^#=83+-qK`6|e~jD^Z)vf1hb6A?jJCLA|Q; zqB<^(+B@Mk-UN#h?}=K$9jKK#jQVuEg6HrHUc*!S-2r=@#Rp8mm8gz)p}PlAD{u~T z<1?Ecc+hl^5jE4CsDTtiJ;Ji6nTMeU(A7E&Ly6BoeZxA1adiHp9WuWpN``vDR7UO6 z8mMQ~7S-Tz)EjUyYDM;2FQLA)KEZtGci0T92x_G&qS7N!n{*Cpf=4mB&i`2g+NC#8 z$L=9&6Me%D825X|P< z9nXuXUH{Y?{UqmK&nEb!*?cWfo30CLMq^RWa2e|O?ZOQBC#oa=Q>Ni`sApObwIZc3 zE%rdI=v>t4S&JI@E>!y$yacpspQBdbGpbNFpPMhwHK<~dDN%o9aP8nZTuPP zQN2Lz@^@GaL(iDK(hareyx2?rB%lht{xF-+i)wHb4#3G+90Sgp^qQ#h4N!Zg8S0n~ zM9p-vbuns>Y(~xWC~C9b#r*gT%h11*=A4;vJJd?_L3J<+bt)#JmTWevflbyusE&`L zcJ&QZN6%54H_~}?OoLGE=0XjqB^N18VavMGbTp>JgsCD0&vx323JGQ8Rpwn%M_b2T?AXj+0n} zP&3ScdQ_!Rr=SX|otCJ9c1FEXd!Ys}6t#(GqdtTVp;sL|AfSrxQ3LpaTB2x|%t{1U z6Izp_I!KM0NhVaiJl5i<_9~$U5QZ9HQ`95sizRXDCCT`av4#lD?e(0Wv_7lwK=MjpqWIVUa=ie z&we~Ae;4XidJ@&ZS(|K(`die>Iaf`GQBg~u7*#JTYL67M@tR&6Xo4C*CtILD zY6eqL4bH{_xENF6UDS6)&o%SHDU3Rf9Z^d>1_N;^Y5+$u7v4g>&;qWTiFwlz&{E_= zEo~9hE4Dmp1zMsiOhFBBC2A?Rp&rRG)QWvZJ;KB{Oov%e&%6X?!f@0I4o9un7^EGq zGns&vcnNBWHlvQ=0o1^5+Wbd2m-su>yM5wKGvEWLO?DbJ@N1}nyhqJE>MiqwND8b@ zJQZq1ySsA!`V*)?!Z6g5UqDs7hI%i&M2+}6YM{Qijd4*ckqU=k4%C3RqgL!7s-vr@ z_U>BW+w|ynSP`B7I0RHNAr8YJ)VW@Pn#o4g```%X#;d5~6Z5Wl*442D@wTW(xB>O3 zc42xvj+)3nsEPbU?UBg$IRAPVrzDUQ>!Fr%0&1pnQ16G;r~&LnJ=1eG{sc9%&zJ^d z-!}u#iR!ozs>9}}3AVHLz`n!>-sk+MBk+v`9gEZt%*SSa)BqZzHdjZ~8*c(?K#}MMRyaY7zp{Qp!3pMhksLitv zRq+_AgFjI-`5X0&e`0Nn@z|_jQ*1!I50=5}sGpPq|1v995`&2kM6H~6oek_pE%`~* z5?!}GL(TjP>RHElVg{57^$n;n24Y>*1p1&>WEg6IlWcrGs{PfdmEDP~wAVR6K)dlg zYR1n{Gkt>^$QRTA{GXcq;Y;ZPf@$}HEKp*P%!tR( z{r~@YO+Xz5J~y9UnNTxsi0Zf#>Y4XLosx;Dj#i*%x(&5bM^WXj+WhCJfqg=4)>wa= zcGIB-mKWWh|7#M^QiWSvpq8>TYG4CVn{>3zUw|2iueM&YenWMb_J#TPzy)wL@kv-3 zlfCpfAFwHA!@93H|N53X`jtsIY5jsa@0tHG9hE~p<1VOy%|JcV<)}xp!MY9gj^B;p z80)q97ZPo-0P%aMc9Om^e|1yz4d*|Qg!LqB#dD~yMnm74-Ms`=VIQjDhd3K^zcarr zyMSehH-GPO|7-a5sBg>NKX{yzxC2#h@JDm*ub@^g(!XX81bYeS{MJTybKo-K$54-? z-6!*md!lAK0<}rUp&rdt8=sG=zYO)P_u)kkdjYkFR(&xazuT}r@m<&uy$QdX&C~5eC{hf{fKs}PE-%PoLsLhxf(_&84jO*F>5F1~G4Ajeig=Uue zIcit?eK!roMZF1ATJxc1UITSH>Y)bK4mGe|=!=7Gd<1GUPD1VW6{t;o7_;DYjH&Y< z`G@H^9v&tm6{>^3Pz`^=&*<~hoa=AaX#4=C6-$8XASIf^Ws)) zjxSLwRU?v*`|fXq8pv35|NEZ>1k}Mw)Qor80!M86HPk?!+5DKkX21zik0=l7xK=|A zq$BDLH~_U5#@O_^sD9R8S326jN;?| z8?YQv%`@DO>foI925QC+F)F@CZOZSciTOnHaX*%0qw>SN1bhfIM(xU`7><)rd*UVb zz?ji}9KBeEq6T^#^(xKg@8kZ2lrDyk`=V)xhe+Rq8gRFmKF&dm9m~gQj2EybhQ{`B z--zB31X_}C*qZq_ANMz&Q&7A60cw+dK|SM40Y2^z9%ZpI@nNWeU&cW6iR0sbDyGKa z#LHtzynr(>L0q$m*CU(M>)a=xbD21vS<(;;CSDjDVOvavr?C>gLY?b^@lD6oQF~w@ zYKg~KXQKANGE{q;un*ovow~XSeE6nB=mr5*%#+YOyOO9!Pz$xYH=&;KX{?4!=ysNA2PlsJ-(JbKys9g2DWM?J9qQbvo*^V;*Xym!LM^4s`$f--862lJFjNKIy$&_w?biL6h4^vQr`89|hBZ_8xc^jZ7;5D*rSx(Ckx4#O{#1;>qo`w;KG4Vg z!6O(ou$6&cANLmq+em0e!ZTFIm4kfTAGK?l@|kv&qBS~ zcA?&wXHlPmZ&8~zQEDH@gA*gMn%wSA%ukBWba5qcox^%s4z8oz`-m^qgXVgM-?%la z*S365;w6a}PysF<>NX~=6yc4uJ%R8M%2s3sbBU)UzaQbn=$%L*R?j(4f$Suf$2G*e zQ*b@%YD9QC=|gP%5@B5nC?7~8x{?#twSc@wwp@GCIuKt%nQ!=!`xtE{vSoes|G!z6 zO3Q79fn@4>Onf5YgLsYmH`~c-8kowRm9!o-GMezOt25=xb04#f4@JG8#&Dk}98Mn9 zoE7-imT94v@lX;6kl<%Kxkmw=f~7V-oxEMd*Ww;-T|aHd<%mb4+>9wfjpDY}`|UnC zBS=|5Ut5TGAY5Dha&04T9X0rN>pUcFENSmZi^2Vv`>QS2jdZ@VJ2j}AiMt$OUA?*Q z6aHsPL_}QgG-9Qx(UrS9t+wW#M(H26m10)a453zEoW)&+@G^S)b-krrn_m%Z&RvtX z9&_sorffXIV{M(H^bu80E`WyoZJ{NYkA^y8Or>$Bv=#Q^DB`Ky=J=Z$;yGy~gu5>H z7t+(wRvm6#rlr%S)z(#1~^PAGRO(sxm2D1Ij1lRhdD zzd;#&aySo2%+9UrFEZX@Lkd459GANn_n!=;DE>uWYr?ZB&$k2T7LD~LoRz$*YQSD2 zaTaMe$p4O`QCB&_x+>EC0eyzvrE+TS@nrDH;UusH7g0c0E8^S8ug$G1GUZNCPFHbT zrag8ceu?yXgTrQV^EIY!8n)P+WLd}^Am%6H7ApA^X}D%Ki3iF8>D+} zw1ZkptQG0YxaXTJrzj4jZkR0-XxsRMct#u6m#@DWP(RyVC(zND;r-#xE^Kh67OeMLInf4FO!~u z{AB1p|KACWp@YU`t|a3l_c_8lZDR!8uZ2?AYVuG1CokNFSI|Zh^26Lx{8a+!(J8CX zK3!?ZKfqwxakn5mArk#}CnFUJr`;kP6Dp-8^C^atK9BGn2FTCU&PZ-ueEvB#29RC>X!Ydm*$!gp-^ zyKPK){D#0eLVP%#Wg(~v#O2MBV!1K0*KGy9z^&N z9rhvpBsSx&OE?VE+d5h3a0&Nl?wh0!LubmQUU9ualxRW=J4t;)t*zulBc7V{d^nIa zT@8r8FhOT9;hLoXB%Ysox>j)4r|v82G{p7XcM0pNPx+RVKT6!6^2Kox`Fyi-H4*5fEXH!hFQr^1T z*fz2SQ&Q$L<>Qc-f^cTS|Gj!sCK7jI(g$E0>L;dv_cawR66r(6b}~v}M>0Ze1E1;z}J6(wn!m`}` z$WP0ys}5y)QZEXPw#H@LrAgml^W8%H;Ya;y`R$5lu3`eh7-<0yHjnw zCfJR8IC%%%5H+Hxwp zhr0=7F5rIhbX}%RUD1g9&_?G-UOs_HtjC>!$}Mf9ORzWvj$t8;z!;PnfH#PzrjdQN zvBUTqw|=J0P8*vEPqTRo=_r)+Y}C1L(_Y%aknA+qPHe|Ll7>H_t~a*e8^Rq3hme~#8B>c+}_0$E=(YT z!f|awi}4(3x{l)n@^tyx{Jf-%CtQhpJ9ks^l985~ayx82m9K6m6ru=MAn}B@4aE=9 zzy1>4y$V_L(7;~8gJ`T4IUN~sZ#%1zqI$asNe~ zhvexRMtl`@SKGE1lGm5JA?f{X+W&tR|3l)hs|$td+8IZ-1xJ%vfHEaXuSs~SEu5at zHj&<%ct*^JTPRb?)>kq2cNxS3X}1pTeXxCvpswE}63XfaTW@JXr6{6nD|cez#V9h9 zo4?y}y4WUzZJFz&>H0*x8uC~6PF2c0C*GU7SMjZ_6O(vS^2_5_(xgr5^AGp+wnLj>Ju@AvRw!^cy-B#pRxz26!64K~>Q`~83%l))w#xvyqPMr*d{cPQ8 zgcDF_18rQ?PDo=jmfMD|5zoqihEcg2Ua{#>sQ87n>ZB#6@)GUXRUdz^^MEnU!oL7mYt8d=+nVFSX^m{wl0I>icll=N`lT zC-rqzy3|u5z|q zZNmSMH;*!jxhvT8{-jMLoE!JsI;vOff9=O{PBWqoO65vILGP47?c;iXlDgU?I{ZG| zsl|PV_)Mx6;r0;M6->AmO-H8Nw%n^pUu3(QPF&XmTGiFcrVk|EopM*mFGqT1!ZpaN zN_r7f#%#+pBzz*_7KOrWW9|Moc4wDO>qJ^~?mFs)Yab1MA+HE`Thg!5PDj#Wk$273 zsbdGziu`Zn7bd?NX*DP_Qy)+_3DhNHJ{1yh-y*XicX|qDB~RB~?$)-!M5GV4;gi(U zb(Zq|=%5mLNeSy3K>P@CUCFrTaL?raK%KAD&&U0z<{vFY5%>tt7Fodaj&<7P<{hjXaOGJ_MshJ1?k6IfP#fds6ppJB>YXr zG}2}f{z3XE(i7Rnl9Jb-cxF6IS`ot82sfwfD%GKUux;EITiOBEAb&1pH<5Oa@Homo zp&plc{<#Td=Zcfxcb|UjVcUjw%wpg=HpJX>KtgK9K-P1gY+Y$mvD1=Aya-Ac`u23rxN&emA8R?wt+0fk5l;_-lNIDSE}Ng9cw^#oZO5^QKc#Fz(n?TfH|Y_!teP%s!{Z1yr3{yO{t9*G-eDW+ZwtmJ zt*8wzAv}Wo`6@%&6r~dmqSFloH*+r~zJ}SQ;66JuPX-u4`tTjLhkJP4d`_e zM$yMC5ItUSXWd9YnY!)+2up z;dzvap??hh(GH*qnY+m>MF-_bn@s^=D+!8zs;uCCnC5@qcXX3N;5Pw~RDKvsRFPRxh{GIRx?vupR*#SJIQXKM9+QwRu zf1P+m?)Y>#-=@!@&MML_la`dab8stp=}9X=d?)#7xU=XG$F`Noa}pEZL!-J9Q6Lt1 zb8OtC(gxG7;> zuekeD<{)X+XsaIK6_LXDbg&IoAu%$A^V$keNH6f8P9wX`a8SwbMdRyj-ex<%D7M}O z>eY0=AT=h`%jPDb#s}hkiQl2*aPG>48_>#kT8>TL@7RO%*@ShyATKIqUXT`tv_XXT zllGg*cK^&_%NC@JuH}^JN?)IJ5(*MYOMyvb{J|ZaxUN2!j6%Pz-84E(5!*-{;<`># z_X^>Hgnh82%|AqVoel4`PNBWu2yf#aM7^{=9eL6O)=+s8ZsvYx3#;*LG}3^9%p|Qc zVO_6n{zmI`8qG|-%fxqc?=;2SKO2yqoKTQW`>el~({Ik=<+Uk8X#F(zd1}u1T-=j# z%e7vK3ryMkZZ5jbN}cTa}xX$E_~RF8T1_b#mtFKgE>qC>Oh9kwUC a;wk78t5}EjhnKdq?R4E9cFpsp{Qm*BTaJ7H diff --git a/locale/tr_TR/LC_MESSAGES/django.mo b/locale/tr_TR/LC_MESSAGES/django.mo index d4e243b6069d3c71fbb630030b205c687f74a61e..ed7e8e520a92caada1374dda3a5ea2ad1879e748 100644 GIT binary patch delta 28676 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 delta 28758 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 delta 27922 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 diff --git a/locale/vi_VN/LC_MESSAGES/django.mo b/locale/vi_VN/LC_MESSAGES/django.mo index ee996af5f796edb2097c4ab5a9a8bca81ac2420a..7c7f7b097e9376297d18e62fd93f3d7ae45cf737 100644 GIT binary patch delta 21 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 bQlecm69s%Iv1@jnfExk3zNr^*ve5qkpqn61 delta 27918 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 Lb42ZcV+H>Yh-XX0 diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo index 6ca03029d5f8310fc6a895aac18cca238a22ba81..33249fb4d4c2c9881a6b21f9c1b08daf6622c2da 100644 GIT binary patch delta 14382 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�H{5$3|cx$cBvs3R|i>KA4Cc+1yEom>mleaU8j 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 YVr%Xmo9>%q_dBBt72bVjVf+051BB1Cw*UYD delta 14550 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 V$sr->Z!i7e+Wv{D*XFg%@ju0%(&zvH From 155e1e6f51ba7e78496e277537e32114467bec6b Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Fri, 26 Jun 2026 20:45:23 +0300 Subject: [PATCH 859/962] container-workflow: cleanup only older than 1 hour untagged layers otherwise concurrent runs might mess parallel building job --- .github/workflows/container.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 1220eb0f23..da2a1db36d 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -75,3 +75,4 @@ jobs: with: package: ${{ matrix.image }} delete-untagged: true + older-than: 1 hour From 457d99cf98fa22545d17fc2d6821727df87a2b48 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Sat, 27 Jun 2026 11:21:12 +0700 Subject: [PATCH 860/962] Add tests for default shelf --- bookwyrm/tests/importers/test_importer.py | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 8c97d34249..8008f0659c 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -88,6 +88,17 @@ def test_create_job(self, *_): self.assertEqual(import_items[3].normalized_data["id"], "10") self.assertEqual(import_items[3].normalized_data["title"], "Patisserie at Home") + def test_create_job_default_shelf(self, *_): + """default_shelf overrides the shelf for every imported item""" + to_read = self.local_user.shelf_set.get(identifier=models.Shelf.TO_READ) + import_job = self.importer.create_job( + self.local_user, self.csv, False, "public", default_shelf=to_read.name + ) + import_items = models.ImportItem.objects.filter(job=import_job).all().order_by("id") + self.assertEqual(len(import_items), 4) + for import_item in import_items: + self.assertEqual(import_item.normalized_data["shelf"], to_read.name) + def test_create_retry_job(self, *_): """trying again with items that didn't import""" import_job = self.importer.create_job( @@ -235,6 +246,26 @@ def test_handle_imported_book_already_shelved(self, *_): ).books.first() ) + def test_handle_imported_book_default_shelf(self, *_): + """default_shelf shelves the book on the chosen shelf, not the csv one""" + to_read = self.local_user.shelf_set.get(identifier=models.Shelf.TO_READ) + read = self.local_user.shelf_set.get(identifier=models.Shelf.READ_FINISHED) + + import_job = self.importer.create_job( + self.local_user, self.csv, False, "public", default_shelf=to_read.name + ) + import_item = import_job.items.first() + import_item.book = self.book + import_item.save() + + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): + handle_imported_book(import_item) + + to_read.refresh_from_db() + read.refresh_from_db() + self.assertEqual(to_read.books.first(), self.book) + self.assertIsNone(read.books.first()) + def test_handle_import_twice(self, *_): """re-importing books""" shelf = self.local_user.shelf_set.filter( From a6bae6681689108aa18fad560b15b887d0c7738e Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Sat, 27 Jun 2026 12:22:54 +0700 Subject: [PATCH 861/962] Name it shelf_override --- bookwyrm/importers/importer.py | 8 ++++---- bookwyrm/templates/import/import.html | 10 +++++----- bookwyrm/tests/importers/test_importer.py | 12 ++++++------ bookwyrm/views/imports/import_data.py | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index 06ef4f097f..5f3aab62ae 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -54,7 +54,7 @@ def create_job( include_reviews: bool, privacy: str, create_shelves: bool = True, - default_shelf: str | None = None, + shelf_override: str | None = None, ) -> ImportJob: """check over a csv and creates a database entry for the job""" csv_reader = csv.DictReader(csv_file, delimiter=self.delimiter) @@ -85,7 +85,7 @@ def create_job( for index, entry in enumerate(itertools.chain([first_row], csv_reader)): if enforce_limit and index >= allowed_imports: break - self.create_item(job, index, entry, default_shelf) + self.create_item(job, index, entry, shelf_override) return job def update_legacy_job(self, job: ImportJob) -> None: @@ -117,10 +117,10 @@ def create_row_mappings(self, headers: list[str]) -> dict[str, Optional[str]]: mappings[key] = value return mappings - def create_item(self, job: ImportJob, index: int, data: dict[str, str], default_shelf: str | None = None) -> None: + def create_item(self, job: ImportJob, index: int, data: dict[str, str], shelf_override: str | None = None) -> None: """creates and saves an import item""" normalized = self.normalize_row(data, job.mappings) - normalized["shelf"] = default_shelf if default_shelf else self.get_shelf(normalized) + normalized["shelf"] = shelf_override if shelf_override else self.get_shelf(normalized) ImportItem(job=job, index=index, data=data, normalized_data=normalized).save() def get_shelf(self, normalized_row: dict[str, Optional[str]]) -> Optional[str]: diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html index e213c2a326..7a1b425407 100644 --- a/bookwyrm/templates/import/import.html +++ b/bookwyrm/templates/import/import.html @@ -106,21 +106,21 @@

        -
        diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 8008f0659c..8099a16e82 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -88,11 +88,11 @@ def test_create_job(self, *_): self.assertEqual(import_items[3].normalized_data["id"], "10") self.assertEqual(import_items[3].normalized_data["title"], "Patisserie at Home") - def test_create_job_default_shelf(self, *_): - """default_shelf overrides the shelf for every imported item""" + def test_create_job_shelf_override(self, *_): + """override the shelf for every imported item""" to_read = self.local_user.shelf_set.get(identifier=models.Shelf.TO_READ) import_job = self.importer.create_job( - self.local_user, self.csv, False, "public", default_shelf=to_read.name + self.local_user, self.csv, False, "public", shelf_override=to_read.name ) import_items = models.ImportItem.objects.filter(job=import_job).all().order_by("id") self.assertEqual(len(import_items), 4) @@ -246,13 +246,13 @@ def test_handle_imported_book_already_shelved(self, *_): ).books.first() ) - def test_handle_imported_book_default_shelf(self, *_): - """default_shelf shelves the book on the chosen shelf, not the csv one""" + def test_handle_imported_book_shelf_override(self, *_): + """shelve the book on the chosen shelf, not the csv one""" to_read = self.local_user.shelf_set.get(identifier=models.Shelf.TO_READ) read = self.local_user.shelf_set.get(identifier=models.Shelf.READ_FINISHED) import_job = self.importer.create_job( - self.local_user, self.csv, False, "public", default_shelf=to_read.name + self.local_user, self.csv, False, "public", shelf_override=to_read.name ) import_item = import_job.items.first() import_item.book = self.book diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py index bedc857334..001650efdd 100644 --- a/bookwyrm/views/imports/import_data.py +++ b/bookwyrm/views/imports/import_data.py @@ -87,7 +87,7 @@ def post(self, request): create_shelves = request.POST.get("create_shelves") == "on" privacy = request.POST.get("privacy") source = request.POST.get("source") - default_shelf = request.POST.get("default_shelf") or None + shelf_override = request.POST.get("shelf_override") or None if source == "BookWyrm": importer = BookwyrmBooksImporter() @@ -112,7 +112,7 @@ def post(self, request): include_reviews, privacy, create_shelves, - default_shelf + shelf_override ) except (UnicodeDecodeError, ValueError, KeyError): return self.get(request, invalid=True) From 0558092e60cf3b756c93454106485c78d2a0b990 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Sat, 27 Jun 2026 12:30:56 +0700 Subject: [PATCH 862/962] Run formatter --- bookwyrm/importers/importer.py | 12 ++++++++++-- bookwyrm/tests/importers/test_importer.py | 4 +++- bookwyrm/views/imports/import_data.py | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/bookwyrm/importers/importer.py b/bookwyrm/importers/importer.py index 5f3aab62ae..6dd1be43d0 100644 --- a/bookwyrm/importers/importer.py +++ b/bookwyrm/importers/importer.py @@ -117,10 +117,18 @@ def create_row_mappings(self, headers: list[str]) -> dict[str, Optional[str]]: mappings[key] = value return mappings - def create_item(self, job: ImportJob, index: int, data: dict[str, str], shelf_override: str | None = None) -> None: + def create_item( + self, + job: ImportJob, + index: int, + data: dict[str, str], + shelf_override: str | None = None, + ) -> None: """creates and saves an import item""" normalized = self.normalize_row(data, job.mappings) - normalized["shelf"] = shelf_override if shelf_override else self.get_shelf(normalized) + normalized["shelf"] = ( + shelf_override if shelf_override else self.get_shelf(normalized) + ) ImportItem(job=job, index=index, data=data, normalized_data=normalized).save() def get_shelf(self, normalized_row: dict[str, Optional[str]]) -> Optional[str]: diff --git a/bookwyrm/tests/importers/test_importer.py b/bookwyrm/tests/importers/test_importer.py index 8099a16e82..d92d076a95 100644 --- a/bookwyrm/tests/importers/test_importer.py +++ b/bookwyrm/tests/importers/test_importer.py @@ -94,7 +94,9 @@ def test_create_job_shelf_override(self, *_): import_job = self.importer.create_job( self.local_user, self.csv, False, "public", shelf_override=to_read.name ) - import_items = models.ImportItem.objects.filter(job=import_job).all().order_by("id") + import_items = ( + models.ImportItem.objects.filter(job=import_job).all().order_by("id") + ) self.assertEqual(len(import_items), 4) for import_item in import_items: self.assertEqual(import_item.normalized_data["shelf"], to_read.name) diff --git a/bookwyrm/views/imports/import_data.py b/bookwyrm/views/imports/import_data.py index 001650efdd..591a409d5c 100644 --- a/bookwyrm/views/imports/import_data.py +++ b/bookwyrm/views/imports/import_data.py @@ -112,7 +112,7 @@ def post(self, request): include_reviews, privacy, create_shelves, - shelf_override + shelf_override, ) except (UnicodeDecodeError, ValueError, KeyError): return self.get(request, invalid=True) From 4db15e7076d328d0bd7f7c562cea47cf6c574df1 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 27 Jun 2026 16:00:39 +1000 Subject: [PATCH 863/962] fix garbled avatar string Per Django docs: "Python f-strings cannot be used directly with gettext functions because f-string expressions are evaluated before they reach gettext." --- bookwyrm/models/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 484e302d27..3912a0ccf8 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -229,7 +229,7 @@ def following_link(self): @property def alt_text(self): """alt text with username""" - return _(f"avatar for {self.localname or self.username}") + return _("avatar for {name}").format(name=(self.localname or self.username)) @property def display_name(self): From 9520a6afbb5e1064e23e37868db05bbf23252185 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 27 Jun 2026 16:03:50 +1000 Subject: [PATCH 864/962] fix tests formatting --- bookwyrm/tests/models/test_user_model.py | 14 +++++++------- bookwyrm/tests/views/test_user.py | 13 ++++++------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index c675b7c827..580fa02053 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -1,4 +1,5 @@ """testing models""" + import pathlib from unittest.mock import patch @@ -126,18 +127,17 @@ def test_activitypub_serialize_avatar(self): with open(avatar_path, "rb") as avatar_file: self.user.avatar.save("mouse-avatar.jpg", avatar_file) activity = self.user.to_activity() - self.assertEqual(activity["icon"], - { + self.assertEqual( + activity["icon"], + { "type": "Image", "url": f"{BASE_URL}{self.user.avatar.url}", "name": "avatar for mouse", "@context": [ "https://www.w3.org/ns/activitystreams", - { - "Hashtag": "as:Hashtag" - } - ] - } + {"Hashtag": "as:Hashtag"}, + ], + }, ) def test_activitypub_outbox(self): diff --git a/bookwyrm/tests/views/test_user.py b/bookwyrm/tests/views/test_user.py index 8afb22cef7..c3eb38fba3 100644 --- a/bookwyrm/tests/views/test_user.py +++ b/bookwyrm/tests/views/test_user.py @@ -118,18 +118,17 @@ def test_user_page_activitypub(self): is_api.return_value = True result = view(request, username="mouse") activity = json.loads(result.content) - self.assertEqual(activity["icon"], - { + self.assertEqual( + activity["icon"], + { "type": "Image", "url": f"{BASE_URL}{self.local_user.avatar.url}", "name": "avatar for mouse", "@context": [ "https://www.w3.org/ns/activitystreams", - { - "Hashtag": "as:Hashtag" - } - ] - } + {"Hashtag": "as:Hashtag"}, + ], + }, ) def test_user_page_domain(self): From 9a4da02bbb32091b2566db9edc5a6862f1bb53eb Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 20 Jun 2026 15:35:04 +0200 Subject: [PATCH 865/962] Allow variable and non-variable fonts --- bookwyrm/preview_images.py | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 58730fcfee..689637fb37 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -51,17 +51,28 @@ def get_imagefont(name, size): def get_font(weight, size=28): """Gets a custom font with the given weight and size""" - font = get_imagefont(DEFAULT_FONT, size) - try: - if weight == "light": - font.set_variation_by_name("Light") - if weight == "bold": - font.set_variation_by_name("Bold") - if weight == "regular": - font.set_variation_by_name("Regular") - except OSError: - pass + fonts = DEFAULT_FONT.split(",") + for file in fonts: + file = file.strip() + font = get_imagefont(file, size) + if weight in file.lower(): + break + + try: + variations = font.get_variation_names() + variations_lower = [ + v.decode("UTF-8").lower() for v in font.get_variation_names() + ] + idx = ( + variations_lower.index(weight.lower()) + if weight.lower() in variations_lower + else 0 + ) + font.set_variation_by_name(variations[idx]) + + except: + pass return font From c88e62734cdc5f98115edef4eacd51aafee8d544 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 20 Jun 2026 15:35:38 +0200 Subject: [PATCH 866/962] Use NotoSansMultilanguageFonts as default font for Preview Images --- bookwyrm/settings.py | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 3ad83783d9..d5bf454632 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -61,15 +61,31 @@ PREVIEW_IMG_WIDTH = env.int("PREVIEW_IMG_WIDTH", 1200) PREVIEW_IMG_HEIGHT = env.int("PREVIEW_IMG_HEIGHT", 630) PREVIEW_DEFAULT_COVER_COLOR = env.str("PREVIEW_DEFAULT_COVER_COLOR", "#002549") -PREVIEW_DEFAULT_FONT = env.str("PREVIEW_DEFAULT_FONT", "Source Han Sans") +PREVIEW_DEFAULT_FONT = env.str( + "PREVIEW_DEFAULT_FONT", + "NotoSansMultilanguage-Bold, NotoSansMultilanguage-Regular, NotoSansMultilanguage-Light", +) -FONTS = { - "Source Han Sans": { - "directory": "source_han_sans", - "filename": "SourceHanSans-VF.ttf.ttc", - "url": "https://github.com/adobe-fonts/source-han-sans/raw/release/Variable/OTC/SourceHanSans-VF.ttf.ttc", - } -} +FONTS = env.json( + "FONTS", + { + "NotoSansMultilanguage-Bold": { + "directory": "NotoMultilanguageFonts", + "filename": "NotoSansMultilanguage-Bold.ttf", + "url": "https://github.com/sefadogann/noto-multilanguage/raw/refs/heads/main/NotoMultilanguageFonts/NotoSansMultilanguage-Bold.ttf", + }, + "NotoSansMultilanguage-Regular": { + "directory": "NotoMultilanguageFonts", + "filename": "NotoSansMultilanguage-Regular.ttf", + "url": "https://github.com/sefadogann/noto-multilanguage/raw/refs/heads/main/NotoMultilanguageFonts/NotoSansMultilanguage-Regular.ttf", + }, + "NotoSansMultilanguage-Light": { + "directory": "NotoMultilanguageFonts", + "filename": "NotoSansMultilanguage-Light.ttf", + "url": "https://github.com/sefadogann/noto-multilanguage/raw/refs/heads/main/NotoMultilanguageFonts/NotoSansMultilanguage-Light.ttf", + }, + }, +) FONT_DIR = os.path.join(STATIC_ROOT, "fonts") # Quick-start development settings - unsuitable for production From 42e723647bdcc8f95e9030d63d6f88ab84c7105a Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 27 Jun 2026 22:24:24 +0200 Subject: [PATCH 867/962] Handle Arabic text reshaping --- bookwyrm/preview_images.py | 11 +++++++++++ pyproject.toml | 2 ++ 2 files changed, 13 insertions(+) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 689637fb37..e1f66fc54a 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -7,6 +7,8 @@ from uuid import uuid4 import logging +import arabic_reshaper +from bidi.algorithm import get_display import colorsys from colorthief import ColorThief from PIL import Image, ImageDraw, ImageFont, ImageOps, ImageColor @@ -80,6 +82,8 @@ def get_font(weight, size=28): def get_wrapped_text(text, font, content_width): """text wrap length depends on the max width of the content""" + text = process_arabic_script(text) + low = 0 high = len(text) @@ -108,6 +112,13 @@ def get_wrapped_text(text, font, content_width): return wrapped_text, height +def process_arabic_script(text): + """First we need to re-shape the text, then apply the bidirectional text algo""" + reshaped_text = arabic_reshaper.reshape(text) + bidi_text = get_display(reshaped_text) + return bidi_text + + def generate_texts_layer(texts, content_width): """Adds text for images""" font_text_zero = get_font("bold", size=20) diff --git a/pyproject.toml b/pyproject.toml index be750d80d1..dc71e19252 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,7 @@ [dependency-groups] main = [ "aiohttp==3.14.1", + "arabic-reshaper==3.0.1", "bleach==6.4.0", "boto3==1.34.74", "bw-file-resubmit==0.6.0rc2", @@ -33,6 +34,7 @@ main = [ "psycopg[binary]==3.2.9", "pycryptodome==3.20.0", "pyotp==2.9.0", + "python-bidi==0.6.10", "python-dateutil==2.9.0.post0", "qrcode==7.4.2", "redis==5.0.3", From e203a82ad3928fbb0b2f5dd354b6777027a398dd Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 27 Jun 2026 22:25:45 +0200 Subject: [PATCH 868/962] Enhance RTL text display --- bookwyrm/preview_images.py | 98 +++++++++++++++++++++++++++++++------- 1 file changed, 80 insertions(+), 18 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index e1f66fc54a..37e08cc80c 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -6,6 +6,8 @@ from io import BytesIO from uuid import uuid4 import logging +import unicodedata as ud +from collections import Counter import arabic_reshaper from bidi.algorithm import get_display @@ -119,6 +121,19 @@ def process_arabic_script(text): return bidi_text +def get_text_direction(text): + """Get the dominant strong direction + We we will not be using direction="rtl" | "ltr" property in multiline_text() + because the bidirectionality has already been treated with process_arabic_script + instead, we use this property to set the align property + """ + # from https://stackoverflow.com/a/75739782 + count = Counter([ud.bidirectional(c) for c in list(text)]) + rtl_count = count["R"] + count["AL"] + count["RLE"] + count["RLI"] + ltr_count = count["L"] + count["LRE"] + count["LRI"] + return "right" if rtl_count > ltr_count else "left" + + def generate_texts_layer(texts, content_width): """Adds text for images""" font_text_zero = get_font("bold", size=20) @@ -129,7 +144,15 @@ def generate_texts_layer(texts, content_width): text_layer = Image.new("RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR) text_layer_draw = ImageDraw.Draw(text_layer) + text_x = 0 + text_anchor = None text_y = 0 + main_title = texts["text_one"] if "text_one" in texts else "" + text_align = get_text_direction(main_title) + + if text_align == "right": + text_x = content_width + text_anchor = "ra" if "text_zero" in texts and texts["text_zero"]: # Text zero (Site preview domain name) @@ -138,7 +161,12 @@ def generate_texts_layer(texts, content_width): ) text_layer_draw.multiline_text( - (0, text_y), text_zero, font=font_text_zero, fill=TEXT_COLOR + (text_x, text_y), + text_zero, + font=font_text_zero, + fill=TEXT_COLOR, + align=text_align, + anchor=text_anchor, ) try: @@ -153,7 +181,12 @@ def generate_texts_layer(texts, content_width): ) text_layer_draw.multiline_text( - (0, text_y), text_one, font=font_text_one, fill=TEXT_COLOR + (text_x, text_y), + text_one, + font=font_text_one, + fill=TEXT_COLOR, + align=text_align, + anchor=text_anchor, ) try: @@ -168,7 +201,12 @@ def generate_texts_layer(texts, content_width): ) text_layer_draw.multiline_text( - (0, text_y), text_two, font=font_text_two, fill=TEXT_COLOR + (text_x, text_y), + text_two, + font=font_text_two, + fill=TEXT_COLOR, + align=text_align, + anchor=text_anchor, ) try: @@ -183,11 +221,16 @@ def generate_texts_layer(texts, content_width): ) text_layer_draw.multiline_text( - (0, text_y), text_three, font=font_text_three, fill=TEXT_COLOR + (text_x, text_y), + text_three, + font=font_text_three, + fill=TEXT_COLOR, + align=text_align, + anchor=text_anchor, ) text_layer_box = text_layer.getbbox() - return text_layer.crop(text_layer_box) + return text_layer.crop(text_layer_box), text_align def generate_instance_layer(content_width): @@ -230,10 +273,12 @@ def generate_instance_layer(content_width): ) instance_layer.alpha_composite(line_layer, (0, 60)) + instance_layer = instance_layer.crop((0, 0, line_width, instance_layer.height)) + return instance_layer -def generate_rating_layer(rating, content_width): +def generate_rating_layer(rating): """Places components for rating preview""" path_star_full = os.path.join(settings.STATIC_ROOT, "images/icons/star-full.png") path_star_empty = os.path.join(settings.STATIC_ROOT, "images/icons/star-empty.png") @@ -242,12 +287,14 @@ def generate_rating_layer(rating, content_width): icon_size = 64 icon_margin = 10 + layer_width = (5 * icon_size) + (4 * icon_margin) + rating_layer_base = Image.new( - "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + "RGBA", (layer_width, icon_size), color=TRANSPARENT_COLOR ) - rating_layer_color = Image.new("RGBA", (content_width, icon_size), color=TEXT_COLOR) + rating_layer_color = Image.new("RGBA", (layer_width, icon_size), color=TEXT_COLOR) rating_layer_mask = Image.new( - "RGBA", (content_width, icon_size), color=TRANSPARENT_COLOR + "RGBA", (layer_width, icon_size), color=TRANSPARENT_COLOR ) position_x = 0 @@ -349,10 +396,16 @@ def generate_preview_image( img = Image.new("RGBA", (IMG_WIDTH, IMG_HEIGHT), color=image_bg_color) # Contents - inner_img_x = margin + inner_img_width - inner_img_layer.width inner_img_y = math.floor((IMG_HEIGHT - inner_img_layer.height) / 2) - content_x = margin + inner_img_width + gutter - content_width = IMG_WIDTH - content_x - margin + content_width = IMG_WIDTH - margin - gutter - inner_img_width - margin + + texts_layer, text_align = generate_texts_layer(texts, content_width) + if text_align == "left": + inner_img_x = margin + inner_img_width - inner_img_layer.width + content_x = margin + inner_img_width + gutter + elif text_align == "right": + inner_img_x = IMG_WIDTH - margin - inner_img_width + content_x = margin contents_layer = Image.new( "RGBA", (content_width, IMG_HEIGHT), color=TRANSPARENT_COLOR @@ -361,20 +414,29 @@ def generate_preview_image( if show_instance_layer: instance_layer = generate_instance_layer(content_width) - contents_layer.alpha_composite(instance_layer, (0, contents_composite_y)) + instance_layer_x = ( + 0 if text_align == "left" else content_width - instance_layer.width + ) + contents_layer.alpha_composite( + instance_layer, (instance_layer_x, contents_composite_y) + ) contents_composite_y = contents_composite_y + instance_layer.height + gutter - texts_layer = generate_texts_layer(texts, content_width) - contents_layer.alpha_composite(texts_layer, (0, contents_composite_y)) + texts_layer_x = 0 if text_align == "left" else content_width - texts_layer.width + contents_layer.alpha_composite(texts_layer, (texts_layer_x, contents_composite_y)) contents_composite_y = contents_composite_y + texts_layer.height + gutter if rating: # Add some more margin contents_composite_y = contents_composite_y + gutter - rating_layer = generate_rating_layer(rating, content_width) - + rating_layer = generate_rating_layer(rating) if rating_layer: - contents_layer.alpha_composite(rating_layer, (0, contents_composite_y)) + rating_layer_x = ( + 0 if text_align == "left" else content_width - rating_layer.width + ) + contents_layer.alpha_composite( + rating_layer, (rating_layer_x, contents_composite_y) + ) contents_composite_y = contents_composite_y + rating_layer.height + gutter contents_layer_box = contents_layer.getbbox() From ffb9473221eac28016c69e595c50e2a8b43a471f Mon Sep 17 00:00:00 2001 From: Joachim Date: Sun, 28 Jun 2026 00:19:22 +0200 Subject: [PATCH 869/962] Improve handling of RTL site name and rating layers --- bookwyrm/preview_images.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 37e08cc80c..e94afdbcdf 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -238,6 +238,9 @@ def generate_instance_layer(content_width): font_instance = get_font("light", size=28) site = models.SiteSettings.get() + site_name = process_arabic_script(site.name) + site_name_width = round(font_instance.getlength(site_name)) + site_name_direction = get_text_direction(site_name) if site.logo_small: with Image.open(site.logo_small) as logo_img: @@ -250,31 +253,26 @@ def generate_instance_layer(content_width): except FileNotFoundError: logo_img = None - instance_layer = Image.new("RGBA", (content_width, 62), color=TRANSPARENT_COLOR) - - instance_text_x = 0 + logo_gutter_width = 60 if logo_img else 0 + layer_width = logo_gutter_width + site_name_width + instance_layer = Image.new("RGBA", (layer_width, 62), color=TRANSPARENT_COLOR) if logo_img: logo_img.thumbnail((50, 50), Image.Resampling.LANCZOS) - - instance_layer.paste(logo_img, (0, 0)) - - instance_text_x = instance_text_x + 60 + logo_img_x = 0 if site_name_direction == "left" else layer_width - 50 + instance_layer.paste(logo_img, (logo_img_x, 0)) instance_layer_draw = ImageDraw.Draw(instance_layer) + text_x = logo_gutter_width if site_name_direction == "left" else 0 instance_layer_draw.text( - (instance_text_x, 10), site.name, font=font_instance, fill=TEXT_COLOR + (text_x, 10), site_name, font=font_instance, fill=TEXT_COLOR ) - line_width = 50 + 10 + round(font_instance.getlength(site.name)) - line_layer = Image.new( - "RGBA", (line_width, 2), color=(*(ImageColor.getrgb(TEXT_COLOR)), 50) + "RGBA", (layer_width, 2), color=(*(ImageColor.getrgb(TEXT_COLOR)), 50) ) instance_layer.alpha_composite(line_layer, (0, 60)) - instance_layer = instance_layer.crop((0, 0, line_width, instance_layer.height)) - return instance_layer @@ -434,6 +432,8 @@ def generate_preview_image( rating_layer_x = ( 0 if text_align == "left" else content_width - rating_layer.width ) + if text_align == "right": + rating_layer = ImageOps.mirror(rating_layer) contents_layer.alpha_composite( rating_layer, (rating_layer_x, contents_composite_y) ) From 5b0e2b01d882d76d05b0f9813c295ad07be6fcd0 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Sun, 28 Jun 2026 23:58:10 +0700 Subject: [PATCH 870/962] Prevent followed users from appearing in follow suggestions --- bookwyrm/suggested_users.py | 4 ++ bookwyrm/tests/test_suggested_users.py | 60 +++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/bookwyrm/suggested_users.py b/bookwyrm/suggested_users.py index a235432d8b..d643ec9570 100644 --- a/bookwyrm/suggested_users.py +++ b/bookwyrm/suggested_users.py @@ -100,6 +100,9 @@ def get_suggestions(self, user, local=False): When(pk=int(pk), then=self.get_counts_from_rank(score)["mutuals"]) for (pk, score) in values ] + invalid_suggestion = ( + Q(id=user.id) | Q(followers=user) | Q(follower_requests=user) + ) # annotate users with mutuals and shared book counts users = ( models.User.objects.filter( @@ -109,6 +112,7 @@ def get_suggestions(self, user, local=False): mutuals=Case(*annotations, output_field=IntegerField(), default=0) ) .exclude(localname=INSTANCE_ACTOR_USERNAME) + .exclude(invalid_suggestion) ) if local: users = users.filter(local=True) diff --git a/bookwyrm/tests/test_suggested_users.py b/bookwyrm/tests/test_suggested_users.py index 3cb391be27..9c4609ee91 100644 --- a/bookwyrm/tests/test_suggested_users.py +++ b/bookwyrm/tests/test_suggested_users.py @@ -143,12 +143,68 @@ def test_rerank_user_suggestions(self, *_): def test_get_suggestions(self, *_): """load from store""" + suggestion_candidate = models.User.objects.create_user( + "rat", "rat@local.rat", "password", local=True, localname="rat" + ) with patch("bookwyrm.suggested_users.SuggestedUsers.get_store") as mock: - mock.return_value = [(self.local_user.id, 7.9)] + mock.return_value = [(suggestion_candidate.id, 7.9)] results = suggested_users.get_suggestions(self.local_user) - self.assertEqual(results[0], self.local_user) + self.assertEqual(results[0], suggestion_candidate) self.assertEqual(results[0].mutuals, 7) + def test_get_suggestions_excludes_self(self, *_): + suggestion_candidate = models.User.objects.create_user( + "rat", "rat@local.rat", "password", local=True, localname="rat" + ) + with patch("bookwyrm.suggested_users.SuggestedUsers.get_store") as mock: + mock.return_value = [ + (self.local_user.id, 1.0), + (suggestion_candidate.id, 1.0), + ] + results = suggested_users.get_suggestions(self.local_user) + self.assertEqual(list(results), [suggestion_candidate]) + + def test_get_suggestions_excludes_followed_users(self, *_): + followed_user = models.User.objects.create_user( + "rat", "rat@local.rat", "password", local=True, localname="rat" + ) + suggestion_candidate = models.User.objects.create_user( + "fish", "fish@fish.fish", "password", local=True, localname="fish" + ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): + self.local_user.following.add(followed_user) + with patch("bookwyrm.suggested_users.SuggestedUsers.get_store") as mock: + mock.return_value = [ + (followed_user.id, 1.0), + (suggestion_candidate.id, 1.0), + ] + results = suggested_users.get_suggestions(self.local_user) + self.assertEqual(list(results), [suggestion_candidate]) + + def test_get_suggestions_excludes_follow_requests(self, *_): + requested_user = models.User.objects.create_user( + "nutria", + "nutria@nutria.nutria", + "password", + local=True, + localname="nutria", + manually_approves_followers=True, + ) + suggestion_candidate = models.User.objects.create_user( + "fish", "fish@fish.fish", "password", local=True, localname="fish" + ) + with patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async"): + models.UserFollowRequest.objects.create( + user_subject=self.local_user, user_object=requested_user + ) + with patch("bookwyrm.suggested_users.SuggestedUsers.get_store") as mock: + mock.return_value = [ + (requested_user.id, 1.0), + (suggestion_candidate.id, 1.0), + ] + results = suggested_users.get_suggestions(self.local_user) + self.assertEqual(list(results), [suggestion_candidate]) + def test_get_annotated_users(self, *_): """list of people you might know""" user_1 = models.User.objects.create_user( From c08e9ceebdd23ceab38560e640f0f60e0b15a183 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Wed, 1 Jul 2026 20:39:15 +0700 Subject: [PATCH 871/962] Render status header via include tag instead of a nested render. --- bookwyrm/templates/snippets/status/header_content.html | 3 ++- bookwyrm/templatetags/status_display.py | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bookwyrm/templates/snippets/status/header_content.html b/bookwyrm/templates/snippets/status/header_content.html index f3b52f1833..eac9d71b77 100644 --- a/bookwyrm/templates/snippets/status/header_content.html +++ b/bookwyrm/templates/snippets/status/header_content.html @@ -1,4 +1,5 @@ {% spaceless %} {% load status_display %} -{% get_header_template status %} +{% get_header_template status as header_template %} +{% include header_template %} {% endspaceless %} diff --git a/bookwyrm/templatetags/status_display.py b/bookwyrm/templatetags/status_display.py index e378fa5523..64d7809ae9 100644 --- a/bookwyrm/templatetags/status_display.py +++ b/bookwyrm/templatetags/status_display.py @@ -67,8 +67,8 @@ def get_published_date(date): return naturaltime(date) -@register.simple_tag(takes_context=True) -def get_header_template(context, status): +@register.simple_tag() +def get_header_template(status): """get the path for the status template""" if isinstance(status, models.Boost): status = status.boosted_status @@ -79,8 +79,7 @@ def get_header_template(context, status): except AttributeError: header_type = status.status_type.lower() filename = f"snippets/status/headers/{header_type}.html" - header_template = select_template([filename, "snippets/status/headers/note.html"]) - return header_template.render({"status": status}, context.get("request")) + return select_template([filename, "snippets/status/headers/note.html"]) @register.simple_tag(takes_context=False) From 193f87a11d798afabafca4d8075cba5699d1dc06 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Wed, 1 Jul 2026 21:11:46 +0700 Subject: [PATCH 872/962] Fix test. --- bookwyrm/tests/templatetags/test_status_display.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/templatetags/test_status_display.py b/bookwyrm/tests/templatetags/test_status_display.py index 6accca2e1f..511a0e8552 100644 --- a/bookwyrm/tests/templatetags/test_status_display.py +++ b/bookwyrm/tests/templatetags/test_status_display.py @@ -3,6 +3,7 @@ import datetime from unittest.mock import patch +from django.template.loader import render_to_string from django.test import TestCase from django.test.client import RequestFactory from django.utils import timezone @@ -135,9 +136,13 @@ def test_get_header_template_rating_forwards_request(self, *_): request.user = self.user self.user.show_ratings = True - shown = status_display.get_header_template({"request": request}, rating) + shown = render_to_string( + "snippets/status/header_content.html", {"status": rating}, request=request + ) self.assertNotIn("Show rating", shown) self.user.show_ratings = False - hidden = status_display.get_header_template({"request": request}, rating) + hidden = render_to_string( + "snippets/status/header_content.html", {"status": rating}, request=request + ) self.assertIn("Show rating", hidden) From 1a1470e3b9bfa36fb92749233af4e18a3279d0c1 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 1 Jul 2026 11:08:19 -0700 Subject: [PATCH 873/962] Exclude self from discover view And updates docstring --- bookwyrm/activitystreams.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index ce44fa2883..1f2cf861b7 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -314,22 +314,22 @@ def add_book_statuses(self, user, book): class LocalStream(ActivityStream): - """users you follow""" + """Posts from local users""" key = "local" - def get_audience(self, status): + def get_audience(self, status, exclude_self=True): # this stream wants no part in non-public statuses if status.privacy != "public" or not status.user.local: return [] - return super().get_audience(status) + return super().get_audience(status, exclude_self=exclude_self) def get_statuses_for_user(self, user): # all public statuses by a local user return models.Status.privacy_filter( user, privacy_levels=["public"], - ).filter(user__local=True) + ).filter(user__local=True).exclude(user=user.id) class BooksStream(ActivityStream): From 8143ffced8afc961714ab0fe68f079750e37583b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 2 Jul 2026 15:16:37 -0700 Subject: [PATCH 874/962] Fixes add to list form on book page --- bookwyrm/templates/book/book.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index d18be41f23..8f13097b4b 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -442,7 +442,7 @@

        {% trans "Lists" %}

        {% if list_options.exists %} {% csrf_token %} - +
        From b3d2c3f75afaa1a66f4466213fdc0eee271168b4 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 4 Jul 2026 10:39:23 -0700 Subject: [PATCH 875/962] Formatting --- bookwyrm/activitystreams.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 1f2cf861b7..2e6e9933d5 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -326,10 +326,14 @@ def get_audience(self, status, exclude_self=True): def get_statuses_for_user(self, user): # all public statuses by a local user - return models.Status.privacy_filter( - user, - privacy_levels=["public"], - ).filter(user__local=True).exclude(user=user.id) + return ( + models.Status.privacy_filter( + user, + privacy_levels=["public"], + ) + .filter(user__local=True) + .exclude(user=user.id) + ) class BooksStream(ActivityStream): From b4d0d6f3b03d8eb81b79b1135042bb1667a67d2e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 4 Jul 2026 10:43:40 -0700 Subject: [PATCH 876/962] Updates test to reflect new rules in local stream --- bookwyrm/tests/activitystreams/test_localstream.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/tests/activitystreams/test_localstream.py b/bookwyrm/tests/activitystreams/test_localstream.py index aa45b409db..6adff8455b 100644 --- a/bookwyrm/tests/activitystreams/test_localstream.py +++ b/bookwyrm/tests/activitystreams/test_localstream.py @@ -46,7 +46,7 @@ def test_localstream_get_audience_local_status(self): user=self.local_user, content="hi", privacy="public" ) users = activitystreams.LocalStream().get_audience(status) - self.assertTrue(self.local_user.id in users) + self.assertFalse(self.local_user.id in users) self.assertTrue(self.another_user.id in users) def test_localstream_get_audience_unlisted(self): From 69ce34f75b9eb6a80edb1d11360be6298911add4 Mon Sep 17 00:00:00 2001 From: diaxoaine <42137630+diaxoaine@users.noreply.github.com> Date: Mon, 6 Jul 2026 21:35:45 +0700 Subject: [PATCH 877/962] Prefetch feed book authors to fix N+1 queries --- bookwyrm/views/feed.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index da1c3048e5..c14eea02f6 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -3,7 +3,7 @@ from datetime import date from django.contrib.auth.decorators import login_required from django.core.paginator import Paginator -from django.db.models import Q +from django.db.models import Prefetch, Q, prefetch_related_objects from django.http import HttpResponseNotFound, Http404 from django.shortcuts import get_object_or_404 from django.template.response import TemplateResponse @@ -67,11 +67,18 @@ def get(self, request, tab, filters_applied=False): else [] ) + page = paginated.get_page(request.GET.get("page")) + # prefetch on the objects, not the queryset, so the cache lands directly on status.book. + prefetch_related_objects( + [status.book for status in page if getattr(status, "book", None)], + Prefetch("authors", queryset=models.Author.objects.order_by("id")), + ) + data = { **feed_page_data(request.user), **{ "user": request.user, - "activities": paginated.get_page(request.GET.get("page")), + "activities": page, "suggested_users": suggestions, "tab": tab, "streams": STREAMS, From 09d51dce84a132a123c47a32a5014c7465a09db0 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 6 Jul 2026 08:05:58 -0700 Subject: [PATCH 878/962] Updates reference locale file --- locale/en_US/LC_MESSAGES/django.po | 133 ++++++++++++++++------------- 1 file changed, 75 insertions(+), 58 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index aae963c59e..933ae6df9f 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: 2026-06-26 17:10+0000\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -357,7 +357,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -370,7 +370,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -518,19 +518,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -539,91 +544,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1790,7 +1795,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3218,134 +3223,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" From 8b75d6b9442dca95db238aa735a28e873903158f Mon Sep 17 00:00:00 2001 From: phanky1 Date: Wed, 8 Jul 2026 20:44:12 +0700 Subject: [PATCH 879/962] Check reset token expiry before changing password --- bookwyrm/views/landing/password.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bookwyrm/views/landing/password.py b/bookwyrm/views/landing/password.py index 94694e695d..4a5e7ed68b 100644 --- a/bookwyrm/views/landing/password.py +++ b/bookwyrm/views/landing/password.py @@ -64,9 +64,8 @@ def get(self, request, code): def post(self, request, code): """allow a user to change their password through an emailed token""" - try: - reset_code = models.PasswordReset.objects.get(code=code) - except models.PasswordReset.DoesNotExist: + reset_code = models.PasswordReset.objects.filter(code=code).first() + if not reset_code or not reset_code.valid(): data = {"errors": ["Invalid password reset link"]} return TemplateResponse(request, "landing/password_reset.html", data) From 023605974b87a0b5e29d31c71f426f6787f85e53 Mon Sep 17 00:00:00 2001 From: phanky1 Date: Wed, 8 Jul 2026 20:51:21 +0700 Subject: [PATCH 880/962] Add test for the change --- bookwyrm/tests/views/landing/test_password.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/bookwyrm/tests/views/landing/test_password.py b/bookwyrm/tests/views/landing/test_password.py index 6e8f194656..cfb7b72328 100644 --- a/bookwyrm/tests/views/landing/test_password.py +++ b/bookwyrm/tests/views/landing/test_password.py @@ -119,6 +119,21 @@ def test_password_reset_post(self): self.assertEqual(resp.status_code, 302) self.assertFalse(models.PasswordReset.objects.exists()) + def test_password_reset_post_expired_code(self): + view = views.PasswordReset.as_view() + code = models.PasswordReset.objects.create( + user=self.local_user, expiry=timezone.now() - timedelta(days=2) + ) + request = self.factory.post( + "", {"password": "longwordsecure", "confirm_password": "longwordsecure"} + ) + with patch("bookwyrm.views.landing.password.login"): + resp = view(request, code.code) + self.assertEqual(resp.status_code, 200) + self.local_user.refresh_from_db() + self.assertFalse(self.local_user.check_password("longwordsecure")) + self.assertTrue(models.PasswordReset.objects.exists()) + def test_password_reset_wrong_code(self): """reset from code""" view = views.PasswordReset.as_view() From 250f8c2796fbeeff2708ceb6a0d94f2bae1fc2f8 Mon Sep 17 00:00:00 2001 From: phanky1 Date: Wed, 8 Jul 2026 20:58:11 +0700 Subject: [PATCH 881/962] Strengthen the test --- bookwyrm/tests/views/landing/test_password.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bookwyrm/tests/views/landing/test_password.py b/bookwyrm/tests/views/landing/test_password.py index cfb7b72328..aea1d6e17e 100644 --- a/bookwyrm/tests/views/landing/test_password.py +++ b/bookwyrm/tests/views/landing/test_password.py @@ -129,7 +129,10 @@ def test_password_reset_post_expired_code(self): ) with patch("bookwyrm.views.landing.password.login"): resp = view(request, code.code) + self.assertEqual(resp.status_code, 200) + self.assertIn("Invalid password reset link", resp.context_data["errors"]) + self.local_user.refresh_from_db() self.assertFalse(self.local_user.check_password("longwordsecure")) self.assertTrue(models.PasswordReset.objects.exists()) From bed09484c3f43a872b01e2ae903846432866c499 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Jul 2026 10:42:31 -0700 Subject: [PATCH 882/962] Creates modified details panel --- .../css/bookwyrm/components/_details.scss | 11 ++ bookwyrm/templates/book/book.html | 44 +++++- .../templates/book/sections/metadata.html | 144 ++++++++---------- bookwyrm/templates/book/sections/reading.html | 45 +----- bookwyrm/templates/components/details.html | 18 +++ .../readthrough/readthrough_list.html | 4 +- 6 files changed, 146 insertions(+), 120 deletions(-) create mode 100644 bookwyrm/templates/components/details.html diff --git a/bookwyrm/static/css/bookwyrm/components/_details.scss b/bookwyrm/static/css/bookwyrm/components/_details.scss index 53dbbf63a1..000161c7b0 100644 --- a/bookwyrm/static/css/bookwyrm/components/_details.scss +++ b/bookwyrm/static/css/bookwyrm/components/_details.scss @@ -130,3 +130,14 @@ details[open] summary .details-close { #navbar-dropdown .navbar-item:hover { background-color: $background-secondary; } + +/** Special tyoe of details panel that shows some content + ******************************************************************************/ +.preview-details { + @extend .notification; + padding: 0.75rem; +} +.preview-details .details-close { + top: 0.75rem; + right: 0.75rem; +} diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index b6804d4ff6..e7039e8b6f 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -1,8 +1,10 @@ {% extends 'layout.html' %} {% load i18n %} +{% load shelf_tags %} {% load utilities %} {% load book_display_tags %} {% load static %} +{% load humanize %} {% block title %}{{ book|book_title }}{% endblock %} @@ -49,13 +51,51 @@ {% include "book/sections/description.html" %}
        - {% include "book/sections/metadata.html" %} + {% with work=book.parent_work editions_count=book.parent_work.editions.count %} + + {% endwith %} + {% include "book/sections/metadata.html" with content_count=2 %}
        {% include "book/sections/subjects.html" %}
        - {% include "book/sections/reading.html" %} + {% if user_authenticated %} + {% if readthroughs.exists %} + {% include "book/sections/reading.html" with content_count=readthroughs.count %} + {% endif %} + +
        + +
        + {% include "readthrough/readthrough_modal.html" with id="add-readthrough" %} + {% endif %} + + {% if other_edition_shelves %} +
        + {% for shelf in other_edition_shelves %} +

        + {% blocktrans trimmed with book_path=shelf.book.local_path shelf_path=shelf.shelf.local_path shelf_name=shelf.shelf|translate_shelf_name %} + A different edition of this book is on your {{ shelf_name }} shelf. + {% endblocktrans %} + {% include 'snippets/switch_edition_button.html' with edition=book %} +

        + {% endfor %} +
        + {% endif %}
        diff --git a/bookwyrm/templates/book/sections/metadata.html b/bookwyrm/templates/book/sections/metadata.html index 9d6dbf54d6..482894c4bf 100644 --- a/bookwyrm/templates/book/sections/metadata.html +++ b/bookwyrm/templates/book/sections/metadata.html @@ -1,94 +1,80 @@ +{% extends "components/details.html" %} + {% load i18n %} -{% load humanize %} -
        - {% with work=book.parent_work editions_count=book.parent_work.editions.count %} + +{% block always-visible %} - {% endwith %} +{% endblock %} -
        - - {% trans "Edition details" %} - - -
        - {% include 'book/publisher_info.html' %} -
        +{% block sometimes-visible %} -
        - {% include 'book/book_identifiers.html' %} -
        +
        + {% include 'book/book_identifiers.html' %} +
        - {% trans "Load data" as button_text %} - {% if book.openlibrary_key %} -

        - - {% trans "View on OpenLibrary" %} - - {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} - - {% endif %} -

        - {% include "book/sync_modal.html" with source="openlibrary.org" source_name="OpenLibrary" id="openlibrary_sync" %} + {% trans "Load data" as button_text %} + {% if book.openlibrary_key %} +

        + + {% trans "View on OpenLibrary" %} + + {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} + {% endif %} +

        + {% include "book/sync_modal.html" with source="openlibrary.org" source_name="OpenLibrary" id="openlibrary_sync" %} + {% endif %} - {% if book.inventaire_id %} -

        - - {% trans "View on Inventaire" %} - - - {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} - - {% endif %} -

        - {% include "book/sync_modal.html" with source="inventaire.io" source_name="Inventaire" id="inventaire_sync" %} - {% endif %} + {% if book.inventaire_id %} +

        + + {% trans "View on Inventaire" %} + - {% if book.isfdb %} -

        - - {% trans "View on ISFDB" %} - -

        + {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} + {% endif %} +

        + {% include "book/sync_modal.html" with source="inventaire.io" source_name="Inventaire" id="inventaire_sync" %} + {% endif %} - {% if book.finna_key %} -

        - - {% trans "View on Finna" %} - + {% if book.isfdb %} +

        + + {% trans "View on ISFDB" %} + +

        + {% endif %} - {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} - - {% endif %} -

        - {% include "book/sync_modal.html" with source="api.finna.fi" source_name="Finna" id="finna_sync" %} - {% endif %} + {% if book.finna_key %} +

        + + {% trans "View on Finna" %} + - {% if book.libris_key %} -

        - - {% trans "View on Libris" %} - -

        + {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} + {% endif %} +

        + {% include "book/sync_modal.html" with source="api.finna.fi" source_name="Finna" id="finna_sync" %} + {% endif %} -
        -
        + {% if book.libris_key %} +

        + + {% trans "View on Libris" %} + +

        + {% endif %} +{% endblock %} diff --git a/bookwyrm/templates/book/sections/reading.html b/bookwyrm/templates/book/sections/reading.html index c83a953d0f..7ce923e370 100644 --- a/bookwyrm/templates/book/sections/reading.html +++ b/bookwyrm/templates/book/sections/reading.html @@ -1,42 +1,13 @@ -{% load i18n %} -{% load shelf_tags %} +{% extends "components/details.html" %} -{% if user_authenticated %} -
        - {% if readthroughs.exists %} -
        - - {% trans "Your reading" %} - - +{% block always-visible %} + {% include 'readthrough/readthrough_list.html' with readthrough=readthroughs.first %} +{% endblock %} - {% for readthrough in readthroughs %} +{% block sometimes-visible %} + {% for readthrough in readthroughs %} + {% if not forloop.first %} {% include 'readthrough/readthrough_list.html' with readthrough=readthrough %} - {% endfor %} -
        {% endif %} - -
        - -
        - {% include "readthrough/readthrough_modal.html" with id="add-readthrough" %} -
        -{% endif %} - -{% if other_edition_shelves %} -
        - {% for shelf in other_edition_shelves %} -

        - {% blocktrans trimmed with book_path=shelf.book.local_path shelf_path=shelf.shelf.local_path shelf_name=shelf.shelf|translate_shelf_name %} - A different edition of this book is on your {{ shelf_name }} shelf. - {% endblocktrans %} - {% include 'snippets/switch_edition_button.html' with edition=book %} -

        {% endfor %} -
        -{% endif %} +{% endblock %} diff --git a/bookwyrm/templates/components/details.html b/bookwyrm/templates/components/details.html new file mode 100644 index 0000000000..5d9e1a6871 --- /dev/null +++ b/bookwyrm/templates/components/details.html @@ -0,0 +1,18 @@ +{% load i18n %} +
        +
        + {% block always-visible %}{% endblock %} +
        + {% if content_count > 1 %} +
        + + + {% trans "Show more" %} + + +
        + {% block sometimes-visible %}{% endblock %} +
        +
        + {% endif %} +
        diff --git a/bookwyrm/templates/readthrough/readthrough_list.html b/bookwyrm/templates/readthrough/readthrough_list.html index 447b02023d..385422edf6 100644 --- a/bookwyrm/templates/readthrough/readthrough_list.html +++ b/bookwyrm/templates/readthrough/readthrough_list.html @@ -2,8 +2,8 @@ {% load humanize %} {% load tz %} {% load utilities %} -
        -
          +
          +
            {% if readthrough.start_date %}
          • {% trans "Started:" %} {{ readthrough.start_date | localtime | naturalday }} From c80f62b63593b99aceba5e38cef41536781e60ce Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Jul 2026 10:54:53 -0700 Subject: [PATCH 883/962] Formatter cleanup --- bookwyrm/static/css/bookwyrm/components/_details.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/static/css/bookwyrm/components/_details.scss b/bookwyrm/static/css/bookwyrm/components/_details.scss index 000161c7b0..73bae4311d 100644 --- a/bookwyrm/static/css/bookwyrm/components/_details.scss +++ b/bookwyrm/static/css/bookwyrm/components/_details.scss @@ -134,9 +134,12 @@ details[open] summary .details-close { /** Special tyoe of details panel that shows some content ******************************************************************************/ .preview-details { - @extend .notification; + background-color: $notification-background-color; + border-radius: $notification-radius; + position: relative; padding: 0.75rem; } + .preview-details .details-close { top: 0.75rem; right: 0.75rem; From 2d96059b140645afe13951b98bd3469a3430bb26 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Jul 2026 11:16:24 -0700 Subject: [PATCH 884/962] Don't ignore boosts from external services (#4016) * Passes model through during boost lookup * Fixes user agent used when looking up boosts --------- Co-authored-by: qbi --- bookwyrm/activitypub/base_activity.py | 3 +- bookwyrm/models/status.py | 1 + bookwyrm/tests/models/test_status_model.py | 55 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py index 77018ec52b..8198662f0b 100644 --- a/bookwyrm/activitypub/base_activity.py +++ b/bookwyrm/activitypub/base_activity.py @@ -16,7 +16,7 @@ from bookwyrm.connectors import ConnectorException, get_data from bookwyrm.models import base_model from bookwyrm.signatures import make_signature -from bookwyrm.settings import DOMAIN, INSTANCE_ACTOR_USERNAME +from bookwyrm.settings import DOMAIN, INSTANCE_ACTOR_USERNAME, USER_AGENT from bookwyrm.tasks import app, MISC logger = logging.getLogger(__name__) @@ -432,6 +432,7 @@ def get_activitypub_data(url): "Accept": 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"', "Date": now, "Signature": make_signature("get", sender, url, now), + "User-Agent": USER_AGENT, }, timeout=15, ) diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 6c3fd23b1e..2de5b75e09 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -133,6 +133,7 @@ def ignore_activity(cls, activity, allow_external_connections=True): activity.object, get_activity=True, allow_external_connections=allow_external_connections, + model=apps.get_model("bookwyrm.Status", require_ready=True), ) if not boosted: # if we can't load the status, definitely ignore it diff --git a/bookwyrm/tests/models/test_status_model.py b/bookwyrm/tests/models/test_status_model.py index 6dfe3b6aec..0ae844906e 100644 --- a/bookwyrm/tests/models/test_status_model.py +++ b/bookwyrm/tests/models/test_status_model.py @@ -556,6 +556,61 @@ def test_recipients_with_reply_parent_and_mentions(self, *_): self.assertEqual(status.recipients, [self.remote_user]) + def test_ignore_activity_boost_include(self, *_): + """do bother with some boost statuses""" + activity = activitypub.Announce( + id="http://www.faraway.com/boost/12", + actor=self.remote_user.remote_id, + object="http://fish.com/nothing", + published="2021-03-24T18:59:41.841208+00:00", + cc="", + to="", + ) + status = models.Quotation.objects.create( + quote="

            my quote

            ", + content="", + user=self.local_user, + book=self.book, + ) + status.remote_id = "http://fish.com/nothing" + status.save(broadcast=False) + + self.assertFalse(models.Status.ignore_activity(activity)) + + @responses.activate + def test_ignore_activity_boost_include_review(self, *_): + """don't ignore remote reviews""" + activity = activitypub.Announce( + id="http://www.faraway.com/boost/12", + actor=self.remote_user.remote_id, + object="http://fish.com/nothing", + published="2021-03-24T18:59:41.841208+00:00", + cc="", + to="", + ) + status = { + "id": "https://fish.com/user/mouse/review/11934130", + "type": "Review", + "published": "2026-07-06T16:05:15.746622+00:00", + "attributedTo": "https://fish.com/user/mouse", + "content": "

            content

            ", + "to": ["https://www.w3.org/ns/activitystreams#Public"], + "cc": ["https://fish.com/user/mouse/followers"], + "replies": {}, + "tag": [], + "attachment": [], + "sensitive": False, + "inReplyToBook": "https://fish.com/book/2265331", + "name": "Leckie's Study of Provincial Life", + "@context": [ + "https://www.w3.org/ns/activitystreams", + {"Hashtag": "as:Hashtag"}, + ], + } + responses.add(responses.GET, "http://fish.com/nothing", json=status, status=200) + + self.assertFalse(models.Status.ignore_activity(activity)) + @responses.activate def test_ignore_activity_boost(self, *_): """don't bother with most remote statuses""" From 5586b49020ad46b764fa99bc30e2e2970a11d817 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 8 Jul 2026 11:18:31 -0700 Subject: [PATCH 885/962] New Crowdin updates (#3992) New translations --- locale/af_ZA/LC_MESSAGES/django.po | 157 ++++++++------ locale/ar_SA/LC_MESSAGES/django.po | 157 ++++++++------ locale/ba_RU/LC_MESSAGES/django.po | 157 ++++++++------ locale/bg_BG/LC_MESSAGES/django.po | 157 ++++++++------ locale/bn_BD/LC_MESSAGES/django.po | 157 ++++++++------ locale/bn_IN/LC_MESSAGES/django.po | 157 ++++++++------ locale/ca_ES/LC_MESSAGES/django.po | 157 ++++++++------ locale/cdo/LC_MESSAGES/django.po | 157 ++++++++------ locale/cs_CZ/LC_MESSAGES/django.po | 157 ++++++++------ locale/cy_GB/LC_MESSAGES/django.po | 157 ++++++++------ locale/da_DK/LC_MESSAGES/django.po | 157 ++++++++------ locale/de_DE/LC_MESSAGES/django.po | 157 ++++++++------ locale/el_GR/LC_MESSAGES/django.po | 157 ++++++++------ locale/en_Oulipo/LC_MESSAGES/django.po | 157 ++++++++------ locale/eo_UY/LC_MESSAGES/django.po | 157 ++++++++------ locale/es_ES/LC_MESSAGES/django.po | 157 ++++++++------ locale/eu_ES/LC_MESSAGES/django.po | 157 ++++++++------ locale/fa_IR/LC_MESSAGES/django.po | 157 ++++++++------ locale/fi_FI/LC_MESSAGES/django.po | 157 ++++++++------ locale/fo_FO/LC_MESSAGES/django.po | 157 ++++++++------ locale/fr_FR/LC_MESSAGES/django.po | 227 +++++++++++--------- locale/ga_IE/LC_MESSAGES/django.po | 157 ++++++++------ locale/gl_ES/LC_MESSAGES/django.po | 157 ++++++++------ locale/he_IL/LC_MESSAGES/django.po | 157 ++++++++------ locale/hu_HU/LC_MESSAGES/django.po | 157 ++++++++------ locale/id_ID/LC_MESSAGES/django.po | 171 ++++++++------- locale/it_IT/LC_MESSAGES/django.po | 157 ++++++++------ locale/ja_JP/LC_MESSAGES/django.po | 157 ++++++++------ locale/ko_KR/LC_MESSAGES/django.po | 197 ++++++++++-------- locale/lt_LT/LC_MESSAGES/django.po | 157 ++++++++------ locale/nl_NL/LC_MESSAGES/django.po | 157 ++++++++------ locale/no_NO/LC_MESSAGES/django.po | 157 ++++++++------ locale/pl_PL/LC_MESSAGES/django.po | 157 ++++++++------ locale/pt_BR/LC_MESSAGES/django.po | 157 ++++++++------ locale/pt_PT/LC_MESSAGES/django.po | 157 ++++++++------ locale/ro_RO/LC_MESSAGES/django.po | 157 ++++++++------ locale/ru_RU/LC_MESSAGES/django.po | 157 ++++++++------ locale/sk_SK/LC_MESSAGES/django.po | 157 ++++++++------ locale/sl_SI/LC_MESSAGES/django.po | 157 ++++++++------ locale/sr_SP/LC_MESSAGES/django.po | 157 ++++++++------ locale/sv_SE/LC_MESSAGES/django.po | 157 ++++++++------ locale/tr_TR/LC_MESSAGES/django.po | 157 ++++++++------ locale/uk_UA/LC_MESSAGES/django.po | 157 ++++++++------ locale/vi_VN/LC_MESSAGES/django.po | 277 ++++++++++++++----------- locale/yi_DE/LC_MESSAGES/django.po | 157 ++++++++------ locale/zh_Hans/LC_MESSAGES/django.po | 157 ++++++++------ locale/zh_Hant/LC_MESSAGES/django.po | 157 ++++++++------ 47 files changed, 4399 insertions(+), 3224 deletions(-) diff --git a/locale/af_ZA/LC_MESSAGES/django.po b/locale/af_ZA/LC_MESSAGES/django.po index dc07b9813c..bd592010c4 100644 --- a/locale/af_ZA/LC_MESSAGES/django.po +++ b/locale/af_ZA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Afrikaans\n" "Language: af\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/ar_SA/LC_MESSAGES/django.po b/locale/ar_SA/LC_MESSAGES/django.po index 7aed80c0d2..454bb8bd5e 100644 --- a/locale/ar_SA/LC_MESSAGES/django.po +++ b/locale/ar_SA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Arabic\n" "Language: ar\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "نشيطٌ" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -521,19 +521,24 @@ msgstr "" msgid "Everything else" msgstr "كل شيء آخر" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "الخط الزمني الرئيسي" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "الصفحة الرئيسية" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "الخط الزمني اللكتب" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -542,91 +547,91 @@ msgstr "الخط الزمني اللكتب" msgid "Books" msgstr "الكتب" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "الإنجليزية" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (الألمانية)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (الإسبانية)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (الفرنسية)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "بولندي (البولندية)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "السويدية (السويدي)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1817,7 +1822,7 @@ msgid "Domain" msgstr "النطاق" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3261,17 +3266,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3282,117 +3287,129 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4169,7 +4186,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5408,7 +5425,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5746,7 +5763,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5793,18 +5810,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7611,14 +7636,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/ba_RU/LC_MESSAGES/django.po b/locale/ba_RU/LC_MESSAGES/django.po index 29c3f5e129..94d8a669dc 100644 --- a/locale/ba_RU/LC_MESSAGES/django.po +++ b/locale/ba_RU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bashkir\n" "Language: ba\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -516,19 +516,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -537,91 +542,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1782,7 +1787,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3206,133 +3211,145 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4099,7 +4116,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5303,7 +5320,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5636,7 +5653,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5683,18 +5700,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7471,14 +7496,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/bg_BG/LC_MESSAGES/django.po b/locale/bg_BG/LC_MESSAGES/django.po index 0b2bb0cfc6..0317b38624 100644 --- a/locale/bg_BG/LC_MESSAGES/django.po +++ b/locale/bg_BG/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bulgarian\n" "Language: bg\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/bn_BD/LC_MESSAGES/django.po b/locale/bn_BD/LC_MESSAGES/django.po index 54461fc02c..b3d9df98a2 100644 --- a/locale/bn_BD/LC_MESSAGES/django.po +++ b/locale/bn_BD/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bengali\n" "Language: bn\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/bn_IN/LC_MESSAGES/django.po b/locale/bn_IN/LC_MESSAGES/django.po index ae4001123e..9b6b9cf4ff 100644 --- a/locale/bn_IN/LC_MESSAGES/django.po +++ b/locale/bn_IN/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Bengali, India\n" "Language: bn_IN\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/ca_ES/LC_MESSAGES/django.po b/locale/ca_ES/LC_MESSAGES/django.po index f697d49462..ae7497f54d 100644 --- a/locale/ca_ES/LC_MESSAGES/django.po +++ b/locale/ca_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Camí incorrecte" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Actiu" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Citacions" msgid "Everything else" msgstr "Tota la resta" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Línia de temps Inici" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Inici" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Cronologia dels llibres" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Cronologia dels llibres" msgid "Books" msgstr "Llibres" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Anglès)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Alemany)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (espanyol)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskera (Basc)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (gallec)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (italià)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Coreà)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (finès)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (francès)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituà)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Països Baixos (Holandès)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (noruec)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (polonès)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portuguès del Brasil)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portuguès europeu)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (romanès)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (suec)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ucraïnès)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (xinès simplificat)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (xinès tradicional)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domini" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Mira què hi ha de nou a la comunitat local de %(site_name)s" msgid "No activities for this hashtag yet!" msgstr "Cap activitat per a aquesta etiqueta!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importa la llista de llibres" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Fitxer CSV no vàlid" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Actualment se us permet la importació de %(display_size)s llibres cada %(import_limit_reset)s dia." msgstr[1] "Actualment se us permet la importació de %(display_size)s llibres cada %(import_limit_reset)s dies." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Et queden %(display_left)s llibres per importar." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Les importacions recents han durat %(hours)s de mitjana." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Les importacions recents han durat %(minutes)s de mitjana." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Font de la informació:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Podeu descarregar-vos les vostres dades de Goodreads des de la pàgina d'Importa/Exporta del vostre compte de Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Arxiu de dades:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Inclou ressenyes" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Crear nous prestatges si no existeixen" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Configuració de privadesa per a ressenyes i prestatges importats:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importa" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Has arribat al límit d'importacions." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Les importacions es troben temporalment deshabilitades; gràcies per la vostra paciència." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Importacions recents" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Data de creació" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Darrera actualització" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Items" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Posició de la llista" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Inicia la sessió per importar o afegir llibres." msgid "Search query" msgstr "Cerca consulta" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Tipus de Cerca" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Temps d'execució" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioritat" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "Crea un nou connector" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Raó de desactivació:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Desactiva" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Activitat" @@ -7499,14 +7524,14 @@ msgstr "per cent" msgid "of %(pages)s pages" msgstr "de %(pages)s pàgines" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Respon" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Contingut" diff --git a/locale/cdo/LC_MESSAGES/django.po b/locale/cdo/LC_MESSAGES/django.po index 31a13edc21..8f62a10264 100644 --- a/locale/cdo/LC_MESSAGES/django.po +++ b/locale/cdo/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Eastern Min\n" "Language: cdo\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "𡅏使" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "頭頁時間線" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "頭頁" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "書其時間線" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "書其時間線" msgid "Books" msgstr "書" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (英語)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (德語)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (西語)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (加利西亞話)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (法語)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (立陶宛話)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (官話)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (官話)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "域名" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "資料來源:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "資料檔案:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "書評收裏" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "攖裏" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "這幫攖裏其乇" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "單單位址" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "尋討類別" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "傒勢停去:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "百分比" msgid "of %(pages)s pages" msgstr "書其第 %(pages)s 頁" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "應" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "内容" diff --git a/locale/cs_CZ/LC_MESSAGES/django.po b/locale/cs_CZ/LC_MESSAGES/django.po index f6ca303be1..8331e099b7 100644 --- a/locale/cs_CZ/LC_MESSAGES/django.po +++ b/locale/cs_CZ/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Czech\n" "Language: cs\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktivní" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -519,19 +519,24 @@ msgstr "Citace" msgid "Everything else" msgstr "Vše ostatní" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Domovská časová osa" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Domov" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Zeď knih" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -540,91 +545,91 @@ msgstr "Zeď knih" msgid "Books" msgstr "Knihy" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Anglicky" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (katalánština)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (němčina)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (španělština)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (galicijština)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (italština)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Korejština)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (finština)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (francouzština)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (litevština)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (Nizozemština)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (norština)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (polština)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugalština (Brazílie))" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugalština (Evropa))" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (rumunština)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (švédština)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrajinština)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (zjednodušená čínština)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (tradiční čínština)" @@ -1803,7 +1808,7 @@ msgid "Domain" msgstr "Doména" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3239,17 +3244,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "Zatím není žádná aktivita pro tento hashtag!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importovat seznam knih" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Neplatný CSV soubor" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3258,117 +3263,129 @@ msgstr[1] "Momentálně můžete importovat %(display_size)s knih každé %(impo msgstr[2] "Momentálně můžete importovat %(display_size)s knih každých %(import_limit_reset)s dní." msgstr[3] "Momentálně můžete importovat %(display_size)s knih každých %(import_limit_reset)s dní." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Zbývá %(display_left)s." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "V průměru, nedávné importy zabrali %(hours)s hodin." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "V průměru, nedávné importy zabrali %(minutes)s minut." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Zdroj dat:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Můžete si stáhnout svá Goodreads data z Import/Export stránky vašeho Goodreads účtu." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Soubor dat:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Zahrnout recenze" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Vytvořte nové poličky, pokud neexistují" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Nastavení ochrany soukromí pro importované recenze a poličky:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importovat" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Dosáhli jste limitu importu." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importy jsou dočasně vypnuty; děkujeme vám za trpělivost." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Nedávné importy" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Datum vytvoření" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Naposledy aktualizováno" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Položky" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4141,7 +4158,7 @@ msgid "List position" msgstr "Umístění seznamu" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5366,7 +5383,7 @@ msgstr "Přihlaste se pro import nebo přidání knih." msgid "Search query" msgstr "Vyhledávací dotaz" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5702,7 +5719,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5749,18 +5766,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7555,14 +7580,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Odpovědět" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/cy_GB/LC_MESSAGES/django.po b/locale/cy_GB/LC_MESSAGES/django.po index 87f73a3627..7306f06588 100644 --- a/locale/cy_GB/LC_MESSAGES/django.po +++ b/locale/cy_GB/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Welsh\n" "Language: cy\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -521,19 +521,24 @@ msgstr "Dyfyniadau" msgid "Everything else" msgstr "Popeth arall" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Ffrwd gartref" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Cartref" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Ffrwd lyfrau" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -542,91 +547,91 @@ msgstr "Ffrwd lyfrau" msgid "Books" msgstr "Llyfrau" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Saesneg" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Almaeneg)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Sbaeneg)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galiseg)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Eidaleg)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomoi (Finneg)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Ffrangeg)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lithwaneg)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwyaidd)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portiwgaleg Brasil)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portiwgaleg Ewropeaidd)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Rwmaneg)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Swedeg)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Tsieinëeg Syml)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tsieinëeg Traddodiadol)" @@ -1817,7 +1822,7 @@ msgid "Domain" msgstr "Parth" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3261,17 +3266,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3282,117 +3287,129 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Ffynhonnell y data:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Ffeil y data:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Cynnwys adolygiadau" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Mewnforiwch" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Mewnforiadau diweddar" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4169,7 +4186,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5408,7 +5425,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5746,7 +5763,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5793,18 +5810,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7611,14 +7636,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/da_DK/LC_MESSAGES/django.po b/locale/da_DK/LC_MESSAGES/django.po index c5c682dc17..3dca71bf0e 100644 --- a/locale/da_DK/LC_MESSAGES/django.po +++ b/locale/da_DK/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Danish\n" "Language: da\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktiv" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Citater" msgid "Everything else" msgstr "Alt det andet" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Hjem-tidslinje" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Hjem" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Bøger-tidslinje" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Bøger-tidslinje" msgid "Books" msgstr "Bøger" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Engelsk" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (catalansk)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (tysk)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (spansk)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Baskisk)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (galicisk)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (italiensk)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (finsk)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (fransk)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (litauisk)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (hollandsk)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (norsk)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (polsk)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasiliansk portugisisk)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (europæisk portugisisk)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (rumænsk)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (svensk)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainsk)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (forenklet kinesisk)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (traditionelt kinesisk)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domæne" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Du har %(display_left)s tilbage." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 12400d4959..9e5e6ffda8 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Ungültiger Pfad" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktiv" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Zitate" msgid "Everything else" msgstr "Alles andere" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Start-Zeitleiste" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Startseite" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Bücher-Timeline" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Bücher-Timeline" msgid "Books" msgstr "Bücher" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Englisch)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Katalanisch)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Spanisch)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Baskisch)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galizisch)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italienisch)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Koreanisch)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Finnisch)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Französisch)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisch)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (Niederländisch)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwegisch)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Polnisch)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasilianisches Portugiesisch)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugiesisch)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Rumänisch)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Schwedisch)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainisch)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (vereinfachtes Chinesisch)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinesisch, traditionell)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domain" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Zeige markierte Status in der lokalen %(site_name)s Gemeinschaft" msgid "No activities for this hashtag yet!" msgstr "Keine Aktivitäten für diesen Hashtag bisher!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Bücherliste importieren" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Keine gültige CSV-Datei" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Aktuell dürfen Sie %(display_size)s Bücher, alle %(import_limit_reset)s Tage importieren." msgstr[1] "Zurzeit dürfen Sie alle %(import_limit_reset)s Tage bis zu %(display_size)s Bücher importieren." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Du hast noch %(display_left)s übrig." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Im Durchschnitt haben die letzten Importe %(hours)s Stunden in Anspruch genommen." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Im Durchschnitt haben die letzten Importe %(minutes)s Minuten in Anspruch genommen." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Datenquelle:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Du kannst deine Goodreads-Daten von der Import / Export-Seite deines Goodreads-Kontos downloaden." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Datei:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Besprechungen einschließen" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Neue Regale erstellen, wenn sie nicht vorhanden sind" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Datenschutzeinstellung für importierte Bewertungen und Regale:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importieren" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Sie haben das Importlimit erreicht." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importe sind vorübergehend deaktiviert; vielen Dank für deine Geduld." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Zuletzt importiert" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Erstellungsdatum" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Zuletzt aktualisiert" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Einträge" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Listenposition" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Melde dich an, um Bücher zu importieren oder hinzuzufügen." msgid "Search query" msgstr "Suchanfrage" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Suchtyp" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Dauer" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Priorität" @@ -5705,18 +5722,26 @@ msgstr "Libris ist der Katalog der schwedischen Nationalbibliothek, der den Zugr msgid "Create new connector" msgstr "Neuen Connector erstellen" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Grund der Deaktivierung:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Deaktivieren" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Aktivieren" @@ -7499,14 +7524,14 @@ msgstr "Prozent" msgid "of %(pages)s pages" msgstr "von %(pages)s Seiten" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Antworten" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Inhalt" diff --git a/locale/el_GR/LC_MESSAGES/django.po b/locale/el_GR/LC_MESSAGES/django.po index 73f2a52433..f34f1a356f 100644 --- a/locale/el_GR/LC_MESSAGES/django.po +++ b/locale/el_GR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Greek\n" "Language: el\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Ενεργός" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "" msgid "Everything else" msgstr "Οτιδήποτε άλλο" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Αρχική σελίδα" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Χρονολόγιο Βιβλίων" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Χρονολόγιο Βιβλίων" msgid "Books" msgstr "Βιβλία" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Αγγλικά" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Καταλανικά)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Γερμανικά)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Ισπανικά)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Ιταλικά)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Φινλανδικά)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Γαλλικά)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Λιθουανικά)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Νορβηγικά)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Πολωνικά)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Πορτογαλικά Βραζιλίας)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Ευρωπαϊκά Πορτογαλικά)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Ρουμανικά)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Σουηδικά)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Απλοποιημένα Κινέζικα)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Παραδοσιακά Κινέζικα)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Τομέας" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Πηγή Δεδομένων:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Συμπερίληψη αξιολογήσεων" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Εισαγωγή" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Πρόσφατες Εισαγωγές" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Ημερομηνία Δημιουργίας" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Αντικείμενα" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Θέση λίστας" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Συνδεθείτε για να εισαγάγετε ή να προσθ msgid "Search query" msgstr "Κριτήρια αναζήτησης" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Τύπος αναζήτησης" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Προτεραιότητα" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Λόγος απενεργοποίησης:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "της εκατό" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Απάντηση" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Περιεχόμενο" diff --git a/locale/en_Oulipo/LC_MESSAGES/django.po b/locale/en_Oulipo/LC_MESSAGES/django.po index 6926c622d3..5c72e0d893 100644 --- a/locale/en_Oulipo/LC_MESSAGES/django.po +++ b/locale/en_Oulipo/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Oulipo\n" "Language: en_Oulipo\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Community Posts" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Community" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Book Posts" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Book Posts" msgid "Books" msgstr "Books" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Data origin" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Data upload" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Import your rankings" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Import" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Your Imports" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/eo_UY/LC_MESSAGES/django.po b/locale/eo_UY/LC_MESSAGES/django.po index e3dbf87702..fe8a0a27ae 100644 --- a/locale/eo_UY/LC_MESSAGES/django.po +++ b/locale/eo_UY/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Esperanto\n" "Language: eo\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktiva" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Citaĵoj" msgid "Everything else" msgstr "Ĉio alia" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Hejma novaĵfluo" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Hejmo" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Libra novaĵfluo" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Libra novaĵfluo" msgid "Books" msgstr "Libroj" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Angla)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Kataluna)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Germana)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Hispana)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Eŭska)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galega)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Itala)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Finna)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Franca)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litova)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (Nederlanda)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvega)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Pola)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brazila portugala)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Eŭropa portugala)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Rumana)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Sveda)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (la ukraina)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Simpligita ĉina)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradicia ĉina)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domajno" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Vidu la afiŝojn kun etikedoj en la loka komunumo de %(site_name)s" msgid "No activities for this hashtag yet!" msgstr "Ankoraŭ neniu agado por ĉi tiu kradvorto!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importi libro-liston" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "La CSV-a dosiero ne validas" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Aktuale vi rajtas importi %(display_size)s librojn ĉiun %(import_limit_reset)s tagon." msgstr[1] "Aktuale vi rajtas importi %(display_size)s librojn ĉiujn %(import_limit_reset)s tagojn." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Restas al vi %(display_left)s." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Averaĝe, lastatempaj importoj bezonis %(hours)s horojn." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Averaĝe, lastatempaj importoj bezonis %(minutes)s minutojn." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Fonto de la datumoj:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Vi povas elŝuti vian datumaron de Goodreads per la paĝo Import/Export de via konto ĉe Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Datumdosiero:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Inkluzivi recenzojn" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importi" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Vi atingis la limon de importado." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Oni provizore malŝaltis importadon; dankon pro via pacienco." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Lastatempaj importoj" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Dato de kreado" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Lasta ĝisdatigo" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Aĵoj" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Pozicio" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Ensalutu por importi aŭ aldoni librojn." msgid "Search query" msgstr "Serĉo" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Tipo de serĉo" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Daŭro" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioritato" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Kialo de la malaktivigo:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "elcento" msgid "of %(pages)s pages" msgstr "de %(pages)s paĝoj" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Respondi" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Enhavo" diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po index 5f8554a7ba..341959af49 100644 --- a/locale/es_ES/LC_MESSAGES/django.po +++ b/locale/es_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Ruta equivocada" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Activo" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Citas" msgid "Everything else" msgstr "Todo lo demás" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Línea de tiempo principal" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Línea temporal de libros" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Línea temporal de libros" msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Catalán)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Alemán)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskera" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (gallego)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (finés)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Francés)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Países bajos (holandés)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (noruego)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Polaco)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugués brasileño)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (rumano)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (ucraniano)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chino simplificado)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chino tradicional)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Dominio" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Mira los estados con etiquetas en la comunidad local de %(site_name)s" msgid "No activities for this hashtag yet!" msgstr "¡Esta etiqueta no tiene aún ninguna actividad!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importar lista de libros" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "No es un archivo CSV válido" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Actualmente, puedes importar %(display_size)s libros cada %(import_limit_reset)s días." msgstr[1] "Actualmente, puedes importar %(display_size)s libros cada %(import_limit_reset)s días." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Te quedan %(display_left)s." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "En promedio, las importaciones recientes han tomado %(hours)s horas." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "En promedio, las importaciones recientes han tomado %(minutes)s minutos." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Fuente de datos:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Puede descargar tus datos de Goodreads desde la página de Importación/Exportación de tu cuenta de Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Archivo de datos:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Incluir reseñas" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Crear nuevos estantes si no existen" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Configuración de privacidad para estantes y evaluaciones importados:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importar" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Has alcanzado el límite de importaciones." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Las importaciones se han deshabilitado temporalmente, gracias por tu paciencia." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Importaciones recientes" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Fecha de Creación" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Última Actualización" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Elementos" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Posición" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Iniciar una sesión para importar o agregar libros." msgid "Search query" msgstr "Búsqueda" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Tipo de búsqueda" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Tiempo de ejecución" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioridad" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Razón de desactivación:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Activar" @@ -7499,14 +7524,14 @@ msgstr "por ciento" msgid "of %(pages)s pages" msgstr "de %(pages)s páginas" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Responder" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Contenido" diff --git a/locale/eu_ES/LC_MESSAGES/django.po b/locale/eu_ES/LC_MESSAGES/django.po index feccf4be58..4adb301b94 100644 --- a/locale/eu_ES/LC_MESSAGES/django.po +++ b/locale/eu_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Basque\n" "Language: eu\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktiboa" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Aipuak" msgid "Everything else" msgstr "Gainerako guztia" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Hasierako denbora-lerroa" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Hasiera" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Liburuen denbora-lerroa" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Liburuen denbora-lerroa" msgid "Books" msgstr "Liburuak" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Ingelesa)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (katalana)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (alemana)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperantoa" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (espainiera)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galiziera)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italiera)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (koreera)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (finlandiera)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (frantses)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lituano (lituaniera)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Herbehereak (nederlandera)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvegiera)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (poloniera)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brasilgo Portugesa)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europako Portugesa)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (errumaniera)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (suediera)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainera)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Txinera soildua)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Txinera tradizionala)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domeinua" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Ikusi etiketatutako egoeran %(site_name)s komunitate lokalean" msgid "No activities for this hashtag yet!" msgstr "Ez dago aktibitaterik oraindik traola honentzat!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Inportatu liburu zerrenda" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "CSV fitxategia ez da baliozkoa" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Une honetan, %(display_size)s liburu inporta ditzakezu %(import_limit_reset)s egun bakoitzeko." msgstr[1] "Une honetan, %(display_size)s liburu inporta ditzakezu %(import_limit_reset)s egunero." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "%(display_left)s geratzen zaizkizu." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Batezbeste, azken aldiko inportazioek %(hours)s ordu hartu dituzte." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Batezbeste, azken aldiko inportazioek %(minutes)s minutu hartu dituzte." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Datu iturria:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Zure Goodreadseko datuak deskargatu ditzakezu zure Goodreads kontuko Inportatu/esportatu orrialdean." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Datu fitxategia:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Gehitu kritikak" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Sortu apal berriak lehendik ez badaude" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Pribatutasun ezarpenak inportatutako kritika eta apalentzat:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Inportatu" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Inportatu ditzakezun liburuen mugara heldu zara." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Inportazioak aldi baterako ezgaituta daude; eskerrik asko zure pazientziagatik." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Azken inportazioak" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Sortze-data" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Azken eguneratzea" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Elementuak" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Zerrenda posizioa" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Hasi saioa liburuak inportatzeko edo gehitzeko." msgid "Search query" msgstr "Bilaketa-kontsulta" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Bilaketa mota" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Exekuzio-denbora" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Lehentasuna" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Desaktibatzeko arrazoia:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "ehunekoa" msgid "of %(pages)s pages" msgstr "%(pages)s orrialdetik" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Erantzun" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Edukia" diff --git a/locale/fa_IR/LC_MESSAGES/django.po b/locale/fa_IR/LC_MESSAGES/django.po index 6bb132891a..0755f146b8 100644 --- a/locale/fa_IR/LC_MESSAGES/django.po +++ b/locale/fa_IR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Persian\n" "Language: fa\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "مسیر نادرست" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "فعال" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "نقل قول‌ها" msgid "Everything else" msgstr "سایر موارد" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "خط زمانی خانه" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "خانه" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "خط زمانی کتاب‌ها" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "خط زمانی کتاب‌ها" msgid "Books" msgstr "کتاب‌ها" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "انگلیسی" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "کاتالان (Catalan)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "آلمانی (German)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "اسپرانتو (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "اسپانیایی (Spanish)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "باسکی (Basque)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "گالیسی (Galician)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "ایتالیایی (Italian)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "کره‌ای (Korean)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "فنلاندی (Finnish)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "فرانسوی (French)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "لیتوانیایی (Lithuanian)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "هلندی (Dutch)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "نروژی (Norwegian)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "لهستانی (Polish)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "پرتغالی برزیلی (Brazilian Portuguese)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "پرتغالی اروپایی (Português Europeu)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "رومانیایی (Română)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "سوئدی (Svenska)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "اوکراینی (Українська)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "چینی ساده (简体中文)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "چینی سنتی (繁體中文)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "دامنه" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "وضعیت‌های دارای برچسب را در جامعه محلی msgid "No activities for this hashtag yet!" msgstr "برای این هشتگ هنوز فعالیتی وجود ندارد!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "فهرست کتاب را وارد کنید" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "این فایل CSV معتبر نیست" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "در حال حاضر، شما اجازه دارید که %(display_size)s کتاب را هر %(import_limit_reset)s روز وارد کنید." msgstr[1] "در حال حاضر، شما اجازه دارید که %(display_size)s کتاب را هر %(import_limit_reset)s روز وارد کنید." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "شما %(display_left)s باقی مانده دارید." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "به طور متوسط، واردات اخیر %(hours)s ساعت طول کشیده است." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "به طور متوسط، واردات اخیر %(minutes)s دقیقه طول کشیده است." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "منبع داده:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "شما می‌توانید داده‌های Goodreads خود را از صفحه وارد/صادر حساب Goodreads خود دانلود کنید." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "فایل داده:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "شامل نظرات" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "اگر قفسه‌ها وجود ندارند، قفسه‌های جدید ایجاد کنید" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "تنظیم حریم خصوصی برای نظرات و قفسه‌های وارد شده:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "وارد کردن" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "شما به حد واردات رسیده‌اید." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "واردات به طور موقت غیرفعال است؛ از صبر شما سپاسگزاریم." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "واردات اخیر" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "تاریخ ایجاد" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "آخرین بروزرسانی" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "اقلام" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "موقعیت لیست" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "برای درونریزی یا اضافه کردن کتاب وارد ش msgid "Search query" msgstr "جستجوی پرس و جو" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "نوع جستجو" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "مدت اجرا" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "اولویت" @@ -5705,18 +5722,26 @@ msgstr "Libris فهرست کتابخانه‌ی ملی سوئد است که دس msgid "Create new connector" msgstr "ایجاد اتصال‌دهنده جدید" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "دلیل غیرفعال‌سازی:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "غیرفعال کردن" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "فعال کردن" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/fi_FI/LC_MESSAGES/django.po b/locale/fi_FI/LC_MESSAGES/django.po index e21a85b4ec..7d6e480277 100644 --- a/locale/fi_FI/LC_MESSAGES/django.po +++ b/locale/fi_FI/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Finnish\n" "Language: fi\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktiivinen" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Lainaukset" msgid "Everything else" msgstr "Muut" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Oma aikajana" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Etusivu" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Kirjavirta" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Kirjavirta" msgid "Books" msgstr "Kirjat" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (englanti)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (katalaani)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (saksa)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (espanja)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (baski)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (galego)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (italia)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (korea)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "suomi" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (ranska)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (liettua)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (hollanti)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (norja)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (puola)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (brasilianportugali)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugali)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (romania)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (ruotsi)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (ukraina)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (yksinkertaistettu kiina)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (perinteinen kiina)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Verkkotunnus" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Aihetunnisteilla merkityt %(site_name)s-yhteisön julkaisut" msgid "No activities for this hashtag yet!" msgstr "Tätä aihetunnistetta ei ole vielä käytetty!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Tuo kirjalista" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Epäkelpo CSV-tiedosto" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Voit käyttää toimintoa vielä %(display_left)s kertaa." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Viime aikoina tuonteihin on kulunut keskimäärin %(hours)s tuntia." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Viime aikoina tuonteihin on kulunut keskimäärin %(minutes)s minuuttia." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Tietolähde:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Goodreads-tiedot voi ladata Goodreads-käyttäjätilin Import/Export-sivun kautta." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Datatiedosto:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Myös arviot" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Luo uusia hyllyjä, jos niitä ei ole" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Tuo" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Olet käyttänyt tuontitoimintoa sallitun määrän." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Tuonti on väliaikaisesti pois käytöstä; palaa asiaan myöhemmin." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Viimeksi tuotu" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Luontipäivä" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Päivitetty viimeksi" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Nimikkeitä" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Sijainti listassa" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Kirjojen tuonti tai lisääminen edellyttää sisäänkirjautumista." msgid "Search query" msgstr "Hakulauseke" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Hakutyyppi" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Käyttöaika" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioriteetti" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Poistumisen syy:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "prosenttia" msgid "of %(pages)s pages" msgstr "yhteensä %(pages)s sivua" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Vastaa" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Sisältö" diff --git a/locale/fo_FO/LC_MESSAGES/django.po b/locale/fo_FO/LC_MESSAGES/django.po index f98bcd3642..fe46a33027 100644 --- a/locale/fo_FO/LC_MESSAGES/django.po +++ b/locale/fo_FO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Faroese\n" "Language: fo\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 2c49c0ec77..0058d3206a 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-08 03:19\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -39,16 +39,16 @@ msgstr "Sans limite" #: bookwyrm/forms/edit_user.py:15 msgid "Readwise access token" -msgstr "" +msgstr "Jeton d'accès Readwise" #: bookwyrm/forms/edit_user.py:24 #: bookwyrm/templates/preferences/edit_user.html:173 msgid "Remove saved Readwise access token" -msgstr "" +msgstr "Supprimer le jeton d'accès Readwise enregistré" #: bookwyrm/forms/edit_user.py:64 msgid "A Readwise access token is saved. Leave this blank to keep it." -msgstr "" +msgstr "Un jeton d'accès Readwise est enregistré. Laissez ce champ vide pour le conserver." #: bookwyrm/forms/edit_user.py:136 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Mauvais chemin d'accès" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Actif" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -419,12 +419,12 @@ msgstr "Approuvé" #: bookwyrm/models/list.py:106 #, python-format msgid "Suggestions for %(title)s" -msgstr "" +msgstr "Suggestions pour %(title)s" #: bookwyrm/models/list.py:112 #, python-format msgid "This is the list of suggestions for %(title)s" -msgstr "" +msgstr "Voici la liste des suggestions pour %(title)s" #: bookwyrm/models/report.py:120 msgid "Resolved report" @@ -517,19 +517,24 @@ msgstr "Citations" msgid "Everything else" msgstr "Tout le reste" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "avatar pour {name}" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Mon fil d’actualité" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Accueil" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Mon fil d’actualité littéraire" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Mon fil d’actualité littéraire" msgid "Books" msgstr "Livres" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Catalan)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Espéranto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galicien)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italien)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Coréen)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Finnois)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituanien)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (néerlandais)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvégien)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Polonais)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugais brésilien)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugais européen)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Roumain)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Suédois)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainien)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简化字" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (chinois traditionnel)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domaine" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -1899,43 +1904,43 @@ msgstr "Livre %(series_number)s" #: bookwyrm/templates/lists/list_item.html:37 #, python-format msgid "Added by %(user_link)s" -msgstr "" +msgstr "Ajouté par %(user_link)s" #: bookwyrm/templates/book/suggestion_list/endorsement_button.html:4 msgid "Endorse this suggestion" -msgstr "" +msgstr "Soutenir cette suggestion" #: bookwyrm/templates/book/suggestion_list/endorsement_button.html:5 msgid "Endorsements" -msgstr "" +msgstr "Recommandations" #: bookwyrm/templates/book/suggestion_list/list.html:6 #: bookwyrm/templates/user/layout.html:111 #: bookwyrm/templates/user/suggestions.html:6 msgid "Suggestions" -msgstr "" +msgstr "Suggestions" #: bookwyrm/templates/book/suggestion_list/list.html:9 msgid "View all suggestions" -msgstr "" +msgstr "Voir toutes les suggestions" #: bookwyrm/templates/book/suggestion_list/list.html:18 #, python-format msgid "Readers who liked %(title)s recommend giving these books a try:" -msgstr "" +msgstr "Les lecteurs qui ont aimé %(title)s vous recommandent de découvrir ces livres :" #: bookwyrm/templates/book/suggestion_list/list.html:27 #: bookwyrm/templates/book/suggestion_list/list.html:51 msgid "Have a recommendation for someone who liked this book?" -msgstr "" +msgstr "Vous avez une recommandation à faire à quelqu'un qui a aimé ce livre ?" #: bookwyrm/templates/book/suggestion_list/list.html:52 msgid "Load books" -msgstr "" +msgstr "Charger des livres" #: bookwyrm/templates/book/suggestion_list/search.html:8 msgid "Add suggestions" -msgstr "" +msgstr "Ajouter des suggestions" #: bookwyrm/templates/book/sync_modal.html:15 #, python-format @@ -2138,7 +2143,7 @@ msgstr "%(username)s a commencé %(username)s stopped reading %(book_title)s" -msgstr "" +msgstr "%(username)s a arrêté de lire %(book_title)s" #: bookwyrm/templates/discover/card-header.html:28 #: bookwyrm/templates/discover/card-header.html:37 @@ -3217,134 +3222,146 @@ msgstr "Voir les statuts avec étiquette dans la communauté %(site_name)s local msgid "No activities for this hashtag yet!" msgstr "Pas encore d’activité pour ce hashtag !" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importer des livres" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Fichier CSV non valide" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Vous êtes actuellement autorisé à importer %(display_size)s livres tous les %(import_limit_reset)s jours." msgstr[1] "Vous avez le droit d’importer %(display_size)s livres chaque %(import_limit_reset)s jours actuellement." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Encore %(display_left)s." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "En moyenne, les dernières importations ont pris %(hours)s heures." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "En moyenne, les dernières importations ont pris %(minutes)s minutes." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Source de données :" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Vous pouvez télécharger vos données Goodreads depuis la page Import/Export de votre compte Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Fichier de données :" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Importer les critiques" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Créer de nouvelles étagères si elles n'existent pas" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "Rangez tous les livres importés sur :" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "Utiliser l'état de mise en rayon indiqué dans le fichier" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "Choisissez une étagère à utiliser à la place de n'importe quelle étagère ou de n'importe quel statut de lecture figurant dans le fichier." + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Confidentialité des critiques et étagères importées :" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importer" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Vous avez atteint la limite d’imports." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Les importations sont temporairement désactivées, merci pour votre patience." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Importations récentes" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Date de Création" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Dernière Mise à jour" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Éléments" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -3396,7 +3413,7 @@ msgstr "Arrêter l'import" msgid "%(display_counter)s item needs manual approval." msgid_plural "%(display_counter)s items need manual approval." msgstr[0] "%(display_counter)s élément a besoin d'être approuvé manuellement." -msgstr[1] "%(display_counter)s éléments ont besoin d'être approuvés manuellement." +msgstr[1] "%(display_counter)s éléments doivent être validés manuellement." #: bookwyrm/templates/import/import_status.html:83 #: bookwyrm/templates/import/manual_review.html:8 @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Position" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -4128,7 +4145,7 @@ msgstr "Retirer" #: bookwyrm/templates/lists/list_item_notes.html:12 #, python-format msgid "%(user_link)s says:" -msgstr "" +msgstr "%(user_link)s dit :" #: bookwyrm/templates/lists/list_item_notes.html:26 msgid "Edit notes" @@ -4710,11 +4727,11 @@ msgstr "Aucun compte bloqué actuellement" #: bookwyrm/templates/preferences/books.html:7 #: bookwyrm/templates/preferences/layout.html:66 msgid "Blocked Books" -msgstr "" +msgstr "Livres interdits" #: bookwyrm/templates/preferences/books.html:12 msgid "No books currently blocked." -msgstr "" +msgstr "Aucun livre n'est actuellement bloqué." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 @@ -4806,7 +4823,7 @@ msgstr "Confidentialité" #: bookwyrm/templates/preferences/edit_user.html:15 #: bookwyrm/templates/preferences/edit_user.html:157 msgid "Integrations" -msgstr "" +msgstr "Intégrations" #: bookwyrm/templates/preferences/edit_user.html:70 msgid "Show reading goal prompt in feed" @@ -4839,7 +4856,7 @@ msgstr "Thème :" #: bookwyrm/templates/preferences/edit_user.html:124 msgid "Make profile private" -msgstr "" +msgstr "Rendre le profil privé" #: bookwyrm/templates/preferences/edit_user.html:130 msgid "Manually approve followers" @@ -4860,11 +4877,11 @@ msgstr "Vous souhaitez protéger vos étagères ? Vous pouvez définir un nive #: bookwyrm/templates/preferences/edit_user.html:160 msgid "Readwise access token:" -msgstr "" +msgstr "Jeton d'accès Readwise :" #: bookwyrm/templates/preferences/edit_user.html:165 msgid "Send new quote posts to Readwise. You can create a token at readwise.io/access_token." -msgstr "" +msgstr "Envoyez les nouvelles publications de citations vers Readwise. Vous pouvez créer un jeton à l'adresse readwise.io/access_token." #: bookwyrm/templates/preferences/export-user.html:6 #: bookwyrm/templates/preferences/export-user.html:9 @@ -5010,7 +5027,7 @@ msgstr "Données" #: bookwyrm/templates/preferences/layout.html:58 msgid "Safety" -msgstr "" +msgstr "Sécurité" #: bookwyrm/templates/preferences/move_user.html:12 msgid "Migrate account to another server" @@ -5286,7 +5303,7 @@ msgstr "Recherche du livre :" #: bookwyrm/templates/search/book.html:12 #, python-format msgid "Some blocked books have been excluded." -msgstr "" +msgstr "Certains livres bloqués ont été écartés." #: bookwyrm/templates/search/book.html:35 #, python-format @@ -5324,7 +5341,7 @@ msgstr "Authentifiez-vous pour importer ou ajouter des livres." msgid "Search query" msgstr "Requête" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Type de recherche" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Durée" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Priorité" @@ -5705,18 +5722,26 @@ msgstr "Libris est le catalogue de la Bibliothèque nationale de Suède, qui don msgid "Create new connector" msgstr "Créer un nouveau connecteur" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Raison de la désactivation :" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "Dernière requête réussie" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "Dernière erreur" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Désactiver" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Activer" @@ -6443,7 +6468,7 @@ msgstr "Envoyer l’invitation de nouveau" #: bookwyrm/templates/settings/invites/manage_invite_requests.html:96 msgid "Revoke invite" -msgstr "" +msgstr "Annuler l'invitation" #: bookwyrm/templates/settings/invites/manage_invite_requests.html:112 msgid "Ignore" @@ -6767,7 +6792,7 @@ msgstr "Mise à jour de votre rapport :" #: bookwyrm/templates/settings/reports/report.html:37 msgid "Reported statuses" -msgstr "" +msgstr "Statuts signalés" #: bookwyrm/templates/settings/reports/report.html:41 msgid "Status has been deleted" @@ -6835,11 +6860,11 @@ msgstr "Signalé par @%(username)s" #: bookwyrm/templates/settings/reports/report_preview.html:29 msgid "Sent to remote instance" -msgstr "" +msgstr "Envoyé vers une instance distante" #: bookwyrm/templates/settings/reports/report_preview.html:31 msgid "Not sent to remote instance" -msgstr "" +msgstr "Non envoyé à l'instance distante" #: bookwyrm/templates/settings/reports/report_preview.html:43 msgid "Re-open" @@ -7499,14 +7524,14 @@ msgstr "pourcent" msgid "of %(pages)s pages" msgstr "sur %(pages)s pages" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Répondre" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Contenu" @@ -7835,7 +7860,7 @@ msgstr "Les liens vers ce domaine seront retirés jusqu’à ce que votre signal #: bookwyrm/templates/snippets/report_modal.html:42 msgid "Also send this report to the user's instance admins" -msgstr "" +msgstr "Envoyez également ce rapport aux administrateurs de l'instance de l'utilisateur" #: bookwyrm/templates/snippets/report_modal.html:49 msgid "More info about this report:" @@ -7875,7 +7900,7 @@ msgstr "Interrompre la lecture" #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:82 msgid "Block this book" -msgstr "" +msgstr "Bloquer ce livre" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:40 msgid "Finish reading" @@ -8170,12 +8195,12 @@ msgstr "Aucune critique ou commentaire pour le moment !" #: bookwyrm/templates/user/suggestions.html:13 msgid "Your Suggestions" -msgstr "" +msgstr "Vos suggestions" #: bookwyrm/templates/user/suggestions.html:27 #, python-format msgid "%(list_name)s" -msgstr "" +msgstr "%(list_name)s" #: bookwyrm/templates/user/user.html:20 msgid "Edit profile" @@ -8187,7 +8212,7 @@ msgstr "La Fédération est actuellement désactivée, vous ne pourrez donc pas #: bookwyrm/templates/user/user.html:39 msgid "This profile is private. Follow this user to see their activity." -msgstr "" +msgstr "Ce profil est privé. Suivez cet utilisateur pour voir son activité." #: bookwyrm/templates/user/user.html:56 #, python-format @@ -8281,7 +8306,7 @@ msgstr[1] "%(num)d livres - par %(user)s" #: bookwyrm/templatetags/utilities.py:43 msgid "deactivated user" -msgstr "" +msgstr "utilisateur désactivé" #: bookwyrm/templatetags/utilities.py:63 #, python-format diff --git a/locale/ga_IE/LC_MESSAGES/django.po b/locale/ga_IE/LC_MESSAGES/django.po index f951b8be6c..2d1f60ddd4 100644 --- a/locale/ga_IE/LC_MESSAGES/django.po +++ b/locale/ga_IE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Irish\n" "Language: ga\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -520,19 +520,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -541,91 +546,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1810,7 +1815,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3250,17 +3255,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3270,117 +3275,129 @@ msgstr[2] "" msgstr[3] "" msgstr[4] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4155,7 +4172,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5387,7 +5404,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5724,7 +5741,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5771,18 +5788,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7583,14 +7608,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po index 9efa7a56cc..86ff7c77b4 100644 --- a/locale/gl_ES/LC_MESSAGES/django.po +++ b/locale/gl_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-19 06:04\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Ruta incorrecta" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Activa" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Citas" msgid "Everything else" msgstr "As outras cousas" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Cronoloxía de Inicio" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Inicio" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Cronoloxía de libros" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Cronoloxía de libros" msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Inglés)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Catalan)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Alemán)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Español)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Éuscaro)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galego)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Finés)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Francés)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Paises Baixos (Dutch)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Noruegués)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Polaco)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugués brasileiro)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugués europeo)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Rumanés)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ucraíno)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinés simplificado)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinés tradicional)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Dominio" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Mira os estados con etiquetas na comunidade local de %(site_name)s" msgid "No activities for this hashtag yet!" msgstr "Aínda non hai actividade para este cancelo!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importar Lista de Libros" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Non é un ficheiro CSV válido" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Actualmente podes importar %(display_size)s libros cada %(import_limit_reset)s día." msgstr[1] "Actualmente podes importar %(display_size)s libros cada %(import_limit_reset)s días." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Aínda podes importar %(display_left)s libros." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "De media, ás importacións recentes levoulles %(hours)s horas." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "De media, ás importacións recentes levoulles %(minutes)s minutos." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Orixe dos datos:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Podes descargar os teus datos de Goodreads desde a páxina de Exportación/Importación da túa conta Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Ficheiro de datos:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Incluír recensións" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Crear novos estantes se non existisen" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Axuste de privacidade para as recensións e estantes importados:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importar" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Acadaches o límite de importacións." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "As importacións están temporalmente desactivadas; grazas pola paciencia." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Importacións recentes" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Data de creación" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Última actualización" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Elementos" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Posición da lista" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Accede para importar ou engadir libros." msgid "Search query" msgstr "Termos a buscar" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Tipo de busca" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Tempo de execución" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioridade" @@ -5705,18 +5722,26 @@ msgstr "Libris é o servizo do catálogo da biblioteca nacional de Suecia, que d msgid "Create new connector" msgstr "Crear un novo conector" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Razón da desactivación:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "Última solicitude con éxito" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "Último erro" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Desactivar" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Activar" @@ -7499,14 +7524,14 @@ msgstr "porcentaxe" msgid "of %(pages)s pages" msgstr "de %(pages)s páxinas" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Responder" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Contido" diff --git a/locale/he_IL/LC_MESSAGES/django.po b/locale/he_IL/LC_MESSAGES/django.po index 8fcdee5a50..b596342cb8 100644 --- a/locale/he_IL/LC_MESSAGES/django.po +++ b/locale/he_IL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Hebrew\n" "Language: he\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "נתיב שגוי" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "פעיל" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -519,19 +519,24 @@ msgstr "ציטוטים" msgid "Everything else" msgstr "כל השאר" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "ציר זמן הבית" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "ראשי" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "ציר זמן הספרים" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -540,91 +545,91 @@ msgstr "ציר זמן הספרים" msgid "Books" msgstr "ספרים" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "אנגלית" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (קטלנית)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (גרמנית)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (אספרנטו)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (ספרדית)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (באסקית)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (גליציאנית)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (איטלקית)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (קוריאנית)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (פינית)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (צרפתית)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (ליטאית)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (הולנדית)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (נורווגית)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (פולנית)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (פוטוגזית ברזילאית)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (פורטוגזית אירופאית)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (רומנית)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (שוודית)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (אוקראינית)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (סינית מפושטת)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (סינית מסורתית)" @@ -1803,7 +1808,7 @@ msgid "Domain" msgstr "דומיין" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3239,17 +3244,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "אין פעילויות עבור ההאשטאג הזה עדיין!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "קובץ CSV לא תקין" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3258,117 +3263,129 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "בממוצע, פעולות ייבוא אחרונות לקחו %(hours)s שעות." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "בממוצע, ייבואים אחרונים לקחו %(minutes)s דקות." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "מקור המידע:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "ניתן להוריד את מידע ה-Goodreads שלך מ-עמוד הייבוא/ייצוא של חשבון ה-Goodreads" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "קובץ נתונים:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "כלול ביקורות" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "ייבוא" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "הגעת למכסת הייבוא." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "האפשרות לייבא חסומה זמנית, תודה על סבלנותך." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "ייבואים אחרונים" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "תאריך יצירה" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "עודכן לאחרונה" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "פריטים" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4141,7 +4158,7 @@ msgid "List position" msgstr "מיקום ברשימה" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5366,7 +5383,7 @@ msgstr "" msgid "Search query" msgstr "שאילתת חיפוש" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "סוג חיפוש" @@ -5702,7 +5719,7 @@ msgid "Run time" msgstr "זמן ריצה" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "עדיפות" @@ -5749,18 +5766,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7555,14 +7580,14 @@ msgstr "אחוז" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "תוכן" diff --git a/locale/hu_HU/LC_MESSAGES/django.po b/locale/hu_HU/LC_MESSAGES/django.po index 336856282e..696ca558a5 100644 --- a/locale/hu_HU/LC_MESSAGES/django.po +++ b/locale/hu_HU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Hungarian\n" "Language: hu\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Angol)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Katalán)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Német)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Eszperantó)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Spanyol)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Baszk)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galiciai)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Olasz)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Koreai)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Finn)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Francia)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litván)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/id_ID/LC_MESSAGES/django.po b/locale/id_ID/LC_MESSAGES/django.po index c4d437d175..21bb9c75f1 100644 --- a/locale/id_ID/LC_MESSAGES/django.po +++ b/locale/id_ID/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-21 15:03\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-08 12:32\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Indonesian\n" "Language: id\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Jalur Salah" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktif" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -516,19 +516,24 @@ msgstr "Kutipan" msgid "Everything else" msgstr "Yang lainnya" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "avatar untuk {name}" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Linimasa Beranda" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Beranda" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Linimasa Buku" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -537,91 +542,91 @@ msgstr "Linimasa Buku" msgid "Books" msgstr "Buku" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Bahasa Inggris" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Bahasa Katalan)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Bahasa Jerman)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Bahasa Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Bahasa Spanyol)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Bahasa Italia)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Korea)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Bahasa Finlandia)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Bahasa Prancis)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Bahasa Lithuania)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (Bahasa Belanda)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Bahasa Norwegia)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Bahasa Polandia)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portugis Brazil)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portugis Eropa)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Rumania)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Swedia)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ukraina)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Cina Sederhana)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Cina Tradisional)" @@ -1782,7 +1787,7 @@ msgid "Domain" msgstr "Domain" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -2161,36 +2166,36 @@ msgstr "Temukan" #: bookwyrm/templates/discover/discover.html:12 #, python-format msgid "See what's new in the local %(site_name)s community" -msgstr "" +msgstr "Lihat yang baru di komunitas lokal %(site_name)s" #: bookwyrm/templates/discover/large-book.html:52 #: bookwyrm/templates/discover/small-book.html:36 msgid "View status" -msgstr "" +msgstr "Lihat status" #: bookwyrm/templates/email/confirm/html_content.html:6 #: bookwyrm/templates/email/confirm/text_content.html:4 #, python-format msgid "One last step before you join %(site_name)s! Please confirm your email address by clicking the link below:" -msgstr "" +msgstr "Satu langkah lagi sebelum Anda bergabung dengan %(site_name)s! Silakan konfirmasi alamat surel Anda dengan klik tautan di bawah:" #: bookwyrm/templates/email/confirm/html_content.html:11 msgid "Confirm Email" -msgstr "" +msgstr "Konfirmasi Surel" #: bookwyrm/templates/email/confirm/html_content.html:15 #, python-format msgid "Or enter the code \"%(confirmation_code)s\" at login." -msgstr "" +msgstr "Atau masukkan kode \"%(confirmation_code)s\" saat masuk akun." #: bookwyrm/templates/email/confirm/subject.html:2 msgid "Please confirm your email" -msgstr "" +msgstr "Silakan konfirmasi surel Anda" #: bookwyrm/templates/email/confirm/text_content.html:10 #, python-format msgid "Or enter the code \"%(confirmation_code)s\" at login." -msgstr "" +msgstr "Atau masukkan kode \"%(confirmation_code)s\" saat masuk akun." #: bookwyrm/templates/email/html_layout.html:15 #: bookwyrm/templates/email/text_layout.html:2 @@ -3206,133 +3211,145 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4099,7 +4116,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5303,7 +5320,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5636,7 +5653,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5683,18 +5700,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7471,14 +7496,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/it_IT/LC_MESSAGES/django.po b/locale/it_IT/LC_MESSAGES/django.po index 468f8ba087..e2bceda02f 100644 --- a/locale/it_IT/LC_MESSAGES/django.po +++ b/locale/it_IT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Italian\n" "Language: it\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Percorso Sbagliato" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Attivo" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Citazioni" msgid "Everything else" msgstr "Tutto il resto" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "La tua timeline" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Home" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Timeline dei libri" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Timeline dei libri" msgid "Books" msgstr "Libri" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Inglese)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (catalano)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Tedesco)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Spagnolo)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galiziano)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Finlandese)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Francese)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (Olandese)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norvegese)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Polacco)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Portoghese Brasiliano)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Portoghese europeo)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Rumeno (Romanian)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Svedese)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (ucraino)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Cinese Semplificato)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Cinese Tradizionale)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Dominio" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3221,134 +3226,146 @@ msgstr "Vedi gli stati taggati nella comunità locale %(site_name)s" msgid "No activities for this hashtag yet!" msgstr "Non c'è ancora nessuna attività per questo hashtag!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importa Elenco Libri" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Non è un file di csv valido" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Attualmente, puoi importare libri %(display_size)s ogni giorno %(import_limit_reset)s." msgstr[1] "Al momento puoi importare %(display_size)s libri ogni %(import_limit_reset)s giorni." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Ti rimane %(display_left)s." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "In media, le importazioni recenti hanno richiesto %(hours)s ore." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "In media, le importazioni recenti hanno richiesto %(minutes)s ore." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Sorgenti dati:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Puoi scaricare i tuoi dati Goodreads dalla pagina \"Importa/Esporta\" del tuo account Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Dati file:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Includi recensioni" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Crea nuovi scaffali se non esistono" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Impostazione della privacy per recensioni e scaffali importati:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importa" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Hai raggiunto il limite per le importazioni." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Le importazioni sono temporaneamente disabilitate; grazie per la pazienza." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Importazioni recenti" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Data Creazione" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Ultimo Aggiornamento" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Elementi" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4117,7 +4134,7 @@ msgid "List position" msgstr "Posizione elenco" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5328,7 +5345,7 @@ msgstr "Accedi per importare o aggiungere libri." msgid "Search query" msgstr "Chiave di ricerca" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Tipo di ricerca" @@ -5662,7 +5679,7 @@ msgid "Run time" msgstr "Tempo di esecuzione" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Priorità" @@ -5709,18 +5726,26 @@ msgstr "" msgid "Create new connector" msgstr "Configura nuovo connettore" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Motivo della disattivazione:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Disabilita" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Abilita" @@ -7503,14 +7528,14 @@ msgstr "percentuale" msgid "of %(pages)s pages" msgstr "di %(pages)s pagine" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Rispondi" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Contenuto" diff --git a/locale/ja_JP/LC_MESSAGES/django.po b/locale/ja_JP/LC_MESSAGES/django.po index ca09321b5c..d7822e79f5 100644 --- a/locale/ja_JP/LC_MESSAGES/django.po +++ b/locale/ja_JP/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Japanese\n" "Language: ja\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "アクティブ" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -516,19 +516,24 @@ msgstr "引用" msgid "Everything else" msgstr "他のすべて" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "ホームタイムライン" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "ホーム" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "本のタイムライン" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -537,91 +542,91 @@ msgstr "本のタイムライン" msgid "Books" msgstr "本" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (英語)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català(カタルーニャ語)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (ドイツ語)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (エスペラント)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (スペイン語)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (バスク語)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (ガリシア語)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (イタリア語)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (フィンランド語)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (フランス語)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (リトアニア語)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (オランダ語)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (ノルウェー語)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (ポーランド語)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil(ブラジルポルトガル語)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (ヨーロッパポルトガル語)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (ルーマニア語)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "スウェーデン語 (Swedish)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (簡体字中国語)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (繁体字中国語)" @@ -1782,7 +1787,7 @@ msgid "Domain" msgstr "ドメイン" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3206,133 +3211,145 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "有効なCSVファイルではありません" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "平均して、最近のインポートでは %(hours)s 時間かかっています。" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "データ元：" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Goodreadsのデータは、あなたのGoodreadsアカウントのインポート/エクスポートのページ からダウンロードできます。" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "データファイル:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "レビューを含める" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "インポート" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "最近のインポート" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "作成日" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "最終更新日" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "項目" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4099,7 +4116,7 @@ msgid "List position" msgstr "リストの位置" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5303,7 +5320,7 @@ msgstr "本をインポートまたは追加するにはログインしてくだ msgid "Search query" msgstr "検索クエリ" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "検索タイプ" @@ -5636,7 +5653,7 @@ msgid "Run time" msgstr "ランタイム" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5683,18 +5700,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7471,14 +7496,14 @@ msgstr "パーセント" msgid "of %(pages)s pages" msgstr "%(pages)s ページの内" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "返信" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "コンテンツ" diff --git a/locale/ko_KR/LC_MESSAGES/django.po b/locale/ko_KR/LC_MESSAGES/django.po index d35cf6c2ac..d0a6a6edd0 100644 --- a/locale/ko_KR/LC_MESSAGES/django.po +++ b/locale/ko_KR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Korean\n" "Language: ko\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "활성화" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -516,19 +516,24 @@ msgstr "인용구" msgid "Everything else" msgstr "그 밖의 것들" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "홈 타임라인" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "홈" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "도서 타임라임" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -537,91 +542,91 @@ msgstr "도서 타임라임" msgid "Books" msgstr "도서" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Catalan)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (German)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Spanish)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Basque)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italian)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Korean)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Finnish)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (French)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lithuanian)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "네덜란드 (Dutch)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norwegian)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Polish)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brazilian Portuguese)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (European Portuguese)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Romanian)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Swedish)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (우크라이나)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Simplified Chinese)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Traditional Chinese)" @@ -908,7 +913,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:270 #, python-format msgid "All the books %(display_name)s read in %(year)s" -msgstr "%(year)s년 한 해 동안 %(display_name)s 님이 읽은 책들" +msgstr "%(display_name)s 님이 %(year)s년 한 해 동안 읽은 책" #: bookwyrm/templates/author/author.html:20 #: bookwyrm/templates/author/author.html:21 @@ -1170,7 +1175,7 @@ msgstr "" #: bookwyrm/templates/book/book.html:69 #, python-format msgid "Book %(number)s in %(title)s" -msgstr "" +msgstr "%(title)s의 %(number)s권" #: bookwyrm/templates/book/book.html:75 #, python-format @@ -1549,7 +1554,7 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book_form.html:150 #: bookwyrm/templates/snippets/create_status/quotation.html:31 msgid "Position:" -msgstr "" +msgstr "위치:" #: bookwyrm/templates/book/edit/edit_book_form.html:164 #, python-format @@ -1567,7 +1572,7 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_book_form.html:186 #: bookwyrm/templates/book/edit/edit_series.html:75 msgid "Series position:" -msgstr "" +msgstr "시리즈 순서:" #: bookwyrm/templates/book/edit/edit_book_form.html:189 msgid "This field was previously called \"Series number\"" @@ -1682,7 +1687,7 @@ msgstr "" #: bookwyrm/templates/book/edit/edit_series.html:36 #: bookwyrm/templates/book/series.html:29 msgid "Alternative names" -msgstr "" +msgstr "다른 제목" #: bookwyrm/templates/book/edit/edit_series.html:39 #: bookwyrm/templates/book/edit/edit_series.html:42 @@ -1782,7 +1787,7 @@ msgid "Domain" msgstr "도메인" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -2423,7 +2428,7 @@ msgstr "읽음" #: bookwyrm/templates/shelf/shelf.html:96 bookwyrm/templates/user/user.html:54 #: bookwyrm/templatetags/shelf_tags.py:18 msgid "Stopped Reading" -msgstr "읽다 멈춘 것" +msgstr "읽다가 멈춤" #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" @@ -3206,133 +3211,145 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "도서 목록 가져오기" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "유효하지 않은 CSV 파일" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "최근 가져오기에 걸린 시간은 평균 %(hours)s시간입니다." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "최근 가져오기에 걸린 시간은 평균 %(minutes)s분입니다." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "데이터 출처:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Goodreads 데이터는 계정의 가져오기/내보내기t페이지에서 내려받을 수 있습니다." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "데이터 파일:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "서평 포함" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "가져오기" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "최근의 가져온 작업" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "만든 날짜" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "갱신 날짜" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "항목" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -3928,7 +3945,7 @@ msgstr "" #: bookwyrm/templates/lists/created_text.html:7 #, python-format msgid "Created and curated by %(username)s" -msgstr "" +msgstr "작성 및 큐레이트: %(username)s" #: bookwyrm/templates/lists/created_text.html:9 #, python-format @@ -4083,7 +4100,7 @@ msgstr "읽을 책 제안" #: bookwyrm/templates/lists/list.html:103 msgid "Embed this list on a website" -msgstr "" +msgstr "이 목록을 웹사이트에 임베드하기" #: bookwyrm/templates/lists/list.html:111 msgid "Copy embed code" @@ -4099,7 +4116,7 @@ msgid "List position" msgstr "목록 위치" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5303,7 +5320,7 @@ msgstr "" msgid "Search query" msgstr "검색 쿼리" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "유형 검색" @@ -5636,7 +5653,7 @@ msgid "Run time" msgstr "실행 시간" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "우선도" @@ -5683,18 +5700,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7397,7 +7422,7 @@ msgstr "" #: bookwyrm/templates/shelf/shelves_filter_field.html:7 msgid "Enter text here" -msgstr "" +msgstr "여기에 텍스트 입력" #: bookwyrm/templates/snippets/add_to_group_button.html:16 msgid "Invite" @@ -7471,14 +7496,14 @@ msgstr "퍼센트" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "답하기" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "컨텐트" @@ -7514,7 +7539,7 @@ msgstr "" #: bookwyrm/templates/snippets/create_status/quotation.html:44 msgid "On page:" -msgstr "" +msgstr "쪽:" #: bookwyrm/templates/snippets/create_status/quotation.html:50 msgid "At percent:" @@ -7760,7 +7785,7 @@ msgstr "" #: bookwyrm/templates/snippets/shelf_selector.html:53 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21 msgid "Stopped reading" -msgstr "읽다 멈춘 것" +msgstr "읽다가 멈춤" #: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 #, python-format @@ -7886,7 +7911,7 @@ msgstr "숨기기" #: bookwyrm/templates/snippets/status/header.html:45 #, python-format msgid "edited %(date)s" -msgstr "" +msgstr "%(date)s일에 편집" #: bookwyrm/templates/snippets/status/headers/comment.html:8 #, python-format @@ -7901,22 +7926,22 @@ msgstr "" #: bookwyrm/templates/snippets/status/headers/note.html:8 #, python-format msgid "replied to %(username)s's status" -msgstr "독자가 %(username)s'독자의 게시물에 회신" +msgstr "님이 %(username)s'독자의 게시물에 회신" #: bookwyrm/templates/snippets/status/headers/quotation.html:8 #, python-format msgid "quoted %(book)s by %(author_name)s" -msgstr "독자가 인용한 %(author_name)s 의 %(book)s" +msgstr "님이 인용한 %(author_name)s 의 %(book)s" #: bookwyrm/templates/snippets/status/headers/quotation.html:15 #, python-format msgid "quoted %(book)s" -msgstr "%(book)s 인용" +msgstr "님이 %(book)s 인용" #: bookwyrm/templates/snippets/status/headers/rating.html:3 #, python-format msgid "rated %(book)s:" -msgstr "" +msgstr "님이 %(book)s에 별점:" #: bookwyrm/templates/snippets/status/headers/read.html:10 #, python-format @@ -7931,12 +7956,12 @@ msgstr "" #: bookwyrm/templates/snippets/status/headers/reading.html:10 #, python-format msgid "started reading %(book)s by %(author_name)s" -msgstr "" +msgstr "님이 %(author_name)s의 %(book)s 읽기 시작" #: bookwyrm/templates/snippets/status/headers/reading.html:17 #, python-format msgid "started reading %(book)s" -msgstr "독자가 읽기 시작한 %(book)s" +msgstr "님이 읽기 시작한 %(book)s" #: bookwyrm/templates/snippets/status/headers/review.html:10 #: bookwyrm/templates/snippets/status/headers/review.html:26 @@ -7952,7 +7977,7 @@ msgstr "" #: bookwyrm/templates/snippets/status/headers/review.html:33 #, python-format msgid "rated %(book)s" -msgstr "" +msgstr "님이 %(book)s에 별점" #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format @@ -8261,7 +8286,7 @@ msgstr "" #: bookwyrm/views/books/series.py:91 msgid "Series position must be unique for each book" -msgstr "" +msgstr "시리즈 순서는 각 권마다 고유해야함" #: bookwyrm/views/updates.py:46 #, python-format diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 8073433c8e..b01307d639 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Blogas kelias" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktyvus" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -519,19 +519,24 @@ msgstr "Citatos" msgid "Everything else" msgstr "Visa kita" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Pagrindinė siena" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Pagrindinis" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Knygų siena" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -540,91 +545,91 @@ msgstr "Knygų siena" msgid "Books" msgstr "Knygos" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Anglų)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (kataloniečių)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Vokiečių)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Ispanų)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Baskų kalba)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (galisų)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italų (Italian)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (korėjiečių)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (suomių)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Prancūzų)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (Olandų)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norvegų (Norwegian)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (lenkų)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português brasileiro (Brazilijos portugalų)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europos portugalų)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (rumunų)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Švedų)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainiečių)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Supaprastinta kinų)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradicinė kinų)" @@ -1803,7 +1808,7 @@ msgid "Domain" msgstr "Domenas" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3239,17 +3244,17 @@ msgstr "Peržiūrėti grotžymiuotas būsenas %(site_name)s bendruomenėje" msgid "No activities for this hashtag yet!" msgstr "Šioje grotžymėje nėra aktyvumo!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importuoti knygų sąrašą" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Netinkamas CSV failas" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3258,117 +3263,129 @@ msgstr[1] "Šiuo metu jums leidžiama importuoti po %(display_size)s knygas kas msgstr[2] "Šiuo metu jums leidžiama importuoti po %(display_size)s knygų kas %(import_limit_reset)s d." msgstr[3] "Šiuo metu jums leidžiama importuoti po %(display_size)s knygų kas %(import_limit_reset)s d." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Jūsų neišnaudotas likutis – %(display_left)s." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Vidutiniškai importavimas užima %(hours)s val." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Vidutiniškai importavimas užima %(minutes)s min." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Duomenų šaltinis:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "„OpenReads“ (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "„BookWyrm“ (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Galite atsisiųsti savo „Goodreads“ duomenis iš Importavimo ir eksportavimo puslapio, esančio jūsų „Goodreads“ paskyroje." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Duomenų failas:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Įtraukti atsiliepimus" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Jeigu tinkamos lentynos nėra, galite sukurti naują" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Importuojamų apžvalgų ir lentynų privatumas:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importuoti" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Pasiekėte importavimo limitą." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importavimo galimybė laikinai išjungta. Dėkojame už kantrybę." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Pastaruoju metu importuota" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Sukūrimo data" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Paskutinį kartą atnaujinta" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Elementai" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4141,7 +4158,7 @@ msgid "List position" msgstr "Sąrašo pozicija" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5366,7 +5383,7 @@ msgstr "Prisijunkite, kad importuotumėte arba pridėtumėte knygas." msgid "Search query" msgstr "Paieškos užklausa" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Paieškos tipas" @@ -5702,7 +5719,7 @@ msgid "Run time" msgstr "Rodymo laikas" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioritetas" @@ -5749,18 +5766,26 @@ msgstr "" msgid "Create new connector" msgstr "Kurti naują integarciją" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Išjungimo priežastis:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Išjungti" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Įjungti" @@ -7555,14 +7580,14 @@ msgstr "procentai" msgid "of %(pages)s pages" msgstr "iš %(pages)s psl." -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Atsakyti" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Turinys" diff --git a/locale/nl_NL/LC_MESSAGES/django.po b/locale/nl_NL/LC_MESSAGES/django.po index 704a00e008..c88ebf2c9c 100644 --- a/locale/nl_NL/LC_MESSAGES/django.po +++ b/locale/nl_NL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-20 09:38\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Dutch\n" "Language: nl\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Verkeerde pad" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Actief" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Quotes" msgid "Everything else" msgstr "Overig" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Tijdlijnen" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Start" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Boeken tijdlijn" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Boeken tijdlijn" msgid "Books" msgstr "Boeken" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Engels (English)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Catalaans)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Duits (Deutsch)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Spaans (Español)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Baskisch)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galicisch)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italiaans)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Koreaans)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Fins)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Frans (Français)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litouws)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Noors)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Pools)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Braziliaans-Portugees)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeaans Portugees)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Roemeens)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Zweeds)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Oekraïens)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Vereenvoudigd Chinees)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "简体中文 (Traditioneel Chinees)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domein" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Zie getagde statussen in de lokale %(site_name)s gemeenschap" msgid "No activities for this hashtag yet!" msgstr "Er zijn nog geen activiteiten voor deze hashtag!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importeer boekenlijst" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Geen geldig CSV-bestand" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "Momenteel mag je %(display_size)s boek importeren elke %(import_limit_reset)s dagen." msgstr[1] "Momenteel mag je %(display_size)s boeken importeren elke %(import_limit_reset)s dagen." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Je hebt %(display_left)s over." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Recente imports hebben gemiddeld %(hours)s uur in beslag genomen." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Recente imports hebben gemiddeld %(minutes)s minuten in beslag genomen." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Gegevensbron:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BoekenWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Je kunt je Goodreads-gegevens downloaden met behulp van de Import/Export-pagina van je Goodreads-account." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Data bestand:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Recensies toevoegen" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Maak nieuwe planken aan als deze niet bestaan" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Privacyinstelling voor geïmporteerde recensies en boekenplanken:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importeren" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Je hebt de limiet voor importeren bereikt." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importeren is tijdelijk uitgeschakeld. Bedankt voor je geduld." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Recent geïmporteerd" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Datum aangemaakt" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Laatst bijgewerkt" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Items" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Lijstpositie" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Log in om boeken te importeren of toe te voegen." msgid "Search query" msgstr "Zoekopdracht" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Zoektype" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Looptijd" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioriteit" @@ -5705,18 +5722,26 @@ msgstr "Libris is de Zweedse nationale bibliotheekcatalogus en geeft toegang tot msgid "Create new connector" msgstr "Nieuwe conector maken" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Reden voor deactivatie:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Deactiveren" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Activeren" @@ -7499,14 +7524,14 @@ msgstr "procent" msgid "of %(pages)s pages" msgstr "van %(pages)s bladzijden" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Reageren" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Inhoud" diff --git a/locale/no_NO/LC_MESSAGES/django.po b/locale/no_NO/LC_MESSAGES/django.po index f45af6e56b..ec1ad3f5a3 100644 --- a/locale/no_NO/LC_MESSAGES/django.po +++ b/locale/no_NO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Norwegian\n" "Language: no\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Feil sti" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktiv" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Sitater" msgid "Everything else" msgstr "Andre ting" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Lokal tidslinje" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Hjem" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Boktidslinja" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Boktidslinja" msgid "Books" msgstr "Bøker" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Engelsk)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (katalansk)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Tysk)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Spansk)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Baskisk)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italiensk)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (koreansk)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (finsk)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Fransk)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litauisk)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (nederlandsk)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norsk)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Polsk)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português - Brasil (Brasiliansk portugisisk)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisisk)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (romansk)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Svensk)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainsk)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Forenklet kinesisk)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Tradisjonelt kinesisk)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domene" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Se merkede statuser i det lokale %(site_name)s-samfunnet" msgid "No activities for this hashtag yet!" msgstr "Ingen aktiviteter for denne emneknaggen ennå!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importer bokliste" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Ikke en gyldig CSV-fil" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "For øyeblikket kan du importere %(display_size)s bøker hver %(import_limit_reset)s dag." msgstr[1] "For øyeblikket kan du importere %(display_size)s bøker hver %(import_limit_reset)s dager." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Du har %(display_left)s igjen." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "I gjennomsnitt har de siste importene tatt %(hours)s timer." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "I gjennomsnitt har de siste importene tatt %(minutes)s minutter." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Datakilde:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Du kan laste ned Goodreads-dataene dine fra Import/Export-siden på Goodreads-kontoen din." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Datafil:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Inkluder omtaler" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Oprett nye hyller om de ikke finnes" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Personverninnstilling for importerte omtaler og hyller:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importér" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Du har nådd importeringsgrensa." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importering er midlertidig deaktivert; takk for din tålmodighet." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Nylig importer" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Opprettet dato" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Sist oppdatert" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Elementer" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Listeposisjon" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Logg på for å importere eller legge til bøker." msgid "Search query" msgstr "Søketerm" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Søketype" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Kjøretid" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioritet" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "Opprett ny kobling" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Deaktiveringsgrunn:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Deaktiver" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Aktiver" @@ -7499,14 +7524,14 @@ msgstr "prosent" msgid "of %(pages)s pages" msgstr "av %(pages)s sider" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Svar" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Innhold" diff --git a/locale/pl_PL/LC_MESSAGES/django.po b/locale/pl_PL/LC_MESSAGES/django.po index 3efa8a1893..46a19cd881 100644 --- a/locale/pl_PL/LC_MESSAGES/django.po +++ b/locale/pl_PL/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Polish\n" "Language: pl\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktywne" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -519,19 +519,24 @@ msgstr "Cytaty" msgid "Everything else" msgstr "Wszystko inne" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Strona główna" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Start" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Oś czasu książek" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -540,91 +545,91 @@ msgstr "Oś czasu książek" msgid "Books" msgstr "Książki" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Angielski)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (kataloński)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (niemiecki)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (hiszpański)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (baskijski)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (galicyjski)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (włoski)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (koreański)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (fiński)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (francuski)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (litewski)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (holenderski)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (norweski)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "polski" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugalski — Brazylia)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugalski — Portugalia)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (rumuński)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (szwedzki)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (ukraiński)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (chiński — uproszczony)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (chiński — tradycyjny)" @@ -1803,7 +1808,7 @@ msgid "Domain" msgstr "Domena" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3239,17 +3244,17 @@ msgstr "Zobacz oznaczone statusy w lokalnej społeczności %(site_name)s" msgid "No activities for this hashtag yet!" msgstr "Brak aktywności dla tego znacznika!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importuj listę książek" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "To nie jest prawidłowy plik CSV" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3258,117 +3263,129 @@ msgstr[1] "Obecnie możesz importować %(display_size)s książek co %(import_li msgstr[2] "Obecnie możesz importować %(display_size)s książek co %(import_limit_reset)s dni." msgstr[3] "Obecnie możesz importować %(display_size)s książek co %(import_limit_reset)s dni." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Pozostało %(display_left)s." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Ostatnie importy zajmowały średnio %(hours)s godzin." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Ostatnie importy zajmowały średnio %(minutes)s minut." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Źródło danych:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Możesz pobrać swoje dane Goodreads ze strony Importuj/Eksportuj na swoim koncie Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Plik danych:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Uwzględnij recenzje" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Utwórz nowe półki, jeśli nie istnieją" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Ustawienie prywatności dla importowanych opinii i półek:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importuj" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Limit importów osiągnięty." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importowanie jest tymczasowo wyłączone; dziękujemy za Twoją cierpliwość." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Najnowsze recenzje" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Data utworzenia" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Najnowsza aktualizacja" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Elementy" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4141,7 +4158,7 @@ msgid "List position" msgstr "Pozycja listy" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5366,7 +5383,7 @@ msgstr "Zaloguj się, aby importować lub dodawać książki." msgid "Search query" msgstr "Zapytanie" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Typ wyszukiwania" @@ -5702,7 +5719,7 @@ msgid "Run time" msgstr "Czas wykonywania" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Priorytet" @@ -5749,18 +5766,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Powód dezaktywacji:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7555,14 +7580,14 @@ msgstr "procent" msgid "of %(pages)s pages" msgstr "z %(pages)s stron" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Odpowiedz" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index f8b986e204..207ff0670c 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Ativo" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Citações" msgid "Everything else" msgstr "Todo o resto" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Linha do tempo" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Página inicial" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Linha do tempo dos livros" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Linha do tempo dos livros" msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Inglês)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Catalão)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Basco)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galego)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Coreano)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Finlandês)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Lituano)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Holandês (Alemão)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Polonês)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português do Brasil)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Português Europeu)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Romeno)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Sueco)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ucraniano)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domínio" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Fonte dos dados:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Arquivo de dados:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Incluir resenhas" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importar" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Importações recentes" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Posição na lista" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Entre para importar ou adicionar livros." msgid "Search query" msgstr "Termo de pesquisa" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Tipo de pesquisa" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Motivo de desativação:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "porcentagem" msgid "of %(pages)s pages" msgstr "de %(pages)s páginas" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Responder" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Conteúdo" diff --git a/locale/pt_PT/LC_MESSAGES/django.po b/locale/pt_PT/LC_MESSAGES/django.po index 7f7b325c69..7cad886ea4 100644 --- a/locale/pt_PT/LC_MESSAGES/django.po +++ b/locale/pt_PT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese\n" "Language: pt\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Ativo" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Citações" msgid "Everything else" msgstr "Tudo o resto" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Cronograma Inicial" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Início" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Cronograma de Livros" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Cronograma de Livros" msgid "Books" msgstr "Livros" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Inglês" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (catalão)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Alemão)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Espanhol)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Basco)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galician)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Italiano)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (finlandês)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Francês)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (lituano)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Holanda (Holanda)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norueguês)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Polaco)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Português brasileiro)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português (Português Europeu)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Romeno)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (sueco)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (ucraniano)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Chinês simplificado)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Chinês tradicional)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domínio" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Vê as actualizaçoes de hashtags da comunidade local %(site_name)s" msgid "No activities for this hashtag yet!" msgstr "Ainda não há atividades para esta hashtag!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Importar Lista de Livros" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Não é um ficheiro CSV válido" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "Em média, as importações recentes levaram %(hours)s horas." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "Em média, as importações recentes levaram %(minutes)s minutos." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Origem dos dados:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph(CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Podes fazer download dos teus dados do Goodreads na Importar/Exportar página da tua conta do Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Ficheiro de dados:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Incluir criticas" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "Configuração de privacidade para revisões e prateleiras importadas:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importar" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Atingiste o teu limite de importações." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "As importações estão temporariamente desativadas; obrigado pela tua paciência." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Importações recentes" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Data de criação" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Última Atualização" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Items" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Posição da lista" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Inicia sessão para importares ou adicionares livros." msgid "Search query" msgstr "Consulta de pesquisa" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Tipo de pesquisa" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Tempo de execução" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioridade" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Razão da desativação:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "porcento" msgid "of %(pages)s pages" msgstr "%(pages)s páginas" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Responder" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Conteúdo" diff --git a/locale/ro_RO/LC_MESSAGES/django.po b/locale/ro_RO/LC_MESSAGES/django.po index 2580f590cb..e56ac6a7c7 100644 --- a/locale/ro_RO/LC_MESSAGES/django.po +++ b/locale/ro_RO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:18\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:03\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Romanian\n" "Language: ro\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Activ" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -518,19 +518,24 @@ msgstr "Citate" msgid "Everything else" msgstr "Orice altceva" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Friză cronologică principală" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Acasă" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Friză cronologică de cărți" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -539,91 +544,91 @@ msgstr "Friză cronologică de cărți" msgid "Books" msgstr "Cărți" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (engleză)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (catalană)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (germană)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (spaniolă)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (galiciană)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (italiană)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (finlandeză)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (franceză)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (lituaniană)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (norvegiană)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (portugheză braziliană)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (portugheză europeană)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (română)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (suedeză)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (chineză simplificată)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (chineză tradițională)" @@ -1796,7 +1801,7 @@ msgid "Domain" msgstr "Domeniu" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3228,17 +3233,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3246,117 +3251,129 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Sursa de date:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Fișierul de date:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Includeți recenzii" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importați" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Importuri recente" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4127,7 +4144,7 @@ msgid "List position" msgstr "Poziția listei" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5345,7 +5362,7 @@ msgstr "Autentificați-vă pentru a importa sau adăuga cărți." msgid "Search query" msgstr "Conținutul căutării" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Tipul căutării" @@ -5680,7 +5697,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5727,18 +5744,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Motiv de dezactivare:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7527,14 +7552,14 @@ msgstr "procent" msgid "of %(pages)s pages" msgstr "din %(pages)s pagini" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Răspundeți" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Conținut" diff --git a/locale/ru_RU/LC_MESSAGES/django.po b/locale/ru_RU/LC_MESSAGES/django.po index 71b39f88bc..cb6e699abf 100644 --- a/locale/ru_RU/LC_MESSAGES/django.po +++ b/locale/ru_RU/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Russian\n" "Language: ru\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -519,19 +519,24 @@ msgstr "Цитаты" msgid "Everything else" msgstr "Всё остальное" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Главная лента" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Главная" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Хронология книг" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -540,91 +545,91 @@ msgstr "Хронология книг" msgid "Books" msgstr "Книги" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (Английский)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Каталанский)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (немецкий)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Эсперанто)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (испанский)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Баскский)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Галицкий)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Итальянский)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Корейский)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Финский)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (французский)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (литовский)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Нидерланды (голландский)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (норвежский)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Польский)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Бразильский Португальский)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Европейский Португальский)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (румынский)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Шведский)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Украинский)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (упрощенный китайский)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Традиционный китайский)" @@ -1803,7 +1808,7 @@ msgid "Domain" msgstr "Домен" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3239,17 +3244,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3258,117 +3263,129 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "Сейчас вам можно импортировать %(display_size)s книг в %(import_limit_reset)s дней." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "У вас осталось %(display_left)s." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Источник данных:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Вы можете загрузить данные Goodreadsх с страницы импорта/экспорта вашей учетной записи Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Файл данных:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Импортировать" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Последнее обновление" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4141,7 +4158,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5366,7 +5383,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5702,7 +5719,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5749,18 +5766,26 @@ msgstr "" msgid "Create new connector" msgstr "Создать коннектор" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7555,14 +7580,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Ответить" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/sk_SK/LC_MESSAGES/django.po b/locale/sk_SK/LC_MESSAGES/django.po index 932a83fd6d..f7769711e1 100644 --- a/locale/sk_SK/LC_MESSAGES/django.po +++ b/locale/sk_SK/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Slovak\n" "Language: sk\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktívny" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -519,19 +519,24 @@ msgstr "Citácie" msgid "Everything else" msgstr "Všetko ostatné" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Domáca časová os" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Domov" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Časová os kníh" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -540,91 +545,91 @@ msgstr "Časová os kníh" msgid "Books" msgstr "Knihy" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Angličtina" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Nemecky" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Španielsky" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Taliansky" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "Kórejsky" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Fínsky" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Francúzky" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Dánsky" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Nórsky" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Poľsky" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Rumunsky" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Švédsky" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Ukrajinsky" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "Klasická čínština" @@ -1803,7 +1808,7 @@ msgid "Domain" msgstr "Doména" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3239,17 +3244,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "Ešte pod týmto hashtagom nieje aktivita!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "Nahrať zoznam kníh" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Nesprávny CSV súbor" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3258,117 +3263,129 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Nahrať" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Dátum vytvorenia" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Položky" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4141,7 +4158,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5366,7 +5383,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5702,7 +5719,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Priorita" @@ -5749,18 +5766,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7555,14 +7580,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/sl_SI/LC_MESSAGES/django.po b/locale/sl_SI/LC_MESSAGES/django.po index 8caf11ebf8..85cdbaf36c 100644 --- a/locale/sl_SI/LC_MESSAGES/django.po +++ b/locale/sl_SI/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Slovenian\n" "Language: sl\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktivno" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -519,19 +519,24 @@ msgstr "Citati" msgid "Everything else" msgstr "Vse ostalo" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Domača časovnica" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Domov" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Knjižna časovnica" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -540,91 +545,91 @@ msgstr "Knjižna časovnica" msgid "Books" msgstr "Knjige" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "angleški (English)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "katalonski (Catalan)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "nemški (German)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "španski (Spanish)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "galicijski (Galician)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "italijanski (Italian)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "finski (Finnish)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "francoski (French)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "litovski (Lithuanian)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "norveški (Norwegian)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "polski (Polish)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "portugalski, brazilski (Brazilian Portuguese)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "portugalski, evropski (European Portuguese)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "romunski (Romanian)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "švedski (Swedish)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "kitajski, poenostavljen (Simplified Chinese)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "kitajski, tradicionalen (Traditional Chinese)" @@ -1803,7 +1808,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3239,17 +3244,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Neveljavna CSV datoteka" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3258,117 +3263,129 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4141,7 +4158,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5366,7 +5383,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5702,7 +5719,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5749,18 +5766,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7555,14 +7580,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/sr_SP/LC_MESSAGES/django.po b/locale/sr_SP/LC_MESSAGES/django.po index ed8e7a65a2..d5a714e06b 100644 --- a/locale/sr_SP/LC_MESSAGES/django.po +++ b/locale/sr_SP/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Serbian (Cyrillic)\n" "Language: sr\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -518,19 +518,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -539,91 +544,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1796,7 +1801,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3228,17 +3233,17 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3246,117 +3251,129 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4127,7 +4144,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5345,7 +5362,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5680,7 +5697,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5727,18 +5744,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7527,14 +7552,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/sv_SE/LC_MESSAGES/django.po b/locale/sv_SE/LC_MESSAGES/django.po index 539726e816..e85e5ff981 100644 --- a/locale/sv_SE/LC_MESSAGES/django.po +++ b/locale/sv_SE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Swedish\n" "Language: sv\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktiv" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Citat" msgid "Everything else" msgstr "Allt annat" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Tidslinje för Hem" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Hem" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Tidslinjer för böcker" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Tidslinjer för böcker" msgid "Books" msgstr "Böcker" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Engelska" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (katalanska)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Tyska (Tysk)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Spanska (Spansk)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Baskiska)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Gallisk)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italienska (Italiensk)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (koreanska)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Finland (Finska)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Franska (Fransk)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Litauiska (Litauisk)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederländerna (Holländska)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norska (Norska)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (polska)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português d Brasil (Brasiliansk Portugisiska)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Europeisk Portugisiska)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Rumänien (Rumänska)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Svenska)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (ukrainska)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Förenklad Kinesiska)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Traditionell Kinesiska)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Domän" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "Se taggade statusar i den lokala %(site_name)s-gemenskapen" msgid "No activities for this hashtag yet!" msgstr "Inga aktiviteter för den här hash-taggen än!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Inte en giltig CSV-fil" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Du har %(display_left)s kvar." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "De senaste importerna har i genomsnitt tagit %(hours)s timmar." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "De senaste importerna har i genomsnitt tagit %(minutes)s minuter." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Datakälla:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "OpenReads (CSV)" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "BookWyrm (CSV)" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Du kan ladda ner din Goodreads-data från Import/Export-sidan för ditt Goodreads-konto." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Datafil:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Inkludera recensioner" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Importera" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Du har nått importeringsgränsen." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Importer är tillfälligt inaktiverade, tack för ditt tålamod." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Senaste importer" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Skapad" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Senast uppdaterad" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Föremål" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Listans plats" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Logga in för att importera eller lägga till böcker." msgid "Search query" msgstr "Sökfråga" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Typ av sökning" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Körtid" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Prioritet" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Orsak till inaktivering:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Inaktivera" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "procent" msgid "of %(pages)s pages" msgstr "av %(pages)s sidor" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Svara" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Innehåll" diff --git a/locale/tr_TR/LC_MESSAGES/django.po b/locale/tr_TR/LC_MESSAGES/django.po index f90f05a65d..c457eb1849 100644 --- a/locale/tr_TR/LC_MESSAGES/django.po +++ b/locale/tr_TR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Turkish\n" "Language: tr\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "Yol hatalı" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "Aktif" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "Alıntılar" msgid "Everything else" msgstr "Diğer" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Akış" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Ana Sayfa" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Kitap Akışı" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "Kitap Akışı" msgid "Books" msgstr "Kitaplar" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "İngilizce" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Katalanca)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Almanca)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Esperanto)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (İspanyolca)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Baskça)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Galiçyaca)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (İtalyanca)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (Korece)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Fince)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Fransızca)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Litovca)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (Felemenkçe)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Norveççe)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Lehçe)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Brezilya Portekizcesi)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Avrupa Portekizcesi)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Rumence)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (İsveççe)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ukraynaca)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Basitleştirilmiş Çince)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Geleneksel Çince)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "Alan adı" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "Bu etiket için henüz bir etkinlik yok!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "Mevcut değillerse yeni raflar oluştur" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "İçe aktarılan incelemeler ve raflar için gizlilik ayarı:" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Oluşturma Tarihi" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "Liste konumu" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "Kitapları içe aktarmak veya eklemek için giriş yapın." msgid "Search query" msgstr "Arama sorgusu" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "Arama türü" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "Çalışma süresi" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Öncelik" @@ -5705,18 +5722,26 @@ msgstr "Libris, İsveç kütüphane kayıtlarına erişim sağlayan İsveç ulus msgid "Create new connector" msgstr "Yeni bağlayıcı oluştur" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Devre dışı bırakma nedeni:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "Devre dışı bırak" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "Aktif et" @@ -7499,14 +7524,14 @@ msgstr "yüzde" msgid "of %(pages)s pages" msgstr "%(pages)s sayfalar" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Yanıtla" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "İçerik" diff --git a/locale/uk_UA/LC_MESSAGES/django.po b/locale/uk_UA/LC_MESSAGES/django.po index 584afda9cd..7112b28ce7 100644 --- a/locale/uk_UA/LC_MESSAGES/django.po +++ b/locale/uk_UA/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "В процесі" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -519,19 +519,24 @@ msgstr "Цитати" msgid "Everything else" msgstr "Все інше" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "Головна Стрічка" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "Головна" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "Книжкова Стрічка" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -540,91 +545,91 @@ msgstr "Книжкова Стрічка" msgid "Books" msgstr "Книги" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "Англійська" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (Каталонська)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (Німецька)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (Есперанто)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (Іспанська)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (Баскська)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (Галісійська)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (Італійська)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (Фінська)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (Французька)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (Литовська)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (Нідерландська)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (Норвезька)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (Польська)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (Бразильська португальська)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (Європейська португальська)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (Румунська)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (Шведська)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (Ukrainian)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (Спрощена китайська)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (Традиційна китайська)" @@ -1803,7 +1808,7 @@ msgid "Domain" msgstr "Домен" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3239,17 +3244,17 @@ msgstr "Дивіться відмічені статуси у локальній msgid "No activities for this hashtag yet!" msgstr "Поки що ніхто не використовував цей хештег!" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "Некоректний CSV-файл" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." @@ -3258,117 +3263,129 @@ msgstr[1] "Наразі ви можете імпортувати тільки %( msgstr[2] "Наразі ви можете імпортувати тільки %(display_size)s книг впродовж кожних %(import_limit_reset)s днів." msgstr[3] "Наразі ви можете імпортувати тільки %(display_size)s книг впродовж кожних %(import_limit_reset)s днів." -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "Залишилось %(display_left)s." -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "В середньому, недавні імпорти зайняли %(hours)s годин." -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "В середньому, недавні імпорти зайняли %(minutes)s хвилин." -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "Джерело даних:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "Ви можете завантажити дані Goodreads на сторінці Import/Export вашого облікового запису Goodreads." -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "Файл даних:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "Разом з рецензіями" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "Імпортувати" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "Ви досягли ліміту на імпорт." -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "Імпортування тимчасово відключено; дякуємо за терпіння." -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "Останні Імпорти" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "Дата Створення" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "Останнє Оновлення" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "Одиниць" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4141,7 +4158,7 @@ msgid "List position" msgstr "Позиція в списку" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5366,7 +5383,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5702,7 +5719,7 @@ msgid "Run time" msgstr "Час виконання" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "Пріоритет" @@ -5749,18 +5766,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "Причина деактивації:" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7555,14 +7580,14 @@ msgstr "процентів" msgid "of %(pages)s pages" msgstr "з %(pages)s сторінок" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Відповісти" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "Зміст" diff --git a/locale/vi_VN/LC_MESSAGES/django.po b/locale/vi_VN/LC_MESSAGES/django.po index 2938bdb3c9..3c8827cffb 100644 --- a/locale/vi_VN/LC_MESSAGES/django.po +++ b/locale/vi_VN/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-07 14:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Vietnamese\n" "Language: vi\n" @@ -19,194 +19,194 @@ msgstr "" #: bookwyrm/forms/admin.py:42 msgid "One Day" -msgstr "" +msgstr "Một ngày" #: bookwyrm/forms/admin.py:43 msgid "One Week" -msgstr "" +msgstr "Một tuần" #: bookwyrm/forms/admin.py:44 msgid "One Month" -msgstr "" +msgstr "Một tháng" #: bookwyrm/forms/admin.py:45 msgid "Does Not Expire" -msgstr "" +msgstr "Không bao giờ hết hạn" #: bookwyrm/forms/admin.py:50 msgid "Unlimited" -msgstr "" +msgstr "Không giới hạn" #: bookwyrm/forms/edit_user.py:15 msgid "Readwise access token" -msgstr "" +msgstr "Mã truy cập Readwise" #: bookwyrm/forms/edit_user.py:24 #: bookwyrm/templates/preferences/edit_user.html:173 msgid "Remove saved Readwise access token" -msgstr "" +msgstr "Xóa mã truy cập Readwise đã lưu" #: bookwyrm/forms/edit_user.py:64 msgid "A Readwise access token is saved. Leave this blank to keep it." -msgstr "" +msgstr "Đã lưu mã truy cập Readwise. Để trống trường này nếu bạn muốn giữ nguyên." #: bookwyrm/forms/edit_user.py:136 bookwyrm/views/landing/password.py:117 msgid "Incorrect password" -msgstr "" +msgstr "Mật khẩu không đúng" #: bookwyrm/forms/edit_user.py:143 bookwyrm/forms/landing.py:93 msgid "Password does not match" -msgstr "" +msgstr "Mật khẩu không khớp" #: bookwyrm/forms/edit_user.py:166 msgid "Incorrect Password" -msgstr "" +msgstr "Mật khẩu không đúng" #: bookwyrm/forms/forms.py:67 msgid "Reading finish date cannot be before start date." -msgstr "" +msgstr "Ngày đọc xong không được trước ngày bắt đầu đọc." #: bookwyrm/forms/forms.py:72 msgid "Reading stopped date cannot be before start date." -msgstr "" +msgstr "Ngày ngừng đọc không được trước ngày bắt đầu đọc." #: bookwyrm/forms/forms.py:80 msgid "Reading stopped date cannot be in the future." -msgstr "" +msgstr "Ngày ngừng đọc không được là ngày trong tương lai." #: bookwyrm/forms/forms.py:87 msgid "Reading finished date cannot be in the future." -msgstr "" +msgstr "Ngày đọc xong không được là ngày trong tương lai." #: bookwyrm/forms/landing.py:37 msgid "Username or password are incorrect" -msgstr "" +msgstr "Tên người dùng hoặc mật khẩu không đúng" #: bookwyrm/forms/landing.py:56 msgid "User with this username already exists" -msgstr "" +msgstr "Tên người dùng này đã tồn tại" #: bookwyrm/forms/landing.py:65 msgid "A user with this email already exists." -msgstr "" +msgstr "Đã có người dùng sử dụng email này." #: bookwyrm/forms/landing.py:69 msgid "This email address cannot be registered." -msgstr "" +msgstr "Không thể đăng ký bằng địa chỉ email này." #: bookwyrm/forms/landing.py:114 msgid "Password cannot be the same as your current password" -msgstr "" +msgstr "Mật khẩu mới không được trùng với mật khẩu hiện tại" #: bookwyrm/forms/landing.py:144 bookwyrm/forms/landing.py:152 msgid "Incorrect code" -msgstr "" +msgstr "Mã xác thực không đúng" #: bookwyrm/forms/links.py:34 msgid "This domain is blocked. Please contact your administrator if you think this is an error." -msgstr "" +msgstr "Tên miền này đã bị chặn. Vui lòng liên hệ quản trị viên nếu bạn cho rằng đây là nhầm lẫn." #: bookwyrm/forms/links.py:47 msgid "This link has already been added for this book. If it is not visible, the domain is still pending." -msgstr "" +msgstr "Liên kết này đã được thêm cho sách này. Nếu liên kết chưa hiển thị, tên miền vẫn đang trong trạng thái chờ xử lý." #: bookwyrm/forms/lists.py:38 msgid "List Order" -msgstr "" +msgstr "Thứ tự danh sách" #: bookwyrm/forms/lists.py:39 msgid "Book Title" -msgstr "" +msgstr "Tên sách" #: bookwyrm/forms/lists.py:40 bookwyrm/templates/shelf/shelf.html:164 #: bookwyrm/templates/shelf/shelf.html:196 #: bookwyrm/templates/snippets/create_status/review.html:31 msgid "Rating" -msgstr "" +msgstr "Xếp hạng" #: bookwyrm/forms/lists.py:42 bookwyrm/templates/lists/list.html:71 msgid "Sort By" -msgstr "" +msgstr "Sắp xếp theo" #: bookwyrm/forms/lists.py:46 msgid "Ascending" -msgstr "" +msgstr "Tăng dần" #: bookwyrm/forms/lists.py:47 msgid "Descending" -msgstr "" +msgstr "Giảm dần" #: bookwyrm/models/announcement.py:12 msgid "Primary" -msgstr "" +msgstr "Chính" #: bookwyrm/models/announcement.py:13 msgid "Success" -msgstr "" +msgstr "Thành công" #: bookwyrm/models/announcement.py:14 #: bookwyrm/templates/settings/invites/manage_invites.html:47 msgid "Link" -msgstr "" +msgstr "Liên kết" #: bookwyrm/models/announcement.py:15 msgid "Warning" -msgstr "" +msgstr "Cảnh báo" #: bookwyrm/models/announcement.py:16 msgid "Danger" -msgstr "" +msgstr "Nguy hiểm" #: bookwyrm/models/antispam.py:114 bookwyrm/models/antispam.py:149 msgid "Automatically generated report" -msgstr "" +msgstr "Báo cáo được tạo tự động" #: bookwyrm/models/base_model.py:19 bookwyrm/models/import_job.py:50 #: bookwyrm/models/job.py:18 bookwyrm/models/link.py:77 #: bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" -msgstr "" +msgstr "Chờ xử lý" #: bookwyrm/models/base_model.py:20 msgid "Self deletion" -msgstr "" +msgstr "Tự xóa" #: bookwyrm/models/base_model.py:21 msgid "Self deactivation" -msgstr "" +msgstr "Tự vô hiệu hóa" #: bookwyrm/models/base_model.py:22 msgid "Moderator suspension" -msgstr "" +msgstr "Đình chỉ bởi kiểm duyệt viên" #: bookwyrm/models/base_model.py:23 msgid "Moderator deletion" -msgstr "" +msgstr "Xóa bởi kiểm duyệt viên" #: bookwyrm/models/base_model.py:24 msgid "Domain block" -msgstr "" +msgstr "Tên miền bị chặn" #: bookwyrm/models/book.py:532 msgid "Audiobook" -msgstr "" +msgstr "Sách nói" #: bookwyrm/models/book.py:533 msgid "eBook" -msgstr "" +msgstr "Sách điện tử" #: bookwyrm/models/book.py:534 msgid "Graphic novel" -msgstr "" +msgstr "Tiểu thuyết đồ họa" #: bookwyrm/models/book.py:535 msgid "Hardcover" -msgstr "" +msgstr "Bìa cứng" #: bookwyrm/models/book.py:536 msgid "Paperback" -msgstr "" +msgstr "Bìa mềm" #: bookwyrm/models/book.py:545 bookwyrm/models/book.py:552 #: bookwyrm/models/book.py:558 bookwyrm/models/book.py:563 @@ -214,38 +214,38 @@ msgstr "" #: bookwyrm/models/book.py:592 bookwyrm/models/book.py:597 #, python-format msgid "%(value)s doesn't look like an ISBN" -msgstr "" +msgstr "%(value)s có vẻ không phải là một mã ISBN" #: bookwyrm/models/book.py:574 bookwyrm/models/book.py:614 #, python-format msgid "%(value)s doesn't have correct ISBN checksum, we expected %(check_version)s" -msgstr "" +msgstr "Mã kiểm tra ISBN của %(value)s không đúng, giá trị hợp lệ phải là %(check_version)s" #: bookwyrm/models/book.py:797 msgid "Book is already in this series" -msgstr "" +msgstr "Sách này đã có trong bộ sách hiện tại" #: bookwyrm/models/bookwyrm_import_job.py:151 bookwyrm/models/report.py:119 #: bookwyrm/templates/settings/reports/report.html:119 #: bookwyrm/templates/snippets/create_status.html:26 msgid "Comment" -msgstr "" +msgstr "Bình luận" #: bookwyrm/models/bookwyrm_import_job.py:152 #: bookwyrm/templates/import/import_status.html:127 #: bookwyrm/templates/import/manual_review.html:13 #: bookwyrm/templates/snippets/create_status.html:16 msgid "Review" -msgstr "" +msgstr "Đánh giá" #: bookwyrm/models/bookwyrm_import_job.py:153 msgid "Quotation" -msgstr "" +msgstr "Trích dẫn" #: bookwyrm/models/bookwyrm_import_job.py:181 #: bookwyrm/templates/snippets/follow_button.html:24 msgid "Follow" -msgstr "" +msgstr "Theo dõi" #: bookwyrm/models/bookwyrm_import_job.py:182 #: bookwyrm/templates/settings/federation/instance.html:116 @@ -253,32 +253,32 @@ msgstr "" #: bookwyrm/templates/snippets/block_book_button.html:5 #: bookwyrm/templates/snippets/block_button.html:5 msgid "Block" -msgstr "" +msgstr "Chặn" #: bookwyrm/models/bookwyrm_import_job.py:395 msgid "Unknown error importing book" -msgstr "" +msgstr "Lỗi không xác định khi nhập sách" #: bookwyrm/models/bookwyrm_import_job.py:490 msgid "unauthorized" -msgstr "" +msgstr "không được phép" #: bookwyrm/models/bookwyrm_import_job.py:496 msgid "Unknown error importing book status" -msgstr "" +msgstr "Lỗi không xác định khi nhập trạng thái sách" #: bookwyrm/models/bookwyrm_import_job.py:686 #: bookwyrm/models/bookwyrm_import_job.py:711 msgid "connection_error" -msgstr "" +msgstr "lỗi kết nối" #: bookwyrm/models/bookwyrm_import_job.py:721 msgid "invalid_relationship" -msgstr "" +msgstr "mối quan hệ không hợp lệ" #: bookwyrm/models/bookwyrm_import_job.py:729 msgid "Unkown error importing relationship" -msgstr "" +msgstr "Lỗi không xác định khi nhập mối quan hệ" #: bookwyrm/models/federated_server.py:12 #: bookwyrm/templates/settings/federation/edit_instance.html:55 @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -516,19 +516,24 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -537,91 +542,91 @@ msgstr "" msgid "Books" msgstr "" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -1782,7 +1787,7 @@ msgid "Domain" msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3206,133 +3211,145 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4099,7 +4116,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5303,7 +5320,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5636,7 +5653,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5683,18 +5700,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7471,14 +7496,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/yi_DE/LC_MESSAGES/django.po b/locale/yi_DE/LC_MESSAGES/django.po index d9464008d7..c4f40b8fd8 100644 --- a/locale/yi_DE/LC_MESSAGES/django.po +++ b/locale/yi_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Yiddish\n" "Language: yi\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "פֿאַלשער װעג" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "אַקטיװ" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -517,19 +517,24 @@ msgstr "ציטאַטן" msgid "Everything else" msgstr "איבעריקע" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "הײם־כראָנאָלאָגיע" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "הײם" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "ביכער־כראָנאָלאָגיע" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -538,91 +543,91 @@ msgstr "ביכער־כראָנאָלאָגיע" msgid "Books" msgstr "ביכער" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English (ענגליש)" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (קאַטאַלאַניש)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch (דײַטש)" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (עספּעראַנטאָ)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español (שפּאַניש)" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (באַסקיש)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (גאַליסיש)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (איטאַליעניש)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (קאָרעניש)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (פֿיניש)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français (פֿראַנצײזיש)" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (ליטװיש)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (האָלענדיש)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (נאָרװעגיש)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (פּױליש)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (בראַזיליאַנער פּאָרטוגעזיש)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (אײראָפּעיש פּאָרטוגעזיש)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (רומעניש)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (שװעדיש)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (אוקראַיִניש)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文 (פֿאַרפּשוטערן כינעזיש)" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文 (טראַדיציאָנעל כינעזיש)" @@ -1789,7 +1794,7 @@ msgid "Domain" msgstr "שטח" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3217,134 +3222,146 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4113,7 +4130,7 @@ msgid "List position" msgstr "" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5324,7 +5341,7 @@ msgstr "" msgid "Search query" msgstr "" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "" @@ -5658,7 +5675,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5705,18 +5722,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7499,14 +7524,14 @@ msgstr "" msgid "of %(pages)s pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "" diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 225df58ee1..4971cc3b7d 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "活跃" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -516,19 +516,24 @@ msgstr "引用" msgid "Everything else" msgstr "所有其它内容" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "主页时间线" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "主页" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "书目时间线" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -537,91 +542,91 @@ msgstr "书目时间线" msgid "Books" msgstr "书目" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English（英语）" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (加泰罗尼亚语)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch（德语）" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (世界语)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español（西班牙语）" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (巴斯克语)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego（加利西亚语）" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano（意大利语）" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "한국어 (韩语)" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi （Finnish/芬兰语）" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français（法语）" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių（立陶宛语）" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (荷兰语)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk（挪威语）" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (波兰语)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil（巴西葡萄牙语）" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu（欧洲葡萄牙语）" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română （罗马尼亚语）" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska（瑞典语）" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "Українська (乌克兰语)" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "简体中文" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文（繁体中文）" @@ -1782,7 +1787,7 @@ msgid "Domain" msgstr "域名" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3206,133 +3211,145 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "此标签尚无活动！" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "导入书单" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "无效的 CSV 文件" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "数据来源:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "Goodreads (CSV)" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "Storygraph (CSV)" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "LibraryThing (TSV)" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "OpenLibrary (CSV)" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "Calibre (CSV)" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "您可以从您的Goodreads帐户的 导入/导出页面 下载您的Goodreads数据。" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "数据文件:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "纳入书评" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "导入" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "您已达到导入限额。" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "最近的导入" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "创建日期" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "最后更新" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4099,7 +4116,7 @@ msgid "List position" msgstr "列表位置:" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5303,7 +5320,7 @@ msgstr "登录以导入或添加书目。" msgid "Search query" msgstr "搜索请求" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "搜索类型" @@ -5636,7 +5653,7 @@ msgid "Run time" msgstr "运行时间" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "优先次序" @@ -5683,18 +5700,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "停用原因：" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7471,14 +7496,14 @@ msgstr "百分比" msgid "of %(pages)s pages" msgstr "全书 %(pages)s 页" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "回复" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "内容" diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index c9d3bddd98..3b2719ae4a 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-06-17 23:40+0000\n" -"PO-Revision-Date: 2026-06-18 00:19\n" +"POT-Creation-Date: 2026-07-06 15:05+0000\n" +"PO-Revision-Date: 2026-07-06 20:04\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -356,7 +356,7 @@ msgid "Wrong Path" msgstr "" #: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:19 -#: bookwyrm/templates/import/import.html:184 +#: bookwyrm/templates/import/import.html:203 #: bookwyrm/templates/import/import_user.html:225 #: bookwyrm/templates/import/user_import_status.html:56 #: bookwyrm/templates/preferences/export-user.html:146 @@ -369,7 +369,7 @@ msgid "Active" msgstr "活躍" #: bookwyrm/models/import_job.py:52 bookwyrm/models/job.py:20 -#: bookwyrm/templates/import/import.html:182 +#: bookwyrm/templates/import/import.html:201 #: bookwyrm/templates/import/import_user.html:223 #: bookwyrm/templates/import/user_import_status.html:54 #: bookwyrm/templates/preferences/export-user.html:144 @@ -516,19 +516,24 @@ msgstr "引用" msgid "Everything else" msgstr "所有其他內容" -#: bookwyrm/settings.py:242 +#: bookwyrm/models/user.py:232 +#, python-brace-format +msgid "avatar for {name}" +msgstr "" + +#: bookwyrm/settings.py:258 msgid "Home Timeline" msgstr "主頁時間線" -#: bookwyrm/settings.py:242 +#: bookwyrm/settings.py:258 msgid "Home" msgstr "主頁" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 msgid "Books Timeline" msgstr "書目時間線" -#: bookwyrm/settings.py:243 +#: bookwyrm/settings.py:259 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/import/user_import_status.html:73 #: bookwyrm/templates/search/layout.html:22 @@ -537,91 +542,91 @@ msgstr "書目時間線" msgid "Books" msgstr "書目" -#: bookwyrm/settings.py:322 +#: bookwyrm/settings.py:338 msgid "English" msgstr "English（英語）" -#: bookwyrm/settings.py:323 +#: bookwyrm/settings.py:339 msgid "Català (Catalan)" msgstr "Català (加泰羅尼亞語)" -#: bookwyrm/settings.py:324 +#: bookwyrm/settings.py:340 msgid "Deutsch (German)" msgstr "Deutsch（德語）" -#: bookwyrm/settings.py:325 +#: bookwyrm/settings.py:341 msgid "Esperanto (Esperanto)" msgstr "Esperanto (世界語)" -#: bookwyrm/settings.py:326 +#: bookwyrm/settings.py:342 msgid "Español (Spanish)" msgstr "Español（西班牙語）" -#: bookwyrm/settings.py:327 +#: bookwyrm/settings.py:343 msgid "Euskara (Basque)" msgstr "Euskara (巴斯克語)" -#: bookwyrm/settings.py:328 +#: bookwyrm/settings.py:344 msgid "Galego (Galician)" msgstr "Galego (加利西亞語)" -#: bookwyrm/settings.py:329 +#: bookwyrm/settings.py:345 msgid "Italiano (Italian)" msgstr "Italiano (意大利語)" -#: bookwyrm/settings.py:330 +#: bookwyrm/settings.py:346 msgid "한국어 (Korean)" msgstr "" -#: bookwyrm/settings.py:331 +#: bookwyrm/settings.py:347 msgid "Suomi (Finnish)" msgstr "Suomi (芬蘭語)" -#: bookwyrm/settings.py:332 +#: bookwyrm/settings.py:348 msgid "Français (French)" msgstr "Français（法語）" -#: bookwyrm/settings.py:333 +#: bookwyrm/settings.py:349 msgid "Lietuvių (Lithuanian)" msgstr "Lietuvių (立陶宛語)" -#: bookwyrm/settings.py:334 +#: bookwyrm/settings.py:350 msgid "Nederlands (Dutch)" msgstr "Nederlands (荷蘭語)" -#: bookwyrm/settings.py:335 +#: bookwyrm/settings.py:351 msgid "Norsk (Norwegian)" msgstr "Norsk (挪威語)" -#: bookwyrm/settings.py:336 +#: bookwyrm/settings.py:352 msgid "Polski (Polish)" msgstr "Polski (波蘭語)" -#: bookwyrm/settings.py:337 +#: bookwyrm/settings.py:353 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "Português do Brasil (巴西葡萄牙語)" -#: bookwyrm/settings.py:338 +#: bookwyrm/settings.py:354 msgid "Português Europeu (European Portuguese)" msgstr "Português Europeu (歐洲葡萄牙語)" -#: bookwyrm/settings.py:339 +#: bookwyrm/settings.py:355 msgid "Română (Romanian)" msgstr "Română (羅馬尼亞語)" -#: bookwyrm/settings.py:340 +#: bookwyrm/settings.py:356 msgid "Svenska (Swedish)" msgstr "Svenska (瑞典語)" -#: bookwyrm/settings.py:341 +#: bookwyrm/settings.py:357 msgid "Українська (Ukrainian)" msgstr "" -#: bookwyrm/settings.py:342 +#: bookwyrm/settings.py:358 msgid "简体中文 (Simplified Chinese)" msgstr "簡體中文" -#: bookwyrm/settings.py:343 +#: bookwyrm/settings.py:359 msgid "繁體中文 (Traditional Chinese)" msgstr "繁體中文" @@ -1782,7 +1787,7 @@ msgid "Domain" msgstr "網域" #: bookwyrm/templates/book/file_links/edit_links.html:36 -#: bookwyrm/templates/import/import.html:149 +#: bookwyrm/templates/import/import.html:168 #: bookwyrm/templates/import/import_status.html:134 #: bookwyrm/templates/import/import_user.html:192 #: bookwyrm/templates/import/user_import_status.html:162 @@ -3206,133 +3211,145 @@ msgstr "" msgid "No activities for this hashtag yet!" msgstr "" -#: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:6 +#: bookwyrm/templates/import/import.html:7 #: bookwyrm/templates/preferences/layout.html:43 msgid "Import Book List" msgstr "" -#: bookwyrm/templates/import/import.html:12 +#: bookwyrm/templates/import/import.html:13 msgid "Not a valid CSV file" msgstr "" -#: bookwyrm/templates/import/import.html:20 +#: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" -#: bookwyrm/templates/import/import.html:26 +#: bookwyrm/templates/import/import.html:27 #, python-format msgid "You have %(display_left)s left." msgstr "" -#: bookwyrm/templates/import/import.html:33 +#: bookwyrm/templates/import/import.html:34 #: bookwyrm/templates/import/import_user.html:40 #, python-format msgid "On average, recent imports have taken %(hours)s hours." msgstr "" -#: bookwyrm/templates/import/import.html:37 +#: bookwyrm/templates/import/import.html:38 #: bookwyrm/templates/import/import_user.html:44 #, python-format msgid "On average, recent imports have taken %(minutes)s minutes." msgstr "" -#: bookwyrm/templates/import/import.html:52 +#: bookwyrm/templates/import/import.html:53 msgid "Data source:" msgstr "資料來源:" -#: bookwyrm/templates/import/import.html:58 +#: bookwyrm/templates/import/import.html:59 msgid "Goodreads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:61 +#: bookwyrm/templates/import/import.html:62 msgid "Storygraph (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:64 +#: bookwyrm/templates/import/import.html:65 msgid "LibraryThing (TSV)" msgstr "" -#: bookwyrm/templates/import/import.html:67 +#: bookwyrm/templates/import/import.html:68 msgid "OpenLibrary (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:70 +#: bookwyrm/templates/import/import.html:71 msgid "OpenReads (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:73 +#: bookwyrm/templates/import/import.html:74 msgid "Calibre (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:76 +#: bookwyrm/templates/import/import.html:77 msgid "BookWyrm (CSV)" msgstr "" -#: bookwyrm/templates/import/import.html:82 +#: bookwyrm/templates/import/import.html:83 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." msgstr "" -#: bookwyrm/templates/import/import.html:91 +#: bookwyrm/templates/import/import.html:92 #: bookwyrm/templates/import/import_user.html:64 msgid "Data file:" msgstr "資料檔案:" -#: bookwyrm/templates/import/import.html:99 +#: bookwyrm/templates/import/import.html:100 msgid "Include reviews" msgstr "納入書評" -#: bookwyrm/templates/import/import.html:104 +#: bookwyrm/templates/import/import.html:105 msgid "Create new shelves if they do not exist" msgstr "" -#: bookwyrm/templates/import/import.html:109 +#: bookwyrm/templates/import/import.html:110 +msgid "Shelve all imported books on:" +msgstr "" + +#: bookwyrm/templates/import/import.html:115 +msgid "Use shelf/status from the file" +msgstr "" + +#: bookwyrm/templates/import/import.html:123 +msgid "Choose a shelf to use instead of any shelf or reading status in the file." +msgstr "" + +#: bookwyrm/templates/import/import.html:128 msgid "Privacy setting for imported reviews and shelves:" msgstr "" -#: bookwyrm/templates/import/import.html:116 -#: bookwyrm/templates/import/import.html:118 +#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:137 #: bookwyrm/templates/import/import_user.html:170 #: bookwyrm/templates/import/import_user.html:172 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "匯入" -#: bookwyrm/templates/import/import.html:119 +#: bookwyrm/templates/import/import.html:138 #: bookwyrm/templates/import/import_user.html:173 msgid "You've reached the import limit." msgstr "" -#: bookwyrm/templates/import/import.html:128 +#: bookwyrm/templates/import/import.html:147 #: bookwyrm/templates/import/import_user.html:27 msgid "Imports are temporarily disabled; thank you for your patience." msgstr "" -#: bookwyrm/templates/import/import.html:135 +#: bookwyrm/templates/import/import.html:154 #: bookwyrm/templates/import/import_user.html:181 msgid "Recent Imports" msgstr "最近的匯入" -#: bookwyrm/templates/import/import.html:140 +#: bookwyrm/templates/import/import.html:159 #: bookwyrm/templates/import/import_user.html:186 #: bookwyrm/templates/settings/imports/imports.html:202 #: bookwyrm/templates/settings/imports/imports.html:292 msgid "Date Created" msgstr "" -#: bookwyrm/templates/import/import.html:143 +#: bookwyrm/templates/import/import.html:162 #: bookwyrm/templates/import/import_user.html:189 msgid "Last Updated" msgstr "" -#: bookwyrm/templates/import/import.html:146 +#: bookwyrm/templates/import/import.html:165 #: bookwyrm/templates/settings/imports/imports.html:211 msgid "Items" msgstr "" -#: bookwyrm/templates/import/import.html:155 +#: bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/import/import_user.html:198 #: bookwyrm/templates/preferences/export-user.html:122 msgid "No recent imports" @@ -4099,7 +4116,7 @@ msgid "List position" msgstr "列表位置:" #: bookwyrm/templates/lists/list_item.html:63 -#: bookwyrm/templates/settings/connectors/connector.html:28 +#: bookwyrm/templates/settings/connectors/connector.html:29 #: bookwyrm/templates/settings/connectors/update.html:27 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23 msgid "Set" @@ -5303,7 +5320,7 @@ msgstr "登陸以匯入或新增書目。" msgid "Search query" msgstr "搜尋請求" -#: bookwyrm/templates/search/layout.html:20 +#: bookwyrm/templates/search/layout.html:21 msgid "Search type" msgstr "搜尋類別" @@ -5636,7 +5653,7 @@ msgid "Run time" msgstr "" #: bookwyrm/templates/settings/celery.html:134 -#: bookwyrm/templates/settings/connectors/connector.html:22 +#: bookwyrm/templates/settings/connectors/connector.html:23 #: bookwyrm/templates/settings/connectors/update.html:21 msgid "Priority" msgstr "" @@ -5683,18 +5700,26 @@ msgstr "" msgid "Create new connector" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:35 +#: bookwyrm/templates/settings/connectors/connector.html:36 #: bookwyrm/templates/settings/connectors/update.html:33 #: bookwyrm/templates/settings/users/user_info.html:87 msgid "Deactivation reason:" msgstr "" +#: bookwyrm/templates/settings/connectors/connector.html:43 +msgid "Latest successful request" +msgstr "" + #: bookwyrm/templates/settings/connectors/connector.html:50 +msgid "Latest error" +msgstr "" + +#: bookwyrm/templates/settings/connectors/connector.html:66 #: bookwyrm/templates/settings/connectors/update.html:47 msgid "Deactivate" msgstr "" -#: bookwyrm/templates/settings/connectors/connector.html:61 +#: bookwyrm/templates/settings/connectors/connector.html:77 #: bookwyrm/templates/settings/connectors/update.html:58 msgid "Activate" msgstr "" @@ -7471,14 +7496,14 @@ msgstr "百分比" msgid "of %(pages)s pages" msgstr "全書 %(pages)s 頁" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "回覆" -#: bookwyrm/templates/snippets/create_status/content_field.html:18 +#: bookwyrm/templates/snippets/create_status/content_field.html:21 msgid "Content" msgstr "內容" From 8b80b3bae6db072b5acd8539c9300955186f0019 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 9 Jul 2026 11:12:19 -0700 Subject: [PATCH 886/962] Handle very long error message in connectors --- bookwyrm/connectors/abstract_connector.py | 2 +- .../connectors/test_abstract_connector.py | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index f6f61b0d2c..1451c91e0e 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -585,7 +585,7 @@ def update_connector_status( try: connector = models.Connector.objects.get(pk=connector_id) if error_message: - connector.latest_error = error_message + connector.latest_error = error_message[:255] connector.most_recent_error = timezone.now() connector.save(update_fields=["latest_error", "most_recent_error"]) else: diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 2a343267ad..0e2ff8345a 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -10,6 +10,7 @@ Mapping, get_data, activitydata_to_seriesbook, + update_connector_status, ) from bookwyrm.settings import BASE_URL, INSTANCE_ACTOR_USERNAME @@ -325,3 +326,25 @@ def test_activitydata_to_seriesbook_with_existing_seriesbook(self): self.assertEqual(models.Series.objects.count(), 1) self.assertEqual(models.SeriesBook.objects.count(), 1) + + def test_update_connector_status(self): + """make sure we save errors correctly""" + self.assertIsNone(self.connector.connector.most_recent_error) + + message = "normal length message" + update_connector_status(self.connector.connector.id, message) + + self.connector.connector.refresh_from_db() + self.assertIsNotNone(self.connector.connector.most_recent_error) + self.assertEqual(self.connector.connector.latest_error, "normal length message") + + def test_update_connector_status_long(self): + """make sure we save errors correctly""" + self.assertIsNone(self.connector.connector.most_recent_error) + + message = "abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz abcdefghijklmnopqrstuvwxyz" + update_connector_status(self.connector.connector.id, message) + + self.connector.connector.refresh_from_db() + self.assertIsNotNone(self.connector.connector.most_recent_error) + self.assertEqual(self.connector.connector.latest_error, message[:255]) From afd3856c50a000bf74e7dcf28332158d4c628796 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 9 Jul 2026 11:16:03 -0700 Subject: [PATCH 887/962] Use settings search timeout in connector --- bookwyrm/activitypub/base_activity.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bookwyrm/activitypub/base_activity.py b/bookwyrm/activitypub/base_activity.py index 8198662f0b..2d98dfaf63 100644 --- a/bookwyrm/activitypub/base_activity.py +++ b/bookwyrm/activitypub/base_activity.py @@ -16,7 +16,12 @@ from bookwyrm.connectors import ConnectorException, get_data from bookwyrm.models import base_model from bookwyrm.signatures import make_signature -from bookwyrm.settings import DOMAIN, INSTANCE_ACTOR_USERNAME, USER_AGENT +from bookwyrm.settings import ( + DOMAIN, + INSTANCE_ACTOR_USERNAME, + USER_AGENT, + SEARCH_TIMEOUT, +) from bookwyrm.tasks import app, MISC logger = logging.getLogger(__name__) @@ -434,7 +439,7 @@ def get_activitypub_data(url): "Signature": make_signature("get", sender, url, now), "User-Agent": USER_AGENT, }, - timeout=15, + timeout=SEARCH_TIMEOUT, ) except requests.RequestException: raise ConnectorException() From 33ebc03dc613d6acfcf86792fd8012e98532fcb7 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 9 Jul 2026 11:39:27 -0700 Subject: [PATCH 888/962] Cleans up formatting on connector view --- .../bookwyrm/overrides/_bulma_overrides.scss | 4 ++ .../settings/connectors/connector.html | 6 +-- .../settings/connectors/connectors.html | 50 +++++++++---------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm/overrides/_bulma_overrides.scss b/bookwyrm/static/css/bookwyrm/overrides/_bulma_overrides.scss index f7d61aca1b..907dfd4a15 100644 --- a/bookwyrm/static/css/bookwyrm/overrides/_bulma_overrides.scss +++ b/bookwyrm/static/css/bookwyrm/overrides/_bulma_overrides.scss @@ -142,3 +142,7 @@ font-size: $size-6; } } + +.is-break-word { + overflow-wrap: anywhere; +} diff --git a/bookwyrm/templates/settings/connectors/connector.html b/bookwyrm/templates/settings/connectors/connector.html index f797e9fc91..1b27e717be 100644 --- a/bookwyrm/templates/settings/connectors/connector.html +++ b/bookwyrm/templates/settings/connectors/connector.html @@ -45,7 +45,7 @@

            {% trans 'Latest successful request' %}

        {% if connector.most_recent_error %} -
        +

        {% trans 'Latest error' %}

        {{ connector.most_recent_error|naturaltime}}

        @@ -59,7 +59,7 @@

        {% trans 'Latest error' %}

        name="deactivate-{{ connector.id }}" method="post" action="{% url 'settings-deactivate-connector' connector.id %}" - class="card-footer-item m-2" + class="card-footer-item m-2 is-flex-grow-0" > {% csrf_token %} @@ -70,7 +70,7 @@

        {% trans 'Latest error' %}

        name="activate-{{ connector.id }}" method="post" action="{% url 'settings-activate-connector' connector.id %}" - class="card-footer-item" + class="card-footer-item m-2 is-flex-grow-0" > {% csrf_token %} diff --git a/bookwyrm/templates/settings/connectors/connectors.html b/bookwyrm/templates/settings/connectors/connectors.html index ff45f97c3c..c95a5f2cd4 100644 --- a/bookwyrm/templates/settings/connectors/connectors.html +++ b/bookwyrm/templates/settings/connectors/connectors.html @@ -6,33 +6,31 @@ {% block header %}{% trans "Connector Settings" %}{% endblock %} {% block panel %} -
        -
        -

        {% trans "Connectors are sources of data about books and authors." %}

        -

        {% trans "The priority determines the order in which search results appear. The highest priority is 1. The default priority is 2." %}

        -

        - {% trans "Connector settings only determine whether a connector will be used to deliver search results. To manage more interactions with other federated servers, including domain blocks, see" %} {% trans "Federated Instances" %}. -

        -

        External Connectors

        -
          - {% for connector in update_connectors %} - {% include "settings/connectors/update.html" %} +
          +

          {% trans "Connectors are sources of data about books and authors." %}

          +

          {% trans "The priority determines the order in which search results appear. The highest priority is 1. The default priority is 2." %}

          +

          + {% trans "Connector settings only determine whether a connector will be used to deliver search results. To manage more interactions with other federated servers, including domain blocks, see" %} {% trans "Federated Instances" %}. +

          +

          External Connectors

          +
            + {% for connector in update_connectors %} + {% include "settings/connectors/update.html" %} + {% endfor %} + {% for connector in other_connectors %} + {% include "settings/connectors/connector.html" %} + {% endfor %} + {% if available_connectors %} + {% for connector in available_connectors %} + {% include "settings/connectors/available.html" %} {% endfor %} - {% for connector in other_connectors %} + {% endif%} +
          +

          BookWyrm Connectors

          +
            + {% for connector in bookwyrm_connectors %} {% include "settings/connectors/connector.html" %} {% endfor %} - {% if available_connectors %} - {% for connector in available_connectors %} - {% include "settings/connectors/available.html" %} - {% endfor %} - {% endif%} -
          -

          BookWyrm Connectors

          -
            - {% for connector in bookwyrm_connectors %} - {% include "settings/connectors/connector.html" %} - {% endfor %} -
          -
          -
        +
    + {% endblock %} From 836265272789a7aaa38c144e96e630c2604e0f3e Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 9 Jul 2026 11:49:33 -0700 Subject: [PATCH 889/962] Sort bookwyrm connectors by active status and latest errors --- bookwyrm/views/admin/connectors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/admin/connectors.py b/bookwyrm/views/admin/connectors.py index b8fd2d24f2..a7e767097f 100644 --- a/bookwyrm/views/admin/connectors.py +++ b/bookwyrm/views/admin/connectors.py @@ -45,7 +45,7 @@ def get(self, request): # other BookWyrm instances bookwrym_connectors = Connector.objects.filter( connector_file="bookwyrm_connector" - ).order_by("identifier") + ).order_by("-active", "latest_error", "identifier") # Optional and new connectors e.g. Finna # These are not yet Connector objects so we have to describe them in the From 995c24346722924ea0c9c51521fe9d79e055a0cc Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Thu, 9 Jul 2026 13:08:51 -0400 Subject: [PATCH 890/962] null coalesce sort response to match implicit sort --- bookwyrm/views/shelf/shelf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/shelf/shelf.py b/bookwyrm/views/shelf/shelf.py index 24de1ea885..ffdeb32cf0 100644 --- a/bookwyrm/views/shelf/shelf.py +++ b/bookwyrm/views/shelf/shelf.py @@ -110,7 +110,7 @@ def get(self, request, username, shelf_identifier=None): "books": page, "edit_form": forms.ShelfForm(instance=shelf if shelf_identifier else None), "create_form": forms.ShelfForm(), - "sort": request.GET.get("sort"), + "sort": request.GET.get("sort") or "-shelved_date", "page_range": paginated.get_elided_page_range( page.number, on_each_side=2, on_ends=1 ), From b67a7337b0546feb6050b56423c51b7222bbc1f2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 9 Jul 2026 12:50:47 -0700 Subject: [PATCH 891/962] Spacing fix --- .../readthrough/readthrough_list.html | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/bookwyrm/templates/readthrough/readthrough_list.html b/bookwyrm/templates/readthrough/readthrough_list.html index 385422edf6..e9b6c05240 100644 --- a/bookwyrm/templates/readthrough/readthrough_list.html +++ b/bookwyrm/templates/readthrough/readthrough_list.html @@ -52,24 +52,24 @@ {% endif %}
  • -
    -
    - {% trans "Edit read dates" as button_text %} - -
    -
    - {% trans "Delete these read dates" as button_text %} - -
    -
    +
    +
    + {% trans "Edit read dates" as button_text %} + +
    +
    + {% trans "Delete these read dates" as button_text %} + +
    +
    • From 2ce7f6234ef0c526182739cd1bad351a42e1a69b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 9 Jul 2026 13:07:26 -0700 Subject: [PATCH 892/962] Remove some divs --- bookwyrm/templates/components/details.html | 8 ++------ bookwyrm/templates/readthrough/readthrough_list.html | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/components/details.html b/bookwyrm/templates/components/details.html index 5d9e1a6871..4a4642879c 100644 --- a/bookwyrm/templates/components/details.html +++ b/bookwyrm/templates/components/details.html @@ -1,8 +1,6 @@ {% load i18n %}
    -
    - {% block always-visible %}{% endblock %} -
    + {% block always-visible %}{% endblock %} {% if content_count > 1 %}
    @@ -10,9 +8,7 @@ {% trans "Show more" %} -
    - {% block sometimes-visible %}{% endblock %} -
    + {% block sometimes-visible %}{% endblock %}
    {% endif %}
    diff --git a/bookwyrm/templates/readthrough/readthrough_list.html b/bookwyrm/templates/readthrough/readthrough_list.html index e9b6c05240..89e474b870 100644 --- a/bookwyrm/templates/readthrough/readthrough_list.html +++ b/bookwyrm/templates/readthrough/readthrough_list.html @@ -3,7 +3,7 @@ {% load tz %} {% load utilities %}
    -
      +
        {% if readthrough.start_date %}
      • {% trans "Started:" %} {{ readthrough.start_date | localtime | naturalday }} From 4385964ab7f0ccf15e24064f69f7c910b8254d6c Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Thu, 9 Jul 2026 16:11:31 -0400 Subject: [PATCH 893/962] unit test to ensure the shelf view has a sorting option --- bookwyrm/tests/views/shelf/test_shelf.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/bookwyrm/tests/views/shelf/test_shelf.py b/bookwyrm/tests/views/shelf/test_shelf.py index dc678e8ddd..1dd72beb7f 100644 --- a/bookwyrm/tests/views/shelf/test_shelf.py +++ b/bookwyrm/tests/views/shelf/test_shelf.py @@ -157,6 +157,25 @@ def test_shelf_page_sorted(self, *_): validate_html(result.render()) self.assertEqual(result.status_code, 200) + def test_shelf_implicit_sort(self, *_): + """ensure the shelf view always has a sort in its response""" + view = views.Shelf.as_view() + shelf = self.local_user.shelf_set.first() + request = self.factory.get("") + request.user = self.local_user + with patch("bookwyrm.views.shelf.shelf.is_api_request") as is_api: + is_api.return_value = False + result = view( + request, + username=self.local_user.username, + shelf_identifier=shelf.identifier, + ) + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + self.assertIsNotNone(result.context_data["sort"]) + self.assertNotEqual("", result.context_data["sort"]) + self.assertEqual(result.status_code, 200) + def test_shelf_page(self, *_): """there are so many views, this just makes sure it LOADS""" view = views.Shelf.as_view() From a2118dbb61a50f0ecd7ac35449419b57c5254987 Mon Sep 17 00:00:00 2001 From: phanky1 Date: Fri, 10 Jul 2026 21:00:06 +0700 Subject: [PATCH 894/962] Show feed filters badge whenever filters are in effect --- bookwyrm/models/user.py | 4 +++ .../snippets/filters_panel/filters_panel.html | 31 ++++++++++--------- bookwyrm/views/feed.py | 10 +++--- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/bookwyrm/models/user.py b/bookwyrm/models/user.py index 3912a0ccf8..d71bc38184 100644 --- a/bookwyrm/models/user.py +++ b/bookwyrm/models/user.py @@ -256,6 +256,10 @@ def has_unread_mentions(self): notification_type__in=["REPLY", "MENTION", "TAG", "REPORT"], ).exists() + @property + def filters_applied(self): + return set(self.feed_status_types) != set(get_feed_filter_choices()) + activity_serializer = activitypub.Person @classmethod diff --git a/bookwyrm/templates/snippets/filters_panel/filters_panel.html b/bookwyrm/templates/snippets/filters_panel/filters_panel.html index 928b4f69b8..6bc1e9dc6d 100644 --- a/bookwyrm/templates/snippets/filters_panel/filters_panel.html +++ b/bookwyrm/templates/snippets/filters_panel/filters_panel.html @@ -1,25 +1,26 @@ {% load i18n %} -
        +
        {% trans "Filters" %} - {% if filters_applied %} - - {% trans "Filters are applied" %} - - {% endif %} - - {% if method != "post" and request.GET %} - - - {% trans "Filters are applied" %} + {% if feed_filters_applied is not None %} + {# Feed filters persist on the user record, not in the query string. #} + {% if feed_filters_applied %} + + {% trans "Filters are applied" %} + + {% endif %} + {% elif method != "post" and request.GET %} + + + {% trans "Filters are applied" %} + + + {% trans "Clear filters" %} + - - {% trans "Clear filters" %} - - {% endif %} diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index c14eea02f6..26f6d0c0fd 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -5,7 +5,7 @@ from django.core.paginator import Paginator from django.db.models import Prefetch, Q, prefetch_related_objects from django.http import HttpResponseNotFound, Http404 -from django.shortcuts import get_object_or_404 +from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse from django.utils import timezone from django.utils.decorators import method_decorator @@ -28,17 +28,15 @@ class Feed(View): def post(self, request, tab): """save feed settings form, with a silent validation fail""" - filters_applied = False form = forms.FeedStatusTypesForm(request.POST, instance=request.user) if form.is_valid(): # workaround to avoid broadcasting this change user = form.save(request, commit=False) user.save(broadcast=False, update_fields=["feed_status_types"]) - filters_applied = True - return self.get(request, tab, filters_applied) + return redirect(request.path) - def get(self, request, tab, filters_applied=False): + def get(self, request, tab): """user's homepage with activity feed""" tab = [s for s in STREAMS if s["key"] == tab] tab = tab[0] if tab else STREAMS[0] @@ -84,7 +82,7 @@ def get(self, request, tab, filters_applied=False): "streams": STREAMS, "goal_form": forms.GoalForm(), "feed_status_types_options": FeedFilterChoices, - "filters_applied": filters_applied, + "feed_filters_applied": request.user.filters_applied, "path": f"/{tab['key']}", "annual_summary_year": get_annual_summary_year(), "has_tour": True, From 5ce2961bd858c636718eb272f99fa3b3d0231a6d Mon Sep 17 00:00:00 2001 From: phanky1 Date: Fri, 10 Jul 2026 23:52:58 +0700 Subject: [PATCH 895/962] Add tests --- bookwyrm/tests/models/test_user_model.py | 7 +++++++ bookwyrm/tests/views/test_feed.py | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/bookwyrm/tests/models/test_user_model.py b/bookwyrm/tests/models/test_user_model.py index 580fa02053..43b920ab9b 100644 --- a/bookwyrm/tests/models/test_user_model.py +++ b/bookwyrm/tests/models/test_user_model.py @@ -51,6 +51,13 @@ def test_computed_fields(self): self.assertIsNotNone(self.user.key_pair.private_key) self.assertIsNotNone(self.user.key_pair.public_key) + def test_filters_applied_all_types_selected(self): + self.assertFalse(self.user.filters_applied) + + def test_filters_applied_with_excluded_type(self): + self.user.feed_status_types = ["review"] + self.assertTrue(self.user.filters_applied) + def test_remote_user(self): with patch("bookwyrm.models.user.set_remote_server.delay"): user = models.User.objects.create_user( diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index 2ae3608307..e43bbc9821 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -84,6 +84,17 @@ def test_save_feed_settings(self, *_): self.local_user.refresh_from_db() self.assertEqual(self.local_user.feed_status_types, ["review"]) + @patch("bookwyrm.suggested_users.SuggestedUsers.get_suggestions") + def test_feed_shows_filters_applied_badge(self, *_): + self.local_user.feed_status_types = ["review"] + view = views.Feed.as_view() + request = self.factory.get("") + request.user = self.local_user + + result = view(request, "home") + + self.assertContains(result, "Filters are applied") + def test_status_page(self, *_): """there are so many views, this just makes sure it LOADS""" view = views.Status.as_view() From b4b84349342f372e7d26f2591b8c723a033f5b46 Mon Sep 17 00:00:00 2001 From: phanky1 Date: Sat, 11 Jul 2026 00:17:29 +0700 Subject: [PATCH 896/962] Redirect feed settings POST via reverse --- bookwyrm/tests/views/test_feed.py | 3 ++- bookwyrm/urls.py | 2 +- bookwyrm/views/feed.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bookwyrm/tests/views/test_feed.py b/bookwyrm/tests/views/test_feed.py index e43bbc9821..b12bee4eef 100644 --- a/bookwyrm/tests/views/test_feed.py +++ b/bookwyrm/tests/views/test_feed.py @@ -80,7 +80,8 @@ def test_save_feed_settings(self, *_): result = view(request, "home") - self.assertEqual(result.status_code, 200) + self.assertEqual(result.status_code, 302) + self.assertEqual(result.url, "/home") self.local_user.refresh_from_db() self.assertEqual(self.local_user.feed_status_types, ["review"]) diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 8370f7d9f7..068eafa7cd 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -515,7 +515,7 @@ name="get-started-users", ), # feeds - re_path(rf"^(?P{STREAMS})/?$", views.Feed.as_view()), + re_path(rf"^(?P{STREAMS})/?$", views.Feed.as_view(), name="feed"), re_path( r"^direct-messages/?$", views.DirectMessage.as_view(), name="direct-messages" ), diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py index 26f6d0c0fd..ceb99bb876 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -34,7 +34,7 @@ def post(self, request, tab): user = form.save(request, commit=False) user.save(broadcast=False, update_fields=["feed_status_types"]) - return redirect(request.path) + return redirect("feed", tab=tab) def get(self, request, tab): """user's homepage with activity feed""" From 27e00aa1abee0ce4c67f04290a2055bdfa55907b Mon Sep 17 00:00:00 2001 From: Tem Revil Date: Sat, 11 Jul 2026 00:04:50 +0300 Subject: [PATCH 897/962] Avoid re-running the book-statuses UNION as a subquery add_book_statuses built a UNION of the four book-status querysets and then reused it twice more: once via values_list("thread_id") and once inside exclude(id__in=...values_list("id")). Embedding a UNION as a subquery makes Postgres re-execute the whole UNION each time, which is what pushed add_book_statuses_task from ~0.1s to several seconds per call on larger instances (#4026). Evaluate the UNION once into id/thread_id lists and reuse those, so the two follow-up lookups filter on plain id lists instead of a UNION subquery. Same statuses are added; behaviour is unchanged. Applied the same change to remove_book_statuses and the HomeStream override, which share the pattern. Fixes #4026 --- bookwyrm/activitystreams.py | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 2e6e9933d5..1a4ef4a450 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -217,10 +217,16 @@ def add_book_statuses(self, user, book): self.bulk_add_objects_to_store(book_statuses, self.stream_id(user.id)) - threads = book_statuses.values_list("thread_id", flat=True) - thread_statuses = statuses.exclude( - id__in=book_statuses.values_list("id", flat=True) - ).filter(thread_id__in=threads) + # Evaluate the union once instead of embedding it as a subquery in the + # two lookups below: reusing the union queryset inside ``id__in`` / + # ``thread_id__in`` makes Postgres re-run the whole UNION each time, + # which is what makes the book-status tasks slow. + book_status_rows = list(book_statuses.values_list("id", "thread_id")) + book_status_ids = [row[0] for row in book_status_rows] + threads = [row[1] for row in book_status_rows] + thread_statuses = statuses.exclude(id__in=book_status_ids).filter( + thread_id__in=threads + ) self.bulk_add_objects_to_store(thread_statuses, self.stream_id(user.id)) @@ -242,10 +248,13 @@ def remove_book_statuses(self, user, book): self.bulk_remove_objects_from_store(book_statuses, self.stream_id(user.id)) - threads = book_statuses.values_list("thread_id", flat=True) - thread_statuses = statuses.exclude( - id__in=book_statuses.values_list("id", flat=True) - ).filter(thread_id__in=threads) + # Evaluate the union once; see add_book_statuses for the rationale. + book_status_rows = list(book_statuses.values_list("id", "thread_id")) + book_status_ids = [row[0] for row in book_status_rows] + threads = [row[1] for row in book_status_rows] + thread_statuses = statuses.exclude(id__in=book_status_ids).filter( + thread_id__in=threads + ) self.bulk_remove_objects_from_store(thread_statuses, self.stream_id(user.id)) @@ -305,10 +314,13 @@ def add_book_statuses(self, user, book): self.bulk_add_objects_to_store(book_statuses, self.stream_id(user.id)) - threads = book_statuses.values_list("thread_id", flat=True) - thread_statuses = statuses.exclude( - id__in=book_statuses.values_list("id", flat=True) - ).filter(thread_id__in=threads) + # Evaluate the union once; see add_book_statuses for the rationale. + book_status_rows = list(book_statuses.values_list("id", "thread_id")) + book_status_ids = [row[0] for row in book_status_rows] + threads = [row[1] for row in book_status_rows] + thread_statuses = statuses.exclude(id__in=book_status_ids).filter( + thread_id__in=threads + ) self.bulk_add_objects_to_store(thread_statuses, self.stream_id(user.id)) From 446c412f5c008e8619df00fd953b3ab5a1dd4527 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Jul 2026 01:33:47 +0000 Subject: [PATCH 898/962] Bump mistune from 3.2.1 to 3.3.0 Bumps [mistune](https://github.com/lepture/mistune) from 3.2.1 to 3.3.0. - [Release notes](https://github.com/lepture/mistune/releases) - [Changelog](https://github.com/lepture/mistune/blob/main/docs/changes.rst) - [Commits](https://github.com/lepture/mistune/compare/v3.2.1...v3.3.0) --- updated-dependencies: - dependency-name: mistune dependency-version: 3.3.0 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index dc71e19252..07ceaa3198 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ main = [ "gunicorn==25.0.3", "hiredis==2.3.2", "libsass==0.23.0", - "mistune==3.2.1", + "mistune==3.3.0", "opentelemetry-api==1.24.0", "opentelemetry-exporter-otlp-proto-grpc==1.24.0", "opentelemetry-instrumentation-celery==0.45b0", From f5047070ff602b33fb642d0b21f3654df2a3e7e4 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 11 Jul 2026 13:19:35 +1000 Subject: [PATCH 899/962] fix reports admin page when no reported_user --- bookwyrm/models/report.py | 4 +++- bookwyrm/templates/settings/reports/report_header.html | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bookwyrm/models/report.py b/bookwyrm/models/report.py index 894ad6a14e..825eeb219b 100644 --- a/bookwyrm/models/report.py +++ b/bookwyrm/models/report.py @@ -60,7 +60,9 @@ def to_activity_dataclass(self, **kwargs): def object(self): """Generate a list of reported objects in a format Mastodon will like""" - items = [self.reported_user.remote_id] + items = [] + if self.reported_user and hasattr(self.reported_user, "remote_id"): + items.append(self.reported_user.remote_id) if self.statuses: items += self.statuses.values_list("remote_id", flat=True) diff --git a/bookwyrm/templates/settings/reports/report_header.html b/bookwyrm/templates/settings/reports/report_header.html index 0c610f2df4..57bd110f4b 100644 --- a/bookwyrm/templates/settings/reports/report_header.html +++ b/bookwyrm/templates/settings/reports/report_header.html @@ -3,9 +3,15 @@ {% if report.statuses.exists %} +{% if report.reported_user %} {% blocktrans trimmed with report_id=report.id username=report.reported_user|username %} Report #{{ report_id }}: Status posted by @{{ username }} {% endblocktrans %} +{% else %} +{% blocktrans trimmed with report_id=report.id %} +Report #{{ report_id }} +{% endblocktrans %} +{% endif %} {% elif report.links.exists %} From 0b4373aae06391d1c544b91a40978caee692111f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 11 Jul 2026 10:55:59 -0700 Subject: [PATCH 900/962] Only execute query once in redis function Plus some typing --- bookwyrm/redis_store.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/bookwyrm/redis_store.py b/bookwyrm/redis_store.py index 4d2262a408..963b94ac62 100644 --- a/bookwyrm/redis_store.py +++ b/bookwyrm/redis_store.py @@ -1,7 +1,10 @@ """access the activity stores stored in redis""" from abc import ABC, abstractmethod +from typing import Any + import redis +from django.db.models.query import QuerySet from bookwyrm import settings @@ -45,27 +48,28 @@ def remove_object_from_stores(self, obj, stores): pipeline.zrem(store, -1, obj_id) pipeline.execute() - def bulk_add_objects_to_store(self, objs, store): + def bulk_add_objects_to_store(self, objs: QuerySet[Any], store: str) -> None: """add a list of objects to a given store""" pipeline = r.pipeline() - for obj in objs[: self.max_length]: + max_length_objs = objs[: self.max_length] + for obj in max_length_objs: pipeline.zadd(store, self.get_value(obj)) - if objs and self.max_length: + if max_length_objs and self.max_length: pipeline.zremrangebyrank(store, 0, -1 * self.max_length) pipeline.execute() - def bulk_remove_objects_from_store(self, objs, store): + def bulk_remove_objects_from_store(self, objs: QuerySet[Any], store: str) -> None: """remove a list of objects from a given store""" pipeline = r.pipeline() for obj in objs[: self.max_length]: pipeline.zrem(store, -1, obj.id) pipeline.execute() - def get_store(self, store, **kwargs): + def get_store(self, store: str, **kwargs) -> list[int]: """load the values in a store""" return r.zrevrange(store, 0, -1, **kwargs) - def populate_store(self, store): + def populate_store(self, store: str) -> None: """go from zero to a store""" pipeline = r.pipeline() queryset = self.get_objects_for_store(store) From aff4b64a0f77dd884219f759a2fdcd99e4174433 Mon Sep 17 00:00:00 2001 From: Tem Revil Date: Sat, 11 Jul 2026 23:18:41 +0300 Subject: [PATCH 901/962] Unzip book_statuses with zip() instead of two list comprehensions Per review from mouse-reeve: zip() over the materialized rows is a little more direct than looping the row list twice to pull out ids and thread_ids separately. Guard the empty case explicitly, since a bare zip(*book_statuses.values_list(...)) raises ValueError when book_statuses is empty (a book with no comments, quotes, reviews, or mentions yet), which the list-comprehension version handled fine. --- bookwyrm/activitystreams.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/bookwyrm/activitystreams.py b/bookwyrm/activitystreams.py index 1a4ef4a450..7c8f3a549a 100644 --- a/bookwyrm/activitystreams.py +++ b/bookwyrm/activitystreams.py @@ -222,8 +222,9 @@ def add_book_statuses(self, user, book): # ``thread_id__in`` makes Postgres re-run the whole UNION each time, # which is what makes the book-status tasks slow. book_status_rows = list(book_statuses.values_list("id", "thread_id")) - book_status_ids = [row[0] for row in book_status_rows] - threads = [row[1] for row in book_status_rows] + book_status_ids, threads = ( + zip(*book_status_rows) if book_status_rows else ((), ()) + ) thread_statuses = statuses.exclude(id__in=book_status_ids).filter( thread_id__in=threads ) @@ -250,8 +251,9 @@ def remove_book_statuses(self, user, book): # Evaluate the union once; see add_book_statuses for the rationale. book_status_rows = list(book_statuses.values_list("id", "thread_id")) - book_status_ids = [row[0] for row in book_status_rows] - threads = [row[1] for row in book_status_rows] + book_status_ids, threads = ( + zip(*book_status_rows) if book_status_rows else ((), ()) + ) thread_statuses = statuses.exclude(id__in=book_status_ids).filter( thread_id__in=threads ) @@ -316,8 +318,9 @@ def add_book_statuses(self, user, book): # Evaluate the union once; see add_book_statuses for the rationale. book_status_rows = list(book_statuses.values_list("id", "thread_id")) - book_status_ids = [row[0] for row in book_status_rows] - threads = [row[1] for row in book_status_rows] + book_status_ids, threads = ( + zip(*book_status_rows) if book_status_rows else ((), ()) + ) thread_statuses = statuses.exclude(id__in=book_status_ids).filter( thread_id__in=threads ) From 17e3aa4a832a90a493dccd5878be5a9ea94bb1b3 Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Mon, 13 Jul 2026 00:56:53 -0400 Subject: [PATCH 902/962] smooth CSS half-stars but with bad default CSS --- .../css/bookwyrm/components/_stars.scss | 62 ++++++++++++++----- .../templates/snippets/form_rate_stars.html | 46 ++++++-------- 2 files changed, 67 insertions(+), 41 deletions(-) diff --git a/bookwyrm/static/css/bookwyrm/components/_stars.scss b/bookwyrm/static/css/bookwyrm/components/_stars.scss index db2772dc05..d31cb4aab0 100644 --- a/bookwyrm/static/css/bookwyrm/components/_stars.scss +++ b/bookwyrm/static/css/bookwyrm/components/_stars.scss @@ -13,8 +13,9 @@ * * Specificity makes hovering taking over checked inputs. * - * \e9d9: filled star * \e9d7: empty star; + * \e9d8: half-filled star; + * \e9d9: filled star * -------------------------------------------------------------------------- */ .form-rate-stars { @@ -26,31 +27,62 @@ content: "\e9d9"; /* icon-star-full */ } -/* Icons directly following half star inputs are marked as half */ -.form-rate-stars input.half:checked ~ .icon::before { +// if a star container has a half-input checked, its icon is a half-star +.form-rate-stars .star-container:has(input.half:checked) .icon::before { content: "\e9d8"; /* icon-star-half */ } -/* stylelint-disable no-descending-specificity */ -.form-rate-stars input.half:checked + input + .icon:hover::before { - content: "\e9d8" !important; /* icon-star-half */ +// if a star container has a full-input checked, its icon is a full-star +.form-rate-stars .star-container:has(input.full:checked) .icon::before { + content: "\e9d9"; /* icon-star-full */ } -/* Icons directly following half check inputs that follow the checked input are emptied. */ -.form-rate-stars input.half:checked + input + .icon ~ .icon::before { +// stars following stars with checked inputs have icons that are empty +.form-rate-stars .star-container:has(input:checked) ~ .star-container .icon::before { content: "\e9d7"; /* icon-star-empty */ } -/* Icons directly following inputs that follow the checked input are emptied. */ -.form-rate-stars input:checked ~ input + .icon::before { - content: "\e9d7"; /* icon-star-empty */ +// When a star is hovered, pre-fill all icons as full +.form-rate-stars:hover .icon::before +{ + content: "\e9d9" !important; /* icon-star-full */ } -/* When a label is hovered, repeat the fill-all-then-empty-following pattern. */ -.form-rate-stars:hover .icon.icon::before { +// when an star is hovered, following icons are emptied +.form-rate-stars .star-container:hover ~ .star-container .icon::before +{ + content: "\e9d7" !important; /* icon-star-empty */ +} + +// if you hover over a star's half-input make its icon a half-star +.inputs-container:has(input.half:hover) + .icon::before +{ + content: "\e9d8" !important; /* icon-star-half */ +} + +// if you hover over a star's full-input make its icon a full-star +.inputs-container:has(input.full:hover) + .icon::before +{ content: "\e9d9" !important; /* icon-star-full */ } -.form-rate-stars .icon:hover ~ .icon::before { - content: "\e9d7" !important; /* icon-star-empty */ +.form-rate-stars input.half { + width: 0.75rem !important; + position:relative; + +} +.form-rate-stars input.full { + width: 0.75rem !important; + position:relative; + opacity: 0; + pointer-events: none; +} + +.form-rate-stars .star-container { + position: relative; +} + +.inputs-container { + position: absolute; + opacity: 0; } diff --git a/bookwyrm/templates/snippets/form_rate_stars.html b/bookwyrm/templates/snippets/form_rate_stars.html index 8cc405abba..ec3210b3ae 100644 --- a/bookwyrm/templates/snippets/form_rate_stars.html +++ b/bookwyrm/templates/snippets/form_rate_stars.html @@ -21,32 +21,25 @@ {% for i in '12345'|make_list %} - - 0 and default_rating > forloop.counter0 %}checked{% endif %} - /> - = forloop.counter %}checked{% endif %} - /> +
        +
        + 0 and default_rating > forloop.counter0 %}checked{% endif %} + /> + = forloop.counter %}checked{% endif %} + /> +
      • - {% include 'snippets/report_button.html' with user=user class="is-fullwidth" %} + {% include 'snippets/remote_follow_button.html' with user=user class="is-fullwidth is-light" %}
      • - {% include 'snippets/block_button.html' with user=user class="is-fullwidth" blocks=False %} + {% include 'snippets/report_button.html' with user=user class="is-fullwidth" %}
      • - {% include 'snippets/remote_follow_button.html' with user=user class="is-fullwidth is-light" %} + {% include 'snippets/block_button.html' with user=user class="is-fullwidth" blocks=False %}
        • {% if followers_page %}
      • From 1793549b418a29e3d9be66fc9b554007454c13f9 Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Tue, 4 Aug 2026 17:48:40 -0400 Subject: [PATCH 953/962] better autocomplete using regex --- bookwyrm/static/js/autocomplete.js | 170 +++++------------------------ 1 file changed, 25 insertions(+), 145 deletions(-) diff --git a/bookwyrm/static/js/autocomplete.js b/bookwyrm/static/js/autocomplete.js index 6836d356d8..5ce9ed35e0 100644 --- a/bookwyrm/static/js/autocomplete.js +++ b/bookwyrm/static/js/autocomplete.js @@ -1,6 +1,28 @@ (function () { "use strict"; + const mimeTypes = [ + "AAC", + "AZW", + "Daisy", + "EPUB", + "FB2", + "FB3", + "FLAC", + "HTML", + "M4A", + "M4B", + "MOBI", + "MP3", + "OGG", + "PDF", + "Plaintext", + "Print book" + ]; + + const regexEscape = (string) => string.replace(/[$^*()-+.?[]{}|\\\/]/g, '\\$&'); + + /** * Suggest a completion as a user types * @@ -18,15 +40,14 @@ function autocomplete(event) { const input = event.target; - // Get suggestions - let trie = tries[input.getAttribute("data-autocomplete")]; + const cleanInput = regexEscape(input.value); - let suggestions = getSuggestions(input.value, trie); + const suggestions = mimeTypes.filter(mimeType => RegExp("^" + cleanInput, "i").test(mimeType)); const boxId = input.getAttribute("list"); // Create suggestion box, if needed - let suggestionsBox = document.getElementById(boxId); + const suggestionsBox = document.getElementById(boxId); // Clear existing suggestions suggestionsBox.innerHTML = ""; @@ -40,149 +61,8 @@ }); } - function getSuggestions(input, trie) { - // Follow the trie through the provided input - input = input.toLowerCase(); - - input.split("").forEach((letter) => { - if (!trie) { - return; - } - - trie = trie[letter]; - }); - - if (!trie) { - return []; - } - - return searchTrie(trie); - } - - function searchTrie(trie) { - const options = Object.values(trie); - - if (typeof trie == "string") { - return [trie]; - } - - return options - .map((option) => { - const newTrie = option; - - if (typeof newTrie == "string") { - return [newTrie]; - } - - return searchTrie(newTrie); - }) - .reduce((prev, next) => prev.concat(next)); - } - document.querySelectorAll("[data-autocomplete]").forEach((input) => { input.addEventListener("input", autocomplete); }); })(); -const tries = { - mimetype: { - a: { - a: { - c: "AAC", - }, - z: { - w: "AZW", - }, - }, - d: { - a: { - i: { - s: { - y: "Daisy", - }, - }, - }, - }, - e: { - p: { - u: { - b: "EPUB", - }, - }, - }, - f: { - b: { - 2: "FB2", - 3: "FB3", - }, - l: { - a: { - c: "FLAC", - }, - }, - }, - h: { - t: { - m: { - l: "HTML", - }, - }, - }, - m: { - 4: { - a: "M4A", - b: "M4B", - }, - o: { - b: { - i: "MOBI", - }, - }, - p: { - 3: "MP3", - }, - }, - o: { - g: { - g: "OGG", - }, - }, - p: { - d: { - f: "PDF", - }, - l: { - a: { - i: { - n: { - t: { - e: { - x: { - t: "Plaintext", - }, - }, - }, - }, - }, - }, - }, - r: { - i: { - n: { - t: { - " ": { - b: { - o: { - o: { - k: "Print book", - }, - }, - }, - }, - }, - }, - }, - }, - }, - }, -}; From ebb53dd36cfde4f335a71218ca61246ac257b0e5 Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Tue, 4 Aug 2026 17:52:09 -0400 Subject: [PATCH 954/962] completely remove addRemoveClass, instead dedicate functions to small utility of not having to write classList.add or classList.remove --- bookwyrm/static/js/bookwyrm.js | 130 +++++++++++++++++------------ bookwyrm/static/js/localstorage.js | 10 ++- bookwyrm/static/js/status_cache.js | 73 ++++++---------- 3 files changed, 109 insertions(+), 104 deletions(-) diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 3f155218b4..abc76bdad6 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -145,7 +145,7 @@ let BookWyrm = new (class { * @return {undefined} */ updateCountElement(counter, data) { - let count = data.count; + const count = data.count; if (count === undefined) { return; @@ -155,9 +155,18 @@ let BookWyrm = new (class { const hasMentions = data.has_mentions; if (count != currentCount) { - this.addRemoveClass(counter.closest("[data-poll-wrapper]"), "is-hidden", count < 1); + const wrapper = counter.closest("[data-poll-wrapper]"); + if(count < 1) { + this.classHide(wrapper); + } else { + this.classShow(wrapper); + } counter.innerText = count; - this.addRemoveClass(counter.closest("[data-poll-wrapper]"), "is-danger", hasMentions); + if(hasMentions) { + this.classList.add("is-danger"); + } else { + this.classList.remove("is-danger"); + } } } @@ -168,11 +177,11 @@ let BookWyrm = new (class { * @return {undefined} */ revealForm(event) { - let trigger = event.currentTarget; - let hidden = trigger.closest(".hidden-form").querySelectorAll(".is-hidden")[0]; + const trigger = event.currentTarget; + const hidden = trigger.closest(".hidden-form").querySelectorAll(".is-hidden")[0]; if (hidden) { - this.addRemoveClass(hidden, "is-hidden", !hidden); + this.classShow(hidden); } } @@ -183,11 +192,11 @@ let BookWyrm = new (class { * @return {undefined} */ hideForm(event) { - let trigger = event.currentTarget; - let targetId = trigger.dataset.hides; - let visible = document.getElementById(targetId); + const trigger = event.currentTarget; + const targetId = trigger.dataset.hides; + const visible = document.getElementById(targetId); - this.addRemoveClass(visible, "is-hidden", true); + this.classHide(visible); } /** @@ -197,9 +206,9 @@ let BookWyrm = new (class { * @return {undefined} */ hideSelf(event) { - let trigger = event.currentTarget; + const trigger = event.currentTarget; - this.addRemoveClass(trigger, "is-hidden", true); + this.classHide(trigger); } /** @@ -209,13 +218,13 @@ let BookWyrm = new (class { * @return {undefined} */ toggleAction(event) { - let trigger = event.currentTarget; + const trigger = event.currentTarget; if (!trigger.dataset.allowDefault || event.currentTarget == event.target) { event.preventDefault(); } - let pressed = trigger.getAttribute("aria-pressed") === "false"; - let targetId = trigger.dataset.controls; + const pressed = trigger.getAttribute("aria-pressed") === "false"; + const targetId = trigger.dataset.controls; // Toggle pressed status on all triggers controlling the same target. document @@ -229,10 +238,15 @@ let BookWyrm = new (class { // @todo Find a better way to handle the exception. if (targetId && !trigger.classList.contains("pulldown-menu")) { - let target = document.getElementById(targetId); + const target = document.getElementById(targetId); - this.addRemoveClass(target, "is-hidden", !pressed); - this.addRemoveClass(target, "is-active", pressed); + if(pressed) { + this.classShow(target); + this.classActivate(target); + } else { + this.classHide(target); + this.classDeactivate(target); + } } // Show/hide pulldown-menus. @@ -241,28 +255,28 @@ let BookWyrm = new (class { } // Show/hide container. - let container = document.getElementById("hide_" + targetId); + const container = document.getElementById("hide_" + targetId); if (container) { this.toggleContainer(container, pressed); } // Check checkbox, if appropriate. - let checkbox = trigger.dataset.controlsCheckbox; + const checkbox = trigger.dataset.controlsCheckbox; if (checkbox) { this.toggleCheckbox(checkbox, pressed); } // Toggle form disabled, if appropriate - let disable = trigger.dataset.disables; + const disable = trigger.dataset.disables; if (disable) { this.toggleDisabled(disable, !pressed); } // Set focus, if appropriate. - let focus = trigger.dataset.focusTarget; + const focus = trigger.dataset.focusTarget; if (focus) { this.toggleFocus(focus); @@ -278,14 +292,18 @@ let BookWyrm = new (class { * @return {undefined} */ toggleMenu(trigger, targetId) { - let expanded = trigger.getAttribute("aria-expanded") == "false"; + const expanded = trigger.getAttribute("aria-expanded") == "false"; trigger.setAttribute("aria-expanded", expanded); if (targetId) { - let target = document.getElementById(targetId); + const target = document.getElementById(targetId); - this.addRemoveClass(target, "is-active", expanded); + if(expanded) { + this.classActivate(target); + } else { + this.classDeactivate(target); + } } } @@ -297,7 +315,11 @@ let BookWyrm = new (class { * @return {undefined} */ toggleContainer(container, pressed) { - this.addRemoveClass(container, "is-hidden", pressed); + if(pressed) { + this.classHide(container); + } else { + this.classShow(container); + } } /** @@ -330,7 +352,7 @@ let BookWyrm = new (class { * @return {undefined} */ toggleFocus(nodeId) { - let node = document.getElementById(nodeId); + const node = document.getElementById(nodeId); node.focus(); @@ -355,11 +377,14 @@ let BookWyrm = new (class { // Toggle class on all related forms. relatedforms.forEach((relatedForm) => - bookwyrm.addRemoveClass( - relatedForm, - "is-hidden", - relatedForm.className.indexOf("is-hidden") == -1 - ) + { + const isHidden = relatedForm.className.indexOf("is-hidden") == -1; + if(isHidden) { + bookwyrm.classShow(relatedForm); + } else { + bookwyrm.classHide(relatedForm); + } + } ); this.ajaxPost(form).catch((error) => { @@ -384,24 +409,23 @@ let BookWyrm = new (class { }); } - /** - * Add or remove a class based on a boolean condition. - * - * @param {object} node - DOM node to change class on - * @param {string} classname - Name of the class - * @param {boolean} add - Add? - * @return {undefined} - */ - addRemoveClass(node, classname, add) { - if (add) { - node.classList.add(classname); - } else { - node.classList.remove(classname); - } + classHide(node) { + node.classList.add("is-hidden"); + } + + classShow(node) { + node.classList.remote("is-hidden"); + } + + classActivate(node) { + node.classList.add("is-active"); + } + + classDeactivate(node) { + node.classList.remove("is-active"); } disableIfTooLarge(eventOrElement) { - const { addRemoveClass } = this; const element = eventOrElement.currentTarget || eventOrElement; const limit = element.dataset.maxUpload; @@ -412,10 +436,10 @@ let BookWyrm = new (class { if (isTooBig) { submits.forEach((submitter) => (submitter.disabled = true)); - warns.forEach((sib) => addRemoveClass(sib, "is-hidden", false)); + warns.forEach((sib) => this.classShow(sib)); } else { submits.forEach((submitter) => (submitter.disabled = false)); - warns.forEach((sib) => addRemoveClass(sib, "is-hidden", true)); + warns.forEach((sib) => this.classHide(sib)); } } @@ -866,12 +890,12 @@ let BookWyrm = new (class { if (passwordInputElement.type === "password") { passwordInputElement.type = "text"; - this.addRemoveClass(iconElement, "icon-eye-blocked"); - this.addRemoveClass(iconElement, "icon-eye", true); + iconElement.classList.remove("icon-eye-blocked"); + iconElement.classList.add("icon-eye") } else { passwordInputElement.type = "password"; - this.addRemoveClass(iconElement, "icon-eye"); - this.addRemoveClass(iconElement, "icon-eye-blocked", true); + iconElement.classList.add("icon-eye-blocked"); + iconElement.classList.remove("icon-eye") } this.toggleFocus(passwordElementId); diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js index 7d0dc9d819..a4488adc92 100644 --- a/bookwyrm/static/js/localstorage.js +++ b/bookwyrm/static/js/localstorage.js @@ -36,9 +36,13 @@ let LocalStorageTools = new (class { */ setDisplay(node) { // Used in set reading goal - let key = node.dataset.hide; - let value = window.localStorage.getItem(key); + const key = node.dataset.hide; + const value = window.localStorage.getItem(key); - BookWyrm.addRemoveClass(node, "is-hidden", value); + if(value) { + BookWyrm.classHide(node); + } else { + BookWyrm.classShow(node); + } } })(); diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js index 0a9f3abc5f..892895156b 100644 --- a/bookwyrm/static/js/status_cache.js +++ b/bookwyrm/static/js/status_cache.js @@ -12,10 +12,6 @@ let StatusCache = new (class { document .querySelectorAll(".submit-status") .forEach((button) => button.addEventListener("submit", this.submitStatus.bind(this))); - - document - .querySelectorAll(".form-rate-stars label.icon") - .forEach((button) => button.addEventListener("click", this.toggleStar.bind(this))); } /** @@ -26,8 +22,8 @@ let StatusCache = new (class { */ updateDraft(event) { // Used in set reading goal - let key = event.target.dataset.cacheDraft; - let value = event.target.value; + const key = event.target.dataset.cacheDraft; + const value = event.target.value; if (!value) { window.localStorage.removeItem(key); @@ -46,8 +42,8 @@ let StatusCache = new (class { */ populateDraft(node) { // Used in set reading goal - let key = node.dataset.cacheDraft; - let value = window.localStorage.getItem(key); + const key = node.dataset.cacheDraft; + const value = window.localStorage.getItem(key); if (!value) { return; @@ -79,14 +75,14 @@ let StatusCache = new (class { event.preventDefault(); - BookWyrm.addRemoveClass(form, "is-processing", true); + form.classList.add("is-processing"); trigger.setAttribute("disabled", null); BookWyrm.ajaxPost(form) .finally(() => { // Change icon to remove ongoing activity on the current UI. // Enable back the element used to submit the form. - BookWyrm.addRemoveClass(form, "is-processing", false); + form.classList.remove("is-processing"); trigger.removeAttribute("disabled"); }) .then((response) => { @@ -107,14 +103,14 @@ let StatusCache = new (class { * @param {String} the id of the message dom element * @return {undefined} */ - announceMessage(message_id) { - const element = document.getElementById(message_id); + announceMessage(messageId) { + const element = document.getElementById(messageId); let copy = element.cloneNode(true); copy.id = null; element.insertAdjacentElement("beforebegin", copy); - BookWyrm.addRemoveClass(copy, "is-hidden", false); + BookWyrm.classShow(copy); setTimeout( function () { copy.remove(); @@ -140,7 +136,7 @@ let StatusCache = new (class { ); // Close modals - let modal = form.closest(".modal.is-active"); + const modal = form.closest(".modal.is-active"); if (modal) { modal.getElementsByClassName("modal-close")[0].click(); @@ -158,7 +154,7 @@ let StatusCache = new (class { } // Close reply panel - let reply = form.closest(".reply-panel"); + const reply = form.closest(".reply-panel"); if (reply) { document.querySelector("[data-controls=" + reply.id + "]").click(); @@ -176,25 +172,25 @@ let StatusCache = new (class { */ cycleShelveButtons(button, identifier) { // Pressed button - let shelf = button.querySelector("[data-shelf-identifier='" + identifier + "']"); - let next_identifier = shelf.dataset.shelfNext; + const shelf = button.querySelector("[data-shelf-identifier='" + identifier + "']"); + let nextIdentifier = shelf.dataset.shelfNext; // Set all buttons to hidden button .querySelectorAll("[data-shelf-identifier]") - .forEach((item) => BookWyrm.addRemoveClass(item, "is-hidden", true)); + .forEach((item) => BookWyrm.classHide(item)); // Button that should be visible now - let next = button.querySelector("[data-shelf-identifier=" + next_identifier + "]"); + const next = button.querySelector("[data-shelf-identifier=" + nextIdentifier + "]"); // Show the desired button - BookWyrm.addRemoveClass(next, "is-hidden", false); + BookWyrm.classShow(next); // ------ update the dropdown buttons // Remove existing hidden class button .querySelectorAll("[data-shelf-dropdown-identifier]") - .forEach((item) => BookWyrm.addRemoveClass(item, "is-hidden", false)); + .forEach((item) => BookWyrm.classShow(item)); // Remove existing disabled states @@ -202,51 +198,32 @@ let StatusCache = new (class { .querySelectorAll("[data-shelf-dropdown-identifier] button") .forEach((item) => (item.disabled = false)); - next_identifier = next_identifier == "complete" ? "read" : next_identifier; - next_identifier = - next_identifier == "stopped-reading-complete" ? "stopped-reading" : next_identifier; + nextIdentifier = nextIdentifier == "complete" ? "read" : nextIdentifier; + nextIdentifier = + nextIdentifier == "stopped-reading-complete" ? "stopped-reading" : nextIdentifier; // Disable the current state button.querySelector( "[data-shelf-dropdown-identifier=" + identifier + "] button" ).disabled = true; - let main_button = button.querySelector( - "[data-shelf-dropdown-identifier=" + next_identifier + "]" + const mainButton = button.querySelector( + "[data-shelf-dropdown-identifier=" + nextIdentifier + "]" ); // Hide the option that's shown as the main button - BookWyrm.addRemoveClass(main_button, "is-hidden", true); + BookWyrm.classHide(mainButton); // Just hide the other two menu options, idk what to do with them button .querySelectorAll("[data-extra-options]") - .forEach((item) => BookWyrm.addRemoveClass(item, "is-hidden", true)); + .forEach((item) => BookWyrm.classHide(item)); // Close menu - let menu = button.querySelector("details[open]"); + const menu = button.querySelector("details[open]"); if (menu) { menu.removeAttribute("open"); } } - - /** - * Reveal half-stars - * - * @param {Event} event - * @return {undefined} - */ - toggleStar(event) { - const label = event.currentTarget; - let wholeStar = document.getElementById(label.getAttribute("for")); - - if (wholeStar.checked) { - event.preventDefault(); - let halfStar = document.getElementById(label.dataset.forHalf); - - wholeStar.checked = null; - halfStar.checked = "checked"; - } - } })(); From 2eba222127b5a6fc9218babf60db3206c50e441d Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Tue, 4 Aug 2026 19:20:06 -0400 Subject: [PATCH 955/962] ran formatters --- bookwyrm/static/js/autocomplete.js | 10 ++++----- bookwyrm/static/js/bookwyrm.js | 34 ++++++++++++++++-------------- bookwyrm/static/js/localstorage.js | 2 +- bookwyrm/static/js/status_cache.js | 4 +--- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/bookwyrm/static/js/autocomplete.js b/bookwyrm/static/js/autocomplete.js index 5ce9ed35e0..84286ac619 100644 --- a/bookwyrm/static/js/autocomplete.js +++ b/bookwyrm/static/js/autocomplete.js @@ -17,11 +17,10 @@ "OGG", "PDF", "Plaintext", - "Print book" + "Print book", ]; - const regexEscape = (string) => string.replace(/[$^*()-+.?[]{}|\\\/]/g, '\\$&'); - + const regexEscape = (string) => string.replace(/[$^*()-+.?[]{}|\\\/]/g, "\\$&"); /** * Suggest a completion as a user types @@ -42,7 +41,9 @@ const cleanInput = regexEscape(input.value); - const suggestions = mimeTypes.filter(mimeType => RegExp("^" + cleanInput, "i").test(mimeType)); + const suggestions = mimeTypes.filter((mimeType) => + RegExp("^" + cleanInput, "i").test(mimeType) + ); const boxId = input.getAttribute("list"); @@ -65,4 +66,3 @@ input.addEventListener("input", autocomplete); }); })(); - diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index abc76bdad6..da1b1f8643 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -156,13 +156,16 @@ let BookWyrm = new (class { if (count != currentCount) { const wrapper = counter.closest("[data-poll-wrapper]"); - if(count < 1) { + + if (count < 1) { this.classHide(wrapper); } else { this.classShow(wrapper); } + counter.innerText = count; - if(hasMentions) { + + if (hasMentions) { this.classList.add("is-danger"); } else { this.classList.remove("is-danger"); @@ -240,7 +243,7 @@ let BookWyrm = new (class { if (targetId && !trigger.classList.contains("pulldown-menu")) { const target = document.getElementById(targetId); - if(pressed) { + if (pressed) { this.classShow(target); this.classActivate(target); } else { @@ -299,7 +302,7 @@ let BookWyrm = new (class { if (targetId) { const target = document.getElementById(targetId); - if(expanded) { + if (expanded) { this.classActivate(target); } else { this.classDeactivate(target); @@ -315,7 +318,7 @@ let BookWyrm = new (class { * @return {undefined} */ toggleContainer(container, pressed) { - if(pressed) { + if (pressed) { this.classHide(container); } else { this.classShow(container); @@ -376,16 +379,15 @@ let BookWyrm = new (class { const relatedforms = document.querySelectorAll(`.${form.dataset.id}`); // Toggle class on all related forms. - relatedforms.forEach((relatedForm) => - { - const isHidden = relatedForm.className.indexOf("is-hidden") == -1; - if(isHidden) { - bookwyrm.classShow(relatedForm); - } else { - bookwyrm.classHide(relatedForm); - } + relatedforms.forEach((relatedForm) => { + const isHidden = relatedForm.className.indexOf("is-hidden") == -1; + + if (isHidden) { + bookwyrm.classShow(relatedForm); + } else { + bookwyrm.classHide(relatedForm); } - ); + }); this.ajaxPost(form).catch((error) => { // @todo Display a notification in the UI instead. @@ -891,11 +893,11 @@ let BookWyrm = new (class { if (passwordInputElement.type === "password") { passwordInputElement.type = "text"; iconElement.classList.remove("icon-eye-blocked"); - iconElement.classList.add("icon-eye") + iconElement.classList.add("icon-eye"); } else { passwordInputElement.type = "password"; iconElement.classList.add("icon-eye-blocked"); - iconElement.classList.remove("icon-eye") + iconElement.classList.remove("icon-eye"); } this.toggleFocus(passwordElementId); diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js index a4488adc92..1fc9f86b83 100644 --- a/bookwyrm/static/js/localstorage.js +++ b/bookwyrm/static/js/localstorage.js @@ -39,7 +39,7 @@ let LocalStorageTools = new (class { const key = node.dataset.hide; const value = window.localStorage.getItem(key); - if(value) { + if (value) { BookWyrm.classHide(node); } else { BookWyrm.classShow(node); diff --git a/bookwyrm/static/js/status_cache.js b/bookwyrm/static/js/status_cache.js index 892895156b..7abde1a10e 100644 --- a/bookwyrm/static/js/status_cache.js +++ b/bookwyrm/static/js/status_cache.js @@ -215,9 +215,7 @@ let StatusCache = new (class { BookWyrm.classHide(mainButton); // Just hide the other two menu options, idk what to do with them - button - .querySelectorAll("[data-extra-options]") - .forEach((item) => BookWyrm.classHide(item)); + button.querySelectorAll("[data-extra-options]").forEach((item) => BookWyrm.classHide(item)); // Close menu const menu = button.querySelector("details[open]"); From 6b6769322e49374fd7ff8711618a8606a468838a Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Wed, 5 Aug 2026 10:09:06 -0400 Subject: [PATCH 956/962] a few remaining let-to-const --- bookwyrm/static/js/localstorage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/static/js/localstorage.js b/bookwyrm/static/js/localstorage.js index 1fc9f86b83..9088d555e2 100644 --- a/bookwyrm/static/js/localstorage.js +++ b/bookwyrm/static/js/localstorage.js @@ -18,8 +18,8 @@ let LocalStorageTools = new (class { */ updateDisplay(event) { // Used in set reading goal - let key = event.target.dataset.id; - let value = event.target.dataset.value; + const key = event.target.dataset.id; + const value = event.target.dataset.value; window.localStorage.setItem(key, value); From 2c276363348820ed76a434cfdcacba42553a24e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Aug 2026 19:55:22 +0000 Subject: [PATCH 957/962] Bump aiohttp from 3.14.1 to 3.14.3 Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.14.1 to 3.14.3. - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](https://github.com/aio-libs/aiohttp/compare/v3.14.1...v3.14.3) --- updated-dependencies: - dependency-name: aiohttp dependency-version: 3.14.3 dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 9026e50682..5a46f9f182 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [dependency-groups] main = [ - "aiohttp==3.14.1", + "aiohttp==3.14.3", "arabic-reshaper==3.0.1", "bleach==6.4.0", "boto3==1.34.74", From a1d46c035e10e5841d448ebfd1e4cb904cf58788 Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Thu, 6 Aug 2026 09:40:11 -0400 Subject: [PATCH 958/962] typo remote -> remove --- bookwyrm/static/js/bookwyrm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index da1b1f8643..abe813c34f 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -416,7 +416,7 @@ let BookWyrm = new (class { } classShow(node) { - node.classList.remote("is-hidden"); + node.classList.remove("is-hidden"); } classActivate(node) { From aa769721be2087025126aead6ca9e3ecfb1f5dfc Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Fri, 7 Aug 2026 10:38:13 -0400 Subject: [PATCH 959/962] move inline style to scss file and changed px to rem --- bookwyrm/static/css/bookwyrm/_all.scss | 1 + bookwyrm/static/css/bookwyrm/components/_embed.scss | 6 ++++++ bookwyrm/templates/embed-layout.html | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 bookwyrm/static/css/bookwyrm/components/_embed.scss diff --git a/bookwyrm/static/css/bookwyrm/_all.scss b/bookwyrm/static/css/bookwyrm/_all.scss index 147af984f9..3de604ceed 100644 --- a/bookwyrm/static/css/bookwyrm/_all.scss +++ b/bookwyrm/static/css/bookwyrm/_all.scss @@ -9,6 +9,7 @@ @import "components/breadcrumbs"; @import "components/copy"; @import "components/details"; +@import "components/embed"; @import "components/file_input"; @import "components/live_message"; @import "components/modal"; diff --git a/bookwyrm/static/css/bookwyrm/components/_embed.scss b/bookwyrm/static/css/bookwyrm/components/_embed.scss new file mode 100644 index 0000000000..d35112bd57 --- /dev/null +++ b/bookwyrm/static/css/bookwyrm/components/_embed.scss @@ -0,0 +1,6 @@ +/** CSS for Embedded layout + ******************************************************************************/ + + .logo-image-height { + height: 2rem; + } \ No newline at end of file diff --git a/bookwyrm/templates/embed-layout.html b/bookwyrm/templates/embed-layout.html index 8652036272..bdce1f2634 100644 --- a/bookwyrm/templates/embed-layout.html +++ b/bookwyrm/templates/embed-layout.html @@ -18,7 +18,7 @@
        - + {{ site.name }}
        From 6c8d70230d495b11547a35d6cb39f8f08d59e68d Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Fri, 7 Aug 2026 21:47:50 +0300 Subject: [PATCH 960/962] anubis: allow POST methods by default Safari might have issue with anubis from time to time, so don't prevent for example book adding or modification for that. --- anubis/botPolicy.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/anubis/botPolicy.yaml b/anubis/botPolicy.yaml index b25731aa80..6c0ce427ca 100644 --- a/anubis/botPolicy.yaml +++ b/anubis/botPolicy.yaml @@ -17,6 +17,11 @@ bots: - name: Allow access to user reviews/quotes/comments rss action: ALLOW path_regex: "^/user/.*/rss-(quotes|reviews|comments)/?$" + # Anubis and Safari don't always see eachother eye-to-eye, most likely happy eyeballs thing + # https://github.com/TecharoHQ/anubis/issues/289 + - name: Allow POST method for book creation etc + action: ALLOW + expression: method == "POST" # Anubis subauth doesn't seem to handle CHALLENGE nicely, so tune weight - name: All email confirmations are suspicious by default action: WEIGH From 662098996c7a28850b75798bff0a0afba1b8743d Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Fri, 7 Aug 2026 21:53:34 +0300 Subject: [PATCH 961/962] systemd: add export to bindpaths in main service it is present in worker-service already --- contrib/systemd/bookwyrm.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/systemd/bookwyrm.service b/contrib/systemd/bookwyrm.service index 6e9434aa3d..f7a6374459 100644 --- a/contrib/systemd/bookwyrm.service +++ b/contrib/systemd/bookwyrm.service @@ -17,7 +17,7 @@ TemporaryFileSystem=/var /run /opt PrivateUsers=true PrivateDevices=true BindReadOnlyPaths=/opt/bookwyrm -BindPaths=/opt/bookwyrm/images /opt/bookwyrm/static /var/run/postgresql +BindPaths=/opt/bookwyrm/images /opt/bookwyrm/static /opt/bookwyrm/exports /var/run/postgresql LockPersonality=yes MemoryDenyWriteExecute=true PrivateMounts=true From c6b71decb0f4e8c3f2f7186d1e06ee79ec4f731a Mon Sep 17 00:00:00 2001 From: Patrick Childers <8558954+PatrickChildersIT@users.noreply.github.com> Date: Tue, 11 Aug 2026 10:38:24 -0400 Subject: [PATCH 962/962] fix inverted hidden logic for interact event --- bookwyrm/static/js/bookwyrm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index abe813c34f..b2b1991aa5 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -380,7 +380,7 @@ let BookWyrm = new (class { // Toggle class on all related forms. relatedforms.forEach((relatedForm) => { - const isHidden = relatedForm.className.indexOf("is-hidden") == -1; + const isHidden = relatedForm.className.indexOf("is-hidden") != -1; if (isHidden) { bookwyrm.classShow(relatedForm);