Merge branch 'main' into user-migration

This commit is contained in:
Mouse Reeve 2023-11-05 06:52:48 -08:00 committed by GitHub
commit 67822d3cb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 1364 additions and 629 deletions

View file

@ -13,14 +13,15 @@ User relationship interactions follow the standard ActivityPub spec.
- `Block`: prevent users from seeing one another's statuses, and prevents the blocked user from viewing the actor's profile
- `Update`: updates a user's profile and settings
- `Delete`: deactivates a user
- `Undo`: reverses a `Follow` or `Block`
- `Undo`: reverses a `Block` or `Follow`
### Activities
- `Create/Status`: saves a new status in the database.
- `Delete/Status`: Removes a status
- `Like/Status`: Creates a favorite on the status
- `Announce/Status`: Boosts the status into the actor's timeline
- `Undo/*`,: Reverses a `Like` or `Announce`
- `Undo/*`,: Reverses an `Announce`, `Like`, or `Move`
- `Move/User`: Moves a user from one ActivityPub id to another.
### Collections
User's books and lists are represented by [`OrderedCollection`](https://www.w3.org/TR/activitystreams-vocabulary/#dfn-orderedcollection)

View file

@ -23,6 +23,7 @@ from .verbs import Create, Delete, Undo, Update
from .verbs import Follow, Accept, Reject, Block
from .verbs import Add, Remove
from .verbs import Announce, Like
from .verbs import Move
# this creates a list of all the Activity types that we can serialize,
# so when an Activity comes in from outside, we can check if it's known

View file

@ -40,4 +40,6 @@ class Person(ActivityObject):
manuallyApprovesFollowers: str = False
discoverable: str = False
hideFollows: str = False
movedTo: str = None
alsoKnownAs: dict[str] = None
type: str = "Person"

View file

@ -231,3 +231,30 @@ class Announce(Verb):
def action(self, allow_external_connections=True):
"""boost"""
self.to_model(allow_external_connections=allow_external_connections)
@dataclass(init=False)
class Move(Verb):
"""a user moving an object"""
object: str
type: str = "Move"
origin: str = None
target: str = None
def action(self, allow_external_connections=True):
"""move"""
object_is_user = resolve_remote_id(remote_id=self.object, model="User")
if object_is_user:
model = apps.get_model("bookwyrm.MoveUser")
self.to_model(
model=model,
save=True,
allow_external_connections=allow_external_connections,
)
else:
# we might do something with this to move other objects at some point
pass

View file

@ -70,6 +70,22 @@ class DeleteUserForm(CustomForm):
fields = ["password"]
class MoveUserForm(CustomForm):
target = forms.CharField(widget=forms.TextInput)
class Meta:
model = models.User
fields = ["password"]
class AliasUserForm(CustomForm):
username = forms.CharField(widget=forms.TextInput)
class Meta:
model = models.User
fields = ["password"]
class ChangePasswordForm(CustomForm):
current_password = forms.CharField(widget=forms.PasswordInput)
confirm_password = forms.CharField(widget=forms.PasswordInput)

View file

@ -45,5 +45,7 @@ class Migration(migrations.Migration):
]
operations = [
migrations.RunPython(populate_sort_title),
migrations.RunPython(
populate_sort_title, reverse_code=migrations.RunPython.noop
),
]

View file

@ -0,0 +1,130 @@
# Generated by Django 3.2.20 on 2023-10-27 11:22
import bookwyrm.models.activitypub_mixin
import bookwyrm.models.fields
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
("bookwyrm", "0181_merge_20230806_2302"),
]
operations = [
migrations.AddField(
model_name="user",
name="also_known_as",
field=bookwyrm.models.fields.ManyToManyField(to=settings.AUTH_USER_MODEL),
),
migrations.AddField(
model_name="user",
name="moved_to",
field=bookwyrm.models.fields.RemoteIdField(
max_length=255,
null=True,
validators=[bookwyrm.models.fields.validate_remote_id],
),
),
migrations.AlterField(
model_name="notification",
name="notification_type",
field=models.CharField(
choices=[
("FAVORITE", "Favorite"),
("REPLY", "Reply"),
("MENTION", "Mention"),
("TAG", "Tag"),
("FOLLOW", "Follow"),
("FOLLOW_REQUEST", "Follow Request"),
("BOOST", "Boost"),
("IMPORT", "Import"),
("ADD", "Add"),
("REPORT", "Report"),
("LINK_DOMAIN", "Link Domain"),
("INVITE", "Invite"),
("ACCEPT", "Accept"),
("JOIN", "Join"),
("LEAVE", "Leave"),
("REMOVE", "Remove"),
("GROUP_PRIVACY", "Group Privacy"),
("GROUP_NAME", "Group Name"),
("GROUP_DESCRIPTION", "Group Description"),
("MOVE", "Move"),
],
max_length=255,
),
),
migrations.CreateModel(
name="Move",
fields=[
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("created_date", models.DateTimeField(auto_now_add=True)),
("updated_date", models.DateTimeField(auto_now=True)),
(
"remote_id",
bookwyrm.models.fields.RemoteIdField(
max_length=255,
null=True,
validators=[bookwyrm.models.fields.validate_remote_id],
),
),
("object", bookwyrm.models.fields.CharField(max_length=255)),
(
"origin",
bookwyrm.models.fields.CharField(
blank=True, default="", max_length=255, null=True
),
),
(
"user",
bookwyrm.models.fields.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
to=settings.AUTH_USER_MODEL,
),
),
],
options={
"abstract": False,
},
bases=(bookwyrm.models.activitypub_mixin.ActivityMixin, models.Model),
),
migrations.CreateModel(
name="MoveUser",
fields=[
(
"move_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="bookwyrm.move",
),
),
(
"target",
bookwyrm.models.fields.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
related_name="move_target",
to=settings.AUTH_USER_MODEL,
),
),
],
options={
"abstract": False,
},
bases=("bookwyrm.move",),
),
]

View file

@ -28,6 +28,8 @@ from .group import Group, GroupMember, GroupMemberInvitation
from .import_job import ImportJob, ImportItem
from .bookwyrm_import_job import BookwyrmImportJob
from .move import MoveUser
from .site import SiteSettings, Theme, SiteInvite
from .site import PasswordReset, InviteRequest
from .announcement import Announcement

View file

@ -483,10 +483,12 @@ class ImageField(ActivitypubFieldMixin, models.ImageField):
image_slug = value
# when it's an inline image (User avatar/icon, Book cover), it's a json
# blob, but when it's an attached image, it's just a url
if hasattr(image_slug, "url"):
url = image_slug.url
elif isinstance(image_slug, str):
if isinstance(image_slug, str):
url = image_slug
elif isinstance(image_slug, dict):
url = image_slug.get("url")
elif hasattr(image_slug, "url"): # Serialized to Image/Document object?
url = image_slug.url
else:
return None

72
bookwyrm/models/move.py Normal file
View file

@ -0,0 +1,72 @@
""" move an object including migrating a user account """
from django.core.exceptions import PermissionDenied
from django.db import models
from bookwyrm import activitypub
from .activitypub_mixin import ActivityMixin
from .base_model import BookWyrmModel
from . import fields
from .notification import Notification
class Move(ActivityMixin, BookWyrmModel):
"""migrating an activitypub user account"""
user = fields.ForeignKey(
"User", on_delete=models.PROTECT, activitypub_field="actor"
)
object = fields.CharField(
max_length=255,
blank=False,
null=False,
activitypub_field="object",
)
origin = fields.CharField(
max_length=255,
blank=True,
null=True,
default="",
activitypub_field="origin",
)
activity_serializer = activitypub.Move
class MoveUser(Move):
"""migrating an activitypub user account"""
target = fields.ForeignKey(
"User",
on_delete=models.PROTECT,
related_name="move_target",
activitypub_field="target",
)
def save(self, *args, **kwargs):
"""update user info and broadcast it"""
# only allow if the source is listed in the target's alsoKnownAs
if self.user in self.target.also_known_as.all():
self.user.also_known_as.add(self.target.id)
self.user.update_active_date()
self.user.moved_to = self.target.remote_id
self.user.save(update_fields=["moved_to"])
if self.user.local:
kwargs[
"broadcast"
] = True # Only broadcast if we are initiating the Move
super().save(*args, **kwargs)
for follower in self.user.followers.all():
if follower.local:
Notification.notify(
follower, self.user, notification_type=Notification.MOVE
)
else:
raise PermissionDenied()

View file

@ -50,11 +50,14 @@ class Notification(BookWyrmModel):
GROUP_NAME = "GROUP_NAME"
GROUP_DESCRIPTION = "GROUP_DESCRIPTION"
# Migrations
MOVE = "MOVE"
# pylint: disable=line-too-long
NotificationType = models.TextChoices(
# there has got be a better way to do this
"NotificationType",
f"{FAVORITE} {REPLY} {MENTION} {TAG} {FOLLOW} {FOLLOW_REQUEST} {BOOST} {IMPORT} {USER_IMPORT} {USER_EXPORT} {ADD} {REPORT} {LINK_DOMAIN} {INVITE} {ACCEPT} {JOIN} {LEAVE} {REMOVE} {GROUP_PRIVACY} {GROUP_NAME} {GROUP_DESCRIPTION}",
f"{FAVORITE} {REPLY} {MENTION} {TAG} {FOLLOW} {FOLLOW_REQUEST} {BOOST} {IMPORT} {USER_IMPORT} {USER_EXPORT} {ADD} {REPORT} {LINK_DOMAIN} {INVITE} {ACCEPT} {JOIN} {LEAVE} {REMOVE} {GROUP_PRIVACY} {GROUP_NAME} {GROUP_DESCRIPTION} {MOVE}",
)
user = models.ForeignKey("User", on_delete=models.CASCADE)

View file

