diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
deleted file mode 100644
index 7cfbe6283f..0000000000
--- a/bookwyrm/forms.py
+++ /dev/null
@@ -1,581 +0,0 @@
-""" using django model forms """
-import datetime
-from collections import defaultdict
-from urllib.parse import urlparse
-
-from django import forms
-from django.forms import ModelForm, PasswordInput, widgets, ChoiceField
-from django.forms.widgets import Textarea
-from django.utils import timezone
-from django.utils.translation import gettext_lazy as _
-
-from bookwyrm import models
-from bookwyrm.models.fields import ClearableFileInputWithWarning
-from bookwyrm.models.user import FeedFilterChoices
-
-
-class CustomForm(ModelForm):
- """add css classes to the forms"""
-
- def __init__(self, *args, **kwargs):
- css_classes = defaultdict(lambda: "")
- css_classes["text"] = "input"
- css_classes["password"] = "input"
- css_classes["email"] = "input"
- css_classes["number"] = "input"
- css_classes["checkbox"] = "checkbox"
- css_classes["textarea"] = "textarea"
- # pylint: disable=super-with-arguments
- super(CustomForm, self).__init__(*args, **kwargs)
- for visible in self.visible_fields():
- if hasattr(visible.field.widget, "input_type"):
- input_type = visible.field.widget.input_type
- if isinstance(visible.field.widget, Textarea):
- input_type = "textarea"
- visible.field.widget.attrs["rows"] = 5
- visible.field.widget.attrs["class"] = css_classes[input_type]
-
-
-# pylint: disable=missing-class-docstring
-class LoginForm(CustomForm):
- class Meta:
- model = models.User
- fields = ["localname", "password"]
- help_texts = {f: None for f in fields}
- widgets = {
- "password": PasswordInput(),
- }
-
-
-class RegisterForm(CustomForm):
- class Meta:
- model = models.User
- fields = ["localname", "email", "password"]
- help_texts = {f: None for f in fields}
- widgets = {"password": PasswordInput()}
-
- def clean(self):
- """Check if the username is taken"""
- cleaned_data = super().clean()
- localname = cleaned_data.get("localname").strip()
- if models.User.objects.filter(localname=localname).first():
- self.add_error("localname", _("User with this username already exists"))
-
-
-class RatingForm(CustomForm):
- class Meta:
- model = models.ReviewRating
- fields = ["user", "book", "rating", "privacy"]
-
-
-class ReviewForm(CustomForm):
- class Meta:
- model = models.Review
- fields = [
- "user",
- "book",
- "name",
- "content",
- "rating",
- "content_warning",
- "sensitive",
- "privacy",
- ]
-
-
-class CommentForm(CustomForm):
- class Meta:
- model = models.Comment
- fields = [
- "user",
- "book",
- "content",
- "content_warning",
- "sensitive",
- "privacy",
- "progress",
- "progress_mode",
- "reading_status",
- ]
-
-
-class QuotationForm(CustomForm):
- class Meta:
- model = models.Quotation
- fields = [
- "user",
- "book",
- "quote",
- "content",
- "content_warning",
- "sensitive",
- "privacy",
- "position",
- "position_mode",
- ]
-
-
-class ReplyForm(CustomForm):
- class Meta:
- model = models.Status
- fields = [
- "user",
- "content",
- "content_warning",
- "sensitive",
- "reply_parent",
- "privacy",
- ]
-
-
-class StatusForm(CustomForm):
- class Meta:
- model = models.Status
- fields = ["user", "content", "content_warning", "sensitive", "privacy"]
-
-
-class DirectForm(CustomForm):
- class Meta:
- model = models.Status
- fields = ["user", "content", "content_warning", "sensitive", "privacy"]
-
-
-class EditUserForm(CustomForm):
- class Meta:
- model = models.User
- fields = [
- "avatar",
- "name",
- "email",
- "summary",
- "show_goal",
- "show_suggested_users",
- "manually_approves_followers",
- "default_post_privacy",
- "discoverable",
- "hide_follows",
- "preferred_timezone",
- "preferred_language",
- "theme",
- ]
- help_texts = {f: None for f in fields}
- widgets = {
- "avatar": ClearableFileInputWithWarning(
- attrs={"aria-describedby": "desc_avatar"}
- ),
- "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
- "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}),
- "email": forms.EmailInput(attrs={"aria-describedby": "desc_email"}),
- "discoverable": forms.CheckboxInput(
- attrs={"aria-describedby": "desc_discoverable"}
- ),
- }
-
-
-class LimitedEditUserForm(CustomForm):
- class Meta:
- model = models.User
- fields = [
- "avatar",
- "name",
- "summary",
- "manually_approves_followers",
- "discoverable",
- ]
- help_texts = {f: None for f in fields}
- widgets = {
- "avatar": ClearableFileInputWithWarning(
- attrs={"aria-describedby": "desc_avatar"}
- ),
- "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
- "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}),
- "discoverable": forms.CheckboxInput(
- attrs={"aria-describedby": "desc_discoverable"}
- ),
- }
-
-
-class DeleteUserForm(CustomForm):
- class Meta:
- model = models.User
- fields = ["password"]
-
-
-class UserGroupForm(CustomForm):
- class Meta:
- model = models.User
- fields = ["groups"]
-
-
-class FeedStatusTypesForm(CustomForm):
- class Meta:
- model = models.User
- fields = ["feed_status_types"]
- help_texts = {f: None for f in fields}
- widgets = {
- "feed_status_types": widgets.CheckboxSelectMultiple(
- choices=FeedFilterChoices,
- ),
- }
-
-
-class CoverForm(CustomForm):
- class Meta:
- model = models.Book
- fields = ["cover"]
- help_texts = {f: None for f in fields}
-
-
-class LinkDomainForm(CustomForm):
- class Meta:
- model = models.LinkDomain
- fields = ["name"]
-
-
-class FileLinkForm(CustomForm):
- class Meta:
- model = models.FileLink
- fields = ["url", "filetype", "availability", "book", "added_by"]
-
- def clean(self):
- """make sure the domain isn't blocked or pending"""
- cleaned_data = super().clean()
- url = cleaned_data.get("url")
- filetype = cleaned_data.get("filetype")
- book = cleaned_data.get("book")
- domain = urlparse(url).netloc
- if models.LinkDomain.objects.filter(domain=domain).exists():
- status = models.LinkDomain.objects.get(domain=domain).status
- if status == "blocked":
- # pylint: disable=line-too-long
- self.add_error(
- "url",
- _(
- "This domain is blocked. Please contact your administrator if you think this is an error."
- ),
- )
- elif models.FileLink.objects.filter(
- url=url, book=book, filetype=filetype
- ).exists():
- # pylint: disable=line-too-long
- self.add_error(
- "url",
- _(
- "This link with file type has already been added for this book. If it is not visible, the domain is still pending."
- ),
- )
-
-
-class EditionForm(CustomForm):
- class Meta:
- model = models.Edition
- exclude = [
- "remote_id",
- "origin_id",
- "created_date",
- "updated_date",
- "edition_rank",
- "authors",
- "parent_work",
- "shelves",
- "connector",
- "search_vector",
- "links",
- "file_links",
- ]
- widgets = {
- "title": forms.TextInput(attrs={"aria-describedby": "desc_title"}),
- "subtitle": forms.TextInput(attrs={"aria-describedby": "desc_subtitle"}),
- "description": forms.Textarea(
- attrs={"aria-describedby": "desc_description"}
- ),
- "series": forms.TextInput(attrs={"aria-describedby": "desc_series"}),
- "series_number": forms.TextInput(
- attrs={"aria-describedby": "desc_series_number"}
- ),
- "languages": forms.TextInput(
- attrs={"aria-describedby": "desc_languages_help desc_languages"}
- ),
- "publishers": forms.TextInput(
- attrs={"aria-describedby": "desc_publishers_help desc_publishers"}
- ),
- "first_published_date": forms.SelectDateWidget(
- attrs={"aria-describedby": "desc_first_published_date"}
- ),
- "published_date": forms.SelectDateWidget(
- attrs={"aria-describedby": "desc_published_date"}
- ),
- "cover": ClearableFileInputWithWarning(
- attrs={"aria-describedby": "desc_cover"}
- ),
- "physical_format": forms.Select(
- attrs={"aria-describedby": "desc_physical_format"}
- ),
- "physical_format_detail": forms.TextInput(
- attrs={"aria-describedby": "desc_physical_format_detail"}
- ),
- "pages": forms.NumberInput(attrs={"aria-describedby": "desc_pages"}),
- "isbn_13": forms.TextInput(attrs={"aria-describedby": "desc_isbn_13"}),
- "isbn_10": forms.TextInput(attrs={"aria-describedby": "desc_isbn_10"}),
- "openlibrary_key": forms.TextInput(
- attrs={"aria-describedby": "desc_openlibrary_key"}
- ),
- "inventaire_id": forms.TextInput(
- attrs={"aria-describedby": "desc_inventaire_id"}
- ),
- "oclc_number": forms.TextInput(
- attrs={"aria-describedby": "desc_oclc_number"}
- ),
- "ASIN": forms.TextInput(attrs={"aria-describedby": "desc_ASIN"}),
- }
-
-
-class AuthorForm(CustomForm):
- class Meta:
- model = models.Author
- fields = [
- "last_edited_by",
- "name",
- "aliases",
- "bio",
- "wikipedia_link",
- "born",
- "died",
- "openlibrary_key",
- "inventaire_id",
- "librarything_key",
- "goodreads_key",
- "isni",
- ]
- widgets = {
- "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
- "aliases": forms.TextInput(attrs={"aria-describedby": "desc_aliases"}),
- "bio": forms.Textarea(attrs={"aria-describedby": "desc_bio"}),
- "wikipedia_link": forms.TextInput(
- attrs={"aria-describedby": "desc_wikipedia_link"}
- ),
- "born": forms.SelectDateWidget(attrs={"aria-describedby": "desc_born"}),
- "died": forms.SelectDateWidget(attrs={"aria-describedby": "desc_died"}),
- "oepnlibrary_key": forms.TextInput(
- attrs={"aria-describedby": "desc_oepnlibrary_key"}
- ),
- "inventaire_id": forms.TextInput(
- attrs={"aria-describedby": "desc_inventaire_id"}
- ),
- "librarything_key": forms.TextInput(
- attrs={"aria-describedby": "desc_librarything_key"}
- ),
- "goodreads_key": forms.TextInput(
- attrs={"aria-describedby": "desc_goodreads_key"}
- ),
- }
-
-
-class ImportForm(forms.Form):
- csv_file = forms.FileField()
-
-
-class ExpiryWidget(widgets.Select):
- def value_from_datadict(self, data, files, name):
- """human-readable exiration time buckets"""
- selected_string = super().value_from_datadict(data, files, name)
-
- if selected_string == "day":
- interval = datetime.timedelta(days=1)
- elif selected_string == "week":
- interval = datetime.timedelta(days=7)
- elif selected_string == "month":
- interval = datetime.timedelta(days=31) # Close enough?
- elif selected_string == "forever":
- return None
- else:
- return selected_string # This will raise
-
- return timezone.now() + interval
-
-
-class InviteRequestForm(CustomForm):
- def clean(self):
- """make sure the email isn't in use by a registered user"""
- cleaned_data = super().clean()
- email = cleaned_data.get("email")
- if email and models.User.objects.filter(email=email).exists():
- self.add_error("email", _("A user with this email already exists."))
-
- class Meta:
- model = models.InviteRequest
- fields = ["email"]
-
-
-class CreateInviteForm(CustomForm):
- class Meta:
- model = models.SiteInvite
- exclude = ["code", "user", "times_used", "invitees"]
- widgets = {
- "expiry": ExpiryWidget(
- choices=[
- ("day", _("One Day")),
- ("week", _("One Week")),
- ("month", _("One Month")),
- ("forever", _("Does Not Expire")),
- ]
- ),
- "use_limit": widgets.Select(
- choices=[(i, _(f"{i} uses")) for i in [1, 5, 10, 25, 50, 100]]
- + [(None, _("Unlimited"))]
- ),
- }
-
-
-class ShelfForm(CustomForm):
- class Meta:
- model = models.Shelf
- fields = ["user", "name", "privacy", "description"]
-
-
-class GoalForm(CustomForm):
- class Meta:
- model = models.AnnualGoal
- fields = ["user", "year", "goal", "privacy"]
-
-
-class SiteForm(CustomForm):
- class Meta:
- model = models.SiteSettings
- exclude = ["admin_code", "install_mode"]
- widgets = {
- "instance_short_description": forms.TextInput(
- attrs={"aria-describedby": "desc_instance_short_description"}
- ),
- "require_confirm_email": forms.CheckboxInput(
- attrs={"aria-describedby": "desc_require_confirm_email"}
- ),
- "invite_request_text": forms.Textarea(
- attrs={"aria-describedby": "desc_invite_request_text"}
- ),
- }
-
-
-class SiteThemeForm(CustomForm):
- class Meta:
- model = models.SiteSettings
- fields = ["default_theme"]
-
-
-class ThemeForm(CustomForm):
- class Meta:
- model = models.Theme
- fields = ["name", "path"]
- widgets = {
- "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
- "path": forms.TextInput(
- attrs={
- "aria-describedby": "desc_path",
- "placeholder": "css/themes/theme-name.scss",
- }
- ),
- }
-
-
-class AnnouncementForm(CustomForm):
- class Meta:
- model = models.Announcement
- exclude = ["remote_id"]
- widgets = {
- "preview": forms.TextInput(attrs={"aria-describedby": "desc_preview"}),
- "content": forms.Textarea(attrs={"aria-describedby": "desc_content"}),
- "event_date": forms.SelectDateWidget(
- attrs={"aria-describedby": "desc_event_date"}
- ),
- "start_date": forms.SelectDateWidget(
- attrs={"aria-describedby": "desc_start_date"}
- ),
- "end_date": forms.SelectDateWidget(
- attrs={"aria-describedby": "desc_end_date"}
- ),
- "active": forms.CheckboxInput(attrs={"aria-describedby": "desc_active"}),
- }
-
-
-class ListForm(CustomForm):
- class Meta:
- model = models.List
- fields = ["user", "name", "description", "curation", "privacy", "group"]
-
-
-class ListItemForm(CustomForm):
- class Meta:
- model = models.ListItem
- fields = ["user", "book", "book_list", "notes"]
-
-
-class GroupForm(CustomForm):
- class Meta:
- model = models.Group
- fields = ["user", "privacy", "name", "description"]
-
-
-class ReportForm(CustomForm):
- class Meta:
- model = models.Report
- fields = ["user", "reporter", "status", "links", "note"]
-
-
-class EmailBlocklistForm(CustomForm):
- class Meta:
- model = models.EmailBlocklist
- fields = ["domain"]
- widgets = {
- "avatar": forms.TextInput(attrs={"aria-describedby": "desc_domain"}),
- }
-
-
-class IPBlocklistForm(CustomForm):
- class Meta:
- model = models.IPBlocklist
- fields = ["address"]
-
-
-class ServerForm(CustomForm):
- class Meta:
- model = models.FederatedServer
- exclude = ["remote_id"]
-
-
-class SortListForm(forms.Form):
- sort_by = ChoiceField(
- choices=(
- ("order", _("List Order")),
- ("title", _("Book Title")),
- ("rating", _("Rating")),
- ),
- label=_("Sort By"),
- )
- direction = ChoiceField(
- choices=(
- ("ascending", _("Ascending")),
- ("descending", _("Descending")),
- ),
- )
-
-
-class ReadThroughForm(CustomForm):
- def clean(self):
- """make sure the email isn't in use by a registered user"""
- cleaned_data = super().clean()
- start_date = cleaned_data.get("start_date")
- finish_date = cleaned_data.get("finish_date")
- if start_date and finish_date and start_date > finish_date:
- self.add_error(
- "finish_date", _("Reading finish date cannot be before start date.")
- )
-
- class Meta:
- model = models.ReadThrough
- fields = ["user", "book", "start_date", "finish_date"]
-
-
-class AutoModRuleForm(CustomForm):
- class Meta:
- model = models.AutoMod
- fields = ["string_match", "flag_users", "flag_statuses", "created_by"]
diff --git a/bookwyrm/forms/__init__.py b/bookwyrm/forms/__init__.py
new file mode 100644
index 0000000000..0757529369
--- /dev/null
+++ b/bookwyrm/forms/__init__.py
@@ -0,0 +1,12 @@
+""" make forms available to the app """
+# site admin
+from .admin import *
+from .author import *
+from .books import *
+from .edit_user import *
+from .forms import *
+from .groups import *
+from .landing import *
+from .links import *
+from .lists import *
+from .status import *
diff --git a/bookwyrm/forms/admin.py b/bookwyrm/forms/admin.py
new file mode 100644
index 0000000000..6b2984b3b2
--- /dev/null
+++ b/bookwyrm/forms/admin.py
@@ -0,0 +1,129 @@
+""" using django model forms """
+import datetime
+
+from django import forms
+from django.forms import widgets
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+
+from bookwyrm import models
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class ExpiryWidget(widgets.Select):
+ def value_from_datadict(self, data, files, name):
+ """human-readable exiration time buckets"""
+ selected_string = super().value_from_datadict(data, files, name)
+
+ if selected_string == "day":
+ interval = datetime.timedelta(days=1)
+ elif selected_string == "week":
+ interval = datetime.timedelta(days=7)
+ elif selected_string == "month":
+ interval = datetime.timedelta(days=31) # Close enough?
+ elif selected_string == "forever":
+ return None
+ else:
+ return selected_string # This will raise
+
+ return timezone.now() + interval
+
+
+class CreateInviteForm(CustomForm):
+ class Meta:
+ model = models.SiteInvite
+ exclude = ["code", "user", "times_used", "invitees"]
+ widgets = {
+ "expiry": ExpiryWidget(
+ choices=[
+ ("day", _("One Day")),
+ ("week", _("One Week")),
+ ("month", _("One Month")),
+ ("forever", _("Does Not Expire")),
+ ]
+ ),
+ "use_limit": widgets.Select(
+ choices=[(i, _(f"{i} uses")) for i in [1, 5, 10, 25, 50, 100]]
+ + [(None, _("Unlimited"))]
+ ),
+ }
+
+
+class SiteForm(CustomForm):
+ class Meta:
+ model = models.SiteSettings
+ exclude = ["admin_code", "install_mode"]
+ widgets = {
+ "instance_short_description": forms.TextInput(
+ attrs={"aria-describedby": "desc_instance_short_description"}
+ ),
+ "require_confirm_email": forms.CheckboxInput(
+ attrs={"aria-describedby": "desc_require_confirm_email"}
+ ),
+ "invite_request_text": forms.Textarea(
+ attrs={"aria-describedby": "desc_invite_request_text"}
+ ),
+ }
+
+
+class ThemeForm(CustomForm):
+ class Meta:
+ model = models.Theme
+ fields = ["name", "path"]
+ widgets = {
+ "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
+ "path": forms.TextInput(
+ attrs={
+ "aria-describedby": "desc_path",
+ "placeholder": "css/themes/theme-name.scss",
+ }
+ ),
+ }
+
+
+class AnnouncementForm(CustomForm):
+ class Meta:
+ model = models.Announcement
+ exclude = ["remote_id"]
+ widgets = {
+ "preview": forms.TextInput(attrs={"aria-describedby": "desc_preview"}),
+ "content": forms.Textarea(attrs={"aria-describedby": "desc_content"}),
+ "event_date": forms.SelectDateWidget(
+ attrs={"aria-describedby": "desc_event_date"}
+ ),
+ "start_date": forms.SelectDateWidget(
+ attrs={"aria-describedby": "desc_start_date"}
+ ),
+ "end_date": forms.SelectDateWidget(
+ attrs={"aria-describedby": "desc_end_date"}
+ ),
+ "active": forms.CheckboxInput(attrs={"aria-describedby": "desc_active"}),
+ }
+
+
+class EmailBlocklistForm(CustomForm):
+ class Meta:
+ model = models.EmailBlocklist
+ fields = ["domain"]
+ widgets = {
+ "avatar": forms.TextInput(attrs={"aria-describedby": "desc_domain"}),
+ }
+
+
+class IPBlocklistForm(CustomForm):
+ class Meta:
+ model = models.IPBlocklist
+ fields = ["address"]
+
+
+class ServerForm(CustomForm):
+ class Meta:
+ model = models.FederatedServer
+ exclude = ["remote_id"]
+
+
+class AutoModRuleForm(CustomForm):
+ class Meta:
+ model = models.AutoMod
+ fields = ["string_match", "flag_users", "flag_statuses", "created_by"]
diff --git a/bookwyrm/forms/author.py b/bookwyrm/forms/author.py
new file mode 100644
index 0000000000..ca59426deb
--- /dev/null
+++ b/bookwyrm/forms/author.py
@@ -0,0 +1,47 @@
+""" using django model forms """
+from django import forms
+
+from bookwyrm import models
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class AuthorForm(CustomForm):
+ class Meta:
+ model = models.Author
+ fields = [
+ "last_edited_by",
+ "name",
+ "aliases",
+ "bio",
+ "wikipedia_link",
+ "born",
+ "died",
+ "openlibrary_key",
+ "inventaire_id",
+ "librarything_key",
+ "goodreads_key",
+ "isni",
+ ]
+ widgets = {
+ "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
+ "aliases": forms.TextInput(attrs={"aria-describedby": "desc_aliases"}),
+ "bio": forms.Textarea(attrs={"aria-describedby": "desc_bio"}),
+ "wikipedia_link": forms.TextInput(
+ attrs={"aria-describedby": "desc_wikipedia_link"}
+ ),
+ "born": forms.SelectDateWidget(attrs={"aria-describedby": "desc_born"}),
+ "died": forms.SelectDateWidget(attrs={"aria-describedby": "desc_died"}),
+ "oepnlibrary_key": forms.TextInput(
+ attrs={"aria-describedby": "desc_oepnlibrary_key"}
+ ),
+ "inventaire_id": forms.TextInput(
+ attrs={"aria-describedby": "desc_inventaire_id"}
+ ),
+ "librarything_key": forms.TextInput(
+ attrs={"aria-describedby": "desc_librarything_key"}
+ ),
+ "goodreads_key": forms.TextInput(
+ attrs={"aria-describedby": "desc_goodreads_key"}
+ ),
+ }
diff --git a/bookwyrm/forms/books.py b/bookwyrm/forms/books.py
new file mode 100644
index 0000000000..72df1371c3
--- /dev/null
+++ b/bookwyrm/forms/books.py
@@ -0,0 +1,87 @@
+""" using django model forms """
+from django import forms
+
+from bookwyrm import models
+from bookwyrm.models.fields import ClearableFileInputWithWarning
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class CoverForm(CustomForm):
+ class Meta:
+ model = models.Book
+ fields = ["cover"]
+ help_texts = {f: None for f in fields}
+
+
+class ArrayWidget(forms.widgets.TextInput):
+ # pylint: disable=unused-argument
+ # pylint: disable=no-self-use
+ def value_from_datadict(self, data, files, name):
+ """get all values for this name"""
+ return [i for i in data.getlist(name) if i]
+
+
+class EditionForm(CustomForm):
+ class Meta:
+ model = models.Edition
+ exclude = [
+ "remote_id",
+ "origin_id",
+ "created_date",
+ "updated_date",
+ "edition_rank",
+ "authors",
+ "parent_work",
+ "shelves",
+ "connector",
+ "search_vector",
+ "links",
+ "file_links",
+ ]
+ widgets = {
+ "title": forms.TextInput(attrs={"aria-describedby": "desc_title"}),
+ "subtitle": forms.TextInput(attrs={"aria-describedby": "desc_subtitle"}),
+ "description": forms.Textarea(
+ attrs={"aria-describedby": "desc_description"}
+ ),
+ "series": forms.TextInput(attrs={"aria-describedby": "desc_series"}),
+ "series_number": forms.TextInput(
+ attrs={"aria-describedby": "desc_series_number"}
+ ),
+ "subjects": ArrayWidget(),
+ "languages": forms.TextInput(
+ attrs={"aria-describedby": "desc_languages_help desc_languages"}
+ ),
+ "publishers": forms.TextInput(
+ attrs={"aria-describedby": "desc_publishers_help desc_publishers"}
+ ),
+ "first_published_date": forms.SelectDateWidget(
+ attrs={"aria-describedby": "desc_first_published_date"}
+ ),
+ "published_date": forms.SelectDateWidget(
+ attrs={"aria-describedby": "desc_published_date"}
+ ),
+ "cover": ClearableFileInputWithWarning(
+ attrs={"aria-describedby": "desc_cover"}
+ ),
+ "physical_format": forms.Select(
+ attrs={"aria-describedby": "desc_physical_format"}
+ ),
+ "physical_format_detail": forms.TextInput(
+ attrs={"aria-describedby": "desc_physical_format_detail"}
+ ),
+ "pages": forms.NumberInput(attrs={"aria-describedby": "desc_pages"}),
+ "isbn_13": forms.TextInput(attrs={"aria-describedby": "desc_isbn_13"}),
+ "isbn_10": forms.TextInput(attrs={"aria-describedby": "desc_isbn_10"}),
+ "openlibrary_key": forms.TextInput(
+ attrs={"aria-describedby": "desc_openlibrary_key"}
+ ),
+ "inventaire_id": forms.TextInput(
+ attrs={"aria-describedby": "desc_inventaire_id"}
+ ),
+ "oclc_number": forms.TextInput(
+ attrs={"aria-describedby": "desc_oclc_number"}
+ ),
+ "ASIN": forms.TextInput(attrs={"aria-describedby": "desc_ASIN"}),
+ }
diff --git a/bookwyrm/forms/custom_form.py b/bookwyrm/forms/custom_form.py
new file mode 100644
index 0000000000..74a3417a27
--- /dev/null
+++ b/bookwyrm/forms/custom_form.py
@@ -0,0 +1,26 @@
+""" Overrides django's default form class """
+from collections import defaultdict
+from django.forms import ModelForm
+from django.forms.widgets import Textarea
+
+
+class CustomForm(ModelForm):
+ """add css classes to the forms"""
+
+ def __init__(self, *args, **kwargs):
+ css_classes = defaultdict(lambda: "")
+ css_classes["text"] = "input"
+ css_classes["password"] = "input"
+ css_classes["email"] = "input"
+ css_classes["number"] = "input"
+ css_classes["checkbox"] = "checkbox"
+ css_classes["textarea"] = "textarea"
+ # pylint: disable=super-with-arguments
+ super(CustomForm, self).__init__(*args, **kwargs)
+ for visible in self.visible_fields():
+ if hasattr(visible.field.widget, "input_type"):
+ input_type = visible.field.widget.input_type
+ if isinstance(visible.field.widget, Textarea):
+ input_type = "textarea"
+ visible.field.widget.attrs["rows"] = 5
+ visible.field.widget.attrs["class"] = css_classes[input_type]
diff --git a/bookwyrm/forms/edit_user.py b/bookwyrm/forms/edit_user.py
new file mode 100644
index 0000000000..d609f15dcc
--- /dev/null
+++ b/bookwyrm/forms/edit_user.py
@@ -0,0 +1,68 @@
+""" using django model forms """
+from django import forms
+
+from bookwyrm import models
+from bookwyrm.models.fields import ClearableFileInputWithWarning
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class EditUserForm(CustomForm):
+ class Meta:
+ model = models.User
+ fields = [
+ "avatar",
+ "name",
+ "email",
+ "summary",
+ "show_goal",
+ "show_suggested_users",
+ "manually_approves_followers",
+ "default_post_privacy",
+ "discoverable",
+ "hide_follows",
+ "preferred_timezone",
+ "preferred_language",
+ "theme",
+ ]
+ help_texts = {f: None for f in fields}
+ widgets = {
+ "avatar": ClearableFileInputWithWarning(
+ attrs={"aria-describedby": "desc_avatar"}
+ ),
+ "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
+ "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}),
+ "email": forms.EmailInput(attrs={"aria-describedby": "desc_email"}),
+ "discoverable": forms.CheckboxInput(
+ attrs={"aria-describedby": "desc_discoverable"}
+ ),
+ }
+
+
+class LimitedEditUserForm(CustomForm):
+ class Meta:
+ model = models.User
+ fields = [
+ "avatar",
+ "name",
+ "summary",
+ "manually_approves_followers",
+ "discoverable",
+ ]
+ help_texts = {f: None for f in fields}
+ widgets = {
+ "avatar": ClearableFileInputWithWarning(
+ attrs={"aria-describedby": "desc_avatar"}
+ ),
+ "name": forms.TextInput(attrs={"aria-describedby": "desc_name"}),
+ "summary": forms.Textarea(attrs={"aria-describedby": "desc_summary"}),
+ "discoverable": forms.CheckboxInput(
+ attrs={"aria-describedby": "desc_discoverable"}
+ ),
+ }
+
+
+class DeleteUserForm(CustomForm):
+ class Meta:
+ model = models.User
+ fields = ["password"]
diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py
new file mode 100644
index 0000000000..8af8fb8121
--- /dev/null
+++ b/bookwyrm/forms/forms.py
@@ -0,0 +1,59 @@
+""" using django model forms """
+from django import forms
+from django.forms import widgets
+from django.utils.translation import gettext_lazy as _
+
+from bookwyrm import models
+from bookwyrm.models.user import FeedFilterChoices
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class FeedStatusTypesForm(CustomForm):
+ class Meta:
+ model = models.User
+ fields = ["feed_status_types"]
+ help_texts = {f: None for f in fields}
+ widgets = {
+ "feed_status_types": widgets.CheckboxSelectMultiple(
+ choices=FeedFilterChoices,
+ ),
+ }
+
+
+class ImportForm(forms.Form):
+ csv_file = forms.FileField()
+
+
+class ShelfForm(CustomForm):
+ class Meta:
+ model = models.Shelf
+ fields = ["user", "name", "privacy", "description"]
+
+
+class GoalForm(CustomForm):
+ class Meta:
+ model = models.AnnualGoal
+ fields = ["user", "year", "goal", "privacy"]
+
+
+class ReportForm(CustomForm):
+ class Meta:
+ model = models.Report
+ fields = ["user", "reporter", "status", "links", "note"]
+
+
+class ReadThroughForm(CustomForm):
+ def clean(self):
+ """make sure the email isn't in use by a registered user"""
+ cleaned_data = super().clean()
+ start_date = cleaned_data.get("start_date")
+ finish_date = cleaned_data.get("finish_date")
+ if start_date and finish_date and start_date > finish_date:
+ self.add_error(
+ "finish_date", _("Reading finish date cannot be before start date.")
+ )
+
+ class Meta:
+ model = models.ReadThrough
+ fields = ["user", "book", "start_date", "finish_date"]
diff --git a/bookwyrm/forms/groups.py b/bookwyrm/forms/groups.py
new file mode 100644
index 0000000000..15b27c0aec
--- /dev/null
+++ b/bookwyrm/forms/groups.py
@@ -0,0 +1,16 @@
+""" using django model forms """
+from bookwyrm import models
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class UserGroupForm(CustomForm):
+ class Meta:
+ model = models.User
+ fields = ["groups"]
+
+
+class GroupForm(CustomForm):
+ class Meta:
+ model = models.Group
+ fields = ["user", "privacy", "name", "description"]
diff --git a/bookwyrm/forms/landing.py b/bookwyrm/forms/landing.py
new file mode 100644
index 0000000000..61b92ee830
--- /dev/null
+++ b/bookwyrm/forms/landing.py
@@ -0,0 +1,45 @@
+""" Forms for the landing pages """
+from django.forms import PasswordInput
+from django.utils.translation import gettext_lazy as _
+
+from bookwyrm import models
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class LoginForm(CustomForm):
+ class Meta:
+ model = models.User
+ fields = ["localname", "password"]
+ help_texts = {f: None for f in fields}
+ widgets = {
+ "password": PasswordInput(),
+ }
+
+
+class RegisterForm(CustomForm):
+ class Meta:
+ model = models.User
+ fields = ["localname", "email", "password"]
+ help_texts = {f: None for f in fields}
+ widgets = {"password": PasswordInput()}
+
+ def clean(self):
+ """Check if the username is taken"""
+ cleaned_data = super().clean()
+ localname = cleaned_data.get("localname").strip()
+ if models.User.objects.filter(localname=localname).first():
+ self.add_error("localname", _("User with this username already exists"))
+
+
+class InviteRequestForm(CustomForm):
+ def clean(self):
+ """make sure the email isn't in use by a registered user"""
+ cleaned_data = super().clean()
+ email = cleaned_data.get("email")
+ if email and models.User.objects.filter(email=email).exists():
+ self.add_error("email", _("A user with this email already exists."))
+
+ class Meta:
+ model = models.InviteRequest
+ fields = ["email"]
diff --git a/bookwyrm/forms/links.py b/bookwyrm/forms/links.py
new file mode 100644
index 0000000000..de229bc2db
--- /dev/null
+++ b/bookwyrm/forms/links.py
@@ -0,0 +1,48 @@
+""" using django model forms """
+from urllib.parse import urlparse
+
+from django.utils.translation import gettext_lazy as _
+
+from bookwyrm import models
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class LinkDomainForm(CustomForm):
+ class Meta:
+ model = models.LinkDomain
+ fields = ["name"]
+
+
+class FileLinkForm(CustomForm):
+ class Meta:
+ model = models.FileLink
+ fields = ["url", "filetype", "availability", "book", "added_by"]
+
+ def clean(self):
+ """make sure the domain isn't blocked or pending"""
+ cleaned_data = super().clean()
+ url = cleaned_data.get("url")
+ filetype = cleaned_data.get("filetype")
+ book = cleaned_data.get("book")
+ domain = urlparse(url).netloc
+ if models.LinkDomain.objects.filter(domain=domain).exists():
+ status = models.LinkDomain.objects.get(domain=domain).status
+ if status == "blocked":
+ # pylint: disable=line-too-long
+ self.add_error(
+ "url",
+ _(
+ "This domain is blocked. Please contact your administrator if you think this is an error."
+ ),
+ )
+ elif models.FileLink.objects.filter(
+ url=url, book=book, filetype=filetype
+ ).exists():
+ # pylint: disable=line-too-long
+ self.add_error(
+ "url",
+ _(
+ "This link with file type has already been added for this book. If it is not visible, the domain is still pending."
+ ),
+ )
diff --git a/bookwyrm/forms/lists.py b/bookwyrm/forms/lists.py
new file mode 100644
index 0000000000..647db3bfe9
--- /dev/null
+++ b/bookwyrm/forms/lists.py
@@ -0,0 +1,37 @@
+""" using django model forms """
+from django import forms
+from django.forms import ChoiceField
+from django.utils.translation import gettext_lazy as _
+
+from bookwyrm import models
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class ListForm(CustomForm):
+ class Meta:
+ model = models.List
+ fields = ["user", "name", "description", "curation", "privacy", "group"]
+
+
+class ListItemForm(CustomForm):
+ class Meta:
+ model = models.ListItem
+ fields = ["user", "book", "book_list", "notes"]
+
+
+class SortListForm(forms.Form):
+ sort_by = ChoiceField(
+ choices=(
+ ("order", _("List Order")),
+ ("title", _("Book Title")),
+ ("rating", _("Rating")),
+ ),
+ label=_("Sort By"),
+ )
+ direction = ChoiceField(
+ choices=(
+ ("ascending", _("Ascending")),
+ ("descending", _("Descending")),
+ ),
+ )
diff --git a/bookwyrm/forms/status.py b/bookwyrm/forms/status.py
new file mode 100644
index 0000000000..0800166bf7
--- /dev/null
+++ b/bookwyrm/forms/status.py
@@ -0,0 +1,82 @@
+""" using django model forms """
+from bookwyrm import models
+from .custom_form import CustomForm
+
+
+# pylint: disable=missing-class-docstring
+class RatingForm(CustomForm):
+ class Meta:
+ model = models.ReviewRating
+ fields = ["user", "book", "rating", "privacy"]
+
+
+class ReviewForm(CustomForm):
+ class Meta:
+ model = models.Review
+ fields = [
+ "user",
+ "book",
+ "name",
+ "content",
+ "rating",
+ "content_warning",
+ "sensitive",
+ "privacy",
+ ]
+
+
+class CommentForm(CustomForm):
+ class Meta:
+ model = models.Comment
+ fields = [
+ "user",
+ "book",
+ "content",
+ "content_warning",
+ "sensitive",
+ "privacy",
+ "progress",
+ "progress_mode",
+ "reading_status",
+ ]
+
+
+class QuotationForm(CustomForm):
+ class Meta:
+ model = models.Quotation
+ fields = [
+ "user",
+ "book",
+ "quote",
+ "content",
+ "content_warning",
+ "sensitive",
+ "privacy",
+ "position",
+ "position_mode",
+ ]
+
+
+class ReplyForm(CustomForm):
+ class Meta:
+ model = models.Status
+ fields = [
+ "user",
+ "content",
+ "content_warning",
+ "sensitive",
+ "reply_parent",
+ "privacy",
+ ]
+
+
+class StatusForm(CustomForm):
+ class Meta:
+ model = models.Status
+ fields = ["user", "content", "content_warning", "sensitive", "privacy"]
+
+
+class DirectForm(CustomForm):
+ class Meta:
+ model = models.Status
+ fields = ["user", "content", "content_warning", "sensitive", "privacy"]
diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js
index 100daa0390..95271795dc 100644
--- a/bookwyrm/static/js/bookwyrm.js
+++ b/bookwyrm/static/js/bookwyrm.js
@@ -38,10 +38,6 @@ let BookWyrm = new (class {
.querySelectorAll("[data-modal-open]")
.forEach((node) => node.addEventListener("click", this.handleModalButton.bind(this)));
- document
- .querySelectorAll("[data-duplicate]")
- .forEach((node) => node.addEventListener("click", this.duplicateInput.bind(this)));
-
document
.querySelectorAll("details.dropdown")
.forEach((node) =>
@@ -495,26 +491,6 @@ let BookWyrm = new (class {
window.open(url, windowName, "left=100,top=100,width=430,height=600");
}
- duplicateInput(event) {
- const trigger = event.currentTarget;
- const input_id = trigger.dataset.duplicate;
- const orig = document.getElementById(input_id);
- const parent = orig.parentNode;
- const new_count = parent.querySelectorAll("input").length + 1;
-
- let input = orig.cloneNode();
-
- input.id += "-" + new_count;
- input.value = "";
-
- let label = parent.querySelector("label").cloneNode();
-
- label.setAttribute("for", input.id);
-
- parent.appendChild(label);
- parent.appendChild(input);
- }
-
/**
* Set up a "click-to-copy" component from a textarea element
* with `data-copytext`, `data-copytext-label`, `data-copytext-success`
diff --git a/bookwyrm/static/js/forms.js b/bookwyrm/static/js/forms.js
new file mode 100644
index 0000000000..9988738989
--- /dev/null
+++ b/bookwyrm/static/js/forms.js
@@ -0,0 +1,49 @@
+(function () {
+ "use strict";
+
+ /**
+ * Remoev input field
+ *
+ * @param {event} the button click event
+ */
+ function removeInput(event) {
+ const trigger = event.currentTarget;
+ const input_id = trigger.dataset.remove;
+ const input = document.getElementById(input_id);
+
+ input.remove();
+ }
+
+ /**
+ * Duplicate an input field
+ *
+ * @param {event} the click even on the associated button
+ */
+ function duplicateInput(event) {
+ const trigger = event.currentTarget;
+ const input_id = trigger.dataset.duplicate;
+ const orig = document.getElementById(input_id);
+ const parent = orig.parentNode;
+ const new_count = parent.querySelectorAll("input").length + 1;
+
+ let input = orig.cloneNode();
+
+ input.id += "-" + new_count;
+ input.value = "";
+
+ let label = parent.querySelector("label").cloneNode();
+
+ label.setAttribute("for", input.id);
+
+ parent.appendChild(label);
+ parent.appendChild(input);
+ }
+
+ document
+ .querySelectorAll("[data-duplicate]")
+ .forEach((node) => node.addEventListener("click", duplicateInput));
+
+ document
+ .querySelectorAll("[data-remove]")
+ .forEach((node) => node.addEventListener("click", removeInput));
+})();
diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html
index fd2516a664..42f1840dfa 100644
--- a/bookwyrm/templates/book/edit/edit_book_form.html
+++ b/bookwyrm/templates/book/edit/edit_book_form.html
@@ -1,4 +1,5 @@
{% load i18n %}
+{% load static %}
{% if form.non_field_errors %}
@@ -21,7 +22,7 @@
{% trans "Title:" %}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.title.errors id="desc_title" %}
@@ -30,7 +31,7 @@
{% trans "Subtitle:" %}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.subtitle.errors id="desc_subtitle" %}
@@ -39,7 +40,7 @@
{% trans "Description:" %}
{{ form.description }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.description.errors id="desc_description" %}
@@ -50,7 +51,7 @@
{% trans "Series:" %}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.series.errors id="desc_series" %}
@@ -60,7 +61,7 @@
{% trans "Series number:" %}
{{ form.series_number }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.series_number.errors id="desc_series_number" %}
@@ -74,9 +75,60 @@
{% trans "Separate multiple values with commas." %}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.languages.errors id="desc_languages" %}
+
+
+
+ {% trans "Subjects:" %}
+
+ {% for subject in book.subjects %}
+
+ {% trans "Add subject" %}
+
+
+
+
+
+
+
+ {% trans "Remove subject" as text %}
+
+ {{ text }}
+
+
+
+
+ {% endfor %}
+
+
+ {% include 'snippets/form_errors.html' with errors_list=form.subjects.errors id="desc_subjects" %}
+
+
+
+
+
+ {% trans "Add Another Subject" %}
+
+
@@ -93,7 +145,7 @@
{% trans "Separate multiple values with commas." %}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.publishers.errors id="desc_publishers" %}
@@ -102,7 +154,7 @@
{% trans "First published date:" %}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.first_published_date.errors id="desc_first_published_date" %}
@@ -111,7 +163,7 @@
{% trans "Published date:" %}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.published_date.errors id="desc_published_date" %}
@@ -149,7 +201,12 @@
{% endfor %}
- {% trans "Add Another Author" %}
+
+
+
+ {% trans "Add Another Author" %}
+
+
@@ -180,7 +237,7 @@
-
+
{% include 'snippets/form_errors.html' with errors_list=form.cover.errors id="desc_cover" %}
@@ -201,7 +258,7 @@
{{ form.physical_format }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.physical_format.errors id="desc_physical_format" %}
@@ -211,7 +268,7 @@
{% trans "Format details:" %}
{{ form.physical_format_detail }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.physical_format_detail.errors id="desc_physical_format_detail" %}
@@ -222,7 +279,7 @@
{% trans "Pages:" %}
{{ form.pages }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.pages.errors id="desc_pages" %}
@@ -238,7 +295,7 @@
{% trans "ISBN 13:" %}
{{ form.isbn_13 }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.isbn_13.errors id="desc_isbn_13" %}
@@ -247,7 +304,7 @@
{% trans "ISBN 10:" %}
{{ form.isbn_10 }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.isbn_10.errors id="desc_isbn_10" %}
@@ -256,7 +313,7 @@
{% trans "Openlibrary ID:" %}
{{ form.openlibrary_key }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.openlibrary_key.errors id="desc_openlibrary_key" %}
@@ -265,7 +322,7 @@
{% trans "Inventaire ID:" %}
{{ form.inventaire_id }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.inventaire_id.errors id="desc_inventaire_id" %}
@@ -274,7 +331,7 @@
{% trans "OCLC Number:" %}
{{ form.oclc_number }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.oclc_number.errors id="desc_oclc_number" %}
@@ -283,10 +340,14 @@
{% trans "ASIN:" %}
{{ form.asin }}
-
+
{% include 'snippets/form_errors.html' with errors_list=form.ASIN.errors id="desc_ASIN" %}
+
+{% block scripts %}
+
+{% endblock %}
diff --git a/bookwyrm/templates/settings/reports/report_filters.html b/bookwyrm/templates/settings/reports/report_filters.html
new file mode 100644
index 0000000000..48a3b7c8a4
--- /dev/null
+++ b/bookwyrm/templates/settings/reports/report_filters.html
@@ -0,0 +1,7 @@
+{% extends 'snippets/filters_panel/filters_panel.html' %}
+
+{% block filter_fields %}
+{% include 'settings/users/username_filter.html' %}
+{% include 'directory/community_filter.html' %}
+{% include 'settings/users/server_filter.html' %}
+{% endblock %}
diff --git a/bookwyrm/templates/settings/reports/reports.html b/bookwyrm/templates/settings/reports/reports.html
index c72fd03d0a..99cca1a75f 100644
--- a/bookwyrm/templates/settings/reports/reports.html
+++ b/bookwyrm/templates/settings/reports/reports.html
@@ -30,7 +30,7 @@
-{% include 'settings/users/user_admin_filters.html' %}
+{% include 'settings/reports/report_filters.html' %}
{% if not reports %}
diff --git a/bookwyrm/templates/settings/users/email_filter.html b/bookwyrm/templates/settings/users/email_filter.html
new file mode 100644
index 0000000000..5d49d615e7
--- /dev/null
+++ b/bookwyrm/templates/settings/users/email_filter.html
@@ -0,0 +1,16 @@
+{% extends 'snippets/filters_panel/filter_field.html' %}
+{% load i18n %}
+
+{% block filter %}
+
{% trans "Email" %}
+
+
+
+{% endblock %}
+
diff --git a/bookwyrm/templates/settings/users/user.html b/bookwyrm/templates/settings/users/user.html
index 676502e6dc..c18ba8295f 100644
--- a/bookwyrm/templates/settings/users/user.html
+++ b/bookwyrm/templates/settings/users/user.html
@@ -1,10 +1,23 @@
{% extends 'settings/layout.html' %}
{% load i18n %}
+{% load utilities %}
{% block title %}{{ user.username }}{% endblock %}
{% block header %}
{{ user.username }}
-
{% trans "Back to users" %}
+{% endblock %}
+
+{% block breadcrumbs %}
+
+
+
{% endblock %}
{% block panel %}
diff --git a/bookwyrm/templates/settings/users/user_admin.html b/bookwyrm/templates/settings/users/user_admin.html
index 874ce8182a..e3de77938a 100644
--- a/bookwyrm/templates/settings/users/user_admin.html
+++ b/bookwyrm/templates/settings/users/user_admin.html
@@ -1,5 +1,7 @@
{% extends 'settings/layout.html' %}
{% load i18n %}
+{% load utilities %}
+
{% block title %}{% trans "Users" %}{% endblock %}
{% block header %}
@@ -15,46 +17,67 @@
{% include 'settings/users/user_admin_filters.html' %}
-
-
- {% url 'settings-users' as url %}
-
- {% trans "Username" as text %}
- {% include 'snippets/table-sort-header.html' with field="username" sort=sort text=text %}
-
-
- {% trans "Date Added" as text %}
- {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
-
-
- {% trans "Last Active" as text %}
- {% include 'snippets/table-sort-header.html' with field="last_active_date" sort=sort text=text %}
-
-
- {% trans "Status" as text %}
- {% include 'snippets/table-sort-header.html' with field="is_active" sort=sort text=text %}
-
-
- {% trans "Remote instance" as text %}
- {% include 'snippets/table-sort-header.html' with field="federated_server__server_name" sort=sort text=text %}
-
-
- {% for user in users %}
-
- {{ user.username }}
- {{ user.created_date }}
- {{ user.last_active_date }}
- {% if user.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %}
-
- {% if user.federated_server %}
- {{ user.federated_server.server_name }}
- {% elif not user.local %}
- {% trans "Not set" %}
+
+
+
+
+
+ {% url 'settings-users' as url %}
+
+ {% trans "Username" as text %}
+ {% include 'snippets/table-sort-header.html' with field="username" sort=sort text=text %}
+
+
+ {% trans "Date Added" as text %}
+ {% include 'snippets/table-sort-header.html' with field="created_date" sort=sort text=text %}
+
+
+ {% trans "Last Active" as text %}
+ {% include 'snippets/table-sort-header.html' with field="last_active_date" sort=sort text=text %}
+
+
+ {% trans "Status" as text %}
+ {% include 'snippets/table-sort-header.html' with field="is_active" sort=sort text=text %}
+
+ {% if status != "local" %}
+
+ {% trans "Remote instance" as text %}
+ {% include 'snippets/table-sort-header.html' with field="federated_server__server_name" sort=sort text=text %}
+
+ {% endif %}
+
+ {% for user in users %}
+
+ {{ user|username }}
+ {{ user.created_date }}
+ {{ user.last_active_date }}
+ {% if user.is_active %}{% trans "Active" %}{% else %}{% trans "Inactive" %}{% endif %}
+ {% if status != "local" %}
+
+ {% if user.federated_server %}
+ {{ user.federated_server.server_name }}
+ {% else %}
+ {% trans "Not set" %}
+ {% endif %}
+
{% endif %}
-
-
- {% endfor %}
-
+
+ {% endfor %}
+
+
{% include 'snippets/pagination.html' with page=users path=request.path %}
{% endblock %}
diff --git a/bookwyrm/templates/settings/users/user_admin_filters.html b/bookwyrm/templates/settings/users/user_admin_filters.html
index 48a3b7c8a4..c5ab2dabed 100644
--- a/bookwyrm/templates/settings/users/user_admin_filters.html
+++ b/bookwyrm/templates/settings/users/user_admin_filters.html
@@ -2,6 +2,11 @@
{% block filter_fields %}
{% include 'settings/users/username_filter.html' %}
-{% include 'directory/community_filter.html' %}
+
+{% if status != "local" %}
{% include 'settings/users/server_filter.html' %}
+{% else %}
+{% include 'settings/users/email_filter.html' %}
+{% endif %}
+
{% endblock %}
diff --git a/bookwyrm/templates/settings/users/user_info.html b/bookwyrm/templates/settings/users/user_info.html
index c60ae285d9..a5447931c7 100644
--- a/bookwyrm/templates/settings/users/user_info.html
+++ b/bookwyrm/templates/settings/users/user_info.html
@@ -71,14 +71,14 @@ {% trans "User details" %}
{{ user.last_active_date }}
{% trans "Manually approved followers:" %}
- {{ user.manually_approves_followers }}
+ {{ user.manually_approves_followers|yesno }}
{% trans "Discoverable:" %}
- {{ user.discoverable }}
+ {{ user.discoverable|yesno }}
{% if not user.is_active %}
{% trans "Deactivation reason:" %}
- {{ user.deactivation_reason }}
+ {{ user.get_deactivation_reason_display }}
{% endif %}
{% if not user.is_active and user.deactivation_reason == "pending" %}
@@ -104,7 +104,7 @@ {{ server.server_name }}
{{ server.application_version }}
{% trans "Status:" %}
- {{ server.status }}
+ {{ server.get_status_display }}
{% if server.notes %}
{% trans "Notes" %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index b9c348a434..4d7f503f32 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -125,6 +125,11 @@
re_path(
r"^settings/users/?$", views.UserAdminList.as_view(), name="settings-users"
),
+ re_path(
+ r"^settings/users/(?P(local|federated))\/?$",
+ views.UserAdminList.as_view(),
+ name="settings-users",
+ ),
re_path(
r"^settings/users/(?P\d+)/?$",
views.UserAdmin.as_view(),
diff --git a/bookwyrm/views/admin/user_admin.py b/bookwyrm/views/admin/user_admin.py
index aa84795904..df716d2cb0 100644
--- a/bookwyrm/views/admin/user_admin.py
+++ b/bookwyrm/views/admin/user_admin.py
@@ -19,7 +19,7 @@
class UserAdminList(View):
"""admin view of users on this server"""
- def get(self, request):
+ def get(self, request, status="local"):
"""list of users"""
filters = {}
server = request.GET.get("server")
@@ -37,6 +37,8 @@ def get(self, request):
if email:
filters["email__endswith"] = email
+ filters["local"] = status == "local"
+
users = models.User.objects.filter(**filters)
sort = request.GET.get("sort", "-created_date")
@@ -56,6 +58,7 @@ def get(self, request):
"users": paginated.get_page(request.GET.get("page")),
"sort": sort,
"server": server,
+ "status": status,
}
return TemplateResponse(request, "settings/users/user_admin.html", data)
diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po
index f7ed0969de..31e44a7b92 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 19:52\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: German\n"
"Language: de\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Follower*innen"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Zitate"
msgid "Everything else"
msgstr "Alles andere"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "Start-Zeitleiste"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Startseite"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Bücher-Zeitleiste"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Bücher"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English (Englisch)"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español (Spanisch)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (Galizisch)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italiano (Italienisch)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français (Französisch)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių (Litauisch)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norsk (Norwegisch)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português do Brasil (brasilianisches Portugiesisch)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu (Portugiesisch)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Svenska (Schwedisch)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文 (vereinfachtes Chinesisch)"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文 (Chinesisch, traditionell)"
@@ -727,14 +727,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -748,20 +748,20 @@ msgstr "Speichern"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Abbrechen"
@@ -770,9 +770,9 @@ msgstr "Abbrechen"
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 "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:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -873,8 +873,8 @@ msgid "Add to list"
msgstr "Zur Liste hinzufügen"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1182,7 +1182,7 @@ msgid "Actions"
msgstr "Aktionen"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "Spam melden"
@@ -1216,7 +1216,7 @@ msgstr "BookWyrm verlassen"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "Dieser Link führt zu: %(link_url)s
. Möchtest du dorthin wechseln?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "Weiter"
@@ -1292,7 +1292,7 @@ msgstr "Bestätigungscode:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Absenden"
@@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\""
msgstr "Keine Benutzer*innen für „%(query)s“ gefunden"
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr "Gruppe erstellen"
#: bookwyrm/templates/groups/created_text.html:4
@@ -1824,9 +1825,9 @@ msgstr "Diese Gruppe löschen?"
msgid "This action cannot be un-done"
msgstr "Diese Aktion kann nicht rückgängig gemacht werden"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2298,7 +2299,7 @@ msgstr "\"%(title)s \" zu dieser Liste hinzufügen"
msgid "Suggest \"%(title)s \" for this list"
msgstr "\"%(title)s \" für diese Liste vorschlagen"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Vorschlagen"
@@ -2468,7 +2469,7 @@ msgid "List position"
msgstr "Listenposition"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Übernehmen"
@@ -3923,7 +3924,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr ""
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
msgstr ""
#: bookwyrm/templates/settings/themes.html:35
@@ -4200,7 +4201,8 @@ msgid "Need help?"
msgstr ""
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
msgstr "Regal erstellen"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
@@ -4216,10 +4218,6 @@ msgstr "Benutzer*inprofil"
msgid "All books"
msgstr "Alle Bücher"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Regal erstellen"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4343,24 +4341,24 @@ msgstr "Antworten"
msgid "Content"
msgstr "Inhalt"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Inhaltswarnung:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Spoileralarm aktivieren"
#: 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 "Spoileralarm!"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Spoileralarm aktivieren"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Kommentar:"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Veröffentlichen"
@@ -4851,10 +4849,6 @@ msgstr "Deine Gruppen"
msgid "Groups: %(username)s"
msgstr "Gruppen: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Gruppe erstellen"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Benutzer*inprofil"
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 76cfb32bdf..c5d3ad3fa8 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: 2022-03-13 18:56+0000\n"
+"POT-Creation-Date: 2022-03-14 19:30+0000\n"
"PO-Revision-Date: 2021-02-28 17:19-0800\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: English \n"
@@ -18,77 +18,77 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: bookwyrm/forms.py:62
-msgid "User with this username already exists"
+#: bookwyrm/forms/admin.py:40
+msgid "One Day"
msgstr ""
-#: bookwyrm/forms.py:254
-msgid "This domain is blocked. Please contact your administrator if you think this is an error."
+#: bookwyrm/forms/admin.py:41
+msgid "One Week"
msgstr ""
-#: bookwyrm/forms.py:264
-msgid "This link with file type has already been added for this book. If it is not visible, the domain is still pending."
+#: bookwyrm/forms/admin.py:42
+msgid "One Month"
msgstr ""
-#: bookwyrm/forms.py:403
-msgid "A user with this email already exists."
+#: bookwyrm/forms/admin.py:43
+msgid "Does Not Expire"
msgstr ""
-#: bookwyrm/forms.py:417
-msgid "One Day"
+#: bookwyrm/forms/admin.py:47
+#, python-brace-format
+msgid "{i} uses"
msgstr ""
-#: bookwyrm/forms.py:418
-msgid "One Week"
+#: bookwyrm/forms/admin.py:48
+msgid "Unlimited"
msgstr ""
-#: bookwyrm/forms.py:419
-msgid "One Month"
+#: bookwyrm/forms/forms.py:54
+msgid "Reading finish date cannot be before start date."
msgstr ""
-#: bookwyrm/forms.py:420
-msgid "Does Not Expire"
+#: bookwyrm/forms/landing.py:32
+msgid "User with this username already exists"
msgstr ""
-#: bookwyrm/forms.py:424
-#, python-brace-format
-msgid "{i} uses"
+#: bookwyrm/forms/landing.py:41
+msgid "A user with this email already exists."
msgstr ""
-#: bookwyrm/forms.py:425
-msgid "Unlimited"
+#: bookwyrm/forms/links.py:36
+msgid "This domain is blocked. Please contact your administrator if you think this is an error."
msgstr ""
-#: bookwyrm/forms.py:543
+#: bookwyrm/forms/links.py:46
+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.py:544
+#: bookwyrm/forms/lists.py:27
msgid "Book Title"
msgstr ""
-#: bookwyrm/forms.py:545 bookwyrm/templates/shelf/shelf.html:155
+#: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:155
#: bookwyrm/templates/shelf/shelf.html:187
#: bookwyrm/templates/snippets/create_status/review.html:32
msgid "Rating"
msgstr ""
-#: bookwyrm/forms.py:547 bookwyrm/templates/lists/list.html:185
+#: bookwyrm/forms/lists.py:30 bookwyrm/templates/lists/list.html:185
msgid "Sort By"
msgstr ""
-#: bookwyrm/forms.py:551
+#: bookwyrm/forms/lists.py:34
msgid "Ascending"
msgstr ""
-#: bookwyrm/forms.py:552
+#: bookwyrm/forms/lists.py:35
msgid "Descending"
msgstr ""
-#: bookwyrm/forms.py:565
-msgid "Reading finish date cannot be before start date."
-msgstr ""
-
#: bookwyrm/importers/importer.py:145 bookwyrm/importers/importer.py:167
msgid "Error loading book"
msgstr ""
@@ -188,7 +188,7 @@ msgstr ""
msgid "%(value)s is not a valid username"
msgstr ""
-#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:171
+#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:179
#: bookwyrm/templates/ostatus/error.html:29
msgid "username"
msgstr ""
@@ -246,7 +246,7 @@ msgstr ""
msgid "Approved"
msgstr ""
-#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:272
+#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:281
msgid "Reviews"
msgstr ""
@@ -400,7 +400,7 @@ msgstr ""
msgid "Moderator"
msgstr ""
-#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:132
+#: bookwyrm/templates/about/about.html:117 bookwyrm/templates/layout.html:140
msgid "Admin"
msgstr ""
@@ -431,7 +431,7 @@ msgid "Software version:"
msgstr ""
#: bookwyrm/templates/about/layout.html:30
-#: bookwyrm/templates/embed-layout.html:34 bookwyrm/templates/layout.html:230
+#: bookwyrm/templates/embed-layout.html:34 bookwyrm/templates/layout.html:238
#, python-format
msgid "About %(site_name)s"
msgstr ""
@@ -534,7 +534,7 @@ msgstr ""
#: bookwyrm/templates/annual_summary/layout.html:155
#: bookwyrm/templates/annual_summary/layout.html:176
#: bookwyrm/templates/annual_summary/layout.html:245
-#: bookwyrm/templates/book/book.html:47
+#: bookwyrm/templates/book/book.html:56
#: bookwyrm/templates/discover/large-book.html:22
#: bookwyrm/templates/landing/large-book.html:26
#: bookwyrm/templates/landing/small-book.html:18
@@ -619,18 +619,18 @@ msgstr ""
#: bookwyrm/templates/author/author.html:83
#: bookwyrm/templates/author/sync_modal.html:5
-#: bookwyrm/templates/book/book.html:122
+#: bookwyrm/templates/book/book.html:131
#: bookwyrm/templates/book/sync_modal.html:5
msgid "Load data"
msgstr ""
#: bookwyrm/templates/author/author.html:87
-#: bookwyrm/templates/book/book.html:126
+#: bookwyrm/templates/book/book.html:135
msgid "View on OpenLibrary"
msgstr ""
#: bookwyrm/templates/author/author.html:102
-#: bookwyrm/templates/book/book.html:140
+#: bookwyrm/templates/book/book.html:149
msgid "View on Inventaire"
msgstr ""
@@ -667,7 +667,7 @@ msgid "Last edited by:"
msgstr ""
#: bookwyrm/templates/author/edit_author.html:33
-#: bookwyrm/templates/book/edit/edit_book_form.html:16
+#: bookwyrm/templates/book/edit/edit_book_form.html:17
msgid "Metadata"
msgstr ""
@@ -679,8 +679,9 @@ msgid "Name:"
msgstr ""
#: bookwyrm/templates/author/edit_author.html:44
-#: bookwyrm/templates/book/edit/edit_book_form.html:75
-#: bookwyrm/templates/book/edit/edit_book_form.html:94
+#: bookwyrm/templates/book/edit/edit_book_form.html:76
+#: bookwyrm/templates/book/edit/edit_book_form.html:88
+#: bookwyrm/templates/book/edit/edit_book_form.html:107
msgid "Separate multiple values with commas."
msgstr ""
@@ -709,7 +710,7 @@ msgid "Openlibrary key:"
msgstr ""
#: bookwyrm/templates/author/edit_author.html:84
-#: bookwyrm/templates/book/edit/edit_book_form.html:265
+#: bookwyrm/templates/book/edit/edit_book_form.html:278
msgid "Inventaire ID:"
msgstr ""
@@ -726,7 +727,7 @@ msgid "ISNI:"
msgstr ""
#: bookwyrm/templates/author/edit_author.html:115
-#: bookwyrm/templates/book/book.html:193
+#: bookwyrm/templates/book/book.html:202
#: bookwyrm/templates/book/edit/edit_book.html:121
#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
@@ -748,7 +749,7 @@ msgstr ""
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
-#: bookwyrm/templates/book/book.html:194
+#: bookwyrm/templates/book/book.html:203
#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
@@ -760,6 +761,7 @@ msgstr ""
#: bookwyrm/templates/lists/delete_list_modal.html:16
#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
+#: bookwyrm/templates/search/barcode_modal.html:45
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
#: bookwyrm/templates/snippets/report_modal.html:52
@@ -780,87 +782,91 @@ msgstr ""
msgid "Confirm"
msgstr ""
-#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56
+#: bookwyrm/templates/book/book.html:19
+msgid "Unable to connect to remote source."
+msgstr ""
+
+#: bookwyrm/templates/book/book.html:64 bookwyrm/templates/book/book.html:65
msgid "Edit Book"
msgstr ""
-#: bookwyrm/templates/book/book.html:79 bookwyrm/templates/book/book.html:82
+#: bookwyrm/templates/book/book.html:88 bookwyrm/templates/book/book.html:91
msgid "Click to add cover"
msgstr ""
-#: bookwyrm/templates/book/book.html:88
+#: bookwyrm/templates/book/book.html:97
msgid "Failed to load cover"
msgstr ""
-#: bookwyrm/templates/book/book.html:99
+#: bookwyrm/templates/book/book.html:108
msgid "Click to enlarge"
msgstr ""
-#: bookwyrm/templates/book/book.html:170
+#: bookwyrm/templates/book/book.html:179
#, python-format
msgid "(%(review_count)s review)"
msgid_plural "(%(review_count)s reviews)"
msgstr[0] ""
msgstr[1] ""
-#: bookwyrm/templates/book/book.html:182
+#: bookwyrm/templates/book/book.html:191
msgid "Add Description"
msgstr ""
-#: bookwyrm/templates/book/book.html:189
-#: bookwyrm/templates/book/edit/edit_book_form.html:39
+#: bookwyrm/templates/book/book.html:198
+#: bookwyrm/templates/book/edit/edit_book_form.html:40
#: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17
msgid "Description:"
msgstr ""
-#: bookwyrm/templates/book/book.html:203
+#: bookwyrm/templates/book/book.html:212
#, python-format
msgid "%(count)s editions "
msgstr ""
-#: bookwyrm/templates/book/book.html:211
+#: bookwyrm/templates/book/book.html:220
msgid "You have shelved this edition in:"
msgstr ""
-#: bookwyrm/templates/book/book.html:226
+#: bookwyrm/templates/book/book.html:235
#, python-format
msgid "A different edition of this book is on your %(shelf_name)s shelf."
msgstr ""
-#: bookwyrm/templates/book/book.html:237
+#: bookwyrm/templates/book/book.html:246
msgid "Your reading activity"
msgstr ""
-#: bookwyrm/templates/book/book.html:243
+#: bookwyrm/templates/book/book.html:252
msgid "Add read dates"
msgstr ""
-#: bookwyrm/templates/book/book.html:251
+#: bookwyrm/templates/book/book.html:260
msgid "You don't have any reading activity for this book."
msgstr ""
-#: bookwyrm/templates/book/book.html:277
+#: bookwyrm/templates/book/book.html:286
msgid "Your reviews"
msgstr ""
-#: bookwyrm/templates/book/book.html:283
+#: bookwyrm/templates/book/book.html:292
msgid "Your comments"
msgstr ""
-#: bookwyrm/templates/book/book.html:289
+#: bookwyrm/templates/book/book.html:298
msgid "Your quotes"
msgstr ""
-#: bookwyrm/templates/book/book.html:325
+#: bookwyrm/templates/book/book.html:334
msgid "Subjects"
msgstr ""
-#: bookwyrm/templates/book/book.html:337
+#: bookwyrm/templates/book/book.html:346
msgid "Places"
msgstr ""
-#: bookwyrm/templates/book/book.html:348
-#: bookwyrm/templates/groups/group.html:19 bookwyrm/templates/layout.html:75
+#: bookwyrm/templates/book/book.html:357
+#: bookwyrm/templates/groups/group.html:19 bookwyrm/templates/layout.html:83
#: 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:25
@@ -869,11 +875,11 @@ msgstr ""
msgid "Lists"
msgstr ""
-#: bookwyrm/templates/book/book.html:360
+#: bookwyrm/templates/book/book.html:369
msgid "Add to list"
msgstr ""
-#: bookwyrm/templates/book/book.html:370
+#: bookwyrm/templates/book/book.html:379
#: bookwyrm/templates/book/cover_add_modal.html:32
#: bookwyrm/templates/lists/add_item_modal.html:39
#: bookwyrm/templates/lists/list.html:255
@@ -887,12 +893,12 @@ msgid "ISBN:"
msgstr ""
#: bookwyrm/templates/book/book_identifiers.html:15
-#: bookwyrm/templates/book/edit/edit_book_form.html:274
+#: bookwyrm/templates/book/edit/edit_book_form.html:287
msgid "OCLC Number:"
msgstr ""
#: bookwyrm/templates/book/book_identifiers.html:22
-#: bookwyrm/templates/book/edit/edit_book_form.html:283
+#: bookwyrm/templates/book/edit/edit_book_form.html:296
msgid "ASIN:"
msgstr ""
@@ -901,12 +907,12 @@ msgid "Add cover"
msgstr ""
#: bookwyrm/templates/book/cover_add_modal.html:17
-#: bookwyrm/templates/book/edit/edit_book_form.html:173
+#: bookwyrm/templates/book/edit/edit_book_form.html:186
msgid "Upload cover:"
msgstr ""
#: bookwyrm/templates/book/cover_add_modal.html:23
-#: bookwyrm/templates/book/edit/edit_book_form.html:179
+#: bookwyrm/templates/book/edit/edit_book_form.html:192
msgid "Load cover from url:"
msgstr ""
@@ -976,110 +982,114 @@ msgstr ""
msgid "Back"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:21
+#: bookwyrm/templates/book/edit/edit_book_form.html:22
#: bookwyrm/templates/snippets/create_status/review.html:15
msgid "Title:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:30
+#: bookwyrm/templates/book/edit/edit_book_form.html:31
msgid "Subtitle:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:50
+#: bookwyrm/templates/book/edit/edit_book_form.html:51
msgid "Series:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:60
+#: bookwyrm/templates/book/edit/edit_book_form.html:61
msgid "Series number:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:71
+#: bookwyrm/templates/book/edit/edit_book_form.html:72
msgid "Languages:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:85
+#: bookwyrm/templates/book/edit/edit_book_form.html:84
+msgid "Subjects:"
+msgstr ""
+
+#: bookwyrm/templates/book/edit/edit_book_form.html:98
msgid "Publication"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:90
+#: bookwyrm/templates/book/edit/edit_book_form.html:103
msgid "Publisher:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:102
+#: bookwyrm/templates/book/edit/edit_book_form.html:115
msgid "First published date:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:111
+#: bookwyrm/templates/book/edit/edit_book_form.html:124
msgid "Published date:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:122
+#: bookwyrm/templates/book/edit/edit_book_form.html:135
msgid "Authors"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:131
+#: bookwyrm/templates/book/edit/edit_book_form.html:144
#, python-format
msgid "Remove %(name)s"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:134
+#: bookwyrm/templates/book/edit/edit_book_form.html:147
#, python-format
msgid "Author page for %(name)s"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:142
+#: bookwyrm/templates/book/edit/edit_book_form.html:155
msgid "Add Authors:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:145
-#: bookwyrm/templates/book/edit/edit_book_form.html:148
+#: bookwyrm/templates/book/edit/edit_book_form.html:158
+#: bookwyrm/templates/book/edit/edit_book_form.html:161
msgid "Add Author"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:146
-#: bookwyrm/templates/book/edit/edit_book_form.html:149
+#: bookwyrm/templates/book/edit/edit_book_form.html:159
+#: bookwyrm/templates/book/edit/edit_book_form.html:162
msgid "Jane Doe"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:152
+#: bookwyrm/templates/book/edit/edit_book_form.html:165
msgid "Add Another Author"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:160
+#: bookwyrm/templates/book/edit/edit_book_form.html:173
#: bookwyrm/templates/shelf/shelf.html:146
msgid "Cover"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:192
+#: bookwyrm/templates/book/edit/edit_book_form.html:205
msgid "Physical Properties"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:199
+#: bookwyrm/templates/book/edit/edit_book_form.html:212
#: bookwyrm/templates/book/editions/format_filter.html:6
msgid "Format:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:211
+#: bookwyrm/templates/book/edit/edit_book_form.html:224
msgid "Format details:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:222
+#: bookwyrm/templates/book/edit/edit_book_form.html:235
msgid "Pages:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:233
+#: bookwyrm/templates/book/edit/edit_book_form.html:246
msgid "Book Identifiers"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:238
+#: bookwyrm/templates/book/edit/edit_book_form.html:251
msgid "ISBN 13:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:247
+#: bookwyrm/templates/book/edit/edit_book_form.html:260
msgid "ISBN 10:"
msgstr ""
-#: bookwyrm/templates/book/edit/edit_book_form.html:256
+#: bookwyrm/templates/book/edit/edit_book_form.html:269
msgid "Openlibrary ID:"
msgstr ""
@@ -1168,7 +1178,7 @@ msgstr ""
#: bookwyrm/templates/settings/federation/instance_list.html:46
#: bookwyrm/templates/settings/invites/manage_invite_requests.html:44
#: bookwyrm/templates/settings/invites/status_filter.html:5
-#: bookwyrm/templates/settings/users/user_admin.html:34
+#: bookwyrm/templates/settings/users/user_admin.html:52
#: bookwyrm/templates/settings/users/user_info.html:20
msgid "Status"
msgstr ""
@@ -1177,7 +1187,7 @@ msgstr ""
#: bookwyrm/templates/settings/announcements/announcements.html:41
#: bookwyrm/templates/settings/federation/instance.html:112
#: bookwyrm/templates/settings/reports/report_links_table.html:6
-#: bookwyrm/templates/settings/themes.html:118
+#: bookwyrm/templates/settings/themes.html:100
msgid "Actions"
msgstr ""
@@ -1321,16 +1331,18 @@ 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:29
msgid "Federated community"
msgstr ""
#: bookwyrm/templates/directory/directory.html:4
#: bookwyrm/templates/directory/directory.html:9
-#: bookwyrm/templates/layout.html:101
+#: bookwyrm/templates/layout.html:109
msgid "Directory"
msgstr ""
@@ -1450,7 +1462,7 @@ msgstr ""
#: bookwyrm/templates/discover/discover.html:4
#: bookwyrm/templates/discover/discover.html:10
-#: bookwyrm/templates/layout.html:78
+#: bookwyrm/templates/layout.html:86
msgid "Discover"
msgstr ""
@@ -1573,7 +1585,7 @@ msgstr ""
msgid "%(site_name)s home page"
msgstr ""
-#: bookwyrm/templates/embed-layout.html:40 bookwyrm/templates/layout.html:234
+#: bookwyrm/templates/embed-layout.html:40 bookwyrm/templates/layout.html:242
msgid "Contact site admin"
msgstr ""
@@ -1587,7 +1599,7 @@ msgid "Direct Messages with %(username)s "
msgstr ""
#: bookwyrm/templates/feed/direct_messages.html:10
-#: bookwyrm/templates/layout.html:111
+#: bookwyrm/templates/layout.html:119
msgid "Direct Messages"
msgstr ""
@@ -1624,7 +1636,7 @@ msgid "Updates"
msgstr ""
#: bookwyrm/templates/feed/suggested_books.html:6
-#: bookwyrm/templates/layout.html:106
+#: bookwyrm/templates/layout.html:114
msgid "Your Books"
msgstr ""
@@ -2176,7 +2188,7 @@ msgid "Login"
msgstr ""
#: bookwyrm/templates/landing/login.html:7
-#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179
+#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:187
#: bookwyrm/templates/ostatus/error.html:37
msgid "Log in"
msgstr ""
@@ -2185,7 +2197,7 @@ msgstr ""
msgid "Success! Email address confirmed."
msgstr ""
-#: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170
+#: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:178
#: bookwyrm/templates/ostatus/error.html:28
#: bookwyrm/templates/snippets/register_form.html:4
msgid "Username:"
@@ -2193,12 +2205,12 @@ msgstr ""
#: bookwyrm/templates/landing/login.html:27
#: bookwyrm/templates/landing/password_reset.html:26
-#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32
+#: bookwyrm/templates/layout.html:182 bookwyrm/templates/ostatus/error.html:32
#: bookwyrm/templates/snippets/register_form.html:45
msgid "Password:"
msgstr ""
-#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176
+#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:184
#: bookwyrm/templates/ostatus/error.html:34
msgid "Forgot your password?"
msgstr ""
@@ -2230,19 +2242,23 @@ msgstr ""
msgid "Search for a book, user, or list"
msgstr ""
-#: bookwyrm/templates/layout.html:64
-msgid "Main navigation menu"
+#: bookwyrm/templates/layout.html:61 bookwyrm/templates/layout.html:62
+msgid "Scan Barcode"
msgstr ""
#: bookwyrm/templates/layout.html:72
+msgid "Main navigation menu"
+msgstr ""
+
+#: bookwyrm/templates/layout.html:80
msgid "Feed"
msgstr ""
-#: bookwyrm/templates/layout.html:116 bookwyrm/templates/setup/config.html:52
+#: bookwyrm/templates/layout.html:124 bookwyrm/templates/setup/config.html:52
msgid "Settings"
msgstr ""
-#: bookwyrm/templates/layout.html:125
+#: bookwyrm/templates/layout.html:133
#: 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
@@ -2250,42 +2266,42 @@ msgstr ""
msgid "Invites"
msgstr ""
-#: bookwyrm/templates/layout.html:139
+#: bookwyrm/templates/layout.html:147
msgid "Log out"
msgstr ""
-#: bookwyrm/templates/layout.html:147 bookwyrm/templates/layout.html:148
+#: bookwyrm/templates/layout.html:155 bookwyrm/templates/layout.html:156
#: bookwyrm/templates/notifications/notifications_page.html:5
#: bookwyrm/templates/notifications/notifications_page.html:10
msgid "Notifications"
msgstr ""
-#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33
+#: bookwyrm/templates/layout.html:183 bookwyrm/templates/ostatus/error.html:33
msgid "password"
msgstr ""
-#: bookwyrm/templates/layout.html:187
+#: bookwyrm/templates/layout.html:195
msgid "Join"
msgstr ""
-#: bookwyrm/templates/layout.html:221
+#: bookwyrm/templates/layout.html:229
msgid "Successfully posted status"
msgstr ""
-#: bookwyrm/templates/layout.html:222
+#: bookwyrm/templates/layout.html:230
msgid "Error posting status"
msgstr ""
-#: bookwyrm/templates/layout.html:238
+#: bookwyrm/templates/layout.html:246
msgid "Documentation"
msgstr ""
-#: bookwyrm/templates/layout.html:245
+#: bookwyrm/templates/layout.html:253
#, python-format
msgid "Support %(site_name)s on %(support_title)s "
msgstr ""
-#: bookwyrm/templates/layout.html:249
+#: bookwyrm/templates/layout.html:257
msgid "BookWyrm's source code is freely available. You can contribute or report issues on GitHub ."
msgstr ""
@@ -3013,6 +3029,44 @@ msgstr ""
msgid "Report"
msgstr ""
+#: bookwyrm/templates/search/barcode_modal.html:5
+msgid ""
+"\n"
+" Scan Barcode\n"
+" "
+msgstr ""
+
+#: bookwyrm/templates/search/barcode_modal.html:23
+msgid "Requesting camera..."
+msgstr ""
+
+#: bookwyrm/templates/search/barcode_modal.html:24
+msgid "Grant access to the camera to scan a book's barcode."
+msgstr ""
+
+#: bookwyrm/templates/search/barcode_modal.html:29
+msgid "Could not access camera"
+msgstr ""
+
+#: bookwyrm/templates/search/barcode_modal.html:33
+msgctxt "barcode scanner"
+msgid "Scanning..."
+msgstr ""
+
+#: bookwyrm/templates/search/barcode_modal.html:34
+msgid "Align your book's barcode with the camera."
+msgstr ""
+
+#: bookwyrm/templates/search/barcode_modal.html:38
+msgctxt "barcode scanner"
+msgid "ISBN scanned"
+msgstr ""
+
+#: bookwyrm/templates/search/barcode_modal.html:39
+msgctxt "followed by ISBN"
+msgid "Searching for book:"
+msgstr ""
+
#: bookwyrm/templates/search/book.html:44
msgid "Results from"
msgstr ""
@@ -3046,8 +3100,9 @@ msgstr ""
#: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:27
#: bookwyrm/templates/settings/federation/instance_list.html:44
#: bookwyrm/templates/settings/layout.html:36
-#: bookwyrm/templates/settings/users/user_admin.html:3
-#: bookwyrm/templates/settings/users/user_admin.html:10
+#: 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 ""
@@ -3514,6 +3569,7 @@ msgid "Date accepted"
msgstr ""
#: bookwyrm/templates/settings/invites/manage_invite_requests.html:42
+#: bookwyrm/templates/settings/users/email_filter.html:5
msgid "Email"
msgstr ""
@@ -3932,7 +3988,7 @@ msgid "Add the file name using the form below to make it available in the applic
msgstr ""
#: bookwyrm/templates/settings/themes.html:42
-#: bookwyrm/templates/settings/themes.html:101
+#: bookwyrm/templates/settings/themes.html:83
msgid "Add theme"
msgstr ""
@@ -3940,28 +3996,24 @@ msgstr ""
msgid "Unable to save theme"
msgstr ""
-#: bookwyrm/templates/settings/themes.html:61
-msgid "No available theme files detected"
-msgstr ""
-
-#: bookwyrm/templates/settings/themes.html:69
-#: bookwyrm/templates/settings/themes.html:112
+#: bookwyrm/templates/settings/themes.html:64
+#: bookwyrm/templates/settings/themes.html:94
msgid "Theme name"
msgstr ""
-#: bookwyrm/templates/settings/themes.html:79
+#: bookwyrm/templates/settings/themes.html:74
msgid "Theme filename"
msgstr ""
-#: bookwyrm/templates/settings/themes.html:107
+#: bookwyrm/templates/settings/themes.html:89
msgid "Available Themes"
msgstr ""
-#: bookwyrm/templates/settings/themes.html:115
+#: bookwyrm/templates/settings/themes.html:97
msgid "File"
msgstr ""
-#: bookwyrm/templates/settings/themes.html:130
+#: bookwyrm/templates/settings/themes.html:112
msgid "Remove theme"
msgstr ""
@@ -3979,43 +4031,39 @@ msgstr ""
msgid "Your password:"
msgstr ""
-#: bookwyrm/templates/settings/users/user.html:7
-msgid "Back to users"
-msgstr ""
-
-#: bookwyrm/templates/settings/users/user_admin.html:7
+#: bookwyrm/templates/settings/users/user_admin.html:9
#, python-format
msgid "Users: %(instance_name)s "
msgstr ""
-#: bookwyrm/templates/settings/users/user_admin.html:22
+#: bookwyrm/templates/settings/users/user_admin.html:40
#: bookwyrm/templates/settings/users/username_filter.html:5
msgid "Username"
msgstr ""
-#: bookwyrm/templates/settings/users/user_admin.html:26
+#: bookwyrm/templates/settings/users/user_admin.html:44
msgid "Date Added"
msgstr ""
-#: bookwyrm/templates/settings/users/user_admin.html:30
+#: bookwyrm/templates/settings/users/user_admin.html:48
msgid "Last Active"
msgstr ""
-#: bookwyrm/templates/settings/users/user_admin.html:38
+#: bookwyrm/templates/settings/users/user_admin.html:57
msgid "Remote instance"
msgstr ""
-#: bookwyrm/templates/settings/users/user_admin.html:47
+#: bookwyrm/templates/settings/users/user_admin.html:67
#: bookwyrm/templates/settings/users/user_info.html:24
msgid "Active"
msgstr ""
-#: bookwyrm/templates/settings/users/user_admin.html:47
+#: bookwyrm/templates/settings/users/user_admin.html:67
#: bookwyrm/templates/settings/users/user_info.html:28
msgid "Inactive"
msgstr ""
-#: bookwyrm/templates/settings/users/user_admin.html:52
+#: bookwyrm/templates/settings/users/user_admin.html:73
#: bookwyrm/templates/settings/users/user_info.html:120
msgid "Not set"
msgstr ""
diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo
index 43db15d9d5..ff4ad1d499 100644
Binary files a/locale/es_ES/LC_MESSAGES/django.mo and b/locale/es_ES/LC_MESSAGES/django.mo differ
diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po
index 98d4e124f8..b68cde7054 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 20:49\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Spanish\n"
"Language: es\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Seguidores"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Citas"
msgid "Everything else"
msgstr "Todo lo demás"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "Línea de tiempo principal"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Inicio"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Línea temporal de libros"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Libros"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English (Inglés)"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch (Alemán)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (Gallego)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italiano"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français (Francés)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių (Lituano)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norsk (Noruego)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português do Brasil (Portugués brasileño)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu (Portugués europeo)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Svenska (Sueco)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文 (Chino simplificado)"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文 (Chino tradicional)"
@@ -598,11 +598,11 @@ msgstr "Alias:"
#: bookwyrm/templates/author/author.html:48
msgid "Born:"
-msgstr "Nacido:"
+msgstr "Fecha de nacimiento:"
#: bookwyrm/templates/author/author.html:55
msgid "Died:"
-msgstr "Muerto:"
+msgstr "Fecha de defunción:"
#: bookwyrm/templates/author/author.html:65
msgid "External links"
@@ -727,14 +727,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -748,20 +748,20 @@ msgstr "Guardar"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Cancelar"
@@ -770,9 +770,9 @@ msgstr "Cancelar"
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 "La carga de datos se conectará a %(source_name)s y comprobará si hay metadatos sobre este autor que no están presentes aquí. Los metadatos existentes no serán sobrescritos."
-#: bookwyrm/templates/author/sync_modal.html:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -873,8 +873,8 @@ msgid "Add to list"
msgstr "Agregar a lista"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1182,7 +1182,7 @@ msgid "Actions"
msgstr "Acciones"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "Denunciar spam"
@@ -1216,7 +1216,7 @@ msgstr "Saliendo de BookWyrm"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "Este enlace te lleva a: %(link_url)s
. ¿Es ahí adonde quieres ir?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "Continuar"
@@ -1292,7 +1292,7 @@ msgstr "Código de confirmación:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Enviar"
@@ -1326,7 +1326,7 @@ msgstr "Usuarios locales"
#: bookwyrm/templates/directory/community_filter.html:12
msgid "Federated community"
-msgstr "Comunidad federalizada"
+msgstr "Comunidad federada"
#: bookwyrm/templates/directory/directory.html:4
#: bookwyrm/templates/directory/directory.html:9
@@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\""
msgstr "No se encontró ningún usuario correspondiente a \"%(query)s\""
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr "Crear grupo"
#: bookwyrm/templates/groups/created_text.html:4
@@ -1824,9 +1825,9 @@ msgstr "¿Eliminar este grupo?"
msgid "This action cannot be un-done"
msgstr "Esta acción no se puede deshacer"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2298,7 +2299,7 @@ msgstr "Añadir «%(title)s » a esta lista"
msgid "Suggest \"%(title)s \" for this list"
msgstr "Sugerir «%(title)s » para esta lista"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Sugerir"
@@ -2468,7 +2469,7 @@ msgid "List position"
msgstr "Posición"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Establecido"
@@ -3923,7 +3924,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr ""
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
msgstr ""
#: bookwyrm/templates/settings/themes.html:35
@@ -4200,8 +4201,9 @@ msgid "Need help?"
msgstr ""
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
-msgstr "Crear Estantería"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
+msgstr "Crear estantería"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
msgid "Edit Shelf"
@@ -4216,10 +4218,6 @@ msgstr "Perfil de usuario"
msgid "All books"
msgstr "Todos los libros"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Crear estantería"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4343,24 +4341,24 @@ msgstr "Responder"
msgid "Content"
msgstr "Contenido"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Advertencia de contenido:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Incluir alerta de spoiler"
#: 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 "¡Advertencia, ya vienen spoilers!"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Incluir alerta de spoiler"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Comentario:"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Compartir"
@@ -4851,10 +4849,6 @@ msgstr "Tus grupos"
msgid "Groups: %(username)s"
msgstr "Grupos: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Crear grupo"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Perfil de usuario"
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 6c5d17c4d6..4e3d049b60 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-14 16:32\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: French\n"
"Language: fr\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Abonné(e)s"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Citations"
msgid "Everything else"
msgstr "Tout le reste"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "Mon fil d’actualité"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Accueil"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Actualité de mes livres"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Livres"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (Galicien)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italiano (italien)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių (Lituanien)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norsk (norvégien)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português do Brasil (Portugais brésilien)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu (Portugais européen)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Svenska (Suédois)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简化字"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "Infos supplémentaires :"
@@ -727,14 +727,14 @@ msgstr "ISNI :"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -748,20 +748,20 @@ msgstr "Enregistrer"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Annuler"
@@ -770,9 +770,9 @@ msgstr "Annuler"
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 "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:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -873,8 +873,8 @@ msgid "Add to list"
msgstr "Ajouter à la liste"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1182,7 +1182,7 @@ msgid "Actions"
msgstr "Actions"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "Signaler un spam"
@@ -1216,7 +1216,7 @@ msgstr "Vous quittez BookWyrm"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "Ce lien vous amène à %(link_url)s
. Est-ce là que vous souhaitez aller ?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "Continuer"
@@ -1292,7 +1292,7 @@ msgstr "Code de confirmation :"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Valider"
@@ -1806,8 +1806,9 @@ msgid "No users found for \"%(query)s\""
msgstr "Aucun compte trouvé pour « %(query)s »"
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
-msgstr "Créer un Groupe"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
+msgstr "Créer un groupe"
#: bookwyrm/templates/groups/created_text.html:4
#, python-format
@@ -1824,9 +1825,9 @@ msgstr "Supprimer ce groupe ?"
msgid "This action cannot be un-done"
msgstr "Cette action ne peut pas être annulée"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2298,7 +2299,7 @@ msgstr "Ajouter « %(title)s » à cette liste"
msgid "Suggest \"%(title)s \" for this list"
msgstr "Suggérer « %(title)s » pour cette liste"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Suggérer"
@@ -2468,7 +2469,7 @@ msgid "List position"
msgstr "Position"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Appliquer"
@@ -3923,8 +3924,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr "Copiez le fichier de thème dans le répertoire bookwyrm/static/css/themes
de votre serveur depuis la ligne de commande."
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
-msgstr "Exécutez ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
+msgstr "Exécutez ./bw-dev collectstatic
."
#: bookwyrm/templates/settings/themes.html:35
msgid "Add the file name using the form below to make it available in the application interface."
@@ -4200,7 +4201,8 @@ msgid "Need help?"
msgstr "Besoin d’aide ?"
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
msgstr "Créer une étagère"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
@@ -4216,10 +4218,6 @@ msgstr "Profil utilisateur·rice"
msgid "All books"
msgstr "Tous les livres"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Créer une étagère"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4343,24 +4341,24 @@ msgstr "Répondre"
msgid "Content"
msgstr "Contenu"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Avertissement sur le contenu :"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Afficher une alerte spoiler"
#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
+msgid "Spoilers/content warnings:"
+msgstr "Avertissements de contenu/spoilers :"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27
msgid "Spoilers ahead!"
msgstr "Attention spoilers !"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Afficher une alerte spoiler"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Commentaire :"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Publier"
@@ -4497,7 +4495,7 @@ msgstr "Critique de « %(book_title)s » : %(review_title)s"
#: 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 "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année."
+msgstr "Définissez un nombre de livres à lire comme objectif pour %(year)s, et suivez votre progression au fil de l’année."
#: bookwyrm/templates/snippets/goal_form.html:16
msgid "Reading goal:"
@@ -4851,10 +4849,6 @@ msgstr "Vos Groupes"
msgid "Groups: %(username)s"
msgstr "Groupes : %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Créer un groupe"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Profil"
diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo
index 691d4246e0..8958c625aa 100644
Binary files a/locale/gl_ES/LC_MESSAGES/django.mo and b/locale/gl_ES/LC_MESSAGES/django.mo differ
diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po
index 1f45a6890d..bf0fc1218a 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 19:52\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Galician\n"
"Language: gl\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Seguidoras"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Citas"
msgid "Everything else"
msgstr "As outras cousas"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "Cronoloxía de Inicio"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Inicio"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Cronoloxía de libros"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Libros"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English (Inglés)"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Alemán (Alemaña)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español (España)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (Galician)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italiano (Italian)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Francés (Francia)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių (Lithuanian)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Noruegués (Norwegian)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português do Brasil (Portugués brasileiro)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu (Portugués europeo)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Sueco (Swedish)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文 (Chinés simplificado)"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文 (Chinés tradicional)"
@@ -727,14 +727,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -748,20 +748,20 @@ msgstr "Gardar"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Cancelar"
@@ -770,9 +770,9 @@ msgstr "Cancelar"
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 "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:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -873,8 +873,8 @@ msgid "Add to list"
msgstr "Engadir a listaxe"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1182,7 +1182,7 @@ msgid "Actions"
msgstr "Accións"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "Denunciar spam"
@@ -1216,7 +1216,7 @@ msgstr "Saír de BookWyrm"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "Esta ligazón vaite levar a: %(link_url)s
. É ahí a onde queres ir?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "Continuar"
@@ -1292,7 +1292,7 @@ msgstr "Código de confirmación:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Enviar"
@@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\""
msgstr "Non se atopan usuarias para \"%(query)s\""
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr "Crear grupo"
#: bookwyrm/templates/groups/created_text.html:4
@@ -1824,9 +1825,9 @@ msgstr "Eliminar este grupo?"
msgid "This action cannot be un-done"
msgstr "Esta acción non ten volta atrás"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2298,7 +2299,7 @@ msgstr "Engadir \"%(title)s \" a esta lista"
msgid "Suggest \"%(title)s \" for this list"
msgstr "Suxerir \"%(title)s \" para esta lista"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Suxire"
@@ -2468,7 +2469,7 @@ msgid "List position"
msgstr "Posición da lista"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Establecer"
@@ -3923,8 +3924,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr "Copia o ficheiro do decorado no cartafol bookwyrm/static/css/themes
do teu servidor usando a liña de comandos."
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
-msgstr "Executa ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
+msgstr ""
#: bookwyrm/templates/settings/themes.html:35
msgid "Add the file name using the form below to make it available in the application interface."
@@ -4200,8 +4201,9 @@ msgid "Need help?"
msgstr "Precisas axuda?"
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
-msgstr "Crear Estante"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
+msgstr "Crear estante"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
msgid "Edit Shelf"
@@ -4216,10 +4218,6 @@ msgstr "Perfil da usuaria"
msgid "All books"
msgstr "Tódolos libros"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Crear estante"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4343,24 +4341,24 @@ msgstr "Responder"
msgid "Content"
msgstr "Contido"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Aviso sobre o contido:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Incluír alerta de spoiler"
#: 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 "Contén Spoilers!"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Incluír alerta de spoiler"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Comentario:"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Publicación"
@@ -4851,10 +4849,6 @@ msgstr "Os teus grupos"
msgid "Groups: %(username)s"
msgstr "Grupos: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Crear grupo"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Perfil da usuaria"
diff --git a/locale/it_IT/LC_MESSAGES/django.mo b/locale/it_IT/LC_MESSAGES/django.mo
index 2be0c3ac01..911ed76e7d 100644
Binary files a/locale/it_IT/LC_MESSAGES/django.mo and b/locale/it_IT/LC_MESSAGES/django.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/django.po b/locale/it_IT/LC_MESSAGES/django.po
index 2453873518..fbeaf64b7d 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 19:52\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Italian\n"
"Language: it\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Followers"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Citazioni"
msgid "Everything else"
msgstr "Tutto il resto"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "La tua timeline"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Home"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Timeline dei libri"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Libri"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English (Inglese)"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch (Tedesco)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español (Spagnolo)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (Galiziano)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italiano (Italiano)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français (Francese)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių (Lituano)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norsk (Norvegese)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português do Brasil (Portoghese Brasiliano)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu (Portoghese europeo)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Svenska (Svedese)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文 (Cinese Semplificato)"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文 (Cinese Tradizionale)"
@@ -727,14 +727,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -748,20 +748,20 @@ msgstr "Salva"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Cancella"
@@ -770,9 +770,9 @@ msgstr "Cancella"
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 "Il caricamento dei dati si collegherà a %(source_name)s e verificherà eventuali metadati relativi a questo autore che non sono presenti qui. I metadati esistenti non vengono sovrascritti."
-#: bookwyrm/templates/author/sync_modal.html:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -873,8 +873,8 @@ msgid "Add to list"
msgstr "Aggiungi all'elenco"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1182,7 +1182,7 @@ msgid "Actions"
msgstr "Azioni"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "Segnala come spam"
@@ -1216,7 +1216,7 @@ msgstr "Esci da BookWyrm"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "Questo link ti sta portando a: %(link_url)s
. È qui che vuoi andare?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "Continua"
@@ -1292,7 +1292,7 @@ msgstr "Codice di conferma:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Invia"
@@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\""
msgstr "Nessun utente trovato per \"%(query)s\""
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr "Crea gruppo"
#: bookwyrm/templates/groups/created_text.html:4
@@ -1824,9 +1825,9 @@ msgstr "Eliminare questo gruppo?"
msgid "This action cannot be un-done"
msgstr "Questa azione non può essere annullata"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2298,7 +2299,7 @@ msgstr "Aggiungi \"%(title)s \" a questa lista"
msgid "Suggest \"%(title)s \" for this list"
msgstr "Suggerisci \"%(title)s \" per questa lista"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Suggerisci"
@@ -2468,7 +2469,7 @@ msgid "List position"
msgstr "Posizione elenco"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Imposta"
@@ -3923,8 +3924,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr "Copia il file del tema nella directory bookwyrm/static/css/themes
sul tuo server dalla riga di comando."
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
-msgstr "Esegui ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
+msgstr ""
#: bookwyrm/templates/settings/themes.html:35
msgid "Add the file name using the form below to make it available in the application interface."
@@ -4200,8 +4201,9 @@ msgid "Need help?"
msgstr "Hai bisogno di aiuto?"
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
-msgstr "Crea Scaffale"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
+msgstr "Crea scaffale"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
msgid "Edit Shelf"
@@ -4216,10 +4218,6 @@ msgstr "Profilo utente"
msgid "All books"
msgstr "Tutti i libri"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Crea scaffale"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4343,24 +4341,24 @@ msgstr "Rispondi"
msgid "Content"
msgstr "Contenuto"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Avviso sul contenuto:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Includi avviso spoiler"
#: 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 "Attenzione Spoiler!"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Includi avviso spoiler"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Commenta:"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Pubblica"
@@ -4851,10 +4849,6 @@ msgstr "I tuoi gruppi"
msgid "Groups: %(username)s"
msgstr "Gruppi: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Crea gruppo"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Profilo utente"
diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo
index b4885e93b6..08a3fe6ac5 100644
Binary files a/locale/lt_LT/LC_MESSAGES/django.mo and b/locale/lt_LT/LC_MESSAGES/django.mo differ
diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po
index b272ecf098..b74de2d2f2 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:15\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 19:51\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Lithuanian\n"
"Language: lt\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Sekėjai"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Citatos"
msgid "Everything else"
msgstr "Visa kita"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "Pagrindinė siena"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Pagrindinis"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Knygų siena"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Knygos"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English (Anglų)"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch (Vokiečių)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español (Ispanų)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (galisų)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italų (Italian)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français (Prancūzų)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norvegų (Norwegian)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português brasileiro (Brazilijos portugalų)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu (Europos portugalų)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Svenska (Švedų)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文 (Supaprastinta kinų)"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文 (Tradicinė kinų)"
@@ -735,14 +735,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -756,20 +756,20 @@ msgstr "Išsaugoti"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Atšaukti"
@@ -778,9 +778,9 @@ msgstr "Atšaukti"
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 "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:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -883,8 +883,8 @@ msgid "Add to list"
msgstr "Pridėti prie sąrašo"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1191,7 +1191,7 @@ msgid "Actions"
msgstr "Veiksmai"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "Pranešti apie brukalą"
@@ -1225,7 +1225,7 @@ msgstr "Tęsti naršymą ne BookWyrm"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "Nuoroda veda į: %(link_url)s
. Ar tikrai norite ten nueiti?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "Tęsti"
@@ -1301,7 +1301,7 @@ msgstr "Patvirtinimo kodas:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Siųsti"
@@ -1819,7 +1819,8 @@ msgid "No users found for \"%(query)s\""
msgstr "Pagal paiešką „%(query)s“ nieko nerasta"
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr "Sukurti grupę"
#: bookwyrm/templates/groups/created_text.html:4
@@ -1837,9 +1838,9 @@ msgstr "Ištrinti šią grupę?"
msgid "This action cannot be un-done"
msgstr "Nebegalite atšaukti šio veiksmo"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2319,7 +2320,7 @@ msgstr "Pridėti \"%(title)s \" į šį sąrašą"
msgid "Suggest \"%(title)s \" for this list"
msgstr "Siūlyti \"%(title)s \" į šį sąrašą"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Siūlyti"
@@ -2489,7 +2490,7 @@ msgid "List position"
msgstr "Sąrašo pozicija"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Nustatyti"
@@ -3952,7 +3953,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr ""
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
msgstr ""
#: bookwyrm/templates/settings/themes.html:35
@@ -4229,7 +4230,8 @@ msgid "Need help?"
msgstr ""
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
msgstr "Sukurti lentyną"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
@@ -4245,10 +4247,6 @@ msgstr "Nario paskyra"
msgid "All books"
msgstr "Visos knygos"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Sukurti lentyną"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4376,24 +4374,24 @@ msgstr "Atsakyti"
msgid "Content"
msgstr "Turinys"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Įspėjimas dėl turinio:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Įdėti įspėjimą apie turinio atskleidimą"
#: 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 "Galimas turinio atskleidimas!"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Įdėti įspėjimą apie turinio atskleidimą"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Komentuoti:"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Publikuoti"
@@ -4894,10 +4892,6 @@ msgstr "Jūsų grupės"
msgid "Groups: %(username)s"
msgstr "Grupės: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Sukurti grupę"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Nario paskyra"
diff --git a/locale/no_NO/LC_MESSAGES/django.mo b/locale/no_NO/LC_MESSAGES/django.mo
index dbfe5ea07b..7f23bb1a85 100644
Binary files a/locale/no_NO/LC_MESSAGES/django.mo and b/locale/no_NO/LC_MESSAGES/django.mo differ
diff --git a/locale/no_NO/LC_MESSAGES/django.po b/locale/no_NO/LC_MESSAGES/django.po
index a7626b2846..2d4003e2b9 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 19:51\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Norwegian\n"
"Language: no\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Følgere"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Sitater"
msgid "Everything else"
msgstr "Andre ting"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "Lokal tidslinje"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Hjem"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Boktidslinja"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Bøker"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English (Engelsk)"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch (Tysk)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español (Spansk)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (Gallisk)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italiano (Italiensk)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français (Fransk)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių (Litauisk)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norsk (Norsk)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português - Brasil (Brasiliansk portugisisk)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu (Europeisk Portugisisk)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Svenska (Svensk)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文 (Forenklet kinesisk)"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文 (Tradisjonelt kinesisk)"
@@ -727,14 +727,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -748,20 +748,20 @@ msgstr "Lagre"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Avbryt"
@@ -770,9 +770,9 @@ msgstr "Avbryt"
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 "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:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -873,8 +873,8 @@ msgid "Add to list"
msgstr "Legg til i liste"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1182,7 +1182,7 @@ msgid "Actions"
msgstr "Handlinger"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "Rapporter spam"
@@ -1216,7 +1216,7 @@ msgstr "Forlater BookWyrm"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "Denne lenka sender deg til: %(link_url)s
. Er det dit du vil dra?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "Fortsett"
@@ -1292,7 +1292,7 @@ msgstr "Bekreftelseskode:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Send inn"
@@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\""
msgstr "Ingen medlemmer funnet for \"%(query)s\""
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr "Opprett gruppe"
#: bookwyrm/templates/groups/created_text.html:4
@@ -1824,9 +1825,9 @@ msgstr "Slette denne gruppa?"
msgid "This action cannot be un-done"
msgstr "Denne handlingen er endelig"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2298,7 +2299,7 @@ msgstr "Legg til \"%(title)s \" på denne lista"
msgid "Suggest \"%(title)s \" for this list"
msgstr "Foreslå \"%(title)s \" for denne lista"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Foreslå"
@@ -2468,7 +2469,7 @@ msgid "List position"
msgstr "Listeposisjon"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Bruk"
@@ -3923,7 +3924,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr ""
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
msgstr ""
#: bookwyrm/templates/settings/themes.html:35
@@ -4200,7 +4201,8 @@ msgid "Need help?"
msgstr ""
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
msgstr "Lag hylle"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
@@ -4216,10 +4218,6 @@ msgstr "Brukerprofil"
msgid "All books"
msgstr "Alle bøker"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Lag hylle"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4343,24 +4341,24 @@ msgstr "Svar"
msgid "Content"
msgstr "Innhold"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Innholdsadvarsel:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Inkluder spoiler-varsel"
#: 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 "Spoilers forut!"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Inkluder spoiler-varsel"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Kommentar:"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Innlegg"
@@ -4851,10 +4849,6 @@ msgstr "Gruppene dine"
msgid "Groups: %(username)s"
msgstr "Grupper: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Opprett gruppe"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Brukerprofil"
diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo
index 064c6caeba..6ca75c4db9 100644
Binary files a/locale/pt_BR/LC_MESSAGES/django.mo and b/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po
index 60b192c6af..4b5ce5865f 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 20:49\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Portuguese, Brazilian\n"
"Language: pt\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Seguidores"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Citações"
msgid "Everything else"
msgstr "Todo o resto"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "Linha do tempo"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Página inicial"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Linha do tempo dos livros"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Livros"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English (Inglês)"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch (Alemão)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español (Espanhol)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (Galego)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italiano (Italiano)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français (Francês)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių (Lituano)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norsk (Norueguês)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português do Brasil (Português do Brasil)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu (Português Europeu)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Svenska (Sueco)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文 (Chinês simplificado)"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文 (Chinês tradicional)"
@@ -727,14 +727,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -748,20 +748,20 @@ msgstr "Salvar"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Cancelar"
@@ -770,9 +770,9 @@ msgstr "Cancelar"
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 "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:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -873,8 +873,8 @@ msgid "Add to list"
msgstr "Adicionar à lista"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1182,7 +1182,7 @@ msgid "Actions"
msgstr "Ações"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "Denunciar spam"
@@ -1216,7 +1216,7 @@ msgstr "Saindo da BookWyrm"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "Este link te levará a: %(link_url)s
. Você quer mesmo ir?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "Continuar"
@@ -1292,7 +1292,7 @@ msgstr "Código de confirmação:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Enviar"
@@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\""
msgstr "Nenhum usuário encontrado para \"%(query)s\""
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr "Criar grupo"
#: bookwyrm/templates/groups/created_text.html:4
@@ -1824,9 +1825,9 @@ msgstr "Deletar grupo?"
msgid "This action cannot be un-done"
msgstr "Esta ação não pode ser desfeita"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2298,7 +2299,7 @@ msgstr "Adicionar \"%(title)s \" a esta lista"
msgid "Suggest \"%(title)s \" for this list"
msgstr "Sugerir \"%(title)s \" para esta lista"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Sugerir"
@@ -2468,7 +2469,7 @@ msgid "List position"
msgstr "Posição na lista"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Definir"
@@ -3923,8 +3924,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr "Copie o arquivo do tema para a pasta bookwyrm/static/css/themes
em seu servidor pela linha de comando."
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
-msgstr "Execute ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
+msgstr "Execute ./bw-dev collectstatic
."
#: bookwyrm/templates/settings/themes.html:35
msgid "Add the file name using the form below to make it available in the application interface."
@@ -4200,7 +4201,8 @@ msgid "Need help?"
msgstr "Precisa de ajuda?"
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
msgstr "Criar estante"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
@@ -4216,10 +4218,6 @@ msgstr "Perfil do usuário"
msgid "All books"
msgstr "Todos os livros"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Criar estante"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4343,24 +4341,24 @@ msgstr "Responder"
msgid "Content"
msgstr "Conteúdo"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Aviso de conteúdo:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Incluir alerta de spoiler"
#: bookwyrm/templates/snippets/create_status/content_warning_field.html:18
+msgid "Spoilers/content warnings:"
+msgstr "Avisos de spoiler/conteúdo:"
+
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:27
msgid "Spoilers ahead!"
msgstr "Alerta de spoiler!"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Incluir alerta de spoiler"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Comentário:"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Publicar"
@@ -4851,10 +4849,6 @@ msgstr "Seus grupos"
msgid "Groups: %(username)s"
msgstr "Grupos: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Criar grupo"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Perfil do usuário"
diff --git a/locale/pt_PT/LC_MESSAGES/django.mo b/locale/pt_PT/LC_MESSAGES/django.mo
index 85e167660b..d943b0f6c1 100644
Binary files a/locale/pt_PT/LC_MESSAGES/django.mo and b/locale/pt_PT/LC_MESSAGES/django.mo differ
diff --git a/locale/pt_PT/LC_MESSAGES/django.po b/locale/pt_PT/LC_MESSAGES/django.po
index 32acf05c36..6f3d2e4b53 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 19:51\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Portuguese\n"
"Language: pt\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Seguidores"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Citações"
msgid "Everything else"
msgstr "Tudo o resto"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "Cronograma Inicial"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Início"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Cronograma de Livros"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Livros"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "Inglês"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch (Alemão)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español (Espanhol)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (Galician)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italiano (Italiano)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français (Francês)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių (lituano)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norsk (Norueguês)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português do Brasil (Português brasileiro)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português (Português Europeu)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr ""
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文 (Chinês simplificado)"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文 (Chinês tradicional)"
@@ -727,14 +727,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -748,20 +748,20 @@ msgstr "Salvar"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Cancelar"
@@ -770,9 +770,9 @@ msgstr "Cancelar"
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 "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:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -873,8 +873,8 @@ msgid "Add to list"
msgstr "Adicionar à lista"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1180,7 +1180,7 @@ msgid "Actions"
msgstr "Acções"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr ""
@@ -1214,7 +1214,7 @@ msgstr ""
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:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr ""
@@ -1290,7 +1290,7 @@ msgstr "Código de confirmação:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Submeter"
@@ -1804,8 +1804,9 @@ msgid "No users found for \"%(query)s\""
msgstr "Nenhum utilizador encontrado para \"%(query)s\""
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
-msgstr "Criar um Grupo"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
+msgstr "Criar grupo"
#: bookwyrm/templates/groups/created_text.html:4
#, python-format
@@ -1822,9 +1823,9 @@ msgstr "Apagar este grupo?"
msgid "This action cannot be un-done"
msgstr "Esta ação não pode ser desfeita"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2296,7 +2297,7 @@ msgstr ""
msgid "Suggest \"%(title)s \" for this list"
msgstr ""
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Sugerir"
@@ -2466,7 +2467,7 @@ msgid "List position"
msgstr "Posição da lista"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Definir"
@@ -3921,7 +3922,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr ""
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
msgstr ""
#: bookwyrm/templates/settings/themes.html:35
@@ -4198,7 +4199,8 @@ msgid "Need help?"
msgstr ""
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
msgstr "Criar prateleira"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
@@ -4214,10 +4216,6 @@ msgstr ""
msgid "All books"
msgstr "Todos os livros"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Criar prateleira"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4341,24 +4339,24 @@ msgstr "Responder"
msgid "Content"
msgstr "Conteúdo"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Aviso de Conteúdo:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Incluir aviso de spoiler"
#: 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 "Alerta de spoiler!"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Incluir aviso de spoiler"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Comentar:"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Publicação"
@@ -4849,10 +4847,6 @@ msgstr "Os Teus Grupos"
msgid "Groups: %(username)s"
msgstr "Grupos: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Criar grupo"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Perfil de Utilizador"
diff --git a/locale/sv_SE/LC_MESSAGES/django.mo b/locale/sv_SE/LC_MESSAGES/django.mo
index eb44d9bf95..d540a049d1 100644
Binary files a/locale/sv_SE/LC_MESSAGES/django.mo and b/locale/sv_SE/LC_MESSAGES/django.mo differ
diff --git a/locale/sv_SE/LC_MESSAGES/django.po b/locale/sv_SE/LC_MESSAGES/django.po
index 303495c60c..691eb7ccb8 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:15\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 19:51\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Swedish\n"
"Language: sv\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "Följare"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "Citationer"
msgid "Everything else"
msgstr "Allt annat"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "Tidslinje för Hem"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "Hem"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "Tidslinjer för böcker"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "Böcker"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "Engelska"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Tyska (Tysk)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Spanska (Spansk)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego (Gallisk)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italienska (Italiensk)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Franska (Fransk)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Litauiska (Litauisk)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norska (Norska)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português d Brasil (Brasiliansk Portugisiska)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu (Europeisk Portugisiska)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Svenska (Svenska)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文 (Förenklad Kinesiska)"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文 (Traditionell Kinesiska)"
@@ -727,14 +727,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -748,20 +748,20 @@ msgstr "Spara"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "Avbryt"
@@ -770,9 +770,9 @@ msgstr "Avbryt"
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 "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:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -873,8 +873,8 @@ msgid "Add to list"
msgstr "Lägg till i listan"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1182,7 +1182,7 @@ msgid "Actions"
msgstr "Åtgärder"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "Rapportera skräppost"
@@ -1216,7 +1216,7 @@ msgstr "Lämnar BookWyrm"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "Den här länken tar dig till: %(link_url)s
. Är det dit du vill åka?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "Fortsätt"
@@ -1292,7 +1292,7 @@ msgstr "Bekräftelsekod:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "Skicka in"
@@ -1806,7 +1806,8 @@ msgid "No users found for \"%(query)s\""
msgstr "Ingen användare \"%(query)s\" hittades"
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr "Skapa grupp"
#: bookwyrm/templates/groups/created_text.html:4
@@ -1824,9 +1825,9 @@ msgstr "Ta bort den här gruppen?"
msgid "This action cannot be un-done"
msgstr "Den här åtgärden kan inte ångras"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2298,7 +2299,7 @@ msgstr "Lägg till \"%(title)s \" i den här listan"
msgid "Suggest \"%(title)s \" for this list"
msgstr "Föreslå \"%(title)s \" för den här listan"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "Föreslå"
@@ -2468,7 +2469,7 @@ msgid "List position"
msgstr "Listans plats"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "Ställ in"
@@ -3923,7 +3924,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr ""
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
msgstr ""
#: bookwyrm/templates/settings/themes.html:35
@@ -4200,7 +4201,8 @@ msgid "Need help?"
msgstr "Behöver du hjälp?"
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
msgstr "Skapa hylla"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
@@ -4216,10 +4218,6 @@ msgstr "Användarprofil"
msgid "All books"
msgstr "Alla böcker"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "Skapa hylla"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4343,24 +4341,24 @@ msgstr "Svara"
msgid "Content"
msgstr "Innehåll"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-msgstr "Innehållsvarning:"
+#: bookwyrm/templates/snippets/create_status/content_warning_field.html:9
+msgid "Include spoiler alert"
+msgstr "Inkludera spoilervarning"
#: 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 "Varning för spoiler!"
-#: bookwyrm/templates/snippets/create_status/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "Inkludera spoilervarning"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: bookwyrm/templates/snippets/create_status/layout.html:45
#: bookwyrm/templates/snippets/reading_modals/form.html:7
msgid "Comment:"
msgstr "Kommentar:"
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "Inlägg"
@@ -4851,10 +4849,6 @@ msgstr "Dina grupper"
msgid "Groups: %(username)s"
msgstr "Grupper: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "Skapa grupp"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "Användarprofil"
diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
index 4acf1dce30..b4b67c9574 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-14 00:10\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Chinese Simplified\n"
"Language: zh\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "关注者"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr "引用"
msgid "Everything else"
msgstr "所有其它内容"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "主页时间线"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "主页"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr "书目时间线"
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "书目"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English(英语)"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch(德语)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español(西班牙语)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr "Galego(加利西亚语)"
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr "Italiano(意大利语)"
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français(法语)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr "Lietuvių(立陶宛语)"
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr "Norsk(挪威语)"
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr "Português do Brasil(巴西葡萄牙语)"
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr "Português Europeu(欧洲葡萄牙语)"
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr "Svenska(瑞典语)"
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "简体中文"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文(繁体中文)"
@@ -476,7 +476,7 @@ 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"
@@ -723,14 +723,14 @@ msgstr "ISNI:"
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -744,20 +744,20 @@ msgstr "保存"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "取消"
@@ -766,9 +766,9 @@ msgstr "取消"
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 "加载数据会连接到 %(source_name)s 并检查这里还没有记录的与作者相关的元数据。现存的元数据不会被覆盖。"
-#: bookwyrm/templates/author/sync_modal.html:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -868,8 +868,8 @@ msgid "Add to list"
msgstr "添加到列表"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1177,7 +1177,7 @@ msgid "Actions"
msgstr "动作"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr "举报垃圾信息"
@@ -1211,7 +1211,7 @@ msgstr "离开 BookWyrm"
msgid "This link is taking you to: %(link_url)s
. Is that where you'd like to go?"
msgstr "此链接将跳转至:%(link_url)s
。 这是您想跳转的网址吗?"
-#: bookwyrm/templates/book/file_links/verification_modal.html:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr "继续"
@@ -1287,7 +1287,7 @@ msgstr "确认代码:"
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "提交"
@@ -1799,7 +1799,8 @@ msgid "No users found for \"%(query)s\""
msgstr "没有找到 \"%(query)s\" 的用户"
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr "创建群组"
#: bookwyrm/templates/groups/created_text.html:4
@@ -1817,9 +1818,9 @@ msgstr "删除该群组?"
msgid "This action cannot be un-done"
msgstr "此操作无法被撤销"
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2287,7 +2288,7 @@ msgstr "将 “%(title)s ” 添加到这个列表"
msgid "Suggest \"%(title)s \" for this list"
msgstr "推荐 “%(title)s ” 到这个列表"
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "推荐"
@@ -2457,7 +2458,7 @@ msgid "List position"
msgstr "列表位置:"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "设定"
@@ -3908,8 +3909,8 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr "从命令行将主题文件复制到您服务器上的 bookwym/static/css/themes
目录。"
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
-msgstr "运行 ./bw-dev compilescsss
。"
+msgid "Run ./bw-dev collectstatic
."
+msgstr ""
#: bookwyrm/templates/settings/themes.html:35
msgid "Add the file name using the form below to make it available in the application interface."
@@ -4185,7 +4186,8 @@ msgid "Need help?"
msgstr "需要帮助?"
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
msgstr "创建书架"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
@@ -4201,10 +4203,6 @@ msgstr "用户个人资料"
msgid "All books"
msgstr "所有书目"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "创建书架"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4326,24 +4324,24 @@ msgstr "回复"
msgid "Content"
msgstr "内容"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-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/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "加入剧透警告"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: 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
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "发布"
@@ -4829,10 +4827,6 @@ msgstr "您的群组"
msgid "Groups: %(username)s"
msgstr "群组: %(username)s"
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr "创建群组"
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "用户个人资料"
diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po
index a410c4fed0..7e25b4b923 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: 2022-03-08 19:55+0000\n"
-"PO-Revision-Date: 2022-03-08 21:16\n"
+"POT-Creation-Date: 2022-03-13 18:56+0000\n"
+"PO-Revision-Date: 2022-03-13 19:52\n"
"Last-Translator: Mouse Reeve \n"
"Language-Team: Chinese Traditional\n"
"Language: zh\n"
@@ -220,7 +220,7 @@ msgid "Followers"
msgstr "關注者"
#: bookwyrm/models/fields.py:208
-#: bookwyrm/templates/snippets/create_status/post_options_block.html:8
+#: 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
@@ -261,73 +261,73 @@ msgstr ""
msgid "Everything else"
msgstr ""
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home Timeline"
msgstr "主頁時間線"
-#: bookwyrm/settings.py:207
+#: bookwyrm/settings.py:208
msgid "Home"
msgstr "主頁"
-#: bookwyrm/settings.py:208
+#: bookwyrm/settings.py:209
msgid "Books Timeline"
msgstr ""
-#: bookwyrm/settings.py:208 bookwyrm/templates/search/layout.html:21
+#: bookwyrm/settings.py:209 bookwyrm/templates/search/layout.html:21
#: bookwyrm/templates/search/layout.html:42
#: bookwyrm/templates/user/layout.html:91
msgid "Books"
msgstr "書目"
-#: bookwyrm/settings.py:280
+#: bookwyrm/settings.py:281
msgid "English"
msgstr "English(英語)"
-#: bookwyrm/settings.py:281
+#: bookwyrm/settings.py:282
msgid "Deutsch (German)"
msgstr "Deutsch(德語)"
-#: bookwyrm/settings.py:282
+#: bookwyrm/settings.py:283
msgid "Español (Spanish)"
msgstr "Español(西班牙語)"
-#: bookwyrm/settings.py:283
+#: bookwyrm/settings.py:284
msgid "Galego (Galician)"
msgstr ""
-#: bookwyrm/settings.py:284
+#: bookwyrm/settings.py:285
msgid "Italiano (Italian)"
msgstr ""
-#: bookwyrm/settings.py:285
+#: bookwyrm/settings.py:286
msgid "Français (French)"
msgstr "Français(法語)"
-#: bookwyrm/settings.py:286
+#: bookwyrm/settings.py:287
msgid "Lietuvių (Lithuanian)"
msgstr ""
-#: bookwyrm/settings.py:287
+#: bookwyrm/settings.py:288
msgid "Norsk (Norwegian)"
msgstr ""
-#: bookwyrm/settings.py:288
+#: bookwyrm/settings.py:289
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr ""
-#: bookwyrm/settings.py:289
+#: bookwyrm/settings.py:290
msgid "Português Europeu (European Portuguese)"
msgstr ""
-#: bookwyrm/settings.py:290
+#: bookwyrm/settings.py:291
msgid "Svenska (Swedish)"
msgstr ""
-#: bookwyrm/settings.py:291
+#: bookwyrm/settings.py:292
msgid "简体中文 (Simplified Chinese)"
msgstr "簡體中文"
-#: bookwyrm/settings.py:292
+#: bookwyrm/settings.py:293
msgid "繁體中文 (Traditional Chinese)"
msgstr "繁體中文"
@@ -723,14 +723,14 @@ msgstr ""
#: bookwyrm/templates/author/edit_author.html:115
#: bookwyrm/templates/book/book.html:193
#: bookwyrm/templates/book/edit/edit_book.html:121
-#: bookwyrm/templates/book/file_links/add_link_modal.html:58
+#: bookwyrm/templates/book/file_links/add_link_modal.html:60
#: bookwyrm/templates/book/file_links/edit_links.html:82
-#: bookwyrm/templates/groups/form.html:30
+#: 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:136
-#: bookwyrm/templates/readthrough/readthrough_modal.html:72
+#: bookwyrm/templates/readthrough/readthrough_modal.html:74
#: bookwyrm/templates/settings/announcements/edit_announcement.html:120
#: bookwyrm/templates/settings/federation/edit_instance.html:98
#: bookwyrm/templates/settings/federation/instance.html:105
@@ -744,20 +744,20 @@ msgstr "儲存"
#: bookwyrm/templates/author/edit_author.html:116
#: bookwyrm/templates/author/sync_modal.html:23
#: bookwyrm/templates/book/book.html:194
-#: bookwyrm/templates/book/cover_add_modal.html:32
+#: bookwyrm/templates/book/cover_add_modal.html:33
#: bookwyrm/templates/book/edit/edit_book.html:123
#: bookwyrm/templates/book/edit/edit_book.html:126
#: bookwyrm/templates/book/file_links/add_link_modal.html:59
-#: bookwyrm/templates/book/file_links/verification_modal.html:21
+#: bookwyrm/templates/book/file_links/verification_modal.html:25
#: bookwyrm/templates/book/sync_modal.html:23
-#: bookwyrm/templates/groups/delete_group_modal.html:17
-#: bookwyrm/templates/lists/add_item_modal.html:42
-#: bookwyrm/templates/lists/delete_list_modal.html:18
-#: bookwyrm/templates/readthrough/delete_readthrough_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/readthrough/delete_readthrough_modal.html:27
#: bookwyrm/templates/readthrough/readthrough_modal.html:73
#: bookwyrm/templates/settings/federation/instance.html:106
#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
-#: bookwyrm/templates/snippets/report_modal.html:53
+#: bookwyrm/templates/snippets/report_modal.html:52
msgid "Cancel"
msgstr "取消"
@@ -766,9 +766,9 @@ msgstr "取消"
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:22
+#: bookwyrm/templates/author/sync_modal.html:24
#: bookwyrm/templates/book/edit/edit_book.html:108
-#: bookwyrm/templates/book/sync_modal.html:22
+#: bookwyrm/templates/book/sync_modal.html:24
#: bookwyrm/templates/groups/members.html:29
#: bookwyrm/templates/landing/password_reset.html:42
#: bookwyrm/templates/snippets/remove_from_group_button.html:17
@@ -868,8 +868,8 @@ msgid "Add to list"
msgstr "新增到列表"
#: bookwyrm/templates/book/book.html:370
-#: bookwyrm/templates/book/cover_add_modal.html:31
-#: bookwyrm/templates/lists/add_item_modal.html:37
+#: 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:31
@@ -1175,7 +1175,7 @@ msgid "Actions"
msgstr "動作"
#: bookwyrm/templates/book/file_links/edit_links.html:53
-#: bookwyrm/templates/book/file_links/verification_modal.html:25
+#: bookwyrm/templates/book/file_links/verification_modal.html:22
msgid "Report spam"
msgstr ""
@@ -1209,7 +1209,7 @@ msgstr ""
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:20
+#: bookwyrm/templates/book/file_links/verification_modal.html:26
#: bookwyrm/templates/setup/config.html:139
msgid "Continue"
msgstr ""
@@ -1285,7 +1285,7 @@ msgstr ""
#: bookwyrm/templates/confirm_email/confirm_email.html:25
#: bookwyrm/templates/landing/layout.html:73
#: bookwyrm/templates/settings/dashboard/dashboard.html:116
-#: bookwyrm/templates/snippets/report_modal.html:52
+#: bookwyrm/templates/snippets/report_modal.html:53
msgid "Submit"
msgstr "提交"
@@ -1797,7 +1797,8 @@ msgid "No users found for \"%(query)s\""
msgstr "沒有找到 \"%(query)s\" 的使用者"
#: bookwyrm/templates/groups/create_form.html:5
-msgid "Create Group"
+#: bookwyrm/templates/user/groups.html:17
+msgid "Create group"
msgstr ""
#: bookwyrm/templates/groups/created_text.html:4
@@ -1815,9 +1816,9 @@ msgstr ""
msgid "This action cannot be un-done"
msgstr ""
-#: bookwyrm/templates/groups/delete_group_modal.html:15
-#: bookwyrm/templates/lists/delete_list_modal.html:15
-#: bookwyrm/templates/readthrough/delete_readthrough_modal.html:21
+#: 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
@@ -2285,7 +2286,7 @@ msgstr ""
msgid "Suggest \"%(title)s \" for this list"
msgstr ""
-#: bookwyrm/templates/lists/add_item_modal.html:39
+#: bookwyrm/templates/lists/add_item_modal.html:41
#: bookwyrm/templates/lists/list.html:257
msgid "Suggest"
msgstr "推薦"
@@ -2455,7 +2456,7 @@ msgid "List position"
msgstr "列表位置:"
#: bookwyrm/templates/lists/list.html:152
-#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:21
+#: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:23
msgid "Set"
msgstr "設定"
@@ -3906,7 +3907,7 @@ msgid "Copy the theme file into the bookwyrm/static/css/themes
dire
msgstr ""
#: bookwyrm/templates/settings/themes.html:32
-msgid "Run ./bw-dev compilescss
."
+msgid "Run ./bw-dev collectstatic
."
msgstr ""
#: bookwyrm/templates/settings/themes.html:35
@@ -4183,7 +4184,8 @@ msgid "Need help?"
msgstr ""
#: bookwyrm/templates/shelf/create_shelf_form.html:5
-msgid "Create Shelf"
+#: bookwyrm/templates/shelf/shelf.html:72
+msgid "Create shelf"
msgstr "建立書架"
#: bookwyrm/templates/shelf/edit_shelf_form.html:5
@@ -4199,10 +4201,6 @@ msgstr ""
msgid "All books"
msgstr "所有書目"
-#: bookwyrm/templates/shelf/shelf.html:72
-msgid "Create shelf"
-msgstr "建立書架"
-
#: bookwyrm/templates/shelf/shelf.html:96
#, python-format
msgid "%(formatted_count)s book"
@@ -4324,24 +4322,24 @@ msgstr "回覆"
msgid "Content"
msgstr "內容"
-#: bookwyrm/templates/snippets/create_status/content_warning_field.html:10
-msgid "Content warning:"
-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/content_warning_toggle.html:13
-msgid "Include spoiler alert"
-msgstr "加入劇透警告"
-
-#: bookwyrm/templates/snippets/create_status/layout.html:47
+#: 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
+#: bookwyrm/templates/snippets/create_status/post_options_block.html:18
msgid "Post"
msgstr "釋出"
@@ -4827,10 +4825,6 @@ msgstr ""
msgid "Groups: %(username)s"
msgstr ""
-#: bookwyrm/templates/user/groups.html:17
-msgid "Create group"
-msgstr ""
-
#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:10
msgid "User Profile"
msgstr "使用者使用者資料"