@ -140,6 +140,19 @@ class User(OrderedCollectionPageMixin, AbstractUser):
theme = models.ForeignKey("Theme", null=True, blank=True, on_delete=models.SET_NULL)
hide_follows = fields.BooleanField(default=False)
# migration fields
moved_to = fields.RemoteIdField(
null=True, unique=False, activitypub_field="movedTo", deduplication_field=False
)
also_known_as = fields.ManyToManyField(
"self",
symmetrical=False,
unique=False,
activitypub_field="alsoKnownAs",
deduplication_field=False,
)
# options to turn features on and off
show_goal = models.BooleanField(default=True)
show_suggested_users = models.BooleanField(default=True)
@ -314,6 +327,8 @@ class User(OrderedCollectionPageMixin, AbstractUser):
"schema": "http://schema.org#",
"PropertyValue": "schema:PropertyValue",
"value": "schema:value",
"alsoKnownAs": {"@id": "as:alsoKnownAs", "@type": "@id"},
"movedTo": {"@id": "as:movedTo", "@type": "@id"},
},
]
return activity_object

View file

@ -366,9 +366,9 @@ if USE_S3:
AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID")
AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY")
AWS_STORAGE_BUCKET_NAME = env("AWS_STORAGE_BUCKET_NAME")
AWS_S3_CUSTOM_DOMAIN = env("AWS_S3_CUSTOM_DOMAIN")
AWS_S3_CUSTOM_DOMAIN = env("AWS_S3_CUSTOM_DOMAIN", None)
AWS_S3_REGION_NAME = env("AWS_S3_REGION_NAME", "")
AWS_S3_ENDPOINT_URL = env("AWS_S3_ENDPOINT_URL")
AWS_S3_ENDPOINT_URL = env("AWS_S3_ENDPOINT_URL", None)
AWS_DEFAULT_ACL = "public-read"
AWS_S3_OBJECT_PARAMETERS = {"CacheControl": "max-age=86400"}
# S3 Static settings

View file

@ -20,7 +20,7 @@
</div>
<div class="column">
<label class="label" for="id_cover_url">
{% trans "Load cover from url:" %}
{% trans "Load cover from URL:" %}
</label>
<input class="input" name="cover-url" id="id_cover_url">
</div>

View file

@ -247,7 +247,7 @@
</div>
<div class="field">
<label class="label" for="id_cover_url">
{% trans "Load cover from url:" %}
{% trans "Load cover from URL:" %}
</label>
<input class="input" name="cover-url" id="id_cover_url" type="url" value="{{ cover_url|default:'' }}" aria-describedby="desc_cover">
</div>

View file

@ -21,7 +21,7 @@
{% blocktrans trimmed count days=import_limit_reset with display_size=import_size_limit|intcomma %}
Currently, you are allowed to import {{ display_size }} books every {{ import_limit_reset }} day.
{% plural %}
Currently, you are allowed to import {{ import_size_limit }} books every {{ import_limit_reset }} days.
Currently, you are allowed to import {{ display_size }} books every {{ import_limit_reset }} days.
{% endblocktrans %}
</p>
<p>{% blocktrans with display_left=allowed_imports|intcomma %}You have {{ display_left }} left.{% endblocktrans %}</p>

View file

@ -27,6 +27,7 @@
<nav class="navbar" aria-label="main navigation">
<div class="container">
{% with notification_count=request.user.unread_notification_count has_unread_mentions=request.user.has_unread_mentions %}
{% if not request.user.moved_to %}
<div class="navbar-brand">
<a class="navbar-item" href="/">
<img class="image logo" src="{% if site.logo_small %}{% get_media_prefix %}{{ site.logo_small }}{% else %}{% static "images/logo-small.png" %}{% endif %}" alt="{% blocktrans with site_name=site.name %}{{ site_name }} home page{% endblocktrans %}" loading="lazy" decoding="async">
@ -34,7 +35,7 @@
<form class="navbar-item column is-align-items-start pt-5" action="{% url 'search' %}">
<div class="field has-addons">
<div class="control">
{% if user.is_authenticated %}
{% if request.user.is_authenticated %}
{% trans "Search for a book, user, or list" as search_placeholder %}
{% else %}
{% trans "Search for a book" as search_placeholder %}
@ -80,19 +81,18 @@
</strong>
</button>
</div>
<div class="navbar-menu" id="main_nav">
<div class="navbar-start" id="tour-navbar-start">
{% if request.user.is_authenticated %}
<a href="/#feed" class="navbar-item mt-3 py-0">
{% trans "Feed" %}
</a>
<a href="{% url 'lists' %}" class="navbar-item mt-3 py-0">
{% trans "Lists" %}
</a>
<a href="{% url 'discover' %}" class="navbar-item mt-3 py-0">
{% trans "Discover" %}
</a>
<a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item mt-3 py-0">
{% trans "Your Books" %}
</a>
{% endif %}
</div>
@ -157,6 +157,13 @@
{% endif %}
</div>
</div>
{% else %}
<div class="navbar-brand">
<a class="navbar-item" href="/">
<img class="image logo" src="{% if site.logo_small %}{% get_media_prefix %}{{ site.logo_small }}{% else %}{% static "images/logo-small.png" %}{% endif %}" alt="{% blocktrans with site_name=site.name %}{{ site_name }} home page{% endblocktrans %}" loading="lazy" decoding="async">
</a>
</div>
{% endif %}
{% endwith %}
</div>
</nav>
@ -173,11 +180,15 @@
<main class="section is-flex-grow-1">
<div class="container">
{# almost every view needs to know the user shelves #}
{% with request.user.shelf_set.all as user_shelves %}
{% block content %}
{% endblock %}
{% endwith %}
{% if request.user.moved_to %}
{% include "moved.html" %}
{% else %}
{# almost every view needs to know the user shelves #}
{% with request.user.shelf_set.all as user_shelves %}
{% block content %}
{% endblock %}
{% endwith %}
{% endif %}
</div>
</main>

View file

@ -0,0 +1,52 @@
{% load i18n %}
{% load static %}
{% load utilities %}
<div class="container my-6">
<div class="card">
<div class="card-content">
<div class="media">
<div class="media-left">
<figure class="image is-48x48">
<img src="{% if request.user.avatar %}{% get_media_prefix %}{{ request.user.avatar }}{% else %}{% static "images/default_avi.jpg" %}{% endif %}"
{% if ariaHide %}aria-hidden="true"{% endif %}
alt="{{ request.user.alt_text }}"
loading="lazy"
decoding="async">
</figure>
</div>
<div class="media-content">
<p class="title is-4">{{ request.user.display_name }}</p>
<p class="subtitle is-6"><s>{{request.user.username}}</s></p>
</div>
</div>
<div class="notification is-warning">
<p>
{% id_to_username request.user.moved_to as username %}
{% blocktrans trimmed with moved_to=user.moved_to %}
<strong>You have moved your account</strong> to <a href="{{ moved_to }}">{{ username }}</a>
{% endblocktrans %}
</p>
<p class="mt-2">
{% trans "You can undo the move to restore full functionality, but some followers may have already unfollowed this account." %}
</p>
</div>
</div>
<div class="columns is-justify-content-center">
<div class="column is-one-quarter">
<div class="level">
<form class="level-left" name="remove-alias" action="{% url 'prefs-unmove' %}" method="post">
{% csrf_token %}
<input type="hidden" name="remote_id" id="remote_id" value="{{user.moved_to}}">
<button type="submit" class="button is-medium is-danger">{% trans "Undo move" %}</button>
</form>
<form class="level-right" name="logout" action="{% url 'logout' %}" method="post">
{% csrf_token %}
<button type="submit" class="button is-medium is-primary">{% trans 'Log out' %}</button>
</form>
</div>
</div>
</div>
</div>
</div>

View file

@ -39,4 +39,6 @@
{% include 'notifications/items/update.html' %}
{% elif notification.notification_type == 'GROUP_DESCRIPTION' %}
{% include 'notifications/items/update.html' %}
{% elif notification.notification_type == 'MOVE' %}
{% include 'notifications/items/move_user.html' %}
{% endif %}

View file

@ -39,6 +39,8 @@
{% with related_user=related_users.0.display_name %}
{% with related_user_link=related_users.0.local_path %}
{% with related_user_moved_to=related_users.0.moved_to %}
{% with related_user_username=related_users.0.username %}
{% with second_user=related_users.1.display_name %}
{% with second_user_link=related_users.1.local_path %}
{% with other_user_count=related_user_count|add:"-1" %}
@ -50,6 +52,8 @@
{% endwith %}
{% endwith %}
{% endwith %}
{% endwith %}
{% endwith %}
</div>
{% if related_status %}

View file

@ -0,0 +1,29 @@
{% extends 'notifications/items/layout.html' %}
{% load i18n %}
{% load utilities %}
{% load user_page_tags %}
{% block primary_link %}{% spaceless %}
{{ notification.related_object.local_path }}
{% endspaceless %}{% endblock %}
{% block icon %}
<span class="icon icon-local"></span>
{% endblock %}
{% block description %}
{% if related_user_moved_to %}
{% id_to_username request.user.moved_to as username %}
{% blocktrans trimmed %}
{{ related_user }} has moved to <a href="{{ related_user_moved_to }}">{{ username }}</a>
{% endblocktrans %}
<div class="row shrink my-2">
{% include 'snippets/move_user_buttons.html' with group=notification.related_group %}
</div>
{% else %}
{% blocktrans trimmed %}
{{ related_user }} has undone their move
{% endblocktrans %}
{% endif %}
{% endblock %}

View file

@ -0,0 +1,59 @@
{% extends 'preferences/layout.html' %}
{% load i18n %}
{% block title %}{% trans "Move Account" %}{% endblock %}
{% block header %}
{% trans "Create Alias" %}
{% endblock %}
{% block panel %}
<div class="block">
<h2 class="title is-4">{% trans "Add another account as an alias" %}</h2>
<div class="box">
<div class="notification is-info is-light">
<p>
{% trans "Marking another account as an alias is required if you want to move that account to this one." %}
</p>
<p>
{% trans "This is a reversable action and will not change the functionality of this account." %}
</p>
</div>
<form name="alias-user" action="{% url 'prefs-alias' %}" method="post">
{% csrf_token %}
<div class="field">
<label class="label" for="id_target">{% trans "Enter the username for the account you want to add as an alias e.g. <em>user@example.com </em>:" %}</label>
<input class="input {% if form.username.errors %}is-danger{% endif %}" type="text" name="username" id="id_username" required aria-describedby="desc_username">
{% include 'snippets/form_errors.html' with errors_list=form.username.errors id="desc_username" %}
</div>
<div class="field">
<label class="label" for="id_password">{% trans "Confirm your password:" %}</label>
<input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required aria-describedby="desc_password">
{% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_password" %}
</div>
<button type="submit" class="button is-success">{% trans "Create Alias" %}</button>
</form>
</div>
{% if user.also_known_as.all.0 %}
<div class="box">
<h2 class="title is-4">{% trans "Aliases" %}</h2>
<div class="table-container block">
<table class="table is-striped is-fullwidth">
{% for alias in user.also_known_as.all %}
<tr>
<td>{{ alias.username }}</td>
<td>
<form name="remove-alias" action="{% url 'prefs-remove-alias' %}" method="post">
{% csrf_token %}
<input type="hidden" name="alias" id="alias" value="{{ alias.id }}">
<button type="submit" class="button is-info">{% trans "Remove alias" %}</button>
</form>
</td>
</tr>
{% endfor %}
</table>
</div>
</div>
{% endif %}
</div>
{% endblock %}

View file

@ -23,6 +23,14 @@
{% url 'prefs-2fa' as url %}
<a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Two Factor Authentication" %}</a>
</li>
<li>
{% url 'prefs-alias' as url %}
<a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Aliases" %}</a>
</li>
<li>
{% url 'prefs-move' as url %}
<a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Move Account" %}</a>
</li>
<li>
{% url 'prefs-delete' as url %}
<a href="{{ url }}"{% if url in request.path %} class="is-active" aria-selected="true"{% endif %}>{% trans "Delete Account" %}</a>

View file

@ -0,0 +1,43 @@
{% extends 'preferences/layout.html' %}
{% load i18n %}
{% block title %}{% trans "Move Account" %}{% endblock %}
{% block header %}
{% trans "Move Account" %}
{% endblock %}
{% block panel %}
<div class="block">
<h2 class="title is-4">{% trans "Migrate account to another server" %}</h2>
<div class="box">
<div class="notification is-danger is-light">
<p>
{% trans "Moving your account will notify all your followers and direct them to follow the new account." %}
</p>
<p>
{% blocktrans %}
<strong>{{ user }}</strong> will be marked as moved and will not be discoverable or usable unless you undo the move.
{% endblocktrans %}
</p>
</div>
<div class="notification is-info is-light">
<p>{% trans "Remember to add this user as an alias of the target account before you try to move." %}</p>
</div>
<form name="move-user" action="{% url 'prefs-move' %}" method="post">
{% csrf_token %}
<div class="field">
<label class="label" for="id_target">{% trans "Enter the username for the account you want to move to e.g. <em>user@example.com </em>:" %}</label>
<input class="input {% if form.target.errors %}is-danger{% endif %}" type="text" name="target" id="id_target" required aria-describedby="desc_target">
{% include 'snippets/form_errors.html' with errors_list=form.target.errors id="desc_target" %}
</div>
<div class="field">
<label class="label" for="id_password">{% trans "Confirm your password:" %}</label>
<input class="input {% if form.password.errors %}is-danger{% endif %}" type="password" name="password" id="id_password" required aria-describedby="desc_password">
{% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_password" %}
</div>
<button type="submit" class="button is-danger">{% trans "Move Account" %}</button>
</form>
</div>
</div>
{% endblock %}

View file

@ -29,7 +29,7 @@
</div>
<div class="column is-4">
<div class="notification">
<p class="header">{% trans "Broadcasts" %}</p>
<p class="header">{% trans "Broadcast" %}</p>
<p class="title is-5">{{ queues.broadcast|intcomma }}</p>
</div>
</div>

View file

@ -75,10 +75,17 @@
<td>{{ user.last_active_date }}</td>
<td>
{% if user.is_active %}
<span class="tag is-success" aria-hidden="true">
<span class="icon icon-check"></span>
</span>
{% trans "Active" %}
{% if user.moved_to %}
<span class="tag is-info" aria-hidden="true">
<span class="icon icon-x"></span>
</span>
{% trans "Moved" %}
{% else %}
<span class="tag is-success" aria-hidden="true">
<span class="icon icon-check"></span>
</span>
{% trans "Active" %}
{% endif %}
{% elif user.deactivation_reason == "moderator_deletion" or user.deactivation_reason == "self_deletion" %}
<span class="tag is-danger" aria-hidden="true">
<span class="icon icon-x"></span>

View file

@ -24,9 +24,15 @@
<h4 class="title is-4">{% trans "Status" %}</h4>
<div class="box is-flex-grow-1 has-text-weight-bold">
{% if user.is_active %}
<p class="notification is-success">
{% trans "Active" %}
</p>
{% if user.moved_to %}
<p class="notification is-info">
{% trans "Moved" %}
</p>
{% else %}
<p class="notification is-success">
{% trans "Active" %}
</p>
{% endif %}
{% else %}
<p class="notification is-warning">
{% trans "Inactive" %}

View file

@ -18,7 +18,22 @@
{% include 'user/books_header.html' %}
</h1>
</header>
{% if user.moved_to %}
<div class="container my-6">
<div class="notification is-info has-text-centered">
<p>
{% trans "You have have moved to" %}
<a href="{{user.moved_to}}">{% id_to_username user.moved_to %}</a>
</p>
<p> {% trans "You can undo this move to restore full functionality, but some followers may have already unfollowed this account." %}</p>
<form name="remove-alias" action="{% url 'prefs-unmove' %}" method="post">
{% csrf_token %}
<input type="hidden" name="remote_id" id="remote_id" value="{{user.moved_to}}">
<button type="submit" class="button is-small">{% trans "Undo move" %}</button>
</form>
</div>
</div>
{% else %}
<nav class="breadcrumb subtitle" aria-label="breadcrumbs">
<ul>
<li><a href="{% url 'user-feed' user|username %}">{% trans "User profile" %}</a></li>
@ -215,6 +230,7 @@
<div>
{% include 'snippets/pagination.html' with page=books path=request.path %}
</div>
{% endif %}
{% endblock %}
{% block scripts %}

View file

@ -0,0 +1,13 @@
{% load i18n %}
{% load utilities %}
{% if related_user_moved_to|user_from_remote_id not in request.user.following.all %}
<div class="field is-grouped">
<form action="{% url 'follow' %}" method="POST" class="interaction follow_{{ related_users.0.id }}" data-id="follow_{{ related_users.0.id }}">
{% csrf_token %}
<input type="hidden" name="user" value="{% id_to_username related_user_moved_to %}">
<button class="button is-link is-small" type="submit">{% trans "Follow at new account" %}</button>
</form>
</div>
{% endif %}

View file

@ -5,6 +5,7 @@
{% load markdown %}
{% load layout %}
{% load group_tags %}
{% load user_page_tags %}
{% block title %}{{ user.display_name }}{% endblock %}
@ -27,7 +28,11 @@
<div class="block">
<div class="columns">
<div class="column is-two-fifths">
{% include 'user/user_preview.html' with user=user %}
{% if user.moved_to %}
{% include 'user/moved.html' with user=user %}
{% else %}
{% include 'user/user_preview.html' with user=user %}
{% endif %}
</div>
{% if user.summary %}
@ -38,70 +43,83 @@
{% endspaceless %}
{% endif %}
</div>
{% if not is_self and request.user.is_authenticated %}
{% include 'snippets/follow_button.html' with user=user %}
{% endif %}
{% if not is_self %}
{% include 'ostatus/remote_follow_button.html' with user=user %}
{% endif %}
{% if is_self and user.active_follower_requests.all %}
<div class="follow-requests">
<h2>{% trans "Follow Requests" %}</h2>
{% for requester in user.follower_requests.all %}
<div class="row shrink">
<p>
<a href="{{ requester.local_path }}">{{ requester.display_name }}</a> ({{ requester.username }})
</p>
{% include 'snippets/follow_request_buttons.html' with user=requester %}
<div>
{% if user.moved_to %}
<div class="container my-6">
<div class="notification is-info has-text-centered">
<p><em>{{ user.localname }}</em> {% trans "has moved to" %} <a href="{{user.moved_to}}">{% id_to_username user.moved_to %}</a></p>
</div>
{% endfor %}
</div>
</div>
{% else %}
{% if not is_self and request.user.is_authenticated %}
{% include 'snippets/follow_button.html' with user=user %}
{% endif %}
{% if not is_self %}
{% include 'ostatus/remote_follow_button.html' with user=user %}
{% endif %}
{% if is_self and user.active_follower_requests.all %}
<div class="follow-requests">
<h2>{% trans "Follow Requests" %}</h2>
{% for requester in user.follower_requests.all %}
<div class="row shrink">
<p>
<a href="{{ requester.local_path }}">{{ requester.display_name }}</a> ({{ requester.username }})
</p>
{% include 'snippets/follow_request_buttons.html' with user=requester %}
</div>
{% endfor %}
</div>
{% endif %}
{% endif %}
</div>
{% block tabs %}
{% if not user.moved_to %}
{% with user|username as username %}
<nav class="tabs">
<ul>
{% url 'user-feed' user|username as url %}
<li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
<a href="{{ url }}">{% trans "Activity" %}</a>
</li>
{% url 'user-reviews-comments' user|username as url %}
<li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
<a href="{{ url }}">{% trans "Reviews and Comments" %}</a>
</li>
{% if is_self or user.goal.exists %}
{% now 'Y' as year %}
{% url 'user-goal' user|username year as url %}
<li{% if url in request.path %} class="is-active"{% endif %} id="tour-reading-goal">
<a href="{{ url }}">{% trans "Reading Goal" %}</a>
</li>
{% endif %}
{% if is_self or user|has_groups %}
{% url 'user-groups' user|username as url %}
<li{% if url in request.path %} class="is-active"{% endif %} id="tour-groups-tab">
<a href="{{ url }}">{% trans "Groups" %}</a>
</li>
{% endif %}
{% if is_self or user.list_set.exists %}
{% url 'user-lists' user|username as url %}
<li{% if url in request.path %} class="is-active"{% endif %} id="tour-lists-tab">
<a href="{{ url }}">{% trans "Lists" %}</a>
</li>
{% endif %}
{% if user.shelf_set.exists %}
{% url 'user-shelves' user|username as url %}
<li{% if url in request.path %} class="is-active"{% endif %} id="tour-shelves-tab">
<a href="{{ url }}">{% trans "Books" %}</a>
</li>
{% endif %}
</ul>
</nav>
{% endwith %}
{% endif %}
{% endblock %}
</div>
{% block tabs %}
{% with user|username as username %}
<nav class="tabs">
<ul>
{% url 'user-feed' user|username as url %}
<li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
<a href="{{ url }}">{% trans "Activity" %}</a>
</li>
{% url 'user-reviews-comments' user|username as url %}
<li{% if url == request.path or url == request.path|add:'/' %} class="is-active"{% endif %}>
<a href="{{ url }}">{% trans "Reviews and Comments" %}</a>
</li>
{% if is_self or user.goal.exists %}
{% now 'Y' as year %}
{% url 'user-goal' user|username year as url %}
<li{% if url in request.path %} class="is-active"{% endif %} id="tour-reading-goal">
<a href="{{ url }}">{% trans "Reading Goal" %}</a>
</li>
{% endif %}
{% if is_self or user|has_groups %}
{% url 'user-groups' user|username as url %}
<li{% if url in request.path %} class="is-active"{% endif %} id="tour-groups-tab">
<a href="{{ url }}">{% trans "Groups" %}</a>
</li>
{% endif %}
{% if is_self or user.list_set.exists %}
{% url 'user-lists' user|username as url %}
<li{% if url in request.path %} class="is-active"{% endif %} id="tour-lists-tab">
<a href="{{ url }}">{% trans "Lists" %}</a>
</li>
{% endif %}
{% if user.shelf_set.exists %}
{% url 'user-shelves' user|username as url %}
<li{% if url in request.path %} class="is-active"{% endif %} id="tour-shelves-tab">
<a href="{{ url }}">{% trans "Books" %}</a>
</li>
{% endif %}
</ul>
</nav>
{% endwith %}
{% endblock %}
{% block panel %}{% endblock %}
{% if not user.moved_to %}
{% block panel %}{% endblock %}
{% endif %}
{% endblock %}

View file

@ -0,0 +1,27 @@
{% load i18n %}
{% load humanize %}
{% load utilities %}
{% load markdown %}
{% load layout %}
{% load group_tags %}
<div class="media block">
<div class="media-left">
<a href="{{ user.local_path }}">
{% include 'snippets/avatar.html' with user=user large=True %}
</a>
</div>
<div class="media-content">
<p>
{% if user.name %}{{ user.name }}{% else %}{{ user.localname }}{% endif %}
{% if user.manually_approves_followers %}
<span class="icon icon-lock is-size-7" title="{% trans 'Locked account' %}">
<span class="is-sr-only">{% trans "Locked account" %}</span>
</span>
{% endif %}
</p>
<p>{{ user.username }}</p>
<p>{% blocktrans with date=user.created_date|naturaltime %}Joined {{ date }}{% endblocktrans %}</p>
</div>
</div>

View file

@ -34,11 +34,6 @@
{% trans "Directory" %}
</a>
</li>
<li role="menuitem">
<a href="{% url 'user-shelves' request.user.localname %}" class="navbar-item">
{% trans 'Your Books' %}
</a>
</li>
<li role="menuitem">
<a href="{% url 'direct-messages' %}" class="navbar-item">
{% trans "Direct Messages" %}

View file

@ -2,11 +2,13 @@
import os
import re
from uuid import uuid4
from urllib.parse import urlparse
from django import template
from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _
from django.templatetags.static import static
from bookwyrm.models import User
register = template.Library()
@ -29,6 +31,13 @@ def get_user_identifier(user):
return user.localname if user.localname else user.username
@register.filter(name="user_from_remote_id")
def get_user_identifier_from_remote_id(remote_id):
"""get the local user id from their remote id"""
user = User.objects.get(remote_id=remote_id)
return user if user else None
@register.filter(name="book_title")
def get_title(book, too_short=5):
"""display the subtitle if the title is short"""
@ -103,3 +112,16 @@ def get_isni(existing, author, autoescape=True):
f'<input type="text" name="isni-for-{author.id}" value="{isni}" hidden>'
)
return ""
@register.simple_tag(takes_context=False)
def id_to_username(user_id):
"""given an arbitrary remote id, return the username"""
if user_id:
url = urlparse(user_id)
domain = url.netloc
parts = url.path.split("/")
name = parts[-1]
value = f"{name}@{domain}"
return value

View file

@ -88,9 +88,11 @@ class User(TestCase):
"https://www.w3.org/ns/activitystreams",
"https://w3id.org/security/v1",
{
"manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
"schema": "http://schema.org#",
"PropertyValue": "schema:PropertyValue",
"alsoKnownAs": {"@id": "as:alsoKnownAs", "@type": "@id"},
"manuallyApprovesFollowers": "as:manuallyApprovesFollowers",
"movedTo": {"@id": "as:movedTo", "@type": "@id"},
"schema": "http://schema.org#",
"value": "schema:value",
},
],

View file

@ -621,6 +621,12 @@ urlpatterns = [
views.ExportArchive.as_view(),
name="prefs-export-file",
),
re_path(r"^preferences/move/?$", views.MoveUser.as_view(), name="prefs-move"),
re_path(r"^preferences/alias/?$", views.AliasUser.as_view(), name="prefs-alias"),
re_path(
r"^preferences/remove-alias/?$", views.remove_alias, name="prefs-remove-alias"
),
re_path(r"^preferences/unmove/?$", views.unmove, name="prefs-unmove"),
re_path(r"^preferences/delete/?$", views.DeleteUser.as_view(), name="prefs-delete"),
re_path(
r"^preferences/deactivate/?$",

View file

@ -39,6 +39,7 @@ from .admin.user_admin import UserAdmin, UserAdminList, ActivateUserAdmin
from .preferences.change_password import ChangePassword
from .preferences.edit_user import EditUser
from .preferences.export import Export, ExportUser, ExportArchive
from .preferences.move_user import MoveUser, AliasUser, remove_alias, unmove
from .preferences.delete_user import DeleteUser, DeactivateUser, ReactivateUser
from .preferences.block import Block, unblock
from .preferences.two_factor_auth import (

View file

@ -110,20 +110,20 @@ class ClearCeleryForm(forms.Form):
queues = forms.MultipleChoiceField(
label="Queues",
choices=[
(LOW, "Low prioirty"),
(LOW, "Low priority"),
(MEDIUM, "Medium priority"),
(HIGH, "High priority"),
(STREAMS, "Streams"),
(IMAGES, "Images"),
(SUGGESTED_USERS, "Suggested users"),
(EMAIL, "Email"),
(BROADCAST, "Broadcast"),
(CONNECTORS, "Connectors"),
(LISTS, "Lists"),
(INBOX, "Inbox"),
(EMAIL, "Email"),
(IMAGES, "Images"),
(IMPORTS, "Imports"),
(IMPORT_TRIGGERED, "Import triggered"),
(BROADCAST, "Broadcasts"),
(INBOX, "Inbox"),
(LISTS, "Lists"),
(MISC, "Misc"),
(STREAMS, "Streams"),
(SUGGESTED_USERS, "Suggested users"),
],
widget=forms.CheckboxSelectMultiple,
)

View file

@ -0,0 +1,111 @@
""" move your account somewhere else """
from django.core.exceptions import PermissionDenied
from django.contrib.auth.decorators import login_required
from django.shortcuts import get_object_or_404, redirect
from django.template.response import TemplateResponse
from django.utils.decorators import method_decorator
from django.views import View
from django.views.decorators.http import require_POST
from bookwyrm import forms, models
from bookwyrm.views.helpers import handle_remote_webfinger
# pylint: disable=no-self-use
@method_decorator(login_required, name="dispatch")
class MoveUser(View):
"""move user view"""
def get(self, request):
"""move page for a user"""
data = {
"form": forms.MoveUserForm(),
"user": request.user,
}
return TemplateResponse(request, "preferences/move_user.html", data)
def post(self, request):
"""Packing your stuff and moving house"""
form = forms.MoveUserForm(request.POST, instance=request.user)
user = models.User.objects.get(id=request.user.id)
if form.is_valid() and user.check_password(form.cleaned_data["password"]):
username = form.cleaned_data["target"]
target = handle_remote_webfinger(username)
try:
models.MoveUser.objects.create(
user=request.user, object=request.user.remote_id, target=target
)
return redirect("user-feed", username=request.user.username)
except PermissionDenied:
form.errors["target"] = [
"Set this user as an alias on the user you are moving to first"
]
data = {"form": form, "user": request.user}
return TemplateResponse(request, "preferences/move_user.html", data)
form.errors["password"] = ["Invalid password"]
data = {"form": form, "user": request.user}
return TemplateResponse(request, "preferences/move_user.html", data)
# pylint: disable=no-self-use
@method_decorator(login_required, name="dispatch")
class AliasUser(View):
"""alias user view"""
def get(self, request):
"""move page for a user"""
data = {
"form": forms.AliasUserForm(),
"user": request.user,
}
return TemplateResponse(request, "preferences/alias_user.html", data)
def post(self, request):
"""Creating a nom de plume"""
form = forms.AliasUserForm(request.POST, instance=request.user)
user = models.User.objects.get(id=request.user.id)
if form.is_valid() and user.check_password(form.cleaned_data["password"]):
username = form.cleaned_data["username"]
remote_user = handle_remote_webfinger(username)
if remote_user is None:
form.errors["username"] = ["Username does not exist"]
data = {"form": form, "user": request.user}
return TemplateResponse(request, "preferences/alias_user.html", data)
user.also_known_as.add(remote_user.id)
return redirect("prefs-alias")
form.errors["password"] = ["Invalid password"]
data = {"form": form, "user": request.user}
return TemplateResponse(request, "preferences/alias_user.html", data)
@login_required
@require_POST
def remove_alias(request):
"""remove an alias from the user profile"""
request.user.also_known_as.remove(request.POST["alias"])
return redirect("prefs-alias")
@require_POST
@login_required
def unmove(request):
"""undo a user move"""
target = get_object_or_404(models.User, remote_id=request.POST["remote_id"])
move = get_object_or_404(models.MoveUser, target=target, user=request.user)
move.delete()
request.user.moved_to = None
request.user.save(update_fields=["moved_to"], broadcast=True)
return redirect("prefs-alias")

View file

@ -21,6 +21,7 @@ def webfinger(request):
username = resource.replace("acct:", "")
user = get_object_or_404(models.User, username__iexact=username)
href = user.moved_to if user.moved_to else user.remote_id
return JsonResponse(
{
@ -29,7 +30,7 @@ def webfinger(request):
{
"rel": "self",
"type": "application/activity+json",
"href": user.remote_id,
"href": href,
},
{
"rel": "http://ostatus.org/schema/1.0/subscribe",

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 06:50\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-11 06:52\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@ -1372,8 +1372,8 @@ msgstr "Edicions de %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Edicions de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr "Edicions de <a href=\"%(work_path)s\"><i>\"%(work_title)s\"</i></a>"
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,15 +2805,10 @@ msgstr "Fitxer CSV no vàlid"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgstr[0] "\n"
"Actualment, es permet la importació de %(display_size)s llibres cada %(import_limit_reset)s dies. "
msgstr[1] ""
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] "Actualment, se't permet la importació de %(import_size_limit)s llibres cada %(import_limit_reset)s dies."
#: bookwyrm/templates/import/import.html:27
#, python-format

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 16:03\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 18:13\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: German\n"
"Language: de\n"
@ -1372,8 +1372,8 @@ msgstr "Ausgaben von %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Ausgaben von <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,15 +2805,10 @@ msgstr "Keine gültige CSV-Datei"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] "\n"
"Momentan darfst du alle %(import_limit_reset)s Tage %(import_size_limit)s Bücher importieren. "
msgstr[1] ""
#: bookwyrm/templates/import/import.html:27
#, python-format

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 19:32\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Esperanto\n"
"Language: eo\n"
@ -1372,8 +1372,8 @@ msgstr "Eldonoj de %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Eldonoj de <a href=\"%(work_path)s\">«%(work_title)s»</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr "Eldonoj de <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,14 +2805,10 @@ msgstr "La CSV-a dosiero ne validas"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgstr[0] ""
msgstr[1] ""
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] "Aktuale vi rajtas importi %(display_size)s librojn ĉiun %(import_limit_reset)s tagon."
msgstr[1] "Aktuale vi rajtas importi %(import_size_limit)s librojn ĉiujn %(import_limit_reset)s tagojn."
#: bookwyrm/templates/import/import.html:27
#, python-format

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 14:47\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-30 00:47\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Spanish\n"
"Language: es\n"
@ -1035,7 +1035,7 @@ msgstr "Tus citas"
#: bookwyrm/templates/book/book.html:360
msgid "Subjects"
msgstr "Sujetos"
msgstr "Temas"
#: bookwyrm/templates/book/book.html:372
msgid "Places"
@ -1372,8 +1372,8 @@ msgstr "Ediciones de %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Ediciones de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr "Ediciones de <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,18 +2805,10 @@ msgstr "No es un archivo CSV válido"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgstr[0] "\n"
" Actualmente, puedes importar %(display_size)s libros cada %(import_limit_reset)s días.\n"
" "
msgstr[1] "\n"
" Actualmente, puedes importar %(import_size_limit)s libros cada %(import_limit_reset)s días.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] "Actualmente, puedes importar %(display_size)s libros cada %(import_limit_reset)s días."
msgstr[1] "Actualmente, puedes importar %(import_size_limit)s libros cada %(import_limit_reset)s días."
#: bookwyrm/templates/import/import.html:27
#, python-format
@ -6162,7 +6154,7 @@ msgstr "Apoya a %(site_name)s en <a href=\"%(support_link)s\" target=\"_blank\"
#: bookwyrm/templates/snippets/footer.html:49
msgid "BookWyrm's source code is freely available. You can contribute or report issues on <a href=\"https://github.com/bookwyrm-social/bookwyrm\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">GitHub</a>."
msgstr "BookWyrm es software libre y de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/bookwyrm-social/bookwyrm\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">GitHub</a>."
msgstr "BookWyrm es software de código abierto. Puedes contribuir o reportar problemas en <a href=\"https://github.com/bookwyrm-social/bookwyrm\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">GitHub</a>."
#: bookwyrm/templates/snippets/form_rate_stars.html:20
#: bookwyrm/templates/snippets/stars.html:23

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 18:13\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Basque\n"
"Language: eu\n"
@ -1372,8 +1372,8 @@ msgstr "%(book_title)s(r)en edizioak"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a>-ren edizioak"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,12 +2805,8 @@ msgstr "CSV fitxategia ez da baliozkoa"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-29 23:37\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 18:13\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Finnish\n"
"Language: fi\n"
@ -1372,8 +1372,8 @@ msgstr "Kirjan %(book_title)s laitokset"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Kirjan <a href=\"%(work_path)s\">\"%(work_title)s\"</a> laitokset"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,12 +2805,8 @@ msgstr "Epäkelpo CSV-tiedosto"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-31 20:26\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: French\n"
"Language: fr\n"
@ -310,47 +310,47 @@ msgstr "Commentaire"
#: bookwyrm/models/report.py:85
msgid "Resolved report"
msgstr ""
msgstr "Signalement résolu"
#: bookwyrm/models/report.py:86
msgid "Re-opened report"
msgstr ""
msgstr "Ouvrir le signalement de nouveau"
#: bookwyrm/models/report.py:87
msgid "Messaged reporter"
msgstr ""
msgstr "Rapporteur contacté"
#: bookwyrm/models/report.py:88
msgid "Messaged reported user"
msgstr ""
msgstr "Compte signalé contacté"
#: bookwyrm/models/report.py:89
msgid "Suspended user"
msgstr ""
msgstr "Compte suspendu"
#: bookwyrm/models/report.py:90
msgid "Un-suspended user"
msgstr ""
msgstr "Compte nonsuspendu"
#: bookwyrm/models/report.py:91
msgid "Changed user permission level"
msgstr ""
msgstr "Niveau des permissions utilisateur modifié"
#: bookwyrm/models/report.py:92
msgid "Deleted user account"
msgstr ""
msgstr "Compte supprimé"
#: bookwyrm/models/report.py:93
msgid "Blocked domain"
msgstr ""
msgstr "Domaine bloqué"
#: bookwyrm/models/report.py:94
msgid "Approved domain"
msgstr ""
msgstr "Domaine approuvé"
#: bookwyrm/models/report.py:95
msgid "Deleted item"
msgstr ""
msgstr "Item supprimé"
#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:307
msgid "Reviews"
@ -378,7 +378,7 @@ msgstr "Accueil"
#: bookwyrm/settings.py:224
msgid "Books Timeline"
msgstr "Actualité de mes livres"
msgstr "Mon fil dactualité littéraire"
#: bookwyrm/settings.py:224
#: bookwyrm/templates/guided_tour/user_profile.html:101
@ -434,7 +434,7 @@ msgstr "Lietuvių (Lituanien)"
#: bookwyrm/settings.py:307
msgid "Nederlands (Dutch)"
msgstr ""
msgstr "PaysBas (Néerlandais)"
#: bookwyrm/settings.py:308
msgid "Norsk (Norwegian)"
@ -1076,11 +1076,11 @@ msgstr "ISBN:"
#: bookwyrm/templates/book/book_identifiers.html:12
#: bookwyrm/templates/book/book_identifiers.html:13
msgid "Copy ISBN"
msgstr ""
msgstr "Copier lISBN"
#: bookwyrm/templates/book/book_identifiers.html:16
msgid "Copied ISBN!"
msgstr ""
msgstr "ISBN copié!"
#: bookwyrm/templates/book/book_identifiers.html:23
#: bookwyrm/templates/book/edit/edit_book_form.html:352
@ -1245,7 +1245,7 @@ msgstr "Titre:"
#: bookwyrm/templates/book/edit/edit_book_form.html:35
msgid "Sort Title:"
msgstr ""
msgstr "Titre de tri :"
#: bookwyrm/templates/book/edit/edit_book_form.html:44
msgid "Subtitle:"
@ -1372,8 +1372,8 @@ msgstr "Éditions de %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Éditions de <a href=\"%(work_path)s\">« %(work_title)s»</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr "Éditions de <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2268,7 +2268,7 @@ msgstr "Responsable"
#: bookwyrm/templates/groups/user_groups.html:35
msgid "No groups found."
msgstr ""
msgstr "Aucun groupe trouvé."
#: bookwyrm/templates/guided_tour/book.html:10
msgid "This is home page of a book. Let's see what you can do while you're here!"
@ -2805,19 +2805,15 @@ msgstr "Fichier CSV non valide"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgstr[0] ""
msgstr[1] ""
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] "Vous êtes actuellement autorisé à importer %(display_size)s livres tous les %(import_limit_reset)s jours."
msgstr[1] "Vous avez le droit dimporter %(display_size)s livres chaque %(import_limit_reset)s jours actuellement."
#: bookwyrm/templates/import/import.html:27
#, python-format
msgid "You have %(display_left)s left."
msgstr ""
msgstr "Encore %(display_left)s."
#: bookwyrm/templates/import/import.html:34
#, python-format
@ -3483,7 +3479,7 @@ msgstr "Sauvegardé"
#: bookwyrm/templates/lists/list_items.html:50
msgid "No lists found."
msgstr ""
msgstr "Aucune liste trouvée."
#: bookwyrm/templates/lists/lists.html:14 bookwyrm/templates/user/lists.html:14
msgid "Your Lists"
@ -4575,7 +4571,7 @@ msgstr "Queues"
#: bookwyrm/templates/settings/celery.html:26
msgid "Streams"
msgstr ""
msgstr "Flux"
#: bookwyrm/templates/settings/celery.html:32
msgid "Broadcasts"
@ -4583,15 +4579,15 @@ msgstr "Diffusion"
#: bookwyrm/templates/settings/celery.html:38
msgid "Inbox"
msgstr ""
msgstr "Boîte de réception"
#: bookwyrm/templates/settings/celery.html:51
msgid "Import triggered"
msgstr ""
msgstr "Import déclenché"
#: bookwyrm/templates/settings/celery.html:57
msgid "Connectors"
msgstr ""
msgstr "Connecteurs"
#: bookwyrm/templates/settings/celery.html:64
#: bookwyrm/templates/settings/site.html:91
@ -4600,7 +4596,7 @@ msgstr "Images"
#: bookwyrm/templates/settings/celery.html:70
msgid "Suggested Users"
msgstr ""
msgstr "Comptes suggérés"
#: bookwyrm/templates/settings/celery.html:83
#: bookwyrm/templates/settings/invites/manage_invite_requests.html:43
@ -4610,7 +4606,7 @@ msgstr "Email"
#: bookwyrm/templates/settings/celery.html:89
msgid "Misc"
msgstr ""
msgstr "Divers"
#: bookwyrm/templates/settings/celery.html:96
msgid "Low priority"
@ -5424,22 +5420,22 @@ msgstr "Liens signalés"
#: bookwyrm/templates/settings/reports/report.html:66
msgid "Moderation Activity"
msgstr ""
msgstr "Activité de la modération"
#: bookwyrm/templates/settings/reports/report.html:73
#, python-format
msgid "<a href=\"%(user_link)s\">%(user)s</a> opened this report"
msgstr ""
msgstr "<a href=\"%(user_link)s\">%(user)s</a> a ouvert ce signalement"
#: bookwyrm/templates/settings/reports/report.html:86
#, python-format
msgid "<a href=\"%(user_link)s\">%(user)s</a> commented on this report:"
msgstr ""
msgstr "<a href=\"%(user_link)s\">%(user)s</a> a commenté ce signalement :"
#: bookwyrm/templates/settings/reports/report.html:90
#, python-format
msgid "<a href=\"%(user_link)s\">%(user)s</a> took an action on this report:"
msgstr ""
msgstr "<a href=\"%(user_link)s\">%(user)s</a> a traité ce signalement :"
#: bookwyrm/templates/settings/reports/report_header.html:6
#, python-format
@ -5463,7 +5459,7 @@ msgstr "Signalement #%(report_id)s : compte @%(username)s"
#: bookwyrm/templates/settings/reports/report_links_table.html:19
msgid "Approve domain"
msgstr ""
msgstr "Approuver le domaine"
#: bookwyrm/templates/settings/reports/report_links_table.html:26
msgid "Block domain"
@ -6053,7 +6049,7 @@ msgstr "Commentaire:"
#: bookwyrm/templates/snippets/create_status/post_options_block.html:19
msgid "Update"
msgstr ""
msgstr "Mettre à jour"
#: bookwyrm/templates/snippets/create_status/post_options_block.html:21
msgid "Post"
@ -6711,8 +6707,8 @@ msgstr "A rejoint ce serveur %(date)s"
#, python-format
msgid "%(display_count)s follower"
msgid_plural "%(display_count)s followers"
msgstr[0] ""
msgstr[1] ""
msgstr[0] "%(display_count)s abonné⋅e"
msgstr[1] "%(display_count)s abonné⋅es"
#: bookwyrm/templates/user/user_preview.html:31
#, python-format

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 04:25\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-20 13:05\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Galician\n"
"Language: gl\n"
@ -497,7 +497,7 @@ msgstr "Acerca de"
#: bookwyrm/templates/get_started/layout.html:22
#, python-format
msgid "Welcome to %(site_name)s!"
msgstr "Sexas ben vida a %(site_name)s!"
msgstr "Recibe a benvida a %(site_name)s!"
#: bookwyrm/templates/about/about.html:25
#, python-format
@ -1372,8 +1372,8 @@ msgstr "Edicións de %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Edicións de <a href=\"%(work_path)s\">%(work_title)s</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr "Edicións de <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,18 +2805,10 @@ msgstr "Non é un ficheiro CSV válido"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgstr[0] "\n"
" Actualmente, tes permiso para importar %(display_size)s libros cada %(import_limit_reset)s día.\n"
" "
msgstr[1] "\n"
" Actualmente, tes permiso para importar %(import_size_limit)s libros cada %(import_limit_reset)s días.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] "Actualmente podes importar %(display_size)s libros cada %(import_limit_reset)s día."
msgstr[1] "Actualmente podes importar %(import_size_limit)s libros cada %(import_limit_reset)s días."
#: bookwyrm/templates/import/import.html:27
#, python-format

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 09:30\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 19:32\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Italian\n"
"Language: it\n"
@ -310,15 +310,15 @@ msgstr "Commenta"
#: bookwyrm/models/report.py:85
msgid "Resolved report"
msgstr ""
msgstr "Segnalazione risolta"
#: bookwyrm/models/report.py:86
msgid "Re-opened report"
msgstr ""
msgstr "Segnalazione riaperta"
#: bookwyrm/models/report.py:87
msgid "Messaged reporter"
msgstr ""
msgstr "Messaggio inviato al segnalatore"
#: bookwyrm/models/report.py:88
msgid "Messaged reported user"
@ -326,11 +326,11 @@ msgstr ""
#: bookwyrm/models/report.py:89
msgid "Suspended user"
msgstr ""
msgstr "Utente sospeso"
#: bookwyrm/models/report.py:90
msgid "Un-suspended user"
msgstr ""
msgstr "Utente riattivato"
#: bookwyrm/models/report.py:91
msgid "Changed user permission level"
@ -1372,8 +1372,8 @@ msgstr "Edizioni di %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Edizioni di <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr "Edizioni di <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,14 +2805,10 @@ msgstr "Non è un file di csv valido"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""
msgstr[1] "Al momento puoi importare %(import_size_limit)s libri ogni %(import_limit_reset)s giorni."
#: bookwyrm/templates/import/import.html:27
#, python-format

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 18:13\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Lithuanian\n"
"Language: lt\n"
@ -1384,8 +1384,8 @@ msgstr "Knygos %(book_title)s leidimai"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> leidimai"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2825,12 +2825,8 @@ msgstr "Netinkamas CSV failas"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 08:16\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 19:32\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Dutch\n"
"Language: nl\n"
@ -1372,8 +1372,8 @@ msgstr "Edities van %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Edities van <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr "Edities van <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,16 +2805,10 @@ msgstr "Geen geldig CSV-bestand"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgstr[0] "\n"
"Momenteel mag je elke %(import_limit_reset)s dag %(display_size)s boeken importeren. "
msgstr[1] "\n"
"Momenteel mag je elke %(import_limit_reset)s dagen %(import_size_limit)s boeken importeren. "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] "Momenteel mag je %(display_size)s boek importeren elke %(import_limit_reset)s dagen."
msgstr[1] "Momenteel mag je %(import_size_limit)s boeken importeren elke %(import_limit_reset)s dagen."
#: bookwyrm/templates/import/import.html:27
#, python-format

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-09 19:52\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Norwegian\n"
"Language: no\n"
@ -314,31 +314,31 @@ msgstr ""
#: bookwyrm/models/report.py:86
msgid "Re-opened report"
msgstr ""
msgstr "Gjenåpnet rapport"
#: bookwyrm/models/report.py:87
msgid "Messaged reporter"
msgstr ""
msgstr "Melding sendt til rapportør"
#: bookwyrm/models/report.py:88
msgid "Messaged reported user"
msgstr ""
msgstr "Melding sendt til rapportert bruker"
#: bookwyrm/models/report.py:89
msgid "Suspended user"
msgstr ""
msgstr "Deaktivert bruker"
#: bookwyrm/models/report.py:90
msgid "Un-suspended user"
msgstr ""
msgstr "Reaktivert bruker"
#: bookwyrm/models/report.py:91
msgid "Changed user permission level"
msgstr ""
msgstr "Endret brukerens rettighetsnivå"
#: bookwyrm/models/report.py:92
msgid "Deleted user account"
msgstr ""
msgstr "Slettet brukerkonto"
#: bookwyrm/models/report.py:93
msgid "Blocked domain"
@ -1372,8 +1372,8 @@ msgstr "Utgaver av %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Utgaver av <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,12 +2805,8 @@ msgstr "Ikke en gyldig CSV-fil"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-03 01:28\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Polish\n"
"Language: pl\n"
@ -350,7 +350,7 @@ msgstr ""
#: bookwyrm/models/report.py:95
msgid "Deleted item"
msgstr ""
msgstr "Usunięty element"
#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:307
msgid "Reviews"
@ -434,7 +434,7 @@ msgstr "Lietuvių (Litewski)"
#: bookwyrm/settings.py:307
msgid "Nederlands (Dutch)"
msgstr ""
msgstr "Holenderski"
#: bookwyrm/settings.py:308
msgid "Norsk (Norwegian)"
@ -502,7 +502,7 @@ msgstr "Witaj na %(site_name)s!"
#: bookwyrm/templates/about/about.html:25
#, python-format
msgid "%(site_name)s is part of <em>BookWyrm</em>, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the <a href=\"https://joinbookwyrm.com/instances/\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">BookWyrm network</a>, this community is unique."
msgstr ""
msgstr "%(site_name)s jest częścią <em>BookWyrm</em>, sieci niezależnych, samostanowiących społeczności czytelników. Możesz beproblemowo wchodzić w interakcje z użytkownikami gdziekolwiek w <a href=\"https://joinbookwyrm.com/instances/\" target=\"_blank\" rel=\"nofollow noopener noreferrer\"> sieci BookWyrm</a>, ta społeczność jest wyjątkowa."
#: bookwyrm/templates/about/about.html:45
#, python-format
@ -521,7 +521,7 @@ msgstr "<a href=\"%(book_path)s\"><em>%(title)s</em></a> ma najbardziej podzielo
#: bookwyrm/templates/about/about.html:94
msgid "Track your reading, talk about books, write reviews, and discover what to read next. Always ad-free, anti-corporate, and community-oriented, BookWyrm is human-scale software, designed to stay small and personal. If you have feature requests, bug reports, or grand dreams, <a href=\"https://joinbookwyrm.com/get-involved\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">reach out</a> and make yourself heard."
msgstr ""
msgstr "Śledź swój postęp czytelniczy, rozmawiaj o książkach, pisz opinie i odkrywaj co czytać następne. Na zawsze bez reklam, antykorporacyjne i skierowane w stronę społeczności, BookWyrm jest programem dla ludzi, stworzonym, by pozostać małym i personalnym. Jeśli masz pomysł, zauważył_ś błąd, albo masz wielkie marzenie, <a href=\"https://joinbookwyrm.com/get-involved\" target=\"_blank\" rel=\"nofollow noopener noreferrer\"> złoś się </a> i pozwól się wysłuchać."
#: bookwyrm/templates/about/about.html:105
msgid "Meet your admins"
@ -672,7 +672,7 @@ msgstr "Przekłada się to na średnio %(pages)s stron na książkę."
#, python-format
msgid "(No page data was available for %(no_page_number)s book)"
msgid_plural "(No page data was available for %(no_page_number)s books)"
msgstr[0] ""
msgstr[0] "(Nie mamy informacji o liczbie stron dla książki %(no_page_number)s)"
msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
@ -778,7 +778,7 @@ msgstr "Zobacz wpis ISNI"
#: bookwyrm/templates/author/author.html:95
#: bookwyrm/templates/book/book.html:173
msgid "View on ISFDB"
msgstr ""
msgstr "Zobacz na ISFDB"
#: bookwyrm/templates/author/author.html:100
#: bookwyrm/templates/author/sync_modal.html:5
@ -1116,7 +1116,7 @@ msgstr ""
#: bookwyrm/templates/book/book_identifiers.html:51
msgid "Goodreads:"
msgstr ""
msgstr "Goodreads:"
#: bookwyrm/templates/book/cover_add_modal.html:5
msgid "Add cover"
@ -1257,7 +1257,7 @@ msgstr "Tytuł:"
#: bookwyrm/templates/book/edit/edit_book_form.html:35
msgid "Sort Title:"
msgstr ""
msgstr "Sortuj Według Tytułu:"
#: bookwyrm/templates/book/edit/edit_book_form.html:44
msgid "Subtitle:"
@ -1384,8 +1384,8 @@ msgstr "Edycje %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Edycje <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr "Edycje <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -1567,7 +1567,7 @@ msgstr ""
#: bookwyrm/templates/book/series.html:27
#, python-format
msgid "Book %(series_number)s"
msgstr ""
msgstr "Książka%(series_number)s"
#: bookwyrm/templates/book/series.html:27
msgid "Unsorted Book"
@ -2825,12 +2825,8 @@ msgstr "To nie jest prawidłowy plik CSV"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 18:50\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 18:13\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Portuguese, Brazilian\n"
"Language: pt\n"
@ -1372,8 +1372,8 @@ msgstr "Edições de %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Edições de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,12 +2805,8 @@ msgstr ""
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 18:13\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Portuguese\n"
"Language: pt\n"
@ -1372,8 +1372,8 @@ msgstr "Edições de %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Edições de <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,12 +2805,8 @@ msgstr "Não é um ficheiro CSV válido"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 18:13\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Romanian\n"
"Language: ro\n"
@ -1378,8 +1378,8 @@ msgstr "Ediții ale %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Ediții ale <a href=\"%(work_path)s\">%(work_title)s</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2815,12 +2815,8 @@ msgstr ""
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""

Binary file not shown.

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 09:30\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 18:13\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Swedish\n"
"Language: sv\n"
@ -1372,8 +1372,8 @@ msgstr "Utgåvor av %(book_title)s"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "Utgåvor av <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2805,12 +2805,8 @@ msgstr "Inte en giltig CSV-fil"
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
msgstr[1] ""

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-02 18:13\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh\n"
@ -1366,8 +1366,8 @@ msgstr "%(book_title)s 的各版本"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "<a href=\"%(work_path)s\">《%(work_title)s》</a> 的各版本"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2795,12 +2795,8 @@ msgstr ""
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
#: bookwyrm/templates/import/import.html:27

View file

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: bookwyrm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-27 01:11+0000\n"
"PO-Revision-Date: 2023-09-28 00:08\n"
"POT-Creation-Date: 2023-10-02 16:40+0000\n"
"PO-Revision-Date: 2023-10-29 07:42\n"
"Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
"Language-Team: Chinese Traditional\n"
"Language: zh\n"
@ -173,7 +173,7 @@ msgstr ""
#: bookwyrm/models/book.py:283
msgid "Audiobook"
msgstr ""
msgstr "有聲書"
#: bookwyrm/models/book.py:284
msgid "eBook"
@ -181,15 +181,15 @@ msgstr "電子書"
#: bookwyrm/models/book.py:285
msgid "Graphic novel"
msgstr ""
msgstr "圖像小說"
#: bookwyrm/models/book.py:286
msgid "Hardcover"
msgstr ""
msgstr "精裝書"
#: bookwyrm/models/book.py:287
msgid "Paperback"
msgstr ""
msgstr "平裝書"
#: bookwyrm/models/federated_server.py:11
#: bookwyrm/templates/settings/federation/edit_instance.html:55
@ -267,15 +267,15 @@ msgstr "活躍"
#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:172
msgid "Complete"
msgstr ""
msgstr "已完成"
#: bookwyrm/models/import_job.py:50
msgid "Stopped"
msgstr ""
msgstr "已停止"
#: bookwyrm/models/import_job.py:83 bookwyrm/models/import_job.py:91
msgid "Import stopped"
msgstr ""
msgstr "匯入已停止"
#: bookwyrm/models/import_job.py:363 bookwyrm/models/import_job.py:388
msgid "Error loading book"
@ -287,20 +287,20 @@ msgstr ""
#: bookwyrm/models/link.py:51
msgid "Free"
msgstr ""
msgstr "免費"
#: bookwyrm/models/link.py:52
msgid "Purchasable"
msgstr ""
msgstr "可購買"
#: bookwyrm/models/link.py:53
msgid "Available for loan"
msgstr ""
msgstr "可借閱"
#: bookwyrm/models/link.py:70
#: bookwyrm/templates/settings/link_domains/link_domains.html:23
msgid "Approved"
msgstr ""
msgstr "已核准"
#: bookwyrm/models/report.py:84
#: bookwyrm/templates/settings/reports/report.html:115
@ -310,11 +310,11 @@ msgstr "評論"
#: bookwyrm/models/report.py:85
msgid "Resolved report"
msgstr ""
msgstr "已處理的舉報"
#: bookwyrm/models/report.py:86
msgid "Re-opened report"
msgstr ""
msgstr "已重新打開的舉報"
#: bookwyrm/models/report.py:87
msgid "Messaged reporter"
@ -358,15 +358,15 @@ msgstr "書評"
#: bookwyrm/models/user.py:33
msgid "Comments"
msgstr ""
msgstr "評論"
#: bookwyrm/models/user.py:34
msgid "Quotations"
msgstr ""
msgstr "引用"
#: bookwyrm/models/user.py:35
msgid "Everything else"
msgstr ""
msgstr "所有其他內容"
#: bookwyrm/settings.py:223
msgid "Home Timeline"
@ -378,7 +378,7 @@ msgstr "主頁"
#: bookwyrm/settings.py:224
msgid "Books Timeline"
msgstr ""
msgstr "書目時間線"
#: bookwyrm/settings.py:224
#: bookwyrm/templates/guided_tour/user_profile.html:101
@ -394,7 +394,7 @@ msgstr "English英語"
#: bookwyrm/settings.py:297
msgid "Català (Catalan)"
msgstr ""
msgstr "Català (加泰羅尼亞語)"
#: bookwyrm/settings.py:298
msgid "Deutsch (German)"
@ -402,7 +402,7 @@ msgstr "Deutsch德語"
#: bookwyrm/settings.py:299
msgid "Esperanto (Esperanto)"
msgstr ""
msgstr "Esperanto (世界語)"
#: bookwyrm/settings.py:300
msgid "Español (Spanish)"
@ -410,19 +410,19 @@ msgstr "Español西班牙語"
#: bookwyrm/settings.py:301
msgid "Euskara (Basque)"
msgstr ""
msgstr "Euskara (巴斯克語)"
#: bookwyrm/settings.py:302
msgid "Galego (Galician)"
msgstr ""
msgstr "Galego (加利西亞語)"
#: bookwyrm/settings.py:303
msgid "Italiano (Italian)"
msgstr ""
msgstr "Italiano (意大利語)"
#: bookwyrm/settings.py:304
msgid "Suomi (Finnish)"
msgstr ""
msgstr "Suomi (芬蘭語)"
#: bookwyrm/settings.py:305
msgid "Français (French)"
@ -430,35 +430,35 @@ msgstr "Français法語"
#: bookwyrm/settings.py:306
msgid "Lietuvių (Lithuanian)"
msgstr ""
msgstr "Lietuvių (立陶宛語)"
#: bookwyrm/settings.py:307
msgid "Nederlands (Dutch)"
msgstr ""
msgstr "Nederlands (荷蘭語)"
#: bookwyrm/settings.py:308
msgid "Norsk (Norwegian)"
msgstr ""
msgstr "Norsk (挪威語)"
#: bookwyrm/settings.py:309
msgid "Polski (Polish)"
msgstr ""
msgstr "Polski (波蘭語)"
#: bookwyrm/settings.py:310
msgid "Português do Brasil (Brazilian Portuguese)"
msgstr ""
msgstr "Português do Brasil (巴西葡萄牙語)"
#: bookwyrm/settings.py:311
msgid "Português Europeu (European Portuguese)"
msgstr ""
msgstr "Português Europeu (歐洲葡萄牙語)"
#: bookwyrm/settings.py:312
msgid "Română (Romanian)"
msgstr ""
msgstr "Română (羅馬尼亞語)"
#: bookwyrm/settings.py:313
msgid "Svenska (Swedish)"
msgstr ""
msgstr "Svenska (瑞典語)"
#: bookwyrm/settings.py:314
msgid "简体中文 (Simplified Chinese)"
@ -491,7 +491,7 @@ msgstr "某些東西出錯了!抱歉。"
#: bookwyrm/templates/about/about.html:9
#: bookwyrm/templates/about/layout.html:35
msgid "About"
msgstr ""
msgstr "關於"
#: bookwyrm/templates/about/about.html:21
#: bookwyrm/templates/get_started/layout.html:22
@ -502,12 +502,12 @@ msgstr "歡迎來到 %(site_name)s"
#: bookwyrm/templates/about/about.html:25
#, python-format
msgid "%(site_name)s is part of <em>BookWyrm</em>, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the <a href=\"https://joinbookwyrm.com/instances/\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">BookWyrm network</a>, this community is unique."
msgstr ""
msgstr "%(site_name)s 是 <em>BookWyrm</em> 的一部分,這是一個為讀者建立的獨立、自我導向的社區網絡。雖然您可以在 <a href=\"https://joinbookwyrm.com/instances/\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">BookWyrm 網絡</a>中任何地方的用戶無縫互動,但這個社區是獨一無二的。"
#: bookwyrm/templates/about/about.html:45
#, python-format
msgid "<a href=\"%(book_path)s\"><em>%(title)s</em></a> is %(site_name)s's most beloved book, with an average rating of %(rating)s out of 5."
msgstr ""
msgstr "<a href=\"%(book_path)s\"><em>%(title)s</em></a> 是 %(site_name)s 最受歡迎的書,平均得分為 %(rating)s滿分五分"
#: bookwyrm/templates/about/about.html:64
#, python-format
@ -703,13 +703,13 @@ msgstr[0] ""
#: bookwyrm/templates/annual_summary/layout.html:211
msgid "Way to go!"
msgstr ""
msgstr "還不錯!"
#: bookwyrm/templates/annual_summary/layout.html:226
#, python-format
msgid "%(display_name)s left %(ratings_total)s rating, <br />their average rating is %(rating_average)s"
msgid_plural "%(display_name)s left %(ratings_total)s ratings, <br />their average rating is %(rating_average)s"
msgstr[0] ""
msgstr[0] "%(display_name)s 留下了 %(ratings_total)s 條評分,<br />他的平均評分是 %(rating_average)s"
#: bookwyrm/templates/annual_summary/layout.html:240
msgid "Their best rated review"
@ -732,7 +732,7 @@ msgstr "編輯作者"
#: bookwyrm/templates/author/author.html:36
msgid "Author details"
msgstr ""
msgstr "作者詳情"
#: bookwyrm/templates/author/author.html:40
#: bookwyrm/templates/author/edit_author.html:42
@ -749,7 +749,7 @@ msgstr "逝世:"
#: bookwyrm/templates/author/author.html:66
msgid "External links"
msgstr ""
msgstr "外部連結"
#: bookwyrm/templates/author/author.html:71
msgid "Wikipedia"
@ -757,23 +757,23 @@ msgstr "維基百科"
#: bookwyrm/templates/author/author.html:79
msgid "Website"
msgstr ""
msgstr "網站"
#: bookwyrm/templates/author/author.html:87
msgid "View ISNI record"
msgstr ""
msgstr "查看 ISNI 記錄"
#: bookwyrm/templates/author/author.html:95
#: bookwyrm/templates/book/book.html:173
msgid "View on ISFDB"
msgstr ""
msgstr "在 ISFDB 查看"
#: bookwyrm/templates/author/author.html:100
#: bookwyrm/templates/author/sync_modal.html:5
#: bookwyrm/templates/book/book.html:140
#: bookwyrm/templates/book/sync_modal.html:5
msgid "Load data"
msgstr ""
msgstr "載入資料"
#: bookwyrm/templates/author/author.html:104
#: bookwyrm/templates/book/book.html:144
@ -787,15 +787,15 @@ msgstr "在 Inventaire 檢視"
#: bookwyrm/templates/author/author.html:135
msgid "View on LibraryThing"
msgstr ""
msgstr "在 LibraryThing 查看"
#: bookwyrm/templates/author/author.html:143
msgid "View on Goodreads"
msgstr ""
msgstr "在 Goodreads 查看"
#: bookwyrm/templates/author/author.html:151
msgid "View ISFDB entry"
msgstr ""
msgstr "查看 ISFDB 條目"
#: bookwyrm/templates/author/author.html:166
#, python-format
@ -849,7 +849,7 @@ msgstr "維基百科連結:"
#: bookwyrm/templates/author/edit_author.html:60
msgid "Website:"
msgstr ""
msgstr "網站:"
#: bookwyrm/templates/author/edit_author.html:65
msgid "Birth date:"
@ -883,11 +883,11 @@ msgstr "Goodreads key:"
#: bookwyrm/templates/author/edit_author.html:109
msgid "ISFDB:"
msgstr ""
msgstr "ISFDB"
#: bookwyrm/templates/author/edit_author.html:116
msgid "ISNI:"
msgstr ""
msgstr "ISNI"
#: bookwyrm/templates/author/edit_author.html:126
#: bookwyrm/templates/book/book.html:220
@ -953,7 +953,7 @@ msgstr "確認"
#: bookwyrm/templates/book/book.html:20
msgid "Unable to connect to remote source."
msgstr ""
msgstr "無法連接到遠程數據源。"
#: bookwyrm/templates/book/book.html:71 bookwyrm/templates/book/book.html:72
msgid "Edit Book"
@ -961,7 +961,7 @@ msgstr "編輯書目"
#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:100
msgid "Click to add cover"
msgstr ""
msgstr "點擊添加封面"
#: bookwyrm/templates/book/book.html:106
msgid "Failed to load cover"
@ -969,7 +969,7 @@ msgstr "載入封面失敗"
#: bookwyrm/templates/book/book.html:117
msgid "Click to enlarge"
msgstr ""
msgstr "點擊放大"
#: bookwyrm/templates/book/book.html:196
#, python-format
@ -991,7 +991,7 @@ msgstr "描述:"
#, python-format
msgid "%(count)s edition"
msgid_plural "%(count)s editions"
msgstr[0] ""
msgstr[0] "%(count)s 版次"
#: bookwyrm/templates/book/book.html:246
msgid "You have shelved this edition in:"
@ -1070,11 +1070,11 @@ msgstr "ISBN:"
#: bookwyrm/templates/book/book_identifiers.html:12
#: bookwyrm/templates/book/book_identifiers.html:13
msgid "Copy ISBN"
msgstr ""
msgstr "複製ISBN"
#: bookwyrm/templates/book/book_identifiers.html:16
msgid "Copied ISBN!"
msgstr ""
msgstr "已複製ISBN"
#: bookwyrm/templates/book/book_identifiers.html:23
#: bookwyrm/templates/book/edit/edit_book_form.html:352
@ -1089,16 +1089,16 @@ msgstr "ASIN:"
#: bookwyrm/templates/book/book_identifiers.html:37
#: bookwyrm/templates/book/edit/edit_book_form.html:370
msgid "Audible ASIN:"
msgstr ""
msgstr "Audible ASIN"
#: bookwyrm/templates/book/book_identifiers.html:44
#: bookwyrm/templates/book/edit/edit_book_form.html:379
msgid "ISFDB ID:"
msgstr ""
msgstr "ISFDB ID"
#: bookwyrm/templates/book/book_identifiers.html:51
msgid "Goodreads:"
msgstr ""
msgstr "Goodreads"
#: bookwyrm/templates/book/cover_add_modal.html:5
msgid "Add cover"
@ -1116,7 +1116,7 @@ msgstr "從網址載入封面:"
#: bookwyrm/templates/book/cover_show_modal.html:6
msgid "Book cover preview"
msgstr ""
msgstr "書籍封面預覽"
#: bookwyrm/templates/book/cover_show_modal.html:11
#: bookwyrm/templates/components/inline_form.html:8
@ -1310,16 +1310,16 @@ msgstr "新增作者:"
#: bookwyrm/templates/book/edit/edit_book_form.html:211
#: bookwyrm/templates/book/edit/edit_book_form.html:214
msgid "Add Author"
msgstr ""
msgstr "新增作者"
#: bookwyrm/templates/book/edit/edit_book_form.html:212
#: bookwyrm/templates/book/edit/edit_book_form.html:215
msgid "Jane Doe"
msgstr ""
msgstr "陳大文"
#: bookwyrm/templates/book/edit/edit_book_form.html:221
msgid "Add Another Author"
msgstr ""
msgstr "新增其他作者"
#: bookwyrm/templates/book/edit/edit_book_form.html:231
#: bookwyrm/templates/shelf/shelf.html:147
@ -1337,7 +1337,7 @@ msgstr "格式:"
#: bookwyrm/templates/book/edit/edit_book_form.html:280
msgid "Format details:"
msgstr ""
msgstr "裝訂詳情:"
#: bookwyrm/templates/book/edit/edit_book_form.html:291
msgid "Pages:"
@ -1366,8 +1366,8 @@ msgstr "%(book_title)s 的各版本"
#: bookwyrm/templates/book/editions/editions.html:8
#, python-format
msgid "Editions of <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgstr "<a href=\"%(work_path)s\">\"%(work_title)s\"</a> 的各版本"
msgid "Editions of <a href=\"%(work_path)s\"><i>%(work_title)s</i></a>"
msgstr ""
#: bookwyrm/templates/book/editions/editions.html:55
msgid "Can't find the edition you're looking for?"
@ -2795,12 +2795,8 @@ msgstr ""
#: bookwyrm/templates/import/import.html:21
#, python-format
msgid "\n"
" Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day.\n"
" "
msgid_plural "\n"
" Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days.\n"
" "
msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days."
msgstr[0] ""
#: bookwyrm/templates/import/import.html:27

View file

@ -2,7 +2,7 @@ aiohttp==3.8.5
bleach==5.0.1
celery==5.2.7
colorthief==0.2.1
Django==3.2.20
Django==3.2.23
django-celery-beat==2.4.0
django-compressor==4.3.1
django-imagekit==4.1.0