From 9d52e3cf273e1fa97051b23fbc4508b2fb574005 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sat, 27 Nov 2021 18:32:50 +1100 Subject: [PATCH 01/57] add ostatus subscribe to webfinger links --- bookwyrm/views/wellknown.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bookwyrm/views/wellknown.py b/bookwyrm/views/wellknown.py index 04aa88bf2..c9b1c1299 100644 --- a/bookwyrm/views/wellknown.py +++ b/bookwyrm/views/wellknown.py @@ -30,6 +30,10 @@ def webfinger(request): "rel": "self", "type": "application/activity+json", "href": user.remote_id, + }, + { + "rel": "http://ostatus.org/schema/1.0/subscribe", + "template": f"https://{DOMAIN}/ostatus_subscribe?acct={{uri}}" } ], } From f7c8f121b9c95f0c4ef7e68a358736f1dd209067 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Nov 2021 12:43:29 +1100 Subject: [PATCH 02/57] add remote follow ostatus templates --- bookwyrm/templates/ostatus/ostatus_error.html | 57 ++++++++++ .../templates/ostatus/ostatus_subscribe.html | 48 ++++++++ bookwyrm/templates/ostatus/template.html | 106 ++++++++++++++++++ 3 files changed, 211 insertions(+) create mode 100644 bookwyrm/templates/ostatus/ostatus_error.html create mode 100644 bookwyrm/templates/ostatus/ostatus_subscribe.html create mode 100644 bookwyrm/templates/ostatus/template.html diff --git a/bookwyrm/templates/ostatus/ostatus_error.html b/bookwyrm/templates/ostatus/ostatus_error.html new file mode 100644 index 000000000..5fbc8e945 --- /dev/null +++ b/bookwyrm/templates/ostatus/ostatus_error.html @@ -0,0 +1,57 @@ +{% extends 'ostatus/template.html' %} +{% load i18n %} +{% load utilities %} +{% load markdown %} + +{% block title %} +{% if not request.user.is_authenticated %} +{% trans "Log in to " %} +{% else %} +{% trans "Error following from " %} +{% endif %} +{% endblock %} + +{% block heading %} +{% if not request.user.is_authenticated %} +Let's log in first... +{% else %} +Uh oh... +{% endif %} +{% endblock %} + +{% block content %} +
+ {% if not request.user.is_authenticated %} +
+ +
+
+
+ {% csrf_token %} +
+
+ + +
+
+ + +

{% trans "Forgot your password?" %}

+
+
+ +
+
+
+
+
+ +
+ {% elif error == 'ostatus_subscribe' %} +
+

{% blocktrans %}Something went wrong trying to follow {{ account }}{% endblocktrans %}

+

{% trans 'Check you have the correct username before trying again.' %}

+
+ {% endif %} +
+{% endblock %} diff --git a/bookwyrm/templates/ostatus/ostatus_subscribe.html b/bookwyrm/templates/ostatus/ostatus_subscribe.html new file mode 100644 index 000000000..7e929202e --- /dev/null +++ b/bookwyrm/templates/ostatus/ostatus_subscribe.html @@ -0,0 +1,48 @@ +{% extends 'ostatus/template.html' %} +{% load i18n %} +{% load utilities %} +{% load markdown %} + +{% if error or not request.user.is_authenticated %} + {% include 'ostatus/ostatus_error.html' %} +{% else %} + +{% block title %}{% trans "Follow from " %}{% endblock %} + +{% block heading %}Follow from {{ site.name }}{% endblock %} + +{% block content %} +
+
+
+ + {% include 'snippets/avatar.html' with user=user large=True %} + +
+ + + {{ user.display_name }} + {% if user.manually_approves_followers %} + + {% trans "Locked account" %} + + {% endif %} + + @{{ user|username }} + +
+ {% csrf_token %} + +
+
+
+
+ {% if user.summary %} + {{ user.summary|to_markdown|safe|truncatechars_html:120 }} + {% else %} {% endif %} +
+
+
+{% endblock %} + +{% endif %} diff --git a/bookwyrm/templates/ostatus/template.html b/bookwyrm/templates/ostatus/template.html new file mode 100644 index 000000000..2e8ee7b3c --- /dev/null +++ b/bookwyrm/templates/ostatus/template.html @@ -0,0 +1,106 @@ +{% load layout %} +{% load i18n %} +{% load static %} +{% load utilities %} +{% load markdown %} + + + + + {% block title %}{% endblock %}{{ site.name }} + + + + + + + + + + {% if preview_images_enabled is True %} + + {% else %} + + {% endif %} + + + + + + {% block opengraph_images %} + {% include 'snippets/opengraph_images.html' %} + {% endblock %} + + + + + + + +
+
+ {% block content%}{% endblock %} +
+
+ + + + + + + + + + + +{% block scripts %}{% endblock %} + + From d05e100421eaf53946e6cd420b2d32f45b35ab2f Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Nov 2021 13:28:58 +1100 Subject: [PATCH 03/57] update ostatus templates --- bookwyrm/templates/ostatus/ostatus_error.html | 19 ------------- .../templates/ostatus/ostatus_subscribe.html | 28 ++++++++++++++----- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/bookwyrm/templates/ostatus/ostatus_error.html b/bookwyrm/templates/ostatus/ostatus_error.html index 5fbc8e945..de2ba988b 100644 --- a/bookwyrm/templates/ostatus/ostatus_error.html +++ b/bookwyrm/templates/ostatus/ostatus_error.html @@ -1,23 +1,4 @@ -{% extends 'ostatus/template.html' %} {% load i18n %} -{% load utilities %} -{% load markdown %} - -{% block title %} -{% if not request.user.is_authenticated %} -{% trans "Log in to " %} -{% else %} -{% trans "Error following from " %} -{% endif %} -{% endblock %} - -{% block heading %} -{% if not request.user.is_authenticated %} -Let's log in first... -{% else %} -Uh oh... -{% endif %} -{% endblock %} {% block content %}
diff --git a/bookwyrm/templates/ostatus/ostatus_subscribe.html b/bookwyrm/templates/ostatus/ostatus_subscribe.html index 7e929202e..9d87d8ef8 100644 --- a/bookwyrm/templates/ostatus/ostatus_subscribe.html +++ b/bookwyrm/templates/ostatus/ostatus_subscribe.html @@ -3,15 +3,30 @@ {% load utilities %} {% load markdown %} -{% if error or not request.user.is_authenticated %} - {% include 'ostatus/ostatus_error.html' %} +{% block title %} +{% if not request.user.is_authenticated %} +{% trans "Log in to " %} +{% elif error %} +{% trans "Error following from " %} {% else %} +{% trans "Follow from " %} +{% endif %} +{% endblock %} -{% block title %}{% trans "Follow from " %}{% endblock %} - -{% block heading %}Follow from {{ site.name }}{% endblock %} +{% block heading %} +{% if not request.user.is_authenticated %} +{% trans "Let's log in first..." %} +{% elif error %} +{% trans 'Uh oh...' %} +{% else %} +{% blocktrans %}Follow from {{ site.name }}{% endblocktrans %} +{% endif %} +{% endblock %} {% block content %} +{% if error or not request.user.is_authenticated %} + {% include 'ostatus/ostatus_error.html' with error=error user=user account=account %} +{% else %}
@@ -43,6 +58,5 @@
-{% endblock %} - {% endif %} +{% endblock %} From 610114b4ebfcd27cde9f76244d559c226e4d78b5 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Nov 2021 16:54:25 +1100 Subject: [PATCH 04/57] rearrange ostatus templates --- .../{ostatus_error.html => error.html} | 14 +++++++- ...{ostatus_subscribe.html => subscribe.html} | 7 ++-- bookwyrm/templates/ostatus/success.html | 32 +++++++++++++++++++ 3 files changed, 49 insertions(+), 4 deletions(-) rename bookwyrm/templates/ostatus/{ostatus_error.html => error.html} (71%) rename bookwyrm/templates/ostatus/{ostatus_subscribe.html => subscribe.html} (86%) create mode 100644 bookwyrm/templates/ostatus/success.html diff --git a/bookwyrm/templates/ostatus/ostatus_error.html b/bookwyrm/templates/ostatus/error.html similarity index 71% rename from bookwyrm/templates/ostatus/ostatus_error.html rename to bookwyrm/templates/ostatus/error.html index de2ba988b..b6e858e24 100644 --- a/bookwyrm/templates/ostatus/ostatus_error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -29,10 +29,22 @@
{% elif error == 'ostatus_subscribe' %} -
+

{% blocktrans %}Something went wrong trying to follow {{ account }}{% endblocktrans %}

{% trans 'Check you have the correct username before trying again.' %}

+ {% elif error == 'is_blocked' %} +
+

{% blocktrans %}You have blocked {{ account }}{% endblocktrans %}

+
+ {% elif error == 'already_following' %} +
+

{% blocktrans %}You are already following {{ account }}{% endblocktrans %}

+
+ {% elif error == 'already_requested' %} +
+

{% blocktrans %}You have already requested to follow {{ account }}{% endblocktrans %}

+
{% endif %}
{% endblock %} diff --git a/bookwyrm/templates/ostatus/ostatus_subscribe.html b/bookwyrm/templates/ostatus/subscribe.html similarity index 86% rename from bookwyrm/templates/ostatus/ostatus_subscribe.html rename to bookwyrm/templates/ostatus/subscribe.html index 9d87d8ef8..e64be6029 100644 --- a/bookwyrm/templates/ostatus/ostatus_subscribe.html +++ b/bookwyrm/templates/ostatus/subscribe.html @@ -25,7 +25,7 @@ {% block content %} {% if error or not request.user.is_authenticated %} - {% include 'ostatus/ostatus_error.html' with error=error user=user account=account %} + {% include 'ostatus/error.html' with error=error user=user account=account %} {% else %}
@@ -45,13 +45,14 @@ @{{ user|username }} -
+ {% csrf_token %} +
-
+
{% if user.summary %} {{ user.summary|to_markdown|safe|truncatechars_html:120 }} {% else %} {% endif %} diff --git a/bookwyrm/templates/ostatus/success.html b/bookwyrm/templates/ostatus/success.html new file mode 100644 index 000000000..10b4409f3 --- /dev/null +++ b/bookwyrm/templates/ostatus/success.html @@ -0,0 +1,32 @@ +{% extends 'ostatus/template.html' %} +{% load i18n %} +{% load utilities %} + +{% block content %} +
+
+
+ + {% include 'snippets/avatar.html' with user=user large=True %} + +
+ + + {{ user.display_name }} + {% if user.manually_approves_followers %} + + {% trans "Locked account" %} + + {% endif %} + + @{{ user|username }} + +
+ + + {% include 'snippets/avatar.html' with user=user large=True %} + +
+
+
+{% endblock %} From e275b98183cdaed4e33d3e11e51307aa63187def Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Nov 2021 16:56:21 +1100 Subject: [PATCH 05/57] ostatus remote follow views --- bookwyrm/urls.py | 3 ++ bookwyrm/views/__init__.py | 2 +- bookwyrm/views/follow.py | 82 +++++++++++++++++++++++++++++++++++++- 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 514bb7e60..79e6e2a98 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -44,6 +44,7 @@ urlpatterns = [ re_path(r"^api/v1/instance/?$", views.instance_info), re_path(r"^api/v1/instance/peers/?$", views.peers), re_path(r"^opensearch.xml$", views.opensearch, name="opensearch"), + re_path(r"^ostatus_subscribe/?$", views.ostatus_follow_request), # polling updates re_path("^api/updates/notifications/?$", views.get_notification_count), re_path("^api/updates/stream/(?P[a-z]+)/?$", views.get_unread_status_count), @@ -450,4 +451,6 @@ urlpatterns = [ re_path(r"^unfollow/?$", views.unfollow, name="unfollow"), re_path(r"^accept-follow-request/?$", views.accept_follow_request), re_path(r"^delete-follow-request/?$", views.delete_follow_request), + # re_path(r"^ostatus_follow/?$", views.remote_follow), + re_path(r"^ostatus_success/?$", views.ostatus_follow_success, name="ostatus-success"), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index d79de4248..034b1830a 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -58,7 +58,7 @@ from .author import Author, EditAuthor from .directory import Directory from .discover import Discover from .feed import DirectMessage, Feed, Replies, Status -from .follow import follow, unfollow +from .follow import follow, unfollow, ostatus_follow_request, ostatus_follow_success from .follow import accept_follow_request, delete_follow_request from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers from .goal import Goal, hide_goal diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 7d91ce5b4..471fe3079 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -1,11 +1,14 @@ """ views for actions you can take in the application """ +import urllib.parse +import re from django.contrib.auth.decorators import login_required from django.db import IntegrityError from django.shortcuts import get_object_or_404, redirect +from django.template.response import TemplateResponse from django.views.decorators.http import require_POST from bookwyrm import models -from .helpers import get_user_from_username +from .helpers import get_user_from_username, handle_remote_webfinger @login_required @@ -23,9 +26,13 @@ def follow(request): except IntegrityError: pass + if request.GET.get("next"): + return redirect(request.GET.get("next", "/")) + return redirect(to_follow.local_path) + @login_required @require_POST def unfollow(request): @@ -84,3 +91,76 @@ def delete_follow_request(request): follow_request.delete() return redirect(f"/user/{request.user.localname}") + +def ostatus_follow_request(request): + """prepare an outgoing remote follow request""" + + # parse the acct URI into a user string + uri = urllib.parse.unquote(request.GET.get("acct")) + username_parts = re.search("(?:^http(?:s?):\/\/)([\w\-\.]*)(?:.)*(?:(?:\/)([\w]*))", uri) + account = f"{username_parts[2]}@{username_parts[1]}" + user = handle_remote_webfinger(account) + error = None + + if user is None or user == "": + error = "ostatus_subscribe" + + if bool(user) and user in request.user.blocks.all(): + error = "is_blocked" + + if hasattr(user, "followers") and request.user in user.followers.all(): + error = "already_following" + + if hasattr(user, "follower_requests") and request.user in user.follower_requests.all(): + error = "already_requested" + + data = { + "account": account, + "user": user, + "error": error + } + + return TemplateResponse(request, "ostatus/subscribe.html", data) + + +@login_required +def ostatus_follow_success(request): + """display success message for remote follow""" + user = get_user_from_username(request.user, request.GET.get("following")) + data = { + "account": user.name, + "user": user, + "error": None + } + return TemplateResponse(request, "ostatus/success.html", data) + +@login_required +@require_POST +def remote_follow(request): + """complete an incoming remote follow request""" + + # this is triggered from remote follow form + # attempt the follow request + # on success [[return success page]] + # on fail return [[ostatus_error]] + + +""" +REQUEST TO FOLLOW FROM REMOTE ACCOUNT +1. click remote follow button [default checked option to open new window] +2. popup new small window +3. enter user acct to follow from (user@domain.tld) and submit form +5. GET {base_url}/.well-known/webfinger/?resource=acct:{user@domain.tld} +6. parse json for links +6.1 rel="http://ostatus.org/schema/1.0/subscribe" and return 'template' +6.2 rel="self" and return href +7. replace '{uri}' in the returned string with self.href +8. GET the URI at 6.1 + +REQUEST TO FOLLOW FROM LOCAL ACCOUNT +1. receive request to /ostatus_subscribe?acct={uri} +2. check user is logged in and present confirmation screen (remote_follow_request) +3. On confirmation, 3. parse user into info needed for a normal follow +4. send follow request, on 200 response display success else display error (remote_follow) +5. Include button inviting to close window +""" From 2e428e6ea1687c15c87856f682a572cdff098e9c Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Nov 2021 20:08:54 +1100 Subject: [PATCH 06/57] add remote follow templates --- bookwyrm/templates/ostatus/remote_follow.html | 43 +++++++++++++++++++ .../ostatus/remote_follow_button.html | 16 +++++++ 2 files changed, 59 insertions(+) create mode 100644 bookwyrm/templates/ostatus/remote_follow.html create mode 100644 bookwyrm/templates/ostatus/remote_follow_button.html diff --git a/bookwyrm/templates/ostatus/remote_follow.html b/bookwyrm/templates/ostatus/remote_follow.html new file mode 100644 index 000000000..ea8881e42 --- /dev/null +++ b/bookwyrm/templates/ostatus/remote_follow.html @@ -0,0 +1,43 @@ +{% extends 'ostatus/template.html' %} +{% load i18n %} +{% load utilities %} + +{% block content %} +
+
+

{% blocktrans %}Follow {{ user.display_name }} on the fediverse{% endblocktrans %}

+
+
+
+ + {% include 'snippets/avatar.html' with user=user large=True %} + +
+ + + {{ user.display_name }} + {% if user.manually_approves_followers %} + + {% trans "Locked account" %} + + {% endif %} + + @{{ user|username }} + +

Follow {{ user.name }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.

+
+
+
+
+
+
+
+ {% csrf_token %} + + + +
+
+
+
+{% endblock %} diff --git a/bookwyrm/templates/ostatus/remote_follow_button.html b/bookwyrm/templates/ostatus/remote_follow_button.html new file mode 100644 index 000000000..4789d3064 --- /dev/null +++ b/bookwyrm/templates/ostatus/remote_follow_button.html @@ -0,0 +1,16 @@ +{% load i18n %} +{% if request.user == user %} +{% else %} + +
+
+
+ {% csrf_token %} + + +
+
+
+{% endif %} From 6e7d23c1aec60317e7989aaf5cafa08112d49cc0 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Nov 2021 20:09:29 +1100 Subject: [PATCH 07/57] add remote follow button --- bookwyrm/templates/user/layout.html | 3 +++ bookwyrm/urls.py | 3 ++- bookwyrm/views/__init__.py | 2 +- bookwyrm/views/follow.py | 34 +++++++++++++++-------------- bookwyrm/views/helpers.py | 27 +++++++++++++++++++++++ 5 files changed, 51 insertions(+), 18 deletions(-) diff --git a/bookwyrm/templates/user/layout.html b/bookwyrm/templates/user/layout.html index d7557ae7b..03e3dfce8 100755 --- a/bookwyrm/templates/user/layout.html +++ b/bookwyrm/templates/user/layout.html @@ -39,6 +39,9 @@ {% 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.follower_requests.all %}
diff --git a/bookwyrm/templates/ostatus/template.html b/bookwyrm/templates/ostatus/template.html index 2e8ee7b3c..cb922f9bd 100644 --- a/bookwyrm/templates/ostatus/template.html +++ b/bookwyrm/templates/ostatus/template.html @@ -92,7 +92,6 @@ - diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 48fe0f6cc..45837ec13 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -453,5 +453,7 @@ urlpatterns = [ re_path(r"^delete-follow-request/?$", views.delete_follow_request), re_path(r"^ostatus_follow/?$", views.remote_follow, name="remote-follow"), re_path(r"^remote_follow/?$", views.remote_follow_page, name="remote-follow-page"), - re_path(r"^ostatus_success/?$", views.ostatus_follow_success, name="ostatus-success"), + re_path( + r"^ostatus_success/?$", views.ostatus_follow_success, name="ostatus-success" + ), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 3b5bf8232..4a92578c2 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -58,7 +58,14 @@ from .author import Author, EditAuthor from .directory import Directory from .discover import Discover from .feed import DirectMessage, Feed, Replies, Status -from .follow import follow, unfollow, ostatus_follow_request, ostatus_follow_success, remote_follow, remote_follow_page +from .follow import ( + follow, + unfollow, + ostatus_follow_request, + ostatus_follow_success, + remote_follow, + remote_follow_page, +) from .follow import accept_follow_request, delete_follow_request from .get_started import GetStartedBooks, GetStartedProfile, GetStartedUsers from .goal import Goal, hide_goal diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 2ebe0ce04..58d979854 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -8,7 +8,11 @@ from django.template.response import TemplateResponse from django.views.decorators.http import require_POST from bookwyrm import models -from .helpers import get_user_from_username, handle_remote_webfinger, subscribe_remote_webfinger +from .helpers import ( + get_user_from_username, + handle_remote_webfinger, + subscribe_remote_webfinger, +) @login_required @@ -32,7 +36,6 @@ def follow(request): return redirect(to_follow.local_path) - @login_required @require_POST def unfollow(request): @@ -92,12 +95,15 @@ def delete_follow_request(request): follow_request.delete() return redirect(f"/user/{request.user.localname}") + def ostatus_follow_request(request): """prepare an outgoing remote follow request""" # parse the acct URI into a user string uri = urllib.parse.unquote(request.GET.get("acct")) - username_parts = re.search("(?:^http(?:s?):\/\/)([\w\-\.]*)(?:.)*(?:(?:\/)([\w]*))", uri) + username_parts = re.search( + "(?:^http(?:s?):\/\/)([\w\-\.]*)(?:.)*(?:(?:\/)([\w]*))", uri + ) account = f"{username_parts[2]}@{username_parts[1]}" user = handle_remote_webfinger(account) error = None @@ -111,14 +117,13 @@ def ostatus_follow_request(request): if hasattr(user, "followers") and request.user in user.followers.all(): error = "already_following" - if hasattr(user, "follower_requests") and request.user in user.follower_requests.all(): + if ( + hasattr(user, "follower_requests") + and request.user in user.follower_requests.all() + ): error = "already_requested" - data = { - "account": account, - "user": user, - "error": error - } + data = {"account": account, "user": user, "error": error} return TemplateResponse(request, "ostatus/subscribe.html", data) @@ -127,21 +132,17 @@ def ostatus_follow_request(request): def ostatus_follow_success(request): """display success message for remote follow""" user = get_user_from_username(request.user, request.GET.get("following")) - data = { - "account": user.name, - "user": user, - "error": None - } + data = {"account": user.name, "user": user, "error": None} return TemplateResponse(request, "ostatus/success.html", data) + def remote_follow_page(request): """Display remote follow page""" user = get_user_from_username(request.user, request.GET.get("user")) - data = { - "user": user - } + data = {"user": user} return TemplateResponse(request, "ostatus/remote_follow.html", data) + @require_POST def remote_follow(request): """direct user to follow from remote account using ostatus subscribe protocol""" diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 607181489..650087ec0 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -84,6 +84,7 @@ def handle_remote_webfinger(query): return None return user + def subscribe_remote_webfinger(query): """get subscribe template from other servers""" template = None @@ -112,6 +113,7 @@ def subscribe_remote_webfinger(query): return template + def get_edition(book_id): """look up a book in the db and return an edition""" book = models.Book.objects.select_subclasses().get(id=book_id) diff --git a/bookwyrm/views/wellknown.py b/bookwyrm/views/wellknown.py index c9b1c1299..03e619dfd 100644 --- a/bookwyrm/views/wellknown.py +++ b/bookwyrm/views/wellknown.py @@ -32,9 +32,9 @@ def webfinger(request): "href": user.remote_id, }, { - "rel": "http://ostatus.org/schema/1.0/subscribe", - "template": f"https://{DOMAIN}/ostatus_subscribe?acct={{uri}}" - } + "rel": "http://ostatus.org/schema/1.0/subscribe", + "template": f"https://{DOMAIN}/ostatus_subscribe?acct={{uri}}", + }, ], } ) From 6abf5d69107c4440e1809e34458e169e823d7e92 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 28 Nov 2021 21:48:03 +1100 Subject: [PATCH 10/57] add submit button to remote follow form --- bookwyrm/templates/ostatus/remote_follow.html | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/templates/ostatus/remote_follow.html b/bookwyrm/templates/ostatus/remote_follow.html index ea8881e42..3ff769432 100644 --- a/bookwyrm/templates/ostatus/remote_follow.html +++ b/bookwyrm/templates/ostatus/remote_follow.html @@ -36,6 +36,7 @@ + From feaf0d5e52ec8d2887b2d14e3bcd3bfc49446cf4 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 07:11:57 +1100 Subject: [PATCH 11/57] handle username errors in remote follow form --- bookwyrm/templates/ostatus/error.html | 5 +++++ bookwyrm/views/follow.py | 3 +++ 2 files changed, 8 insertions(+) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index b6e858e24..cb1aec408 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -33,6 +33,11 @@

{% blocktrans %}Something went wrong trying to follow {{ account }}{% endblocktrans %}

{% trans 'Check you have the correct username before trying again.' %}

+ {% elif error == 'remote_subscribe' %} +
+

{% blocktrans %}Something went wrong trying to follow from {{ account }}{% endblocktrans %}

+

{% trans 'Check you have the correct username before trying again.' %}

+
{% elif error == 'is_blocked' %}

{% blocktrans %}You have blocked {{ account }}{% endblocktrans %}

diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 58d979854..fcab5d6ac 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -148,5 +148,8 @@ def remote_follow(request): """direct user to follow from remote account using ostatus subscribe protocol""" remote_user = request.POST.get("remote_user") template = subscribe_remote_webfinger(remote_user) + if template is None: + data = {"account": remote_user, "user": None, "error": "remote_subscribe"} + return TemplateResponse(request, "ostatus/subscribe.html", data) url = template.replace("{uri}", request.POST.get("user")) return redirect(url) From 46f32944315b9add4f04776668bbf7c2117efc12 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 07:56:09 +1100 Subject: [PATCH 12/57] fix remote follow template --- bookwyrm/templates/ostatus/remote_follow.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/templates/ostatus/remote_follow.html b/bookwyrm/templates/ostatus/remote_follow.html index 3ff769432..98442547e 100644 --- a/bookwyrm/templates/ostatus/remote_follow.html +++ b/bookwyrm/templates/ostatus/remote_follow.html @@ -24,7 +24,7 @@ @{{ user|username }} -

Follow {{ user.name }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.

+

Follow {{ user.display_name }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.

From c7242b6022c9e70725e9445255fe766ecedee2ed Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 07:56:31 +1100 Subject: [PATCH 13/57] add popup warning --- bookwyrm/templates/ostatus/remote_follow_button.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/ostatus/remote_follow_button.html b/bookwyrm/templates/ostatus/remote_follow_button.html index 2848fde0e..fc869229a 100644 --- a/bookwyrm/templates/ostatus/remote_follow_button.html +++ b/bookwyrm/templates/ostatus/remote_follow_button.html @@ -4,9 +4,12 @@
- + {% blocktrans with username=user.localname %}Follow on Fediverse{% endblocktrans %}
+

+ {% trans 'This link opens in a pop-up window' %} +

{% endif %} From 4a9713b812d65d2bc2f9ef4ecbc1eeec8f6a617f Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 08:03:01 +1100 Subject: [PATCH 14/57] fix template for remote follower error --- bookwyrm/templates/ostatus/error.html | 2 +- bookwyrm/templates/ostatus/subscribe.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index cb1aec408..442c35b9e 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -2,7 +2,7 @@ {% block content %}
- {% if not request.user.is_authenticated %} + {% if not request.user.is_authenticated and not error == 'remote_subscribe' %}
diff --git a/bookwyrm/templates/ostatus/subscribe.html b/bookwyrm/templates/ostatus/subscribe.html index 66245ffc9..7bf6299a6 100644 --- a/bookwyrm/templates/ostatus/subscribe.html +++ b/bookwyrm/templates/ostatus/subscribe.html @@ -14,7 +14,7 @@ {% endblock %} {% block heading %} -{% if not request.user.is_authenticated %} +{% if not request.user.is_authenticated and not error == 'remote_subscribe' %} {% trans "Let's log in first..." %} {% elif error %} {% trans 'Uh oh...' %} From 587b0194fc385821eb4d46afed2c35308eea1c61 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 15:33:18 +1100 Subject: [PATCH 15/57] bugfix remote follows --- bookwyrm/views/follow.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index fcab5d6ac..1555fc5e4 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -98,8 +98,6 @@ def delete_follow_request(request): def ostatus_follow_request(request): """prepare an outgoing remote follow request""" - - # parse the acct URI into a user string uri = urllib.parse.unquote(request.GET.get("acct")) username_parts = re.search( "(?:^http(?:s?):\/\/)([\w\-\.]*)(?:.)*(?:(?:\/)([\w]*))", uri @@ -111,7 +109,7 @@ def ostatus_follow_request(request): if user is None or user == "": error = "ostatus_subscribe" - if bool(user) and user in request.user.blocks.all(): + if hasattr(request.user, "blocks") and user in request.user.blocks.all(): error = "is_blocked" if hasattr(user, "followers") and request.user in user.followers.all(): @@ -151,5 +149,8 @@ def remote_follow(request): if template is None: data = {"account": remote_user, "user": None, "error": "remote_subscribe"} return TemplateResponse(request, "ostatus/subscribe.html", data) - url = template.replace("{uri}", request.POST.get("user")) + user = get_object_or_404( + models.User, id=request.POST.get("user") + ) + url = template.replace("{uri}", urllib.parse.quote(user.remote_id)) return redirect(url) From 7b65edf10b59d698e63dcadb7302166304b5c448 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 15:33:26 +1100 Subject: [PATCH 16/57] improve and bugfix remote follow templates --- bookwyrm/templates/ostatus/error.html | 5 ++++- bookwyrm/templates/ostatus/remote_follow.html | 6 +++--- bookwyrm/templates/ostatus/subscribe.html | 4 ++-- bookwyrm/templates/ostatus/success.html | 11 +++++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index 442c35b9e..91bb6a0a4 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -7,7 +7,7 @@
-
+ {% csrf_token %}
@@ -52,4 +52,7 @@
{% endif %}
+
+ Close window +
{% endblock %} diff --git a/bookwyrm/templates/ostatus/remote_follow.html b/bookwyrm/templates/ostatus/remote_follow.html index 98442547e..ef8f1b90f 100644 --- a/bookwyrm/templates/ostatus/remote_follow.html +++ b/bookwyrm/templates/ostatus/remote_follow.html @@ -24,7 +24,7 @@ @{{ user|username }} -

Follow {{ user.display_name }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.

+

{% blocktrans %}Follow {{ user.display_name }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.{% endblocktrans %}

@@ -33,8 +33,8 @@
{% csrf_token %} - - + + diff --git a/bookwyrm/templates/ostatus/subscribe.html b/bookwyrm/templates/ostatus/subscribe.html index 7bf6299a6..d41ce6743 100644 --- a/bookwyrm/templates/ostatus/subscribe.html +++ b/bookwyrm/templates/ostatus/subscribe.html @@ -19,7 +19,7 @@ {% elif error %} {% trans 'Uh oh...' %} {% else %} -{% blocktrans %}Follow from {{ site.name }}{% endblocktrans %} +{% trans 'Follow from ' %}{{ site.name }} {% endif %} {% endblock %} @@ -48,7 +48,7 @@
{% csrf_token %} - +
diff --git a/bookwyrm/templates/ostatus/success.html b/bookwyrm/templates/ostatus/success.html index 10b4409f3..d8c311829 100644 --- a/bookwyrm/templates/ostatus/success.html +++ b/bookwyrm/templates/ostatus/success.html @@ -22,11 +22,14 @@ @{{ user|username }} - - - {% include 'snippets/avatar.html' with user=user large=True %} - +

+ + {% trans 'You are now following ' %}{{ user.display_name }}! +

+
+ Close window +
{% endblock %} From 3d73ea92e85b84bfc4f7e2fc5a8fab5179767e00 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 18:08:25 +1100 Subject: [PATCH 17/57] handle user blocks properly --- bookwyrm/templates/ostatus/error.html | 4 +++ bookwyrm/views/follow.py | 36 +++++++++++++++++++-------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index 91bb6a0a4..8a047172f 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -42,6 +42,10 @@

{% blocktrans %}You have blocked {{ account }}{% endblocktrans %}

+ {% elif error == 'has_blocked' %} +
+

{% blocktrans %}{{ account }} has blocked you{% endblocktrans %}

+
{% elif error == 'already_following' %}

{% blocktrans %}You are already following {{ account }}{% endblocktrans %}

diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 1555fc5e4..83b900354 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -109,17 +109,33 @@ def ostatus_follow_request(request): if user is None or user == "": error = "ostatus_subscribe" - if hasattr(request.user, "blocks") and user in request.user.blocks.all(): - error = "is_blocked" + # don't do these checks for AnonymousUser before they sign in + if request.user.id: - if hasattr(user, "followers") and request.user in user.followers.all(): - error = "already_following" - - if ( - hasattr(user, "follower_requests") - and request.user in user.follower_requests.all() - ): - error = "already_requested" + # you have blocked them so you probably don't want to follow + if ( + hasattr(request.user, "blocks") + and user in request.user.blocks.all() + ): + error = "is_blocked" + # they have blocked you + if ( + hasattr(user, "blocks") + and request.user in user.blocks.all() + ): + error = "has_blocked" + # you're already following them + if ( + hasattr(user, "followers") + and request.user in user.followers.all() + ): + error = "already_following" + # you're not following yet but you already asked + if ( + hasattr(user, "follower_requests") + and request.user in user.follower_requests.all() + ): + error = "already_requested" data = {"account": account, "user": user, "error": error} From f5d9a204ebfd0045a04046200feaeaa3b21d68d8 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 19:37:56 +1100 Subject: [PATCH 18/57] clean up ostatus templates --- bookwyrm/templates/ostatus/error.html | 46 +++--- bookwyrm/templates/ostatus/remote_follow.html | 67 +++++---- bookwyrm/templates/ostatus/success.html | 46 +++--- bookwyrm/templates/ostatus/template.html | 133 +++++++++--------- 4 files changed, 145 insertions(+), 147 deletions(-) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index 8a047172f..085fa3454 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -4,30 +4,28 @@
{% if not request.user.is_authenticated and not error == 'remote_subscribe' %}
- -
-
-
- {% csrf_token %} -
-
- - -
-
- - -

{% trans "Forgot your password?" %}

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

{% trans "Forgot your password?" %}

+
+
+ +
+
+
+
+
+
{% elif error == 'ostatus_subscribe' %}

{% blocktrans %}Something went wrong trying to follow {{ account }}{% endblocktrans %}

diff --git a/bookwyrm/templates/ostatus/remote_follow.html b/bookwyrm/templates/ostatus/remote_follow.html index ef8f1b90f..6a4e565ac 100644 --- a/bookwyrm/templates/ostatus/remote_follow.html +++ b/bookwyrm/templates/ostatus/remote_follow.html @@ -4,41 +4,40 @@ {% block content %}
-
-

{% blocktrans %}Follow {{ user.display_name }} on the fediverse{% endblocktrans %}

-
-
-
- - {% include 'snippets/avatar.html' with user=user large=True %} - -
- - - {{ user.display_name }} - {% if user.manually_approves_followers %} - - {% trans "Locked account" %} - - {% endif %} - - @{{ user|username }} - -

{% blocktrans %}Follow {{ user.display_name }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.{% endblocktrans %}

-
-
+
+

{% blocktrans %}Follow {{ user.display_name }} on the fediverse{% endblocktrans %}

+
+
+
+ + {% include 'snippets/avatar.html' with user=user large=True %} + +
+ + + {{ user.display_name }} + {% if user.manually_approves_followers %} + + {% trans "Locked account" %} + + {% endif %} + + @{{ user|username }} + +

{% blocktrans %}Follow {{ user.display_name }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.{% endblocktrans %}

+
+
-
-
-
- {% csrf_token %} - - - - -
-
-
+
+
+
+ {% csrf_token %} + + + + +
+
{% endblock %} diff --git a/bookwyrm/templates/ostatus/success.html b/bookwyrm/templates/ostatus/success.html index d8c311829..89f662735 100644 --- a/bookwyrm/templates/ostatus/success.html +++ b/bookwyrm/templates/ostatus/success.html @@ -4,29 +4,29 @@ {% block content %}
-
-
- - {% include 'snippets/avatar.html' with user=user large=True %} - -
- - - {{ user.display_name }} - {% if user.manually_approves_followers %} - - {% trans "Locked account" %} - - {% endif %} - - @{{ user|username }} - -
-
-

- - {% trans 'You are now following ' %}{{ user.display_name }}! -

+
+
+ + {% include 'snippets/avatar.html' with user=user large=True %} + +
+ + + {{ user.display_name }} + {% if user.manually_approves_followers %} + + {% trans "Locked account" %} + + {% endif %} + + @{{ user|username }} + +
+
+

+ + {% trans 'You are now following ' %}{{ user.display_name }}! +

diff --git a/bookwyrm/templates/ostatus/template.html b/bookwyrm/templates/ostatus/template.html index cb922f9bd..1dbb32a36 100644 --- a/bookwyrm/templates/ostatus/template.html +++ b/bookwyrm/templates/ostatus/template.html @@ -7,45 +7,46 @@ - {% block title %}{% endblock %}{{ site.name }} - - - - + {% block title %}{% endblock %}{{ site.name }} + + + + - + - + - {% if preview_images_enabled is True %} - - {% else %} - - {% endif %} - - - - + {% if preview_images_enabled is True %} + + {% else %} + + {% endif %} + + + + - {% block opengraph_images %} - {% include 'snippets/opengraph_images.html' %} - {% endblock %} - - + {% block opengraph_images %} + {% include 'snippets/opengraph_images.html' %} + {% endblock %} + + @@ -57,43 +58,43 @@ From 9a3ec4362b85ce7920632ff6a74ee44f4b99d9ff Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 19:45:52 +1100 Subject: [PATCH 19/57] code cleanup --- bookwyrm/static/js/bookwyrm.js | 13 ++++++------- bookwyrm/views/follow.py | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/bookwyrm/static/js/bookwyrm.js b/bookwyrm/static/js/bookwyrm.js index 86a021af8..ebac78a91 100644 --- a/bookwyrm/static/js/bookwyrm.js +++ b/bookwyrm/static/js/bookwyrm.js @@ -376,12 +376,11 @@ let BookWyrm = new class { * @param {string} windowName windowName * @return {undefined} */ - displayPopUp(url, windowName){ - - window.open( - url, - windowName, - "left=100,top=100,width=430,height=600" - ) + displayPopUp(url, windowName) { + window.open( + url, + windowName, + "left=100,top=100,width=430,height=600" + ); } }(); diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 83b900354..11bff60a3 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -100,7 +100,7 @@ def ostatus_follow_request(request): """prepare an outgoing remote follow request""" uri = urllib.parse.unquote(request.GET.get("acct")) username_parts = re.search( - "(?:^http(?:s?):\/\/)([\w\-\.]*)(?:.)*(?:(?:\/)([\w]*))", uri + r"(?:^http(?:s?):\/\/)([\w\-\.]*)(?:.)*(?:(?:\/)([\w]*))", uri ) account = f"{username_parts[2]}@{username_parts[1]}" user = handle_remote_webfinger(account) From 1211fda7ff82a2eca793981cb5fbddda4643af5b Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 19:53:13 +1100 Subject: [PATCH 20/57] beautiful code quality, pylint will be pleased --- bookwyrm/templates/ostatus/template.html | 2 +- bookwyrm/views/follow.py | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/bookwyrm/templates/ostatus/template.html b/bookwyrm/templates/ostatus/template.html index 1dbb32a36..7d670b0a5 100644 --- a/bookwyrm/templates/ostatus/template.html +++ b/bookwyrm/templates/ostatus/template.html @@ -33,7 +33,7 @@ diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 11bff60a3..7af8b0db7 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -113,22 +113,13 @@ def ostatus_follow_request(request): if request.user.id: # you have blocked them so you probably don't want to follow - if ( - hasattr(request.user, "blocks") - and user in request.user.blocks.all() - ): + if hasattr(request.user, "blocks") and user in request.user.blocks.all(): error = "is_blocked" # they have blocked you - if ( - hasattr(user, "blocks") - and request.user in user.blocks.all() - ): + if hasattr(user, "blocks") and request.user in user.blocks.all(): error = "has_blocked" # you're already following them - if ( - hasattr(user, "followers") - and request.user in user.followers.all() - ): + if hasattr(user, "followers") and request.user in user.followers.all(): error = "already_following" # you're not following yet but you already asked if ( @@ -165,8 +156,6 @@ def remote_follow(request): if template is None: data = {"account": remote_user, "user": None, "error": "remote_subscribe"} return TemplateResponse(request, "ostatus/subscribe.html", data) - user = get_object_or_404( - models.User, id=request.POST.get("user") - ) + user = get_object_or_404(models.User, id=request.POST.get("user")) url = template.replace("{uri}", urllib.parse.quote(user.remote_id)) return redirect(url) From 1d90ca6fa62362e840ca2ba9fd0306b0ea8a2752 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 20:35:26 +1100 Subject: [PATCH 21/57] keep footer DRY Pulls footer and scripts after it into a separate component template. This allows ostatus/template to use the footer without having to use layout without repeating the same code. --- bookwyrm/templates/components/footer.html | 49 +++++++++++++++++++++++ bookwyrm/templates/layout.html | 45 +-------------------- bookwyrm/templates/ostatus/template.html | 48 +--------------------- 3 files changed, 51 insertions(+), 91 deletions(-) create mode 100644 bookwyrm/templates/components/footer.html diff --git a/bookwyrm/templates/components/footer.html b/bookwyrm/templates/components/footer.html new file mode 100644 index 000000000..047d7bfad --- /dev/null +++ b/bookwyrm/templates/components/footer.html @@ -0,0 +1,49 @@ +{% load layout %} +{% load i18n %} +{% load static %} + + + + + + + + + +{% block scripts %}{% endblock %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index f2d04f961..50a7ae6d1 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -222,50 +222,7 @@
- +{% include 'components/footer.html' %} - - - - - - -{% block scripts %}{% endblock %} diff --git a/bookwyrm/templates/ostatus/template.html b/bookwyrm/templates/ostatus/template.html index 7d670b0a5..04e432aaa 100644 --- a/bookwyrm/templates/ostatus/template.html +++ b/bookwyrm/templates/ostatus/template.html @@ -48,59 +48,13 @@
- -
{% block content%}{% endblock %}
- - +{% include 'components/footer.html' %} - - - - - - -{% block scripts %}{% endblock %} From 1636dfd308ca8eb8827a6aa8f6be9587bc902656 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 29 Nov 2021 20:42:16 +1100 Subject: [PATCH 22/57] fix footer indentation --- bookwyrm/templates/components/footer.html | 68 +++++++++++------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/bookwyrm/templates/components/footer.html b/bookwyrm/templates/components/footer.html index 047d7bfad..df11e9d55 100644 --- a/bookwyrm/templates/components/footer.html +++ b/bookwyrm/templates/components/footer.html @@ -3,43 +3,43 @@ {% load static %} From 386371baa3ee85e54c1f918c41297dc3c0681120 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Tue, 30 Nov 2021 12:42:52 +1100 Subject: [PATCH 23/57] improve a11y on notifications Also change close link to a button. Co-authored-by: Joachim --- bookwyrm/templates/ostatus/error.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index 085fa3454..99a2a9acb 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -27,34 +27,34 @@
{% elif error == 'ostatus_subscribe' %} -
+

{% blocktrans %}Something went wrong trying to follow {{ account }}{% endblocktrans %}

{% trans 'Check you have the correct username before trying again.' %}

{% elif error == 'remote_subscribe' %} -
+

{% blocktrans %}Something went wrong trying to follow from {{ account }}{% endblocktrans %}

{% trans 'Check you have the correct username before trying again.' %}

{% elif error == 'is_blocked' %} -
+

{% blocktrans %}You have blocked {{ account }}{% endblocktrans %}

{% elif error == 'has_blocked' %} -
+

{% blocktrans %}{{ account }} has blocked you{% endblocktrans %}

{% elif error == 'already_following' %} -
+

{% blocktrans %}You are already following {{ account }}{% endblocktrans %}

{% elif error == 'already_requested' %} -
+

{% blocktrans %}You have already requested to follow {{ account }}{% endblocktrans %}

{% endif %}
- Close window +
{% endblock %} From 4ee234258a15edb56485306480cb141f291e6c1b Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Tue, 30 Nov 2021 12:47:04 +1100 Subject: [PATCH 24/57] remove OG meta in ostatus template It's just a temporary popup so would be weird to share and just gunks things up. Co-authored-by: Joachim --- bookwyrm/templates/ostatus/template.html | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/bookwyrm/templates/ostatus/template.html b/bookwyrm/templates/ostatus/template.html index 04e432aaa..68284a35f 100644 --- a/bookwyrm/templates/ostatus/template.html +++ b/bookwyrm/templates/ostatus/template.html @@ -17,20 +17,6 @@ - {% if preview_images_enabled is True %} - - {% else %} - - {% endif %} - - - - - - {% block opengraph_images %} - {% include 'snippets/opengraph_images.html' %} - {% endblock %} - - - - - - -{% block scripts %}{% endblock %} diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html index 50a7ae6d1..bc85e678e 100644 --- a/bookwyrm/templates/layout.html +++ b/bookwyrm/templates/layout.html @@ -222,7 +222,51 @@
-{% include 'components/footer.html' %} + + + + + + + + +{% block scripts %}{% endblock %} From 7848ff792766b67d171e27dcab13f485cbf23bd4 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Tue, 30 Nov 2021 20:46:41 +1100 Subject: [PATCH 26/57] fix translation strings --- bookwyrm/templates/ostatus/remote_follow.html | 11 +++++++---- bookwyrm/templates/ostatus/subscribe.html | 10 +++++----- bookwyrm/templates/ostatus/success.html | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/bookwyrm/templates/ostatus/remote_follow.html b/bookwyrm/templates/ostatus/remote_follow.html index 6a4e565ac..96c7f9452 100644 --- a/bookwyrm/templates/ostatus/remote_follow.html +++ b/bookwyrm/templates/ostatus/remote_follow.html @@ -2,11 +2,12 @@ {% load i18n %} {% load utilities %} +{% block heading %} +{% blocktrans with username=user.localname sitename=site.name %}Follow {{ username }} on the fediverse{% endblocktrans %} +{% endblock %} + {% block content %}
-
-

{% blocktrans %}Follow {{ user.display_name }} on the fediverse{% endblocktrans %}

-
@@ -24,11 +25,13 @@ @{{ user|username }} -

{% blocktrans %}Follow {{ user.display_name }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.{% endblocktrans %}

+
+

{% blocktrans with username=user.display_name %}Follow {{ username }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.{% endblocktrans %}

+
diff --git a/bookwyrm/templates/ostatus/subscribe.html b/bookwyrm/templates/ostatus/subscribe.html index d41ce6743..51dec4382 100644 --- a/bookwyrm/templates/ostatus/subscribe.html +++ b/bookwyrm/templates/ostatus/subscribe.html @@ -5,11 +5,11 @@ {% block title %} {% if not request.user.is_authenticated %} -{% trans "Log in to " %} +{% blocktrans with sitename=site.name %}Log in to {{ sitename }}{% endblocktrans %} {% elif error %} -{% trans "Error following from " %} +{% blocktrans with sitename=site.name %}Error following from {{ sitename }}{% endblocktrans %} {% else %} -{% trans "Follow from " %} +{% blocktrans with sitename=site.name %}Follow from {{ sitename }}{% endblocktrans %} {% endif %} {% endblock %} @@ -19,7 +19,7 @@ {% elif error %} {% trans 'Uh oh...' %} {% else %} -{% trans 'Follow from ' %}{{ site.name }} +{% blocktrans with sitename=site.name %}Follow from {{ sitename }}{% endblocktrans %} {% endif %} {% endblock %} @@ -48,7 +48,7 @@ {% csrf_token %} - +
diff --git a/bookwyrm/templates/ostatus/success.html b/bookwyrm/templates/ostatus/success.html index 89f662735..a652989be 100644 --- a/bookwyrm/templates/ostatus/success.html +++ b/bookwyrm/templates/ostatus/success.html @@ -25,7 +25,7 @@

- {% trans 'You are now following ' %}{{ user.display_name }}! + {% blocktrans with display_name=user.display_name %}You are now following {{ display_name }}!{% endblocktrans %}

From 080fa72c84b6608d0788e2fc1b31cf0e34ed2b1c Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Tue, 30 Nov 2021 21:01:07 +1100 Subject: [PATCH 27/57] ostatus template fixes - remove unnecessary links - remove footer - remove unnecessary JS scripts - make block title and block heading empty --- bookwyrm/templates/ostatus/template.html | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/bookwyrm/templates/ostatus/template.html b/bookwyrm/templates/ostatus/template.html index 68284a35f..8d2d193ec 100644 --- a/bookwyrm/templates/ostatus/template.html +++ b/bookwyrm/templates/ostatus/template.html @@ -7,16 +7,11 @@ - {% block title %}{% endblock %}{{ site.name }} + {% block title %}{% endblock %} - - - - - + From 461c35f416e1838c470824d03f10c8eed8a7ff73 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Tue, 30 Nov 2021 21:02:39 +1100 Subject: [PATCH 28/57] fix buttons --- bookwyrm/templates/ostatus/error.html | 2 +- bookwyrm/templates/ostatus/success.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index 99a2a9acb..0c8d6f768 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -55,6 +55,6 @@ {% endif %}
- +
{% endblock %} diff --git a/bookwyrm/templates/ostatus/success.html b/bookwyrm/templates/ostatus/success.html index a652989be..a4f78ace8 100644 --- a/bookwyrm/templates/ostatus/success.html +++ b/bookwyrm/templates/ostatus/success.html @@ -30,6 +30,6 @@
- Close window +
{% endblock %} From 9be1a8f4557e98e9bfe4aee072f074fed3fc4d5a Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Wed, 1 Dec 2021 07:45:30 +1100 Subject: [PATCH 29/57] keep close button simple --- bookwyrm/templates/ostatus/error.html | 2 +- bookwyrm/templates/ostatus/success.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index 0c8d6f768..b5a3bf406 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -55,6 +55,6 @@ {% endif %}
- +
{% endblock %} diff --git a/bookwyrm/templates/ostatus/success.html b/bookwyrm/templates/ostatus/success.html index a4f78ace8..66577e83f 100644 --- a/bookwyrm/templates/ostatus/success.html +++ b/bookwyrm/templates/ostatus/success.html @@ -30,6 +30,6 @@
- +
{% endblock %} From c77edab79c1b53404a83f8e8bcc33de37ec55648 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Sun, 5 Dec 2021 18:09:51 +1100 Subject: [PATCH 30/57] minor functionality fixes --- bookwyrm/templates/ostatus/remote_follow.html | 4 ++-- bookwyrm/views/follow.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bookwyrm/templates/ostatus/remote_follow.html b/bookwyrm/templates/ostatus/remote_follow.html index 96c7f9452..ca47c529b 100644 --- a/bookwyrm/templates/ostatus/remote_follow.html +++ b/bookwyrm/templates/ostatus/remote_follow.html @@ -30,7 +30,7 @@
-

{% blocktrans with username=user.display_name %}Follow {{ username }} from another Fediverse account like Bookwyrm, Mastodon, or Pleroma.{% endblocktrans %}

+

{% blocktrans with username=user.display_name %}Follow {{ username }} from another Fediverse account like BookWyrm, Mastodon, or Pleroma.{% endblocktrans %}

@@ -38,7 +38,7 @@ {% csrf_token %} - +
diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 7af8b0db7..7a9d7bad1 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -110,7 +110,7 @@ def ostatus_follow_request(request): error = "ostatus_subscribe" # don't do these checks for AnonymousUser before they sign in - if request.user.id: + if request.user.is_authenticated: # you have blocked them so you probably don't want to follow if hasattr(request.user, "blocks") and user in request.user.blocks.all(): From 2d875b5575c580f1da2c40051c6952992f52e8c8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 5 Dec 2021 12:28:17 -0800 Subject: [PATCH 31/57] Add link properties for remotes --- bookwyrm/models/author.py | 12 ++++++++++++ bookwyrm/models/book.py | 10 ++++++++++ bookwyrm/templates/author/author.html | 10 +++++----- bookwyrm/templates/book/book.html | 4 ++-- bookwyrm/templatetags/utilities.py | 8 -------- 5 files changed, 29 insertions(+), 15 deletions(-) diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index 6c29ac058..ce0d027cd 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -1,4 +1,5 @@ """ database schema for info about authors """ +import re from django.contrib.postgres.indexes import GinIndex from django.db import models @@ -33,6 +34,17 @@ class Author(BookDataModel): ) bio = fields.HtmlField(null=True, blank=True) + @property + def isni_link(self): + """generate the url from the isni id""" + clean_isni = re.sub(r"\s", "", self.isni) + return f"https://insi.org/isni/{clean_isni}" + + @property + def openlibrary_link(self): + """generate the url from the openlibrary id""" + return f"https://openlibrary.org/authors/{self.openlibrary_key}" + def get_remote_id(self): """editions and works both use "book" instead of model_name""" return f"https://{DOMAIN}/author/{self.id}" diff --git a/bookwyrm/models/book.py b/bookwyrm/models/book.py index d97a1b8a6..0a551bf28 100644 --- a/bookwyrm/models/book.py +++ b/bookwyrm/models/book.py @@ -52,6 +52,16 @@ class BookDataModel(ObjectMixin, BookWyrmModel): null=True, ) + @property + def openlibrary_link(self): + """generate the url from the openlibrary id""" + return f"https://openlibrary.org/books/{self.openlibrary_key}" + + @property + def inventaire_link(self): + """generate the url from the inventaire id""" + return f"https://inventaire.io/entity/{self.inventaire_id}" + class Meta: """can't initialize this model, that wouldn't make sense""" diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index b066c6ca4..fb6821766 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -66,23 +66,23 @@ {% if author.isni %}

- + {% trans "View ISNI record" %}

{% endif %} {% if author.openlibrary_key %} -

- +

+ {% trans "View on OpenLibrary" %}

{% endif %} {% if author.inventaire_id %} -

- +

+ {% trans "View on Inventaire" %}

diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 7d4df76f7..cbca31b56 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -91,10 +91,10 @@ {% endwith %} {% if book.openlibrary_key %} -

{% trans "View on OpenLibrary" %}

+

{% trans "View on OpenLibrary" %}

{% endif %} {% if book.inventaire_id %} -

{% trans "View on Inventaire" %}

+

{% trans "View on Inventaire" %}

{% endif %}
diff --git a/bookwyrm/templatetags/utilities.py b/bookwyrm/templatetags/utilities.py index 5cc25fed8..2246fab19 100644 --- a/bookwyrm/templatetags/utilities.py +++ b/bookwyrm/templatetags/utilities.py @@ -5,7 +5,6 @@ from uuid import uuid4 from django import template from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _ -from django.template.defaultfilters import stringfilter from django.templatetags.static import static @@ -98,10 +97,3 @@ def get_isni(existing, author, autoescape=True): f'' ) return "" - - -@register.filter(name="remove_spaces") -@stringfilter -def remove_spaces(arg): - """Removes spaces from argument passed in""" - return re.sub(r"\s", "", str(arg)) From b824841cb333d1624b49de06613ac324549a2a96 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 5 Dec 2021 12:37:19 -0800 Subject: [PATCH 32/57] Adds update logic to connectors --- bookwyrm/connectors/abstract_connector.py | 36 ++++++++++++++++++----- bookwyrm/connectors/inventaire.py | 2 ++ bookwyrm/connectors/openlibrary.py | 2 ++ 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index c032986d1..97ac92496 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -111,7 +111,7 @@ class AbstractConnector(AbstractMinimalConnector): return existing.default_edition return existing - # load the json + # load the json data from the remote data source data = self.get_book_data(remote_id) if self.is_work_data(data): try: @@ -150,23 +150,32 @@ class AbstractConnector(AbstractMinimalConnector): """this allows connectors to override the default behavior""" return get_data(remote_id) - def create_edition_from_data(self, work, edition_data): + def create_edition_from_data(self, work, edition_data, instance=None): """if we already have the work, we're ready""" mapped_data = dict_from_mappings(edition_data, self.book_mappings) mapped_data["work"] = work.remote_id edition_activity = activitypub.Edition(**mapped_data) - edition = edition_activity.to_model(model=models.Edition, overwrite=False) - edition.connector = self.connector - edition.save() + edition = edition_activity.to_model( + model=models.Edition, overwrite=False, instance=instance + ) + + # if we're updating an existing instance, we don't need to load authors + if instance: + return edition + + if not edition.connector: + edition.connector = self.connector + edition.save(broadcast=False, update_fields=["connector"]) for author in self.get_authors_from_data(edition_data): edition.authors.add(author) + # use the authors from the work if none are found for the edition if not edition.authors.exists() and work.authors.exists(): edition.authors.set(work.authors.all()) return edition - def get_or_create_author(self, remote_id): + def get_or_create_author(self, remote_id, instance=None): """load that author""" existing = models.Author.find_existing_by_remote_id(remote_id) if existing: @@ -181,7 +190,20 @@ class AbstractConnector(AbstractMinimalConnector): return None # this will dedupe - return activity.to_model(model=models.Author, overwrite=False) + return activity.to_model( + model=models.Author, overwrite=False, instance=instance + ) + + def update_author_from_remote(self, obj): + """load the remote data from this connector and add it to an existing author""" + remote_id = obj.getattr(self, "generated_remote_link_field") + return self.get_or_create_author(remote_id, instance=obj) + + def update_book_from_remote(self, obj): + """load the remote data from this connector and add it to an existing book""" + remote_id = obj.getattr(self, "generated_remote_link_field") + data = self.get_book_data(remote_id) + return self.create_edition_from_data(obj.parent_work, data, instance=obj) @abstractmethod def is_work_data(self, data): diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index e9f538569..bc5b3f684 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -11,6 +11,8 @@ from .connector_manager import ConnectorException class Connector(AbstractConnector): """instantiate a connector for inventaire""" + generated_remote_link_field = "inventaire_link" + def __init__(self, identifier): super().__init__(identifier) diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index b8afc7ca6..225174c80 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -12,6 +12,8 @@ from .openlibrary_languages import languages class Connector(AbstractConnector): """instantiate a connector for OL""" + generated_remote_link_field = "openlibrary_link" + def __init__(self, identifier): super().__init__(identifier) From 113eda33e9cf5281b8c1aa406634f76658ae0ed9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 5 Dec 2021 12:47:43 -0800 Subject: [PATCH 33/57] Adds update views --- bookwyrm/views/author.py | 18 ++++++++++++++++++ bookwyrm/views/books/books.py | 16 ++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index 0c8e3e05a..fdf86cd49 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -6,9 +6,11 @@ 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.activitypub import ActivitypubResponse +from bookwyrm.connectors import connector_manager from bookwyrm.settings import PAGE_LENGTH from bookwyrm.views.helpers import is_api_request @@ -73,3 +75,19 @@ class EditAuthor(View): author = form.save() return redirect(f"/author/{author.id}") + + +@login_required +@require_POST +@permission_required("bookwyrm.edit_book", raise_exception=True) +# pylint: disable=unused-argument +def update_author_from_remote(request, connector_identifier, author_id): + """load the remote data for this author""" + connector = connector_manager.load_connector( + get_object_or_404(models.Connector, identifier=connector_identifier) + ) + author = get_object_or_404(models.Book.objects.select_subclasses(), id=author_id) + + connector.update_author_from_remote(author) + + return redirect("author", author.id) diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index e495da3e7..f7166749b 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -178,3 +178,19 @@ def resolve_book(request): book = connector.get_or_create_book(remote_id) return redirect("book", book.id) + + +@login_required +@require_POST +@permission_required("bookwyrm.edit_book", raise_exception=True) +# pylint: disable=unused-argument +def update_book_from_remote(request, connector_identifier, book_id): + """load the remote data for this book""" + connector = connector_manager.load_connector( + get_object_or_404(models.Connector, identifier=connector_identifier) + ) + book = get_object_or_404(models.Book.objects.select_subclasses(), id=book_id) + + connector.update_book_from_remote(book) + + return redirect("book", book.id) From d7e4e6aa1e45a9bdd8c55eba449d06b4ff4f422f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 5 Dec 2021 13:02:42 -0800 Subject: [PATCH 34/57] Adds openlibrary update for book --- bookwyrm/connectors/abstract_connector.py | 4 ++-- bookwyrm/templates/author/author.html | 6 ++++++ bookwyrm/templates/book/book.html | 8 +++++++- bookwyrm/urls.py | 9 +++++++-- bookwyrm/views/__init__.py | 1 + bookwyrm/views/author.py | 2 +- bookwyrm/views/books/books.py | 2 +- 7 files changed, 25 insertions(+), 7 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 97ac92496..48d2b4cbc 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -196,12 +196,12 @@ class AbstractConnector(AbstractMinimalConnector): def update_author_from_remote(self, obj): """load the remote data from this connector and add it to an existing author""" - remote_id = obj.getattr(self, "generated_remote_link_field") + remote_id = getattr(obj, getattr(self, "generated_remote_link_field")) return self.get_or_create_author(remote_id, instance=obj) def update_book_from_remote(self, obj): """load the remote data from this connector and add it to an existing book""" - remote_id = obj.getattr(self, "generated_remote_link_field") + remote_id = getattr(obj, getattr(self, "generated_remote_link_field")) data = self.get_book_data(remote_id) return self.create_edition_from_data(obj.parent_work, data, instance=obj) diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index fb6821766..c2355955b 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -77,6 +77,9 @@ {% trans "View on OpenLibrary" %} + {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} + + {% endif %}

{% endif %} @@ -85,6 +88,9 @@ {% trans "View on Inventaire" %} + {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} + + {% endif %}

{% endif %} diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index cbca31b56..3a7b1cbc8 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -91,7 +91,13 @@ {% endwith %} {% if book.openlibrary_key %} -

{% trans "View on OpenLibrary" %}

+

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

+ {% csrf_token %} + +
+

{% endif %} {% if book.inventaire_id %}

{% trans "View on Inventaire" %}

diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 514bb7e60..697028b79 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -422,8 +422,13 @@ urlpatterns = [ r"^upload-cover/(?P\d+)/?$", views.upload_cover, name="upload-cover" ), re_path(r"^add-description/(?P\d+)/?$", views.add_description), - re_path(r"^resolve-book/?$", views.resolve_book), - re_path(r"^switch-edition/?$", views.switch_edition), + re_path(r"^resolve-book/?$", views.resolve_book, name="resolve-book"), + re_path(r"^switch-edition/?$", views.switch_edition, name="switch-edition"), + re_path( + rf"{BOOK_PATH}/update/(?P[\w\.]+)?$", + views.update_book_from_remote, + name="book-update-remote" + ), # isbn re_path(r"^isbn/(?P\d+)(.json)?/?$", views.Isbn.as_view()), # author diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index d79de4248..b399b90ab 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -29,6 +29,7 @@ from .preferences.block import Block, unblock # books from .books.books import Book, upload_cover, add_description, resolve_book +from .books.books import update_book_from_remote from .books.edit_book import EditBook, ConfirmEditBook from .books.editions import Editions, switch_edition diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index fdf86cd49..838d1c2b7 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -81,7 +81,7 @@ class EditAuthor(View): @require_POST @permission_required("bookwyrm.edit_book", raise_exception=True) # pylint: disable=unused-argument -def update_author_from_remote(request, connector_identifier, author_id): +def update_author_from_remote(request, author_id, connector_identifier): """load the remote data for this author""" connector = connector_manager.load_connector( get_object_or_404(models.Connector, identifier=connector_identifier) diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index f7166749b..2d49ae30c 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -184,7 +184,7 @@ def resolve_book(request): @require_POST @permission_required("bookwyrm.edit_book", raise_exception=True) # pylint: disable=unused-argument -def update_book_from_remote(request, connector_identifier, book_id): +def update_book_from_remote(request, book_id, connector_identifier): """load the remote data for this book""" connector = connector_manager.load_connector( get_object_or_404(models.Connector, identifier=connector_identifier) From 4085714764af94157e740848f1c90472f0b16e5c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 5 Dec 2021 13:24:40 -0800 Subject: [PATCH 35/57] Update openlibrary author with ISNI --- bookwyrm/connectors/abstract_connector.py | 7 ++++--- bookwyrm/connectors/openlibrary.py | 8 ++++++++ bookwyrm/models/author.py | 2 +- bookwyrm/templates/author/author.html | 16 +++++++++++----- bookwyrm/templates/book/book.html | 2 ++ bookwyrm/urls.py | 19 +++++++++++++++---- bookwyrm/views/__init__.py | 2 +- bookwyrm/views/author.py | 2 +- 8 files changed, 43 insertions(+), 15 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 48d2b4cbc..4b1f6e58e 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -177,9 +177,10 @@ class AbstractConnector(AbstractMinimalConnector): def get_or_create_author(self, remote_id, instance=None): """load that author""" - existing = models.Author.find_existing_by_remote_id(remote_id) - if existing: - return existing + if not instance: + existing = models.Author.find_existing_by_remote_id(remote_id) + if existing: + return existing data = self.get_book_data(remote_id) diff --git a/bookwyrm/connectors/openlibrary.py b/bookwyrm/connectors/openlibrary.py index 225174c80..c15277f84 100644 --- a/bookwyrm/connectors/openlibrary.py +++ b/bookwyrm/connectors/openlibrary.py @@ -68,6 +68,7 @@ class Connector(AbstractConnector): Mapping("born", remote_field="birth_date"), Mapping("died", remote_field="death_date"), Mapping("bio", formatter=get_description), + Mapping("isni", remote_field="remote_ids", formatter=get_isni), ] def get_book_data(self, remote_id): @@ -226,6 +227,13 @@ def get_languages(language_blob): return langs +def get_isni(remote_ids_blob): + """extract the isni from the remote id data for the author""" + if not remote_ids_blob or not isinstance(remote_ids_blob, dict): + return None + return remote_ids_blob.get("isni") + + def pick_default_edition(options): """favor physical copies with covers in english""" if not options: diff --git a/bookwyrm/models/author.py b/bookwyrm/models/author.py index ce0d027cd..5cc11afd6 100644 --- a/bookwyrm/models/author.py +++ b/bookwyrm/models/author.py @@ -38,7 +38,7 @@ class Author(BookDataModel): def isni_link(self): """generate the url from the isni id""" clean_isni = re.sub(r"\s", "", self.isni) - return f"https://insi.org/isni/{clean_isni}" + return f"https://isni.org/isni/{clean_isni}" @property def openlibrary_link(self): diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index c2355955b..6e93d3131 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -14,7 +14,7 @@ {% if request.user.is_authenticated and perms.bookwyrm.edit_book %}
- + {% trans "Edit Author" %} @@ -73,23 +73,29 @@ {% endif %} {% if author.openlibrary_key %} -

+

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

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

{% endif %} {% if author.inventaire_id %} -

+

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

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

{% endif %} diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 3a7b1cbc8..cdfbdf983 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -93,10 +93,12 @@ {% if book.openlibrary_key %}

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

{% csrf_token %}
+ {% endif %}

{% endif %} {% if book.inventaire_id %} diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 697028b79..6e53ef2ac 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -425,15 +425,26 @@ urlpatterns = [ re_path(r"^resolve-book/?$", views.resolve_book, name="resolve-book"), re_path(r"^switch-edition/?$", views.switch_edition, name="switch-edition"), re_path( - rf"{BOOK_PATH}/update/(?P[\w\.]+)?$", + rf"^{BOOK_PATH}/update/(?P[\w\.]+)?$", views.update_book_from_remote, - name="book-update-remote" + name="book-update-remote", + ), + re_path( + r"^author/(?P\d+)/update/(?P[\w\.]+)?$", + views.update_author_from_remote, + name="author-update-remote", ), # isbn re_path(r"^isbn/(?P\d+)(.json)?/?$", views.Isbn.as_view()), # author - re_path(r"^author/(?P\d+)(.json)?/?$", views.Author.as_view()), - re_path(r"^author/(?P\d+)/edit/?$", views.EditAuthor.as_view()), + re_path( + r"^author/(?P\d+)(.json)?/?$", views.Author.as_view(), name="author" + ), + re_path( + r"^author/(?P\d+)/edit/?$", + views.EditAuthor.as_view(), + name="edit-author", + ), # reading progress re_path(r"^edit-readthrough/?$", views.edit_readthrough, name="edit-readthrough"), re_path(r"^delete-readthrough/?$", views.delete_readthrough), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index b399b90ab..837b12570 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -55,7 +55,7 @@ from .imports.manually_review import ( ) # misc views -from .author import Author, EditAuthor +from .author import Author, EditAuthor, update_author_from_remote from .directory import Directory from .discover import Discover from .feed import DirectMessage, Feed, Replies, Status diff --git a/bookwyrm/views/author.py b/bookwyrm/views/author.py index 838d1c2b7..2acb3b19a 100644 --- a/bookwyrm/views/author.py +++ b/bookwyrm/views/author.py @@ -86,7 +86,7 @@ def update_author_from_remote(request, author_id, connector_identifier): connector = connector_manager.load_connector( get_object_or_404(models.Connector, identifier=connector_identifier) ) - author = get_object_or_404(models.Book.objects.select_subclasses(), id=author_id) + author = get_object_or_404(models.Author, id=author_id) connector.update_author_from_remote(author) From 071da7d4fb9d379dab8a703b987e88dfd353ef9a Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 5 Dec 2021 13:38:15 -0800 Subject: [PATCH 36/57] Handle various link generation needs --- bookwyrm/connectors/abstract_connector.py | 8 ++++++-- bookwyrm/connectors/inventaire.py | 7 ++++++- bookwyrm/templates/author/author.html | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 4b1f6e58e..bb2bfb6f9 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -195,14 +195,18 @@ class AbstractConnector(AbstractMinimalConnector): model=models.Author, overwrite=False, instance=instance ) + def get_remote_id_from_model(self, obj): + """given the data stored, how can we look this up""" + return getattr(obj, getattr(self, "generated_remote_link_field")) + def update_author_from_remote(self, obj): """load the remote data from this connector and add it to an existing author""" - remote_id = getattr(obj, getattr(self, "generated_remote_link_field")) + remote_id = self.get_remote_id_from_model(obj) return self.get_or_create_author(remote_id, instance=obj) def update_book_from_remote(self, obj): """load the remote data from this connector and add it to an existing book""" - remote_id = getattr(obj, getattr(self, "generated_remote_link_field")) + remote_id = self.get_remote_id_from_model(obj) data = self.get_book_data(remote_id) return self.create_edition_from_data(obj.parent_work, data, instance=obj) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index bc5b3f684..45d0546fb 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -11,7 +11,7 @@ from .connector_manager import ConnectorException class Connector(AbstractConnector): """instantiate a connector for inventaire""" - generated_remote_link_field = "inventaire_link" + generated_remote_link_field = "inventaire_id" def __init__(self, identifier): super().__init__(identifier) @@ -212,6 +212,11 @@ class Connector(AbstractConnector): return "" return data.get("extract") + def get_remote_id_from_model(self, obj): + """use get_remote_id to figure out the link from a model obj""" + remote_id_value = getattr(obj, self.inventaire_id) + return self.get_remote_id(remote_id_value) + def get_language_code(options, code="en"): """when there are a bunch of translation but we need a single field""" diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index 6e93d3131..bf2c8f3fd 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -92,7 +92,7 @@ {% trans "View on Inventaire" %} {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} -
+ {% csrf_token %}
From 02313f40b8700a7a3c121f94bbdc0d301db16c60 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 5 Dec 2021 13:46:13 -0800 Subject: [PATCH 37/57] Adds update from inventaire link for books --- bookwyrm/connectors/inventaire.py | 2 +- bookwyrm/templates/book/book.html | 10 +++++++++- bookwyrm/urls.py | 4 ++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bookwyrm/connectors/inventaire.py b/bookwyrm/connectors/inventaire.py index 45d0546fb..a9aeb94f9 100644 --- a/bookwyrm/connectors/inventaire.py +++ b/bookwyrm/connectors/inventaire.py @@ -214,7 +214,7 @@ class Connector(AbstractConnector): def get_remote_id_from_model(self, obj): """use get_remote_id to figure out the link from a model obj""" - remote_id_value = getattr(obj, self.inventaire_id) + remote_id_value = obj.inventaire_id return self.get_remote_id(remote_id_value) diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index cdfbdf983..6d8ce72b8 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -102,7 +102,15 @@

{% endif %} {% if book.inventaire_id %} -

{% trans "View on Inventaire" %}

+

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

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

{% endif %}
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index 6e53ef2ac..012a91164 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -425,12 +425,12 @@ urlpatterns = [ re_path(r"^resolve-book/?$", views.resolve_book, name="resolve-book"), re_path(r"^switch-edition/?$", views.switch_edition, name="switch-edition"), re_path( - rf"^{BOOK_PATH}/update/(?P[\w\.]+)?$", + rf"{BOOK_PATH}/update/(?P[\w\.]+)/?$", views.update_book_from_remote, name="book-update-remote", ), re_path( - r"^author/(?P\d+)/update/(?P[\w\.]+)?$", + r"^author/(?P\d+)/update/(?P[\w\.]+)/?$", views.update_author_from_remote, name="author-update-remote", ), From 781fe69470125f888f5c7583db157e0ecc8129f9 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Dec 2021 09:29:51 +1100 Subject: [PATCH 38/57] more descriptive remote follow errors - distinguish between invalid username, user not found, and remote follow not supported - make helpers DRYer --- bookwyrm/templates/ostatus/error.html | 28 ++++++++++--- bookwyrm/templates/ostatus/subscribe.html | 6 +-- bookwyrm/views/follow.py | 36 +++++++++++++--- bookwyrm/views/helpers.py | 51 +++++++++++++---------- 4 files changed, 83 insertions(+), 38 deletions(-) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index b5a3bf406..a603529fe 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -2,7 +2,28 @@ {% block content %}
- {% if not request.user.is_authenticated and not error == 'remote_subscribe' %} + {% if error == 'invalid_username' %} +
+ {% blocktrans %} +

{{ account }} is not a valid username.

+

Check you have the correct username before trying again.

+ {% endblocktrans %} +
+ {% elif error == 'user_not_found' %} +
+ {% blocktrans %} +

{{ account }} could not be found or {{ remote_domain }} does not support identity discovery.

+

Check you have the correct username before trying again.

+ {% endblocktrans %} +
+ {% elif error == 'not_supported' %} +
+ {% blocktrans %} +

{{ account }} was found but {{ remote_domain }} does not support 'remote follow'.

+

Try searching for {{ user }} on {{ remote_domain }} instead.

+ {% endblocktrans %} +
+ {% elif not request.user.is_authenticated %}
@@ -31,11 +52,6 @@

{% blocktrans %}Something went wrong trying to follow {{ account }}{% endblocktrans %}

{% trans 'Check you have the correct username before trying again.' %}

- {% elif error == 'remote_subscribe' %} -
-

{% blocktrans %}Something went wrong trying to follow from {{ account }}{% endblocktrans %}

-

{% trans 'Check you have the correct username before trying again.' %}

-
{% elif error == 'is_blocked' %}

{% blocktrans %}You have blocked {{ account }}{% endblocktrans %}

diff --git a/bookwyrm/templates/ostatus/subscribe.html b/bookwyrm/templates/ostatus/subscribe.html index 51dec4382..ee6225420 100644 --- a/bookwyrm/templates/ostatus/subscribe.html +++ b/bookwyrm/templates/ostatus/subscribe.html @@ -14,10 +14,10 @@ {% endblock %} {% block heading %} -{% if not request.user.is_authenticated and not error == 'remote_subscribe' %} -{% trans "Let's log in first..." %} -{% elif error %} +{% if error %} {% trans 'Uh oh...' %} +{% elif not request.user.is_authenticated %} +{% trans "Let's log in first..." %} {% else %} {% blocktrans with sitename=site.name %}Follow from {{ sitename }}{% endblocktrans %} {% endif %} diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 7a9d7bad1..6b1de5e6d 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -12,6 +12,7 @@ from .helpers import ( get_user_from_username, handle_remote_webfinger, subscribe_remote_webfinger, + WebFingerError, ) @@ -142,7 +143,7 @@ def ostatus_follow_success(request): def remote_follow_page(request): - """Display remote follow page""" + """display remote follow page""" user = get_user_from_username(request.user, request.GET.get("user")) data = {"user": user} return TemplateResponse(request, "ostatus/remote_follow.html", data) @@ -152,10 +153,33 @@ def remote_follow_page(request): def remote_follow(request): """direct user to follow from remote account using ostatus subscribe protocol""" remote_user = request.POST.get("remote_user") - template = subscribe_remote_webfinger(remote_user) - if template is None: - data = {"account": remote_user, "user": None, "error": "remote_subscribe"} - return TemplateResponse(request, "ostatus/subscribe.html", data) + try: + if remote_user[0] == "@": + remote_user = remote_user[1:] + remote_domain = remote_user.split("@")[1] + except: + remote_domain = None + + wf_response = subscribe_remote_webfinger(remote_user) user = get_object_or_404(models.User, id=request.POST.get("user")) - url = template.replace("{uri}", urllib.parse.quote(user.remote_id)) + + if wf_response is None: + data = { + "account": remote_user, + "user": user, + "error": "not_supported", + "remote_domain": remote_domain, + } + return TemplateResponse(request, "ostatus/subscribe.html", data) + + if type(wf_response) == WebFingerError: + data = { + "account": remote_user, + "user": user, + "error": str(wf_response), + "remote_domain": remote_domain, + } + return TemplateResponse(request, "ostatus/subscribe.html", data) + + url = wf_response.replace("{uri}", urllib.parse.quote(user.remote_id)) return redirect(url) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 650087ec0..eb15637e1 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -15,6 +15,27 @@ from bookwyrm.status import create_generated_note from bookwyrm.utils import regex +class WebFingerError(Exception): + """error class for problems finding user information with webfinger""" + + pass + + +def get_domain_from_username(username): + # usernames could be @user@domain or user@domain + if not username: + return None + + if username[0] == "@": + username = username[1:] + + try: + domain = username.split("@")[1] + return domain + except IndexError: + return None + + def get_user_from_username(viewer, username): """helper function to resolve a localname or a username to a user""" if viewer.is_authenticated and viewer.localname == username: @@ -52,17 +73,8 @@ def is_bookwyrm_request(request): def handle_remote_webfinger(query): """webfingerin' other servers""" user = None - - # usernames could be @user@domain or user@domain - if not query: - return None - - if query[0] == "@": - query = query[1:] - - try: - domain = query.split("@")[1] - except IndexError: + domain = get_domain_from_username(query) + if domain is None: return None try: @@ -88,24 +100,17 @@ def handle_remote_webfinger(query): def subscribe_remote_webfinger(query): """get subscribe template from other servers""" template = None + domain = get_domain_from_username(query) - # usernames could be @user@domain or user@domain - if not query: - return None - - if query[0] == "@": - query = query[1:] - - try: - domain = query.split("@")[1] - except IndexError: - return None + if domain is None: + return WebFingerError("invalid_username") url = f"https://{domain}/.well-known/webfinger?resource=acct:{query}" + try: data = get_data(url) except (ConnectorException, HTTPError): - return None + return WebFingerError("user_not_found") for link in data.get("links"): if link.get("rel") == "http://ostatus.org/schema/1.0/subscribe": From 685e0a172dadfebb4f316e9c3d62661cdb972d4c Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Dec 2021 10:45:39 +1100 Subject: [PATCH 39/57] make code WET again moving url discovery borked general webfinger tests for some reason IDK why. --- bookwyrm/views/helpers.py | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index eb15637e1..af98f7e8b 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -21,21 +21,6 @@ class WebFingerError(Exception): pass -def get_domain_from_username(username): - # usernames could be @user@domain or user@domain - if not username: - return None - - if username[0] == "@": - username = username[1:] - - try: - domain = username.split("@")[1] - return domain - except IndexError: - return None - - def get_user_from_username(viewer, username): """helper function to resolve a localname or a username to a user""" if viewer.is_authenticated and viewer.localname == username: @@ -73,8 +58,15 @@ def is_bookwyrm_request(request): def handle_remote_webfinger(query): """webfingerin' other servers""" user = None - domain = get_domain_from_username(query) - if domain is None: + + # usernames could be @user@domain or user@domain + if not query: + return None + if query[0] == "@": + query = query[1:] + try: + domain = query.split("@")[1] + except IndexError: return None try: @@ -100,9 +92,16 @@ def handle_remote_webfinger(query): def subscribe_remote_webfinger(query): """get subscribe template from other servers""" template = None - domain = get_domain_from_username(query) + # usernames could be @user@domain or user@domain + if not query: + return WebFingerError("invalid_username") - if domain is None: + if query[0] == "@": + query = query[1:] + + try: + domain = query.split("@")[1] + except IndexError: return WebFingerError("invalid_username") url = f"https://{domain}/.well-known/webfinger?resource=acct:{query}" From 027520d9232640211a96ed271ecd0f65edc59be4 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Dec 2021 16:26:02 +1100 Subject: [PATCH 40/57] add remote follow tests --- bookwyrm/tests/views/test_follow.py | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/bookwyrm/tests/views/test_follow.py b/bookwyrm/tests/views/test_follow.py index 25b5a0146..046fe3d93 100644 --- a/bookwyrm/tests/views/test_follow.py +++ b/bookwyrm/tests/views/test_follow.py @@ -4,10 +4,12 @@ from unittest.mock import patch from django.contrib.auth.models import Group, Permission from django.contrib.contenttypes.models import ContentType +from django.template.response import TemplateResponse from django.test import TestCase from django.test.client import RequestFactory from bookwyrm import models, views +from bookwyrm.tests.validate_html import validate_html @patch("bookwyrm.activitystreams.add_user_statuses_task.delay") @@ -16,6 +18,7 @@ class FollowViews(TestCase): def setUp(self): """we need basic test data and mocks""" + models.SiteSettings.objects.create() self.factory = RequestFactory() with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( "bookwyrm.activitystreams.populate_stream_task.delay" @@ -174,3 +177,43 @@ class FollowViews(TestCase): self.assertEqual(models.UserFollowRequest.objects.filter(id=rel.id).count(), 0) # follow relationship should not exist self.assertEqual(models.UserFollows.objects.filter(id=rel.id).count(), 0) + + def test_ostatus_follow_request(self, _): + """check ostatus subscribe template loads""" + request = self.factory.get( + "", {"acct": "https%3A%2F%2Fexample.com%2Fusers%2Frat"} + ) + request.user = self.local_user + result = views.ostatus_follow_request(request) + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + self.assertEqual(result.status_code, 200) + + def test_remote_follow_page(self, _): + """check remote follow page loads""" + request = self.factory.get("", {"acct": "mouse@local.com"}) + request.user = self.remote_user + result = views.remote_follow_page(request) + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + self.assertEqual(result.status_code, 200) + + def test_ostatus_follow_success(self, _): + """check remote follow success page loads""" + request = self.factory.get("") + request.user = self.remote_user + request.following = "mouse@local.com" + result = views.ostatus_follow_success(request) + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + self.assertEqual(result.status_code, 200) + + def test_remote_follow(self, _): + """check follow from remote page loads""" + request = self.factory.post("", {"user": self.remote_user.id}) + request.user = self.remote_user + request.remote_user = "mouse@local.com" + result = views.remote_follow(request) + self.assertIsInstance(result, TemplateResponse) + validate_html(result.render()) + self.assertEqual(result.status_code, 200) From 5bbd6faa8b5c6a193b64bc63615beba20d2fb8f7 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Dec 2021 16:26:16 +1100 Subject: [PATCH 41/57] tidy templates --- bookwyrm/templates/ostatus/subscribe.html | 4 ++-- bookwyrm/templates/ostatus/template.html | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bookwyrm/templates/ostatus/subscribe.html b/bookwyrm/templates/ostatus/subscribe.html index ee6225420..1020279b7 100644 --- a/bookwyrm/templates/ostatus/subscribe.html +++ b/bookwyrm/templates/ostatus/subscribe.html @@ -39,7 +39,7 @@ {{ user.display_name }} {% if user.manually_approves_followers %} - {% trans "Locked account" %} + {% trans 'Locked account' %} {% endif %} @@ -47,7 +47,7 @@
{% csrf_token %} - +
diff --git a/bookwyrm/templates/ostatus/template.html b/bookwyrm/templates/ostatus/template.html index 8d2d193ec..9776f28dd 100644 --- a/bookwyrm/templates/ostatus/template.html +++ b/bookwyrm/templates/ostatus/template.html @@ -9,9 +9,9 @@ {% block title %}{% endblock %} - - - + + + - + From c817ea0ff9a2dd00b31e4f2b99598e5516b6d91f Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Dec 2021 16:40:18 +1100 Subject: [PATCH 42/57] improve error handling --- bookwyrm/views/follow.py | 4 ++-- bookwyrm/views/helpers.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 6b1de5e6d..4c61417a2 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -157,7 +157,7 @@ def remote_follow(request): if remote_user[0] == "@": remote_user = remote_user[1:] remote_domain = remote_user.split("@")[1] - except: + except IndexError: remote_domain = None wf_response = subscribe_remote_webfinger(remote_user) @@ -172,7 +172,7 @@ def remote_follow(request): } return TemplateResponse(request, "ostatus/subscribe.html", data) - if type(wf_response) == WebFingerError: + if isinstance(wf_response, WebFingerError): data = { "account": remote_user, "user": user, diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index af98f7e8b..f6ac8979b 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -18,7 +18,8 @@ from bookwyrm.utils import regex class WebFingerError(Exception): """error class for problems finding user information with webfinger""" - pass + def __init__(self, message): + super().__init__(message) def get_user_from_username(viewer, username): From 4ade58073263c3a2e92338b1f165b04793683e16 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Dec 2021 16:47:04 +1100 Subject: [PATCH 43/57] pylint called my code useless how rude --- bookwyrm/views/helpers.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index f6ac8979b..cee95fd33 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -16,10 +16,7 @@ from bookwyrm.utils import regex class WebFingerError(Exception): - """error class for problems finding user information with webfinger""" - - def __init__(self, message): - super().__init__(message) + """empty error class for problems finding user information with webfinger""" def get_user_from_username(viewer, username): From 6d894d71ec2d98a783c8769a22b9fd5278b17b2e Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Dec 2021 16:59:51 +1100 Subject: [PATCH 44/57] stop pylint contradicting itself --- bookwyrm/views/helpers.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index cee95fd33..052b661ad 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -15,9 +15,11 @@ from bookwyrm.status import create_generated_note from bookwyrm.utils import regex +#pylint: disable=unnecessary-pass class WebFingerError(Exception): """empty error class for problems finding user information with webfinger""" + pass def get_user_from_username(viewer, username): """helper function to resolve a localname or a username to a user""" From c3f24316a06addf473ee9e580cc610039b1096a1 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Dec 2021 17:02:47 +1100 Subject: [PATCH 45/57] lint --- bookwyrm/views/helpers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bookwyrm/views/helpers.py b/bookwyrm/views/helpers.py index 052b661ad..8beae6dd8 100644 --- a/bookwyrm/views/helpers.py +++ b/bookwyrm/views/helpers.py @@ -15,12 +15,13 @@ from bookwyrm.status import create_generated_note from bookwyrm.utils import regex -#pylint: disable=unnecessary-pass +# pylint: disable=unnecessary-pass class WebFingerError(Exception): """empty error class for problems finding user information with webfinger""" pass + def get_user_from_username(viewer, username): """helper function to resolve a localname or a username to a user""" if viewer.is_authenticated and viewer.localname == username: From 5847bc19242a587b296a2078a6af823247738e6f Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Mon, 6 Dec 2021 18:18:12 +1100 Subject: [PATCH 46/57] handle type errors --- bookwyrm/views/follow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/views/follow.py b/bookwyrm/views/follow.py index 4c61417a2..6e58a2b22 100644 --- a/bookwyrm/views/follow.py +++ b/bookwyrm/views/follow.py @@ -157,7 +157,7 @@ def remote_follow(request): if remote_user[0] == "@": remote_user = remote_user[1:] remote_domain = remote_user.split("@")[1] - except IndexError: + except (TypeError, IndexError): remote_domain = None wf_response = subscribe_remote_webfinger(remote_user) From caf1d4163bce310ec46839b1b2f3ebde56d5a739 Mon Sep 17 00:00:00 2001 From: Hugh Rundle Date: Tue, 7 Dec 2021 08:36:57 +1100 Subject: [PATCH 47/57] simplify translation blocks --- bookwyrm/templates/ostatus/error.html | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/bookwyrm/templates/ostatus/error.html b/bookwyrm/templates/ostatus/error.html index a603529fe..fc1dd18d5 100644 --- a/bookwyrm/templates/ostatus/error.html +++ b/bookwyrm/templates/ostatus/error.html @@ -4,24 +4,18 @@
{% if error == 'invalid_username' %}
- {% blocktrans %} -

{{ account }} is not a valid username.

-

Check you have the correct username before trying again.

- {% endblocktrans %} +

{% blocktrans %}{{ account }} is not a valid username{% endblocktrans %}.

+

{% trans 'Check you have the correct username before trying again' %}.

{% elif error == 'user_not_found' %}
- {% blocktrans %} -

{{ account }} could not be found or {{ remote_domain }} does not support identity discovery.

-

Check you have the correct username before trying again.

- {% endblocktrans %} +

{% blocktrans %}{{ account }} could not be found or {{ remote_domain }} does not support identity discovery{% endblocktrans %}.

+

{% trans 'Check you have the correct username before trying again' %}.

{% elif error == 'not_supported' %}
- {% blocktrans %} -

{{ account }} was found but {{ remote_domain }} does not support 'remote follow'.

-

Try searching for {{ user }} on {{ remote_domain }} instead.

- {% endblocktrans %} +

{% blocktrans %}{{ account }} was found but {{ remote_domain }} does not support 'remote follow'{% endblocktrans %}.

+

{% blocktrans %}Try searching for {{ user }} on {{ remote_domain }} instead{% endblocktrans %}.

{% elif not request.user.is_authenticated %}
From c178c4de805bc77d3ba850058a70c03d3fe3eb63 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 09:39:46 -0800 Subject: [PATCH 48/57] Loads new translation strings and adds remote follow text --- locale/de_DE/LC_MESSAGES/django.mo | Bin 30883 -> 60361 bytes locale/de_DE/LC_MESSAGES/django.po | 397 +++++++++++++----------- locale/en_US/LC_MESSAGES/django.po | 176 +++++++++-- locale/es_ES/LC_MESSAGES/django.mo | Bin 64857 -> 65497 bytes locale/es_ES/LC_MESSAGES/django.po | 443 +++++++++++++++------------ locale/fr_FR/LC_MESSAGES/django.mo | Bin 44850 -> 67209 bytes locale/fr_FR/LC_MESSAGES/django.po | 407 +++++++++++++----------- locale/gl_ES/LC_MESSAGES/django.mo | Bin 63448 -> 64021 bytes locale/gl_ES/LC_MESSAGES/django.po | 393 +++++++++++++----------- locale/lt_LT/LC_MESSAGES/django.mo | Bin 65921 -> 66495 bytes locale/lt_LT/LC_MESSAGES/django.po | 395 +++++++++++++----------- locale/pt_BR/LC_MESSAGES/django.mo | Bin 63800 -> 64372 bytes locale/pt_BR/LC_MESSAGES/django.po | 393 +++++++++++++----------- locale/zh_Hans/LC_MESSAGES/django.mo | Bin 44096 -> 58899 bytes locale/zh_Hans/LC_MESSAGES/django.po | 393 +++++++++++++----------- locale/zh_Hant/LC_MESSAGES/django.mo | Bin 38839 -> 37183 bytes locale/zh_Hant/LC_MESSAGES/django.po | 389 +++++++++++++---------- 17 files changed, 1961 insertions(+), 1425 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index 4ce83f72b3f3850c58528f13afcd23442a75a515..a3ee72875231fa43e9606d325475dec0d0f36d63 100644 GIT binary patch literal 60361 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

bn~W~QNz|orPMejL!qyZkp$n5y3!IC^afNj| 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 YkT@M*x?^sihR|JnWC?+_x8BMBe+?jgy8r+H delta 18724 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\n" "Language-Team: Spanish\n" "Language: es\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:350 msgid "A user with this email already exists." msgstr "Ya existe un usuario con ese correo electrónico." -#: bookwyrm/forms.py:276 +#: bookwyrm/forms.py:364 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:277 +#: bookwyrm/forms.py:365 msgid "One Week" msgstr "Una semana" -#: bookwyrm/forms.py:278 +#: bookwyrm/forms.py:366 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:279 +#: bookwyrm/forms.py:367 msgid "Does Not Expire" msgstr "No expira" -#: bookwyrm/forms.py:283 +#: bookwyrm/forms.py:371 #, python-brace-format msgid "{i} uses" msgstr "{i} usos" -#: bookwyrm/forms.py:284 +#: bookwyrm/forms.py:372 msgid "Unlimited" msgstr "Sin límite" -#: bookwyrm/forms.py:352 +#: bookwyrm/forms.py:468 msgid "List Order" msgstr "Orden de la lista" -#: bookwyrm/forms.py:353 +#: bookwyrm/forms.py:469 msgid "Book Title" msgstr "Título" -#: bookwyrm/forms.py:354 bookwyrm/templates/shelf/shelf.html:149 -#: bookwyrm/templates/shelf/shelf.html:181 +#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Calificación" -#: bookwyrm/forms.py:356 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Ordenar por" -#: bookwyrm/forms.py:360 +#: bookwyrm/forms.py:476 msgid "Ascending" msgstr "Ascendente" -#: bookwyrm/forms.py:361 +#: bookwyrm/forms.py:477 msgid "Descending" msgstr "Descendente" @@ -122,13 +122,13 @@ msgid "Paperback" msgstr "Tapa blanda" #: bookwyrm/models/federated_server.py:11 -#: bookwyrm/templates/settings/federation/edit_instance.html:42 +#: bookwyrm/templates/settings/federation/edit_instance.html:43 #: bookwyrm/templates/settings/federation/instance_list.html:19 msgid "Federated" msgstr "Federalizado" #: bookwyrm/models/federated_server.py:12 -#: bookwyrm/templates/settings/federation/edit_instance.html:43 +#: bookwyrm/templates/settings/federation/edit_instance.html:44 #: bookwyrm/templates/settings/federation/instance.html:10 #: bookwyrm/templates/settings/federation/instance_list.html:23 msgid "Blocked" @@ -152,7 +152,7 @@ msgstr "nombre de usuario" msgid "A user with that username already exists." msgstr "Ya existe un usuario con ese nombre." -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:218 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:227 msgid "Reviews" msgstr "Reseñas" @@ -170,7 +170,7 @@ msgstr "Todo lo demás" #: bookwyrm/settings.py:118 msgid "Home Timeline" -msgstr "Línea temporal de hogar" +msgstr "Línea de tiempo principal" #: bookwyrm/settings.py:118 msgid "Home" @@ -188,7 +188,7 @@ msgstr "Libros" #: bookwyrm/settings.py:165 msgid "English" -msgstr "Inglés" +msgstr "English (Inglés)" #: bookwyrm/settings.py:166 msgid "Deutsch (German)" @@ -200,7 +200,7 @@ msgstr "Español" #: bookwyrm/settings.py:168 msgid "Galego (Galician)" -msgstr "Gallego (Galicia)" +msgstr "Galego (Gallego)" #: bookwyrm/settings.py:169 msgid "Français (French)" @@ -208,7 +208,7 @@ msgstr "Français (Francés)" #: bookwyrm/settings.py:170 msgid "Lietuvių (Lithuanian)" -msgstr "Lituano (Lituania)" +msgstr "Lietuvių (Lituano)" #: bookwyrm/settings.py:171 msgid "Português - Brasil (Brazilian Portuguese)" @@ -224,7 +224,7 @@ msgstr "繁體中文 (Chino tradicional)" #: bookwyrm/templates/404.html:4 bookwyrm/templates/404.html:8 msgid "Not Found" -msgstr "No encontrado" +msgstr "No Encontrado" #: bookwyrm/templates/404.html:9 msgid "The page you requested doesn't seem to exist!" @@ -232,11 +232,11 @@ msgstr "¡Parece que la página solicitada no existe!" #: bookwyrm/templates/500.html:4 msgid "Oops!" -msgstr "¡Úps!" +msgstr "¡Ups!" #: bookwyrm/templates/500.html:8 msgid "Server Error" -msgstr "Error de servidor" +msgstr "Error del Servidor" #: bookwyrm/templates/500.html:9 msgid "Something went wrong! Sorry about that." @@ -248,7 +248,7 @@ msgid "Edit Author" msgstr "Editar Autor/Autora" #: bookwyrm/templates/author/author.html:35 -#: bookwyrm/templates/author/edit_author.html:43 +#: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" msgstr "Alias:" @@ -311,7 +311,7 @@ msgid "Last edited by:" msgstr "Editado más recientemente por:" #: bookwyrm/templates/author/edit_author.html:33 -#: bookwyrm/templates/book/edit/edit_book_form.html:15 +#: bookwyrm/templates/book/edit/edit_book_form.html:16 msgid "Metadata" msgstr "Metadatos" @@ -320,51 +320,50 @@ msgstr "Metadatos" msgid "Name:" msgstr "Nombre:" -#: bookwyrm/templates/author/edit_author.html:45 -#: bookwyrm/templates/book/edit/edit_book_form.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:79 -#: bookwyrm/templates/book/edit/edit_book_form.html:124 +#: bookwyrm/templates/author/edit_author.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:75 +#: bookwyrm/templates/book/edit/edit_book_form.html:94 msgid "Separate multiple values with commas." msgstr "Separar varios valores con comas." -#: bookwyrm/templates/author/edit_author.html:52 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "Biografía:" -#: bookwyrm/templates/author/edit_author.html:59 +#: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" msgstr "Enlace de Wikipedia:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:61 msgid "Birth date:" msgstr "Fecha de nacimiento:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:68 msgid "Death date:" msgstr "Fecha de muerte:" -#: bookwyrm/templates/author/edit_author.html:81 +#: bookwyrm/templates/author/edit_author.html:75 msgid "Author Identifiers" msgstr "Identificadores de autor/autora" -#: bookwyrm/templates/author/edit_author.html:83 +#: bookwyrm/templates/author/edit_author.html:77 msgid "Openlibrary key:" msgstr "Clave OpenLibrary:" -#: bookwyrm/templates/author/edit_author.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:224 +#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/book/edit/edit_book_form.html:265 msgid "Inventaire ID:" msgstr "ID Inventaire:" -#: bookwyrm/templates/author/edit_author.html:99 +#: bookwyrm/templates/author/edit_author.html:91 msgid "Librarything key:" msgstr "Clave Librarything:" -#: bookwyrm/templates/author/edit_author.html:107 +#: bookwyrm/templates/author/edit_author.html:98 msgid "Goodreads key:" msgstr "Clave Goodreads:" -#: bookwyrm/templates/author/edit_author.html:118 +#: bookwyrm/templates/author/edit_author.html:108 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -372,18 +371,18 @@ msgstr "Clave Goodreads:" #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/form.html:75 #: bookwyrm/templates/preferences/edit_user.html:124 -#: bookwyrm/templates/settings/announcements/announcement_form.html:69 -#: bookwyrm/templates/settings/federation/edit_instance.html:74 +#: bookwyrm/templates/settings/announcements/announcement_form.html:76 +#: bookwyrm/templates/settings/federation/edit_instance.html:82 #: bookwyrm/templates/settings/federation/instance.html:87 -#: bookwyrm/templates/settings/site.html:134 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:64 +#: bookwyrm/templates/settings/site.html:133 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:68 #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" msgstr "Guardar" -#: bookwyrm/templates/author/edit_author.html:119 -#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 @@ -428,7 +427,7 @@ msgid "Add Description" msgstr "Agregar descripción" #: bookwyrm/templates/book/book.html:136 -#: bookwyrm/templates/book/edit/edit_book_form.html:34 +#: bookwyrm/templates/book/edit/edit_book_form.html:39 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descripción:" @@ -439,52 +438,51 @@ msgid "%(count)s editions" msgstr "%(count)s ediciones" #: bookwyrm/templates/book/book.html:158 -#, python-format -msgid "This edition is on your %(shelf_name)s shelf." -msgstr "Esta edición está en tu %(shelf_name)s estante." +msgid "You have shelved this edition in:" +msgstr "Has guardado esta edición en la estantería de:" -#: bookwyrm/templates/book/book.html:164 +#: bookwyrm/templates/book/book.html:173 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." -msgstr "Una edición diferente de este libro está en tu %(shelf_name)s estante." +msgstr "Una edición diferente de este libro está en tu estantería %(shelf_name)s." -#: bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:184 msgid "Your reading activity" msgstr "Tu actividad de lectura" -#: bookwyrm/templates/book/book.html:178 +#: bookwyrm/templates/book/book.html:187 msgid "Add read dates" msgstr "Agregar fechas de lectura" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:196 msgid "Create" msgstr "Crear" -#: bookwyrm/templates/book/book.html:197 +#: bookwyrm/templates/book/book.html:206 msgid "You don't have any reading activity for this book." msgstr "No tienes ninguna actividad de lectura para este libro." -#: bookwyrm/templates/book/book.html:223 +#: bookwyrm/templates/book/book.html:232 msgid "Your reviews" msgstr "Tus reseñas" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:238 msgid "Your comments" msgstr "Tus comentarios" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:244 msgid "Your quotes" msgstr "Tus citas" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:280 msgid "Subjects" msgstr "Sujetos" -#: bookwyrm/templates/book/book.html:283 +#: bookwyrm/templates/book/book.html:292 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:294 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:303 bookwyrm/templates/layout.html:75 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -492,15 +490,15 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:314 msgid "Add to list" msgstr "Agregar a lista" -#: bookwyrm/templates/book/book.html:315 +#: bookwyrm/templates/book/book.html:324 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:182 -#: bookwyrm/templates/settings/email_blocklist/domain_form.html:26 -#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 msgid "Add" msgstr "Agregar" @@ -509,22 +507,22 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:15 -#: bookwyrm/templates/book/edit/edit_book_form.html:232 +#: bookwyrm/templates/book/edit/edit_book_form.html:274 msgid "OCLC Number:" msgstr "Número OCLC:" #: bookwyrm/templates/book/book_identifiers.html:22 -#: bookwyrm/templates/book/edit/edit_book_form.html:240 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:143 +#: bookwyrm/templates/book/edit/edit_book_form.html:173 msgid "Upload cover:" msgstr "Subir portada:" #: bookwyrm/templates/book/cover_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:148 +#: bookwyrm/templates/book/edit/edit_book_form.html:179 msgid "Load cover from url:" msgstr "Agregar portada de url:" @@ -576,110 +574,120 @@ msgstr "Esta es una obra nueva" #: bookwyrm/templates/book/edit/edit_book.html:108 #: bookwyrm/templates/groups/members.html:16 -#: bookwyrm/templates/landing/password_reset.html:30 +#: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:16 msgid "Confirm" msgstr "Confirmar" #: bookwyrm/templates/book/edit/edit_book.html:110 -#: bookwyrm/templates/feed/status.html:9 +#: bookwyrm/templates/feed/status.html:21 msgid "Back" msgstr "Volver" -#: bookwyrm/templates/book/edit/edit_book_form.html:18 +#: bookwyrm/templates/book/edit/edit_book_form.html:21 #: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "Título:" -#: bookwyrm/templates/book/edit/edit_book_form.html:26 +#: bookwyrm/templates/book/edit/edit_book_form.html:30 msgid "Subtitle:" msgstr "Subtítulo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:50 msgid "Series:" msgstr "Serie:" -#: bookwyrm/templates/book/edit/edit_book_form.html:53 +#: bookwyrm/templates/book/edit/edit_book_form.html:60 msgid "Series number:" msgstr "Número de serie:" -#: bookwyrm/templates/book/edit/edit_book_form.html:63 +#: bookwyrm/templates/book/edit/edit_book_form.html:71 msgid "Languages:" msgstr "Idiomas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:74 +#: bookwyrm/templates/book/edit/edit_book_form.html:85 msgid "Publication" msgstr "Publicación" -#: bookwyrm/templates/book/edit/edit_book_form.html:77 +#: bookwyrm/templates/book/edit/edit_book_form.html:90 msgid "Publisher:" msgstr "Editorial:" -#: bookwyrm/templates/book/edit/edit_book_form.html:86 +#: bookwyrm/templates/book/edit/edit_book_form.html:102 msgid "First published date:" msgstr "Fecha de primera publicación:" -#: bookwyrm/templates/book/edit/edit_book_form.html:94 +#: bookwyrm/templates/book/edit/edit_book_form.html:111 msgid "Published date:" msgstr "Fecha de publicación:" -#: bookwyrm/templates/book/edit/edit_book_form.html:104 +#: bookwyrm/templates/book/edit/edit_book_form.html:122 msgid "Authors" msgstr "Autores" -#: bookwyrm/templates/book/edit/edit_book_form.html:112 +#: bookwyrm/templates/book/edit/edit_book_form.html:131 #, python-format msgid "Remove %(name)s" msgstr "Quitar %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:115 +#: bookwyrm/templates/book/edit/edit_book_form.html:134 #, python-format msgid "Author page for %(name)s" msgstr "Página de autor por %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:122 +#: bookwyrm/templates/book/edit/edit_book_form.html:142 msgid "Add Authors:" msgstr "Agregar Autores:" -#: bookwyrm/templates/book/edit/edit_book_form.html:123 -msgid "John Doe, Jane Smith" -msgstr "Juan Nadie, Natalia Natalia" +#: bookwyrm/templates/book/edit/edit_book_form.html:145 +#: bookwyrm/templates/book/edit/edit_book_form.html:148 +msgid "Add Author" +msgstr "Añadir Autor" -#: bookwyrm/templates/book/edit/edit_book_form.html:132 -#: bookwyrm/templates/shelf/shelf.html:140 +#: bookwyrm/templates/book/edit/edit_book_form.html:146 +#: bookwyrm/templates/book/edit/edit_book_form.html:149 +msgid "Jane Doe" +msgstr "María López García" + +#: bookwyrm/templates/book/edit/edit_book_form.html:152 +msgid "Add Another Author" +msgstr "Añadir Otro Autor" + +#: bookwyrm/templates/book/edit/edit_book_form.html:160 +#: bookwyrm/templates/shelf/shelf.html:143 msgid "Cover" msgstr "Portada" -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:192 msgid "Physical Properties" msgstr "Propiedades físicas" -#: bookwyrm/templates/book/edit/edit_book_form.html:166 +#: bookwyrm/templates/book/edit/edit_book_form.html:199 #: bookwyrm/templates/book/editions/format_filter.html:5 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Format details:" msgstr "Detalles del formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:187 +#: bookwyrm/templates/book/edit/edit_book_form.html:222 msgid "Pages:" msgstr "Páginas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:197 +#: bookwyrm/templates/book/edit/edit_book_form.html:233 msgid "Book Identifiers" msgstr "Identificadores de libro" -#: bookwyrm/templates/book/edit/edit_book_form.html:200 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:208 +#: bookwyrm/templates/book/edit/edit_book_form.html:247 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:256 msgid "Openlibrary ID:" msgstr "ID OpenLibrary:" @@ -811,7 +819,7 @@ msgid "Confirmation code:" msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 -#: bookwyrm/templates/landing/layout.html:73 +#: bookwyrm/templates/landing/layout.html:72 #: bookwyrm/templates/settings/dashboard/dashboard.html:93 #: bookwyrm/templates/snippets/report_modal.html:33 msgid "Submit" @@ -828,8 +836,8 @@ msgstr "Reenviar enlace de confirmación" #: bookwyrm/templates/confirm_email/resend_form.html:11 #: bookwyrm/templates/landing/layout.html:67 #: bookwyrm/templates/landing/password_reset_request.html:18 -#: bookwyrm/templates/preferences/edit_user.html:56 -#: bookwyrm/templates/snippets/register_form.html:13 +#: bookwyrm/templates/preferences/edit_user.html:53 +#: bookwyrm/templates/snippets/register_form.html:12 msgid "Email address:" msgstr "Dirección de correo electrónico:" @@ -859,16 +867,21 @@ msgstr "Directorio" msgid "Make your profile discoverable to other BookWyrm users." msgstr "Haz que tu perfil sea reconocible a otros usarios de BookWyrm." +#: bookwyrm/templates/directory/directory.html:21 +msgid "Join Directory" +msgstr "Unirse al Directorio" + #: bookwyrm/templates/directory/directory.html:24 #, python-format msgid "You can opt-out at any time in your profile settings." msgstr "Puedes optar por no en cualquier hora en tus configuraciones de perfil." #: bookwyrm/templates/directory/directory.html:29 +#: bookwyrm/templates/directory/directory.html:31 #: bookwyrm/templates/feed/goal_card.html:17 #: bookwyrm/templates/snippets/announcement.html:34 msgid "Dismiss message" -msgstr "Desechar mensaje" +msgstr "Descartar mensaje" #: bookwyrm/templates/directory/sort_filter.html:5 msgid "Order by" @@ -876,7 +889,7 @@ msgstr "Ordenar por" #: bookwyrm/templates/directory/sort_filter.html:8 msgid "Recently active" -msgstr "Activo recientemente" +msgstr "Activ@ recientemente" #: bookwyrm/templates/directory/sort_filter.html:9 msgid "Suggested" @@ -898,8 +911,8 @@ msgstr[1] "seguidores que tu sigues" #: bookwyrm/templates/directory/user_card.html:47 msgid "book on your shelves" msgid_plural "books on your shelves" -msgstr[0] "libro en tus estantes" -msgstr[1] "libro en tus estantes" +msgstr[0] "libro en tus estanterías" +msgstr[1] "libros en tus estanterías" #: bookwyrm/templates/directory/user_card.html:55 msgid "posts" @@ -1014,7 +1027,7 @@ msgstr "Preferencia de correo electrónico" #: bookwyrm/templates/email/invite/subject.html:2 #, python-format msgid "You're invited to join %(site_name)s!" -msgstr "¡Estás invitado a unirse con %(site_name)s!" +msgstr "¡Te han invitado a unirte a %(site_name)s!" #: bookwyrm/templates/email/invite/html_content.html:9 msgid "Join Now" @@ -1093,28 +1106,28 @@ msgstr "Todos los mensajes" msgid "You have no messages right now." msgstr "No tienes ningún mensaje en este momento." -#: bookwyrm/templates/feed/feed.html:23 +#: bookwyrm/templates/feed/feed.html:27 msgid "Feed settings" msgstr "Configuración del feed" -#: bookwyrm/templates/feed/feed.html:26 +#: bookwyrm/templates/feed/feed.html:39 msgid "Saved!" msgstr "¡Guardado!" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:53 msgid "Save settings" msgstr "Guardar ajustes" -#: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/feed/feed.html:63 #, python-format msgid "load 0 unread status(es)" msgstr "cargar 0 estado(s) no leído(s)" -#: bookwyrm/templates/feed/feed.html:72 +#: bookwyrm/templates/feed/feed.html:80 msgid "There aren't any activities right now! Try following a user to get started" msgstr "¡No hay actividad ahora mismo! Sigue a otro usuario para empezar" -#: bookwyrm/templates/feed/feed.html:73 +#: bookwyrm/templates/feed/feed.html:81 msgid "Alternatively, you can try enabling more status types" msgstr "Alternativamente, puedes intentar habilitar más tipos de estado" @@ -1143,22 +1156,35 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "¡No hay ningún libro aquí ahorita! Busca a un libro para empezar" #: bookwyrm/templates/feed/layout.html:25 +#: bookwyrm/templates/get_started/book_preview.html:10 #: bookwyrm/templates/shelf/shelf.html:38 +#: bookwyrm/templates/shelf/shelf.html:83 +#: bookwyrm/templates/snippets/shelf_selector.html:28 #: bookwyrm/templates/user/books_header.html:4 +#: bookwyrm/templates/user/user.html:33 msgid "To Read" msgstr "Para leer" #: bookwyrm/templates/feed/layout.html:26 +#: bookwyrm/templates/get_started/book_preview.html:11 #: bookwyrm/templates/shelf/shelf.html:40 +#: bookwyrm/templates/shelf/shelf.html:84 +#: bookwyrm/templates/snippets/shelf_selector.html:29 #: bookwyrm/templates/user/books_header.html:6 +#: bookwyrm/templates/user/user.html:34 msgid "Currently Reading" msgstr "Leyendo actualmente" #: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/get_started/book_preview.html:12 #: bookwyrm/templates/shelf/shelf.html:42 +#: bookwyrm/templates/shelf/shelf.html:85 +#: bookwyrm/templates/snippets/shelf_selector.html:30 +#: bookwyrm/templates/snippets/shelf_selector.html:49 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 #: bookwyrm/templates/user/books_header.html:8 +#: bookwyrm/templates/user/user.html:35 msgid "Read" msgstr "Leído" @@ -1180,6 +1206,10 @@ msgstr "Ver directorio" msgid "Have you read %(book_title)s?" msgstr "¿Has leído %(book_title)s?" +#: bookwyrm/templates/get_started/book_preview.html:7 +msgid "Add to your books" +msgstr "Añadir a tus libros" + #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" msgstr "¿Qué estás leyendo?" @@ -1226,7 +1256,7 @@ msgid "No books found" msgstr "No se encontró ningún libro" #: bookwyrm/templates/get_started/books.html:63 -#: bookwyrm/templates/get_started/profile.html:54 +#: bookwyrm/templates/get_started/profile.html:51 msgid "Save & continue" msgstr "Guardar & continuar" @@ -1266,35 +1296,33 @@ msgid "Finish" msgstr "Terminar" #: bookwyrm/templates/get_started/profile.html:15 -#: bookwyrm/templates/preferences/edit_user.html:42 +#: bookwyrm/templates/preferences/edit_user.html:41 msgid "Display name:" msgstr "Nombre de visualización:" -#: bookwyrm/templates/get_started/profile.html:22 -#: bookwyrm/templates/preferences/edit_user.html:49 +#: bookwyrm/templates/get_started/profile.html:21 +#: bookwyrm/templates/preferences/edit_user.html:47 msgid "Summary:" msgstr "Resumen:" -#: bookwyrm/templates/get_started/profile.html:23 +#: bookwyrm/templates/get_started/profile.html:22 msgid "A little bit about you" msgstr "Un poco sobre ti" -#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/get_started/profile.html:30 #: bookwyrm/templates/preferences/edit_user.html:27 msgid "Avatar:" msgstr "Avatar:" -#: bookwyrm/templates/get_started/profile.html:42 -#: bookwyrm/templates/preferences/edit_user.html:110 +#: bookwyrm/templates/get_started/profile.html:39 msgid "Manually approve followers:" msgstr "Aprobar seguidores a mano:" -#: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:80 +#: bookwyrm/templates/get_started/profile.html:45 msgid "Show this account in suggested users:" msgstr "Mostrar esta cuenta en los usuarios sugeridos:" -#: bookwyrm/templates/get_started/profile.html:52 +#: bookwyrm/templates/get_started/profile.html:49 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "Tu cuenta se aparecerá en el directorio, y puede ser recomendado a otros usuarios de BookWyrm." @@ -1396,8 +1424,8 @@ msgstr[1] "%(mutuals)s seguidores que sigues" #, python-format msgid "%(shared_books)s book on your shelves" msgid_plural "%(shared_books)s books on your shelves" -msgstr[0] "%(shared_books)s libro en tus estantes" -msgstr[1] "%(shared_books)s libros en tus estantes" +msgstr[0] "%(shared_books)s libro en tus estanterías" +msgstr[1] "%(shared_books)s libros en tus estanterías" #: bookwyrm/templates/groups/suggested_users.html:40 #, python-format @@ -1498,8 +1526,8 @@ msgid "Row" msgstr "Fila" #: bookwyrm/templates/import/import_status.html:103 -#: bookwyrm/templates/shelf/shelf.html:141 -#: bookwyrm/templates/shelf/shelf.html:163 +#: bookwyrm/templates/shelf/shelf.html:144 +#: bookwyrm/templates/shelf/shelf.html:166 msgid "Title" msgstr "Título" @@ -1508,8 +1536,8 @@ msgid "ISBN" msgstr "ISBN" #: bookwyrm/templates/import/import_status.html:109 -#: bookwyrm/templates/shelf/shelf.html:142 -#: bookwyrm/templates/shelf/shelf.html:166 +#: bookwyrm/templates/shelf/shelf.html:145 +#: bookwyrm/templates/shelf/shelf.html:169 msgid "Author" msgstr "Autor/Autora" @@ -1632,7 +1660,7 @@ msgstr "Política de privacidad" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 -#: bookwyrm/templates/landing/login.html:49 +#: bookwyrm/templates/landing/login.html:48 msgid "Create an Account" msgstr "Crear una cuenta" @@ -1663,7 +1691,7 @@ msgstr "Anti-corporativo" #: bookwyrm/templates/landing/layout.html:45 #, python-format msgid "Join %(name)s" -msgstr "Unirse con %(name)s" +msgstr "Únete a %(name)s" #: bookwyrm/templates/landing/layout.html:47 msgid "Request an Invitation" @@ -1678,7 +1706,7 @@ msgstr "El registro de %(name)s está cerrado" msgid "Thank you! Your request has been received." msgstr "¡Gracias! Tu solicitud ha sido recibido." -#: bookwyrm/templates/landing/layout.html:82 +#: bookwyrm/templates/landing/layout.html:81 msgid "Your Account" msgstr "Tu cuenta" @@ -1687,7 +1715,7 @@ msgid "Login" msgstr "Iniciar sesión" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:37 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 msgid "Log in" msgstr "Iniciar sesión" @@ -1701,21 +1729,21 @@ msgid "Username:" msgstr "Nombre de usuario:" #: bookwyrm/templates/landing/login.html:27 -#: bookwyrm/templates/landing/password_reset.html:17 +#: bookwyrm/templates/landing/password_reset.html:26 #: bookwyrm/templates/layout.html:174 -#: bookwyrm/templates/snippets/register_form.html:22 +#: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Contraseña:" -#: bookwyrm/templates/landing/login.html:40 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 msgid "Forgot your password?" msgstr "¿Olvidaste tu contraseña?" -#: bookwyrm/templates/landing/login.html:62 +#: bookwyrm/templates/landing/login.html:61 msgid "More about this site" msgstr "Más sobre este sitio" -#: bookwyrm/templates/landing/password_reset.html:23 +#: bookwyrm/templates/landing/password_reset.html:34 #: bookwyrm/templates/preferences/change_password.html:18 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" @@ -1847,7 +1875,7 @@ msgstr "Sugerido por" #: bookwyrm/templates/lists/curate.html:63 msgid "Discard" -msgstr "Desechar" +msgstr "Descartar" #: bookwyrm/templates/lists/delete_list_modal.html:4 msgid "Delete this list?" @@ -1942,7 +1970,6 @@ msgstr "Establecido" #: bookwyrm/templates/lists/list.html:92 #: bookwyrm/templates/snippets/remove_from_group_button.html:19 -#: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "Quitar" @@ -2188,9 +2215,9 @@ msgstr "Nueva contraseña:" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/delete_user.html:25 #: bookwyrm/templates/preferences/layout.html:24 -#: bookwyrm/templates/settings/users/delete_user_form.html:23 +#: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "Quitar cuenta" @@ -2215,7 +2242,7 @@ msgid "Profile" msgstr "Perfil" #: bookwyrm/templates/preferences/edit_user.html:13 -#: bookwyrm/templates/preferences/edit_user.html:68 +#: bookwyrm/templates/preferences/edit_user.html:64 msgid "Display preferences" msgstr "Preferencias de visualización" @@ -2224,13 +2251,17 @@ msgstr "Preferencias de visualización" msgid "Privacy" msgstr "Privacidad" -#: bookwyrm/templates/preferences/edit_user.html:72 -msgid "Show reading goal prompt in feed:" -msgstr "Mostrar indicador de objetivo de lectura en el feed:" +#: bookwyrm/templates/preferences/edit_user.html:69 +msgid "Show reading goal prompt in feed" +msgstr "Mostrar el indicador del objetivo de lectura en el feed" -#: bookwyrm/templates/preferences/edit_user.html:76 -msgid "Show suggested users:" -msgstr "Mostrar usuarios sugeridos:" +#: bookwyrm/templates/preferences/edit_user.html:75 +msgid "Show suggested users" +msgstr "Mostrar usuarios sugeridos" + +#: bookwyrm/templates/preferences/edit_user.html:81 +msgid "Show this account in suggested users" +msgstr "Mostrar esta cuenta en usuarios sugeridos" #: bookwyrm/templates/preferences/edit_user.html:85 #, python-format @@ -2241,6 +2272,10 @@ msgstr "Tu cuenta se aparecerá en el directorio, y pue msgid "Preferred Timezone: " msgstr "Huso horario preferido:" +#: bookwyrm/templates/preferences/edit_user.html:111 +msgid "Manually approve followers" +msgstr "Aprobar seguidores manualmente" + #: bookwyrm/templates/preferences/edit_user.html:116 msgid "Default post privacy:" msgstr "Privacidad de publicación por defecto:" @@ -2268,6 +2303,10 @@ msgstr "Empezar \"%(book_title)s\"" msgid "Want to Read \"%(book_title)s\"" msgstr "Quiero leer \"%(book_title)s\"" +#: bookwyrm/templates/search/book.html:42 +msgid "Results from" +msgstr "Resultados de" + #: bookwyrm/templates/search/book.html:47 #: bookwyrm/templates/settings/reports/reports.html:25 #: bookwyrm/templates/snippets/announcement.html:16 @@ -2341,19 +2380,19 @@ msgid "False" msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:47 -#: bookwyrm/templates/settings/announcements/announcement_form.html:40 +#: bookwyrm/templates/settings/announcements/announcement_form.html:44 #: bookwyrm/templates/settings/dashboard/dashboard.html:71 msgid "Start date:" msgstr "Fecha de inicio:" #: bookwyrm/templates/settings/announcements/announcement.html:54 -#: bookwyrm/templates/settings/announcements/announcement_form.html:49 +#: bookwyrm/templates/settings/announcements/announcement_form.html:54 #: bookwyrm/templates/settings/dashboard/dashboard.html:77 msgid "End date:" msgstr "Fecha final:" #: bookwyrm/templates/settings/announcements/announcement.html:60 -#: bookwyrm/templates/settings/announcements/announcement_form.html:58 +#: bookwyrm/templates/settings/announcements/announcement_form.html:64 msgid "Active:" msgstr "Activo:" @@ -2362,15 +2401,15 @@ msgstr "Activo:" msgid "Create Announcement" msgstr "Crear anuncio" -#: bookwyrm/templates/settings/announcements/announcement_form.html:16 +#: bookwyrm/templates/settings/announcements/announcement_form.html:17 msgid "Preview:" msgstr "Vista preliminar:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:23 +#: bookwyrm/templates/settings/announcements/announcement_form.html:25 msgid "Content:" msgstr "Contenido:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:30 +#: bookwyrm/templates/settings/announcements/announcement_form.html:33 msgid "Event date:" msgstr "Fecha de evento:" @@ -2547,29 +2586,29 @@ msgstr "Volver a la lista de instancias" msgid "Import block list" msgstr "Importar lista de bloqueo" -#: bookwyrm/templates/settings/federation/edit_instance.html:30 +#: bookwyrm/templates/settings/federation/edit_instance.html:31 msgid "Instance:" msgstr "Instancia:" -#: bookwyrm/templates/settings/federation/edit_instance.html:39 +#: bookwyrm/templates/settings/federation/edit_instance.html:40 #: bookwyrm/templates/settings/federation/instance.html:28 #: bookwyrm/templates/settings/users/user_info.html:106 msgid "Status:" msgstr "Estado:" -#: bookwyrm/templates/settings/federation/edit_instance.html:52 +#: bookwyrm/templates/settings/federation/edit_instance.html:54 #: bookwyrm/templates/settings/federation/instance.html:22 #: bookwyrm/templates/settings/users/user_info.html:100 msgid "Software:" msgstr "Software:" -#: bookwyrm/templates/settings/federation/edit_instance.html:61 +#: bookwyrm/templates/settings/federation/edit_instance.html:64 #: bookwyrm/templates/settings/federation/instance.html:25 #: bookwyrm/templates/settings/users/user_info.html:103 msgid "Version:" msgstr "Versión:" -#: bookwyrm/templates/settings/federation/edit_instance.html:70 +#: bookwyrm/templates/settings/federation/edit_instance.html:74 msgid "Notes:" msgstr "Notas:" @@ -3148,11 +3187,11 @@ msgstr "Nivel de acceso:" #: bookwyrm/templates/shelf/create_shelf_form.html:5 msgid "Create Shelf" -msgstr "Crear estante" +msgstr "Crear Estantería" #: bookwyrm/templates/shelf/edit_shelf_form.html:5 msgid "Edit Shelf" -msgstr "Editar estante" +msgstr "Editar Estantería" #: bookwyrm/templates/shelf/shelf.html:28 bookwyrm/views/shelf/shelf.py:53 msgid "All books" @@ -3160,46 +3199,46 @@ msgstr "Todos los libros" #: bookwyrm/templates/shelf/shelf.html:69 msgid "Create shelf" -msgstr "Crear estante" +msgstr "Crear estantería" -#: bookwyrm/templates/shelf/shelf.html:90 +#: bookwyrm/templates/shelf/shelf.html:93 #, python-format msgid "%(formatted_count)s book" msgid_plural "%(formatted_count)s books" msgstr[0] "%(formatted_count)s libro" msgstr[1] "%(formatted_count)s libros" -#: bookwyrm/templates/shelf/shelf.html:97 +#: bookwyrm/templates/shelf/shelf.html:100 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "(mostrando %(start)s-%(end)s)" -#: bookwyrm/templates/shelf/shelf.html:109 +#: bookwyrm/templates/shelf/shelf.html:112 msgid "Edit shelf" -msgstr "Editar estante" +msgstr "Editar estantería" -#: bookwyrm/templates/shelf/shelf.html:117 +#: bookwyrm/templates/shelf/shelf.html:120 msgid "Delete shelf" -msgstr "Eliminar estante" +msgstr "Eliminar estantería" -#: bookwyrm/templates/shelf/shelf.html:145 -#: bookwyrm/templates/shelf/shelf.html:171 +#: bookwyrm/templates/shelf/shelf.html:148 +#: bookwyrm/templates/shelf/shelf.html:174 msgid "Shelved" msgstr "Archivado" -#: bookwyrm/templates/shelf/shelf.html:146 -#: bookwyrm/templates/shelf/shelf.html:174 +#: bookwyrm/templates/shelf/shelf.html:149 +#: bookwyrm/templates/shelf/shelf.html:177 msgid "Started" msgstr "Empezado" -#: bookwyrm/templates/shelf/shelf.html:147 -#: bookwyrm/templates/shelf/shelf.html:177 +#: bookwyrm/templates/shelf/shelf.html:150 +#: bookwyrm/templates/shelf/shelf.html:180 msgid "Finished" msgstr "Terminado" -#: bookwyrm/templates/shelf/shelf.html:203 +#: bookwyrm/templates/shelf/shelf.html:206 msgid "This shelf is empty." -msgstr "Este estante está vacio." +msgstr "Esta estantería está vacía." #: bookwyrm/templates/snippets/add_to_group_button.html:15 msgid "Invite" @@ -3307,7 +3346,7 @@ msgstr "Comentario:" #: bookwyrm/templates/snippets/privacy_select.html:20 #: bookwyrm/templates/snippets/privacy_select_no_followers.html:17 msgid "Private" -msgstr "Privada" +msgstr "Privado" #: bookwyrm/templates/snippets/create_status/post_options_block.html:21 msgid "Post" @@ -3454,7 +3493,7 @@ msgstr "Reseña de \"%(book_title)s\": %(review_title)s" #: bookwyrm/templates/snippets/goal_form.html:4 #, python-format msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year." -msgstr "Establece una meta para cuantos libros leerás en %(year)s, y seguir tu progreso durante el año." +msgstr "Establece un objetivo de cuántos libros leerás en %(year)s, y sigue tu progreso a lo largo del año." #: bookwyrm/templates/snippets/goal_form.html:16 msgid "Reading goal:" @@ -3552,13 +3591,13 @@ msgstr "Calificar" msgid "Finish \"%(book_title)s\"" msgstr "Terminar \"%(book_title)s\"" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:23 -#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:24 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:21 #: bookwyrm/templates/snippets/readthrough_form.html:7 msgid "Started reading" msgstr "Lectura se empezó" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:31 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:32 #: bookwyrm/templates/snippets/readthrough_form.html:20 msgid "Finished reading" msgstr "Lectura se terminó" @@ -3586,7 +3625,7 @@ msgstr "Quiero leer \"%(book_title)s\"" msgid "Progress" msgstr "Progreso" -#: bookwyrm/templates/snippets/register_form.html:32 +#: bookwyrm/templates/snippets/register_form.html:30 msgid "Sign Up" msgstr "Inscribirse" @@ -3608,24 +3647,31 @@ msgstr "Este informe se enviará a los moderadores de %(site_name)s para la revi msgid "More info about this report:" msgstr "Más información sobre este informe:" -#: bookwyrm/templates/snippets/shelf_selector.html:4 +#: bookwyrm/templates/snippets/shelf_selector.html:7 msgid "Move book" msgstr "Mover libro" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 -msgid "More shelves" -msgstr "Más estantes" - +#: bookwyrm/templates/snippets/shelf_selector.html:42 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24 msgid "Start reading" msgstr "Empezar leer" +#: bookwyrm/templates/snippets/shelf_selector.html:55 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Want to read" msgstr "Quiero leer" +#: bookwyrm/templates/snippets/shelf_selector.html:73 +#: bookwyrm/templates/snippets/shelf_selector.html:84 +msgid "Remove from" +msgstr "Eliminar de" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 +msgid "More shelves" +msgstr "Más estanterías" + #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62 #, python-format msgid "Remove from %(name)s" @@ -3840,24 +3886,29 @@ msgstr "%(username)s no sigue a nadie" msgid "Edit profile" msgstr "Editar perfil" -#: bookwyrm/templates/user/user.html:33 +#: bookwyrm/templates/user/user.html:37 #, python-format msgid "View all %(size)s" msgstr "Ver los %(size)s" -#: bookwyrm/templates/user/user.html:46 +#: bookwyrm/templates/user/user.html:51 msgid "View all books" msgstr "Ver todos los libros" -#: bookwyrm/templates/user/user.html:59 +#: bookwyrm/templates/user/user.html:58 +#, python-format +msgid "%(current_year)s Reading Goal" +msgstr "Objetivo de Lectura de %(current_year)s" + +#: bookwyrm/templates/user/user.html:65 msgid "User Activity" msgstr "Actividad del usuario" -#: bookwyrm/templates/user/user.html:63 +#: bookwyrm/templates/user/user.html:69 msgid "RSS feed" msgstr "Feed RSS" -#: bookwyrm/templates/user/user.html:74 +#: bookwyrm/templates/user/user.html:80 msgid "No activities yet!" msgstr "¡Aún no actividades!" diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 4cdcbf8ea2a3ffdeed740317a055f435e5954b7c..88f3631ae0c7e200a93aa2d8500126dd03dac960 100644 GIT binary patch literal 67209 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 O&1My;BL#)-KL3AvHp\n" "Language-Team: French\n" "Language: fr\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:350 msgid "A user with this email already exists." msgstr "Cet email est déjà associé à un compte." -#: bookwyrm/forms.py:276 +#: bookwyrm/forms.py:364 msgid "One Day" msgstr "Un jour" -#: bookwyrm/forms.py:277 +#: bookwyrm/forms.py:365 msgid "One Week" msgstr "Une semaine" -#: bookwyrm/forms.py:278 +#: bookwyrm/forms.py:366 msgid "One Month" msgstr "Un mois" -#: bookwyrm/forms.py:279 +#: bookwyrm/forms.py:367 msgid "Does Not Expire" msgstr "Sans expiration" -#: bookwyrm/forms.py:283 +#: bookwyrm/forms.py:371 #, python-brace-format msgid "{i} uses" msgstr "{i} utilisations" -#: bookwyrm/forms.py:284 +#: bookwyrm/forms.py:372 msgid "Unlimited" msgstr "Sans limite" -#: bookwyrm/forms.py:352 +#: bookwyrm/forms.py:468 msgid "List Order" msgstr "Ordre de la liste" -#: bookwyrm/forms.py:353 +#: bookwyrm/forms.py:469 msgid "Book Title" msgstr "Titre du livre" -#: bookwyrm/forms.py:354 bookwyrm/templates/shelf/shelf.html:149 -#: bookwyrm/templates/shelf/shelf.html:181 +#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Note" -#: bookwyrm/forms.py:356 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Trier par" -#: bookwyrm/forms.py:360 +#: bookwyrm/forms.py:476 msgid "Ascending" msgstr "Ordre croissant" -#: bookwyrm/forms.py:361 +#: bookwyrm/forms.py:477 msgid "Descending" msgstr "Ordre décroissant" @@ -122,13 +122,13 @@ msgid "Paperback" msgstr "Couverture souple" #: bookwyrm/models/federated_server.py:11 -#: bookwyrm/templates/settings/federation/edit_instance.html:42 +#: bookwyrm/templates/settings/federation/edit_instance.html:43 #: bookwyrm/templates/settings/federation/instance_list.html:19 msgid "Federated" msgstr "Fédéré" #: bookwyrm/models/federated_server.py:12 -#: bookwyrm/templates/settings/federation/edit_instance.html:43 +#: bookwyrm/templates/settings/federation/edit_instance.html:44 #: bookwyrm/templates/settings/federation/instance.html:10 #: bookwyrm/templates/settings/federation/instance_list.html:23 msgid "Blocked" @@ -152,21 +152,21 @@ msgstr "nom du compte :" msgid "A user with that username already exists." msgstr "Ce nom est déjà associé à un compte." -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:218 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:227 msgid "Reviews" msgstr "Critiques" #: bookwyrm/models/user.py:33 msgid "Comments" -msgstr "" +msgstr "Commentaires" #: bookwyrm/models/user.py:34 msgid "Quotations" -msgstr "" +msgstr "Citations" #: bookwyrm/models/user.py:35 msgid "Everything else" -msgstr "" +msgstr "Tout le reste" #: bookwyrm/settings.py:118 msgid "Home Timeline" @@ -248,7 +248,7 @@ msgid "Edit Author" msgstr "Modifier l’auteur ou autrice" #: bookwyrm/templates/author/author.html:35 -#: bookwyrm/templates/author/edit_author.html:43 +#: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" msgstr "Pseudonymes :" @@ -311,7 +311,7 @@ msgid "Last edited by:" msgstr "Dernière modification par :" #: bookwyrm/templates/author/edit_author.html:33 -#: bookwyrm/templates/book/edit/edit_book_form.html:15 +#: bookwyrm/templates/book/edit/edit_book_form.html:16 msgid "Metadata" msgstr "Métadonnées" @@ -320,51 +320,50 @@ msgstr "Métadonnées" msgid "Name:" msgstr "Nom :" -#: bookwyrm/templates/author/edit_author.html:45 -#: bookwyrm/templates/book/edit/edit_book_form.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:79 -#: bookwyrm/templates/book/edit/edit_book_form.html:124 +#: bookwyrm/templates/author/edit_author.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:75 +#: bookwyrm/templates/book/edit/edit_book_form.html:94 msgid "Separate multiple values with commas." msgstr "Séparez plusieurs valeurs par une virgule." -#: bookwyrm/templates/author/edit_author.html:52 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "Bio :" -#: bookwyrm/templates/author/edit_author.html:59 +#: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" msgstr "Wikipedia :" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:61 msgid "Birth date:" msgstr "Date de naissance :" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:68 msgid "Death date:" msgstr "Date de décès :" -#: bookwyrm/templates/author/edit_author.html:81 +#: bookwyrm/templates/author/edit_author.html:75 msgid "Author Identifiers" msgstr "Identifiants de l’auteur ou autrice" -#: bookwyrm/templates/author/edit_author.html:83 +#: bookwyrm/templates/author/edit_author.html:77 msgid "Openlibrary key:" msgstr "Clé Openlibrary :" -#: bookwyrm/templates/author/edit_author.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:224 +#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/book/edit/edit_book_form.html:265 msgid "Inventaire ID:" msgstr "Identifiant Inventaire :" -#: bookwyrm/templates/author/edit_author.html:99 +#: bookwyrm/templates/author/edit_author.html:91 msgid "Librarything key:" msgstr "Clé Librarything :" -#: bookwyrm/templates/author/edit_author.html:107 +#: bookwyrm/templates/author/edit_author.html:98 msgid "Goodreads key:" msgstr "Clé Goodreads :" -#: bookwyrm/templates/author/edit_author.html:118 +#: bookwyrm/templates/author/edit_author.html:108 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -372,18 +371,18 @@ msgstr "Clé Goodreads :" #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/form.html:75 #: bookwyrm/templates/preferences/edit_user.html:124 -#: bookwyrm/templates/settings/announcements/announcement_form.html:69 -#: bookwyrm/templates/settings/federation/edit_instance.html:74 +#: bookwyrm/templates/settings/announcements/announcement_form.html:76 +#: bookwyrm/templates/settings/federation/edit_instance.html:82 #: bookwyrm/templates/settings/federation/instance.html:87 -#: bookwyrm/templates/settings/site.html:134 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:64 +#: bookwyrm/templates/settings/site.html:133 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:68 #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" msgstr "Enregistrer" -#: bookwyrm/templates/author/edit_author.html:119 -#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 @@ -428,7 +427,7 @@ msgid "Add Description" msgstr "Ajouter une description" #: bookwyrm/templates/book/book.html:136 -#: bookwyrm/templates/book/edit/edit_book_form.html:34 +#: bookwyrm/templates/book/edit/edit_book_form.html:39 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Description :" @@ -439,52 +438,51 @@ msgid "%(count)s editions" msgstr "%(count)s éditions" #: bookwyrm/templates/book/book.html:158 -#, python-format -msgid "This edition is on your %(shelf_name)s shelf." -msgstr "Cette édition est sur votre étagère %(shelf_name)s." +msgid "You have shelved this edition in:" +msgstr "Vous avez rangé cette édition dans :" -#: bookwyrm/templates/book/book.html:164 +#: bookwyrm/templates/book/book.html:173 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Une édition différente de ce livre existe sur votre étagère %(shelf_name)s." -#: bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:184 msgid "Your reading activity" msgstr "Votre activité de lecture" -#: bookwyrm/templates/book/book.html:178 +#: bookwyrm/templates/book/book.html:187 msgid "Add read dates" msgstr "Ajouter des dates de lecture" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:196 msgid "Create" msgstr "Créer" -#: bookwyrm/templates/book/book.html:197 +#: bookwyrm/templates/book/book.html:206 msgid "You don't have any reading activity for this book." msgstr "Vous n’avez aucune activité de lecture pour ce livre" -#: bookwyrm/templates/book/book.html:223 +#: bookwyrm/templates/book/book.html:232 msgid "Your reviews" msgstr "Vos critiques" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:238 msgid "Your comments" msgstr "Vos commentaires" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:244 msgid "Your quotes" msgstr "Vos citations" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:280 msgid "Subjects" msgstr "Sujets" -#: bookwyrm/templates/book/book.html:283 +#: bookwyrm/templates/book/book.html:292 msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book/book.html:294 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:303 bookwyrm/templates/layout.html:75 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -492,15 +490,15 @@ msgstr "Lieux" msgid "Lists" msgstr "Listes" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:314 msgid "Add to list" msgstr "Ajouter à la liste" -#: bookwyrm/templates/book/book.html:315 +#: bookwyrm/templates/book/book.html:324 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:182 -#: bookwyrm/templates/settings/email_blocklist/domain_form.html:26 -#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 msgid "Add" msgstr "Ajouter" @@ -509,22 +507,22 @@ msgid "ISBN:" msgstr "ISBN :" #: bookwyrm/templates/book/book_identifiers.html:15 -#: bookwyrm/templates/book/edit/edit_book_form.html:232 +#: bookwyrm/templates/book/edit/edit_book_form.html:274 msgid "OCLC Number:" msgstr "Numéro OCLC :" #: bookwyrm/templates/book/book_identifiers.html:22 -#: bookwyrm/templates/book/edit/edit_book_form.html:240 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 msgid "ASIN:" msgstr "ASIN :" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:143 +#: bookwyrm/templates/book/edit/edit_book_form.html:173 msgid "Upload cover:" msgstr "Charger une couverture :" #: bookwyrm/templates/book/cover_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:148 +#: bookwyrm/templates/book/edit/edit_book_form.html:179 msgid "Load cover from url:" msgstr "Charger la couverture depuis une URL :" @@ -576,110 +574,120 @@ msgstr "Il s’agit d’un nouvel ouvrage." #: bookwyrm/templates/book/edit/edit_book.html:108 #: bookwyrm/templates/groups/members.html:16 -#: bookwyrm/templates/landing/password_reset.html:30 +#: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:16 msgid "Confirm" msgstr "Confirmer" #: bookwyrm/templates/book/edit/edit_book.html:110 -#: bookwyrm/templates/feed/status.html:9 +#: bookwyrm/templates/feed/status.html:21 msgid "Back" msgstr "Retour" -#: bookwyrm/templates/book/edit/edit_book_form.html:18 +#: bookwyrm/templates/book/edit/edit_book_form.html:21 #: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "Titre :" -#: bookwyrm/templates/book/edit/edit_book_form.html:26 +#: bookwyrm/templates/book/edit/edit_book_form.html:30 msgid "Subtitle:" msgstr "Sous‑titre :" -#: bookwyrm/templates/book/edit/edit_book_form.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:50 msgid "Series:" msgstr "Série :" -#: bookwyrm/templates/book/edit/edit_book_form.html:53 +#: bookwyrm/templates/book/edit/edit_book_form.html:60 msgid "Series number:" msgstr "Numéro dans la série :" -#: bookwyrm/templates/book/edit/edit_book_form.html:63 +#: bookwyrm/templates/book/edit/edit_book_form.html:71 msgid "Languages:" msgstr "Langues :" -#: bookwyrm/templates/book/edit/edit_book_form.html:74 +#: bookwyrm/templates/book/edit/edit_book_form.html:85 msgid "Publication" msgstr "Publication" -#: bookwyrm/templates/book/edit/edit_book_form.html:77 +#: bookwyrm/templates/book/edit/edit_book_form.html:90 msgid "Publisher:" msgstr "Éditeur :" -#: bookwyrm/templates/book/edit/edit_book_form.html:86 +#: bookwyrm/templates/book/edit/edit_book_form.html:102 msgid "First published date:" msgstr "Première date de parution :" -#: bookwyrm/templates/book/edit/edit_book_form.html:94 +#: bookwyrm/templates/book/edit/edit_book_form.html:111 msgid "Published date:" msgstr "Date de parution :" -#: bookwyrm/templates/book/edit/edit_book_form.html:104 +#: bookwyrm/templates/book/edit/edit_book_form.html:122 msgid "Authors" msgstr "Auteurs ou autrices" -#: bookwyrm/templates/book/edit/edit_book_form.html:112 +#: bookwyrm/templates/book/edit/edit_book_form.html:131 #, python-format msgid "Remove %(name)s" msgstr "Retirer %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:115 +#: bookwyrm/templates/book/edit/edit_book_form.html:134 #, python-format msgid "Author page for %(name)s" msgstr "Page de %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:122 +#: bookwyrm/templates/book/edit/edit_book_form.html:142 msgid "Add Authors:" msgstr "Ajouter des auteurs ou autrices :" -#: bookwyrm/templates/book/edit/edit_book_form.html:123 -msgid "John Doe, Jane Smith" -msgstr "Claude Dupont, Dominique Durand" +#: bookwyrm/templates/book/edit/edit_book_form.html:145 +#: bookwyrm/templates/book/edit/edit_book_form.html:148 +msgid "Add Author" +msgstr "Ajouter un auteur ou une autrice" -#: bookwyrm/templates/book/edit/edit_book_form.html:132 -#: bookwyrm/templates/shelf/shelf.html:140 +#: bookwyrm/templates/book/edit/edit_book_form.html:146 +#: bookwyrm/templates/book/edit/edit_book_form.html:149 +msgid "Jane Doe" +msgstr "Camille Dupont" + +#: bookwyrm/templates/book/edit/edit_book_form.html:152 +msgid "Add Another Author" +msgstr "Ajouter un autre auteur ou autrice" + +#: bookwyrm/templates/book/edit/edit_book_form.html:160 +#: bookwyrm/templates/shelf/shelf.html:143 msgid "Cover" msgstr "Couverture" -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:192 msgid "Physical Properties" msgstr "Propriétés physiques" -#: bookwyrm/templates/book/edit/edit_book_form.html:166 +#: bookwyrm/templates/book/edit/edit_book_form.html:199 #: bookwyrm/templates/book/editions/format_filter.html:5 msgid "Format:" msgstr "Format :" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Format details:" msgstr "Détails du format :" -#: bookwyrm/templates/book/edit/edit_book_form.html:187 +#: bookwyrm/templates/book/edit/edit_book_form.html:222 msgid "Pages:" msgstr "Pages :" -#: bookwyrm/templates/book/edit/edit_book_form.html:197 +#: bookwyrm/templates/book/edit/edit_book_form.html:233 msgid "Book Identifiers" msgstr "Identifiants du livre" -#: bookwyrm/templates/book/edit/edit_book_form.html:200 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 msgid "ISBN 13:" msgstr "ISBN 13 :" -#: bookwyrm/templates/book/edit/edit_book_form.html:208 +#: bookwyrm/templates/book/edit/edit_book_form.html:247 msgid "ISBN 10:" msgstr "ISBN 10 :" -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:256 msgid "Openlibrary ID:" msgstr "Identifiant Openlibrary :" @@ -811,7 +819,7 @@ msgid "Confirmation code:" msgstr "Code de confirmation :" #: bookwyrm/templates/confirm_email/confirm_email.html:25 -#: bookwyrm/templates/landing/layout.html:73 +#: bookwyrm/templates/landing/layout.html:72 #: bookwyrm/templates/settings/dashboard/dashboard.html:93 #: bookwyrm/templates/snippets/report_modal.html:33 msgid "Submit" @@ -828,8 +836,8 @@ msgstr "Envoyer le lien de confirmation de nouveau" #: bookwyrm/templates/confirm_email/resend_form.html:11 #: bookwyrm/templates/landing/layout.html:67 #: bookwyrm/templates/landing/password_reset_request.html:18 -#: bookwyrm/templates/preferences/edit_user.html:56 -#: bookwyrm/templates/snippets/register_form.html:13 +#: bookwyrm/templates/preferences/edit_user.html:53 +#: bookwyrm/templates/snippets/register_form.html:12 msgid "Email address:" msgstr "Adresse email :" @@ -859,12 +867,17 @@ msgstr "Répertoire" msgid "Make your profile discoverable to other BookWyrm users." msgstr "Autoriser d’autres utilisateurs ou utilisatrices de BookWyrm à découvrir votre profil." +#: bookwyrm/templates/directory/directory.html:21 +msgid "Join Directory" +msgstr "Rejoindre le répertoire" + #: bookwyrm/templates/directory/directory.html:24 #, python-format msgid "You can opt-out at any time in your profile settings." msgstr "Vous pouvez décider de ne plus y figurer à n’importe quel moment depuis vos paramètres de profil." #: bookwyrm/templates/directory/directory.html:29 +#: bookwyrm/templates/directory/directory.html:31 #: bookwyrm/templates/feed/goal_card.html:17 #: bookwyrm/templates/snippets/announcement.html:34 msgid "Dismiss message" @@ -1093,30 +1106,30 @@ msgstr "Tous les messages" msgid "You have no messages right now." msgstr "Vous n’avez aucun message pour l’instant." -#: bookwyrm/templates/feed/feed.html:23 +#: bookwyrm/templates/feed/feed.html:27 msgid "Feed settings" -msgstr "" +msgstr "Réglages du fil d’actualités" -#: bookwyrm/templates/feed/feed.html:26 +#: bookwyrm/templates/feed/feed.html:39 msgid "Saved!" -msgstr "" +msgstr "Enregistré !" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:53 msgid "Save settings" -msgstr "" +msgstr "Enregistrer les réglages" -#: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/feed/feed.html:63 #, python-format msgid "load 0 unread status(es)" msgstr "charger 0 statut(s) non lus" -#: bookwyrm/templates/feed/feed.html:72 +#: bookwyrm/templates/feed/feed.html:80 msgid "There aren't any activities right now! Try following a user to get started" msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer" -#: bookwyrm/templates/feed/feed.html:73 +#: bookwyrm/templates/feed/feed.html:81 msgid "Alternatively, you can try enabling more status types" -msgstr "" +msgstr "Sinon, vous pouvez essayer d’activer plus de types de statuts" #: bookwyrm/templates/feed/goal_card.html:6 #: bookwyrm/templates/feed/layout.html:90 @@ -1143,22 +1156,35 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer" #: bookwyrm/templates/feed/layout.html:25 +#: bookwyrm/templates/get_started/book_preview.html:10 #: bookwyrm/templates/shelf/shelf.html:38 +#: bookwyrm/templates/shelf/shelf.html:83 +#: bookwyrm/templates/snippets/shelf_selector.html:28 #: bookwyrm/templates/user/books_header.html:4 +#: bookwyrm/templates/user/user.html:33 msgid "To Read" msgstr "À lire" #: bookwyrm/templates/feed/layout.html:26 +#: bookwyrm/templates/get_started/book_preview.html:11 #: bookwyrm/templates/shelf/shelf.html:40 +#: bookwyrm/templates/shelf/shelf.html:84 +#: bookwyrm/templates/snippets/shelf_selector.html:29 #: bookwyrm/templates/user/books_header.html:6 +#: bookwyrm/templates/user/user.html:34 msgid "Currently Reading" msgstr "Lectures en cours" #: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/get_started/book_preview.html:12 #: bookwyrm/templates/shelf/shelf.html:42 +#: bookwyrm/templates/shelf/shelf.html:85 +#: bookwyrm/templates/snippets/shelf_selector.html:30 +#: bookwyrm/templates/snippets/shelf_selector.html:49 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 #: bookwyrm/templates/user/books_header.html:8 +#: bookwyrm/templates/user/user.html:35 msgid "Read" msgstr "Lu" @@ -1180,6 +1206,10 @@ msgstr "Voir le répertoire" msgid "Have you read %(book_title)s?" msgstr "Avez‑vous lu « %(book_title)s » ?" +#: bookwyrm/templates/get_started/book_preview.html:7 +msgid "Add to your books" +msgstr "Ajouter à vos livres" + #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" msgstr "Que lisez‑vous ?" @@ -1226,7 +1256,7 @@ msgid "No books found" msgstr "Aucun livre trouvé" #: bookwyrm/templates/get_started/books.html:63 -#: bookwyrm/templates/get_started/profile.html:54 +#: bookwyrm/templates/get_started/profile.html:51 msgid "Save & continue" msgstr "Enregistrer & continuer" @@ -1266,35 +1296,33 @@ msgid "Finish" msgstr "Terminer" #: bookwyrm/templates/get_started/profile.html:15 -#: bookwyrm/templates/preferences/edit_user.html:42 +#: bookwyrm/templates/preferences/edit_user.html:41 msgid "Display name:" msgstr "Nom affiché :" -#: bookwyrm/templates/get_started/profile.html:22 -#: bookwyrm/templates/preferences/edit_user.html:49 +#: bookwyrm/templates/get_started/profile.html:21 +#: bookwyrm/templates/preferences/edit_user.html:47 msgid "Summary:" msgstr "Résumé :" -#: bookwyrm/templates/get_started/profile.html:23 +#: bookwyrm/templates/get_started/profile.html:22 msgid "A little bit about you" msgstr "Parlez‑nous de vous" -#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/get_started/profile.html:30 #: bookwyrm/templates/preferences/edit_user.html:27 msgid "Avatar:" msgstr "Avatar :" -#: bookwyrm/templates/get_started/profile.html:42 -#: bookwyrm/templates/preferences/edit_user.html:110 +#: bookwyrm/templates/get_started/profile.html:39 msgid "Manually approve followers:" msgstr "Autoriser les abonnements manuellement :" -#: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:80 +#: bookwyrm/templates/get_started/profile.html:45 msgid "Show this account in suggested users:" msgstr "Afficher ce compte dans ceux suggérés :" -#: bookwyrm/templates/get_started/profile.html:52 +#: bookwyrm/templates/get_started/profile.html:49 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "Votre compte sera listé dans le répertoire et pourra être recommandé à d’autres utilisateurs ou utilisatrices de BookWyrm." @@ -1498,8 +1526,8 @@ msgid "Row" msgstr "Ligne" #: bookwyrm/templates/import/import_status.html:103 -#: bookwyrm/templates/shelf/shelf.html:141 -#: bookwyrm/templates/shelf/shelf.html:163 +#: bookwyrm/templates/shelf/shelf.html:144 +#: bookwyrm/templates/shelf/shelf.html:166 msgid "Title" msgstr "Titre" @@ -1508,8 +1536,8 @@ msgid "ISBN" msgstr "ISBN" #: bookwyrm/templates/import/import_status.html:109 -#: bookwyrm/templates/shelf/shelf.html:142 -#: bookwyrm/templates/shelf/shelf.html:166 +#: bookwyrm/templates/shelf/shelf.html:145 +#: bookwyrm/templates/shelf/shelf.html:169 msgid "Author" msgstr "Auteur/autrice" @@ -1632,7 +1660,7 @@ msgstr "Politique de vie privée" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 -#: bookwyrm/templates/landing/login.html:49 +#: bookwyrm/templates/landing/login.html:48 msgid "Create an Account" msgstr "Créer un compte" @@ -1678,7 +1706,7 @@ msgstr "L'inscription à %(name)s est fermée" msgid "Thank you! Your request has been received." msgstr "Merci ! Votre demande a bien été reçue." -#: bookwyrm/templates/landing/layout.html:82 +#: bookwyrm/templates/landing/layout.html:81 msgid "Your Account" msgstr "Votre compte" @@ -1687,7 +1715,7 @@ msgid "Login" msgstr "Connexion" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:37 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 msgid "Log in" msgstr "Se connecter" @@ -1701,21 +1729,21 @@ msgid "Username:" msgstr "Nom du compte :" #: bookwyrm/templates/landing/login.html:27 -#: bookwyrm/templates/landing/password_reset.html:17 +#: bookwyrm/templates/landing/password_reset.html:26 #: bookwyrm/templates/layout.html:174 -#: bookwyrm/templates/snippets/register_form.html:22 +#: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Mot de passe :" -#: bookwyrm/templates/landing/login.html:40 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 msgid "Forgot your password?" msgstr "Mot de passe oublié ?" -#: bookwyrm/templates/landing/login.html:62 +#: bookwyrm/templates/landing/login.html:61 msgid "More about this site" msgstr "En savoir plus sur ce site" -#: bookwyrm/templates/landing/password_reset.html:23 +#: bookwyrm/templates/landing/password_reset.html:34 #: bookwyrm/templates/preferences/change_password.html:18 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" @@ -1942,7 +1970,6 @@ msgstr "Appliquer" #: bookwyrm/templates/lists/list.html:92 #: bookwyrm/templates/snippets/remove_from_group_button.html:19 -#: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "Retirer" @@ -2188,9 +2215,9 @@ msgstr "Nouveau mot de passe :" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/delete_user.html:25 #: bookwyrm/templates/preferences/layout.html:24 -#: bookwyrm/templates/settings/users/delete_user_form.html:23 +#: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "Supprimer le compte" @@ -2215,7 +2242,7 @@ msgid "Profile" msgstr "Profil" #: bookwyrm/templates/preferences/edit_user.html:13 -#: bookwyrm/templates/preferences/edit_user.html:68 +#: bookwyrm/templates/preferences/edit_user.html:64 msgid "Display preferences" msgstr "Paramètres d'affichage" @@ -2224,13 +2251,17 @@ msgstr "Paramètres d'affichage" msgid "Privacy" msgstr "Confidentialité" -#: bookwyrm/templates/preferences/edit_user.html:72 -msgid "Show reading goal prompt in feed:" -msgstr "Afficher l'invite d'objectif de lecture dans le fil d'actualité :" +#: bookwyrm/templates/preferences/edit_user.html:69 +msgid "Show reading goal prompt in feed" +msgstr "Afficher l'invite du défi lecture dans le fil d’actualités" -#: bookwyrm/templates/preferences/edit_user.html:76 -msgid "Show suggested users:" -msgstr "Afficher les utilisateurs suggérés :" +#: bookwyrm/templates/preferences/edit_user.html:75 +msgid "Show suggested users" +msgstr "Afficher les comptes suggérés" + +#: bookwyrm/templates/preferences/edit_user.html:81 +msgid "Show this account in suggested users" +msgstr "Afficher ce compte dans ceux suggérés" #: bookwyrm/templates/preferences/edit_user.html:85 #, python-format @@ -2241,6 +2272,10 @@ msgstr "Votre compte sera listé dans le répertoire et msgid "Preferred Timezone: " msgstr "Fuseau horaire préféré" +#: bookwyrm/templates/preferences/edit_user.html:111 +msgid "Manually approve followers" +msgstr "Autoriser les abonnements manuellement" + #: bookwyrm/templates/preferences/edit_user.html:116 msgid "Default post privacy:" msgstr "Niveau de confidentialité des messages par défaut :" @@ -2268,6 +2303,10 @@ msgstr "Commencer \"%(book_title)s\"" msgid "Want to Read \"%(book_title)s\"" msgstr "Je veux lire \"%(book_title)s\"" +#: bookwyrm/templates/search/book.html:42 +msgid "Results from" +msgstr "Résultats de" + #: bookwyrm/templates/search/book.html:47 #: bookwyrm/templates/settings/reports/reports.html:25 #: bookwyrm/templates/snippets/announcement.html:16 @@ -2341,19 +2380,19 @@ msgid "False" msgstr "Faux" #: bookwyrm/templates/settings/announcements/announcement.html:47 -#: bookwyrm/templates/settings/announcements/announcement_form.html:40 +#: bookwyrm/templates/settings/announcements/announcement_form.html:44 #: bookwyrm/templates/settings/dashboard/dashboard.html:71 msgid "Start date:" msgstr "Date de début :" #: bookwyrm/templates/settings/announcements/announcement.html:54 -#: bookwyrm/templates/settings/announcements/announcement_form.html:49 +#: bookwyrm/templates/settings/announcements/announcement_form.html:54 #: bookwyrm/templates/settings/dashboard/dashboard.html:77 msgid "End date:" msgstr "Date de fin :" #: bookwyrm/templates/settings/announcements/announcement.html:60 -#: bookwyrm/templates/settings/announcements/announcement_form.html:58 +#: bookwyrm/templates/settings/announcements/announcement_form.html:64 msgid "Active:" msgstr "Active :" @@ -2362,15 +2401,15 @@ msgstr "Active :" msgid "Create Announcement" msgstr "Ajouter une annonce" -#: bookwyrm/templates/settings/announcements/announcement_form.html:16 +#: bookwyrm/templates/settings/announcements/announcement_form.html:17 msgid "Preview:" msgstr "Aperçu :" -#: bookwyrm/templates/settings/announcements/announcement_form.html:23 +#: bookwyrm/templates/settings/announcements/announcement_form.html:25 msgid "Content:" msgstr "Contenu :" -#: bookwyrm/templates/settings/announcements/announcement_form.html:30 +#: bookwyrm/templates/settings/announcements/announcement_form.html:33 msgid "Event date:" msgstr "Date de l'événement :" @@ -2547,29 +2586,29 @@ msgstr "Retour à la liste des instances" msgid "Import block list" msgstr "Importer une liste de blocage" -#: bookwyrm/templates/settings/federation/edit_instance.html:30 +#: bookwyrm/templates/settings/federation/edit_instance.html:31 msgid "Instance:" msgstr "Instance :" -#: bookwyrm/templates/settings/federation/edit_instance.html:39 +#: bookwyrm/templates/settings/federation/edit_instance.html:40 #: bookwyrm/templates/settings/federation/instance.html:28 #: bookwyrm/templates/settings/users/user_info.html:106 msgid "Status:" msgstr "Statut :" -#: bookwyrm/templates/settings/federation/edit_instance.html:52 +#: bookwyrm/templates/settings/federation/edit_instance.html:54 #: bookwyrm/templates/settings/federation/instance.html:22 #: bookwyrm/templates/settings/users/user_info.html:100 msgid "Software:" msgstr "Logiciel :" -#: bookwyrm/templates/settings/federation/edit_instance.html:61 +#: bookwyrm/templates/settings/federation/edit_instance.html:64 #: bookwyrm/templates/settings/federation/instance.html:25 #: bookwyrm/templates/settings/users/user_info.html:103 msgid "Version:" msgstr "Description :" -#: bookwyrm/templates/settings/federation/edit_instance.html:70 +#: bookwyrm/templates/settings/federation/edit_instance.html:74 msgid "Notes:" msgstr "Remarques :" @@ -3162,42 +3201,42 @@ msgstr "Tous les livres" msgid "Create shelf" msgstr "Créer une étagère" -#: bookwyrm/templates/shelf/shelf.html:90 +#: bookwyrm/templates/shelf/shelf.html:93 #, python-format msgid "%(formatted_count)s book" msgid_plural "%(formatted_count)s books" msgstr[0] "%(formatted_count)s livre" msgstr[1] "%(formatted_count)s livres" -#: bookwyrm/templates/shelf/shelf.html:97 +#: bookwyrm/templates/shelf/shelf.html:100 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "(affichage de %(start)s-%(end)s)" -#: bookwyrm/templates/shelf/shelf.html:109 +#: bookwyrm/templates/shelf/shelf.html:112 msgid "Edit shelf" msgstr "Modifier l’étagère" -#: bookwyrm/templates/shelf/shelf.html:117 +#: bookwyrm/templates/shelf/shelf.html:120 msgid "Delete shelf" msgstr "Supprimer l’étagère" -#: bookwyrm/templates/shelf/shelf.html:145 -#: bookwyrm/templates/shelf/shelf.html:171 +#: bookwyrm/templates/shelf/shelf.html:148 +#: bookwyrm/templates/shelf/shelf.html:174 msgid "Shelved" msgstr "Date d’ajout" -#: bookwyrm/templates/shelf/shelf.html:146 -#: bookwyrm/templates/shelf/shelf.html:174 +#: bookwyrm/templates/shelf/shelf.html:149 +#: bookwyrm/templates/shelf/shelf.html:177 msgid "Started" msgstr "Commencé" -#: bookwyrm/templates/shelf/shelf.html:147 -#: bookwyrm/templates/shelf/shelf.html:177 +#: bookwyrm/templates/shelf/shelf.html:150 +#: bookwyrm/templates/shelf/shelf.html:180 msgid "Finished" msgstr "Terminé" -#: bookwyrm/templates/shelf/shelf.html:203 +#: bookwyrm/templates/shelf/shelf.html:206 msgid "This shelf is empty." msgstr "Cette étagère est vide" @@ -3552,13 +3591,13 @@ msgstr "Noter" msgid "Finish \"%(book_title)s\"" msgstr "Terminer « %(book_title)s »" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:23 -#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:24 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:21 #: bookwyrm/templates/snippets/readthrough_form.html:7 msgid "Started reading" msgstr "Lecture commencée le" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:31 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:32 #: bookwyrm/templates/snippets/readthrough_form.html:20 msgid "Finished reading" msgstr "Lecture terminée le" @@ -3586,7 +3625,7 @@ msgstr "Ajouter « %(book_title)s » aux envies de lecture" msgid "Progress" msgstr "Progression" -#: bookwyrm/templates/snippets/register_form.html:32 +#: bookwyrm/templates/snippets/register_form.html:30 msgid "Sign Up" msgstr "S’enregistrer" @@ -3608,24 +3647,31 @@ msgstr "Ce signalement sera envoyé à l’équipe de modération de %(site_name msgid "More info about this report:" msgstr "En savoir plus sur ce signalement :" -#: bookwyrm/templates/snippets/shelf_selector.html:4 +#: bookwyrm/templates/snippets/shelf_selector.html:7 msgid "Move book" msgstr "Déplacer le livre" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 -msgid "More shelves" -msgstr "Plus d’étagères" - +#: bookwyrm/templates/snippets/shelf_selector.html:42 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24 msgid "Start reading" msgstr "Commencer la lecture" +#: bookwyrm/templates/snippets/shelf_selector.html:55 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Want to read" msgstr "Je veux le lire" +#: bookwyrm/templates/snippets/shelf_selector.html:73 +#: bookwyrm/templates/snippets/shelf_selector.html:84 +msgid "Remove from" +msgstr "Retirer de" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 +msgid "More shelves" +msgstr "Plus d’étagères" + #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62 #, python-format msgid "Remove from %(name)s" @@ -3840,24 +3886,29 @@ msgstr "%(username)s ne suit personne" msgid "Edit profile" msgstr "Modifier le profil" -#: bookwyrm/templates/user/user.html:33 +#: bookwyrm/templates/user/user.html:37 #, python-format msgid "View all %(size)s" msgstr "Voir les %(size)s" -#: bookwyrm/templates/user/user.html:46 +#: bookwyrm/templates/user/user.html:51 msgid "View all books" msgstr "Voir tous les livres" -#: bookwyrm/templates/user/user.html:59 +#: bookwyrm/templates/user/user.html:58 +#, python-format +msgid "%(current_year)s Reading Goal" +msgstr "Défi lecture pour %(current_year)s" + +#: bookwyrm/templates/user/user.html:65 msgid "User Activity" msgstr "Activité du compte" -#: bookwyrm/templates/user/user.html:63 +#: bookwyrm/templates/user/user.html:69 msgid "RSS feed" msgstr "Flux RSS" -#: bookwyrm/templates/user/user.html:74 +#: bookwyrm/templates/user/user.html:80 msgid "No activities yet!" msgstr "Aucune activité pour l’instant !" diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo index 39e6e907a42f2f0325af7b843100fe2719e7b134..c12abdac0950180e78fdff95d406ad4ae22c9f47 100644 GIT binary patch delta 18940 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 delta 18417 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 diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po index a756d3758..1944de649 100644 --- a/locale/gl_ES/LC_MESSAGES/django.po +++ b/locale/gl_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-02 18:24+0000\n" -"PO-Revision-Date: 2021-12-03 05:48\n" +"POT-Creation-Date: 2021-12-04 22:38+0000\n" +"PO-Revision-Date: 2021-12-05 08:32\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:350 msgid "A user with this email already exists." msgstr "Xa existe unha usuaria con este email." -#: bookwyrm/forms.py:276 +#: bookwyrm/forms.py:364 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:277 +#: bookwyrm/forms.py:365 msgid "One Week" msgstr "Unha semana" -#: bookwyrm/forms.py:278 +#: bookwyrm/forms.py:366 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:279 +#: bookwyrm/forms.py:367 msgid "Does Not Expire" msgstr "Non caduca" -#: bookwyrm/forms.py:283 +#: bookwyrm/forms.py:371 #, python-brace-format msgid "{i} uses" msgstr "{i} usos" -#: bookwyrm/forms.py:284 +#: bookwyrm/forms.py:372 msgid "Unlimited" msgstr "Sen límite" -#: bookwyrm/forms.py:352 +#: bookwyrm/forms.py:468 msgid "List Order" msgstr "Orde da listaxe" -#: bookwyrm/forms.py:353 +#: bookwyrm/forms.py:469 msgid "Book Title" msgstr "Título do libro" -#: bookwyrm/forms.py:354 bookwyrm/templates/shelf/shelf.html:149 -#: bookwyrm/templates/shelf/shelf.html:181 +#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Puntuación" -#: bookwyrm/forms.py:356 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Ordenar por" -#: bookwyrm/forms.py:360 +#: bookwyrm/forms.py:476 msgid "Ascending" msgstr "Ascendente" -#: bookwyrm/forms.py:361 +#: bookwyrm/forms.py:477 msgid "Descending" msgstr "Descendente" @@ -122,13 +122,13 @@ msgid "Paperback" msgstr "En rústica" #: bookwyrm/models/federated_server.py:11 -#: bookwyrm/templates/settings/federation/edit_instance.html:42 +#: bookwyrm/templates/settings/federation/edit_instance.html:43 #: bookwyrm/templates/settings/federation/instance_list.html:19 msgid "Federated" msgstr "Federado" #: bookwyrm/models/federated_server.py:12 -#: bookwyrm/templates/settings/federation/edit_instance.html:43 +#: bookwyrm/templates/settings/federation/edit_instance.html:44 #: bookwyrm/templates/settings/federation/instance.html:10 #: bookwyrm/templates/settings/federation/instance_list.html:23 msgid "Blocked" @@ -152,7 +152,7 @@ msgstr "nome de usuaria" msgid "A user with that username already exists." msgstr "Xa existe unha usuaria con ese nome." -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:218 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:227 msgid "Reviews" msgstr "Recensións" @@ -248,7 +248,7 @@ msgid "Edit Author" msgstr "Editar Autora" #: bookwyrm/templates/author/author.html:35 -#: bookwyrm/templates/author/edit_author.html:43 +#: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" msgstr "Alias:" @@ -311,7 +311,7 @@ msgid "Last edited by:" msgstr "Última edición por:" #: bookwyrm/templates/author/edit_author.html:33 -#: bookwyrm/templates/book/edit/edit_book_form.html:15 +#: bookwyrm/templates/book/edit/edit_book_form.html:16 msgid "Metadata" msgstr "Metadatos" @@ -320,51 +320,50 @@ msgstr "Metadatos" msgid "Name:" msgstr "Nome:" -#: bookwyrm/templates/author/edit_author.html:45 -#: bookwyrm/templates/book/edit/edit_book_form.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:79 -#: bookwyrm/templates/book/edit/edit_book_form.html:124 +#: bookwyrm/templates/author/edit_author.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:75 +#: bookwyrm/templates/book/edit/edit_book_form.html:94 msgid "Separate multiple values with commas." msgstr "Separa múltiples valores con vírgulas." -#: bookwyrm/templates/author/edit_author.html:52 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "Bio:" -#: bookwyrm/templates/author/edit_author.html:59 +#: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" msgstr "Ligazón a Wikipedia:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:61 msgid "Birth date:" msgstr "Data de nacemento:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:68 msgid "Death date:" msgstr "Data do falecemento:" -#: bookwyrm/templates/author/edit_author.html:81 +#: bookwyrm/templates/author/edit_author.html:75 msgid "Author Identifiers" msgstr "Identificadores da autora" -#: bookwyrm/templates/author/edit_author.html:83 +#: bookwyrm/templates/author/edit_author.html:77 msgid "Openlibrary key:" msgstr "Chave en Openlibrary:" -#: bookwyrm/templates/author/edit_author.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:224 +#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/book/edit/edit_book_form.html:265 msgid "Inventaire ID:" msgstr "ID en Inventaire:" -#: bookwyrm/templates/author/edit_author.html:99 +#: bookwyrm/templates/author/edit_author.html:91 msgid "Librarything key:" msgstr "Chave en Librarything:" -#: bookwyrm/templates/author/edit_author.html:107 +#: bookwyrm/templates/author/edit_author.html:98 msgid "Goodreads key:" msgstr "Chave en Goodreads:" -#: bookwyrm/templates/author/edit_author.html:118 +#: bookwyrm/templates/author/edit_author.html:108 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -372,18 +371,18 @@ msgstr "Chave en Goodreads:" #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/form.html:75 #: bookwyrm/templates/preferences/edit_user.html:124 -#: bookwyrm/templates/settings/announcements/announcement_form.html:69 -#: bookwyrm/templates/settings/federation/edit_instance.html:74 +#: bookwyrm/templates/settings/announcements/announcement_form.html:76 +#: bookwyrm/templates/settings/federation/edit_instance.html:82 #: bookwyrm/templates/settings/federation/instance.html:87 -#: bookwyrm/templates/settings/site.html:134 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:64 +#: bookwyrm/templates/settings/site.html:133 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:68 #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" msgstr "Gardar" -#: bookwyrm/templates/author/edit_author.html:119 -#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 @@ -428,7 +427,7 @@ msgid "Add Description" msgstr "Engadir descrición" #: bookwyrm/templates/book/book.html:136 -#: bookwyrm/templates/book/edit/edit_book_form.html:34 +#: bookwyrm/templates/book/edit/edit_book_form.html:39 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descrición:" @@ -439,52 +438,51 @@ msgid "%(count)s editions" msgstr "%(count)s edicións" #: bookwyrm/templates/book/book.html:158 -#, python-format -msgid "This edition is on your %(shelf_name)s shelf." -msgstr "Esta edición está no teu estante %(shelf_name)s." +msgid "You have shelved this edition in:" +msgstr "Puxeches esta edición no estante:" -#: bookwyrm/templates/book/book.html:164 +#: bookwyrm/templates/book/book.html:173 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Hai unha edición diferente deste libro no teu estante %(shelf_name)s." -#: bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:184 msgid "Your reading activity" msgstr "Actividade lectora" -#: bookwyrm/templates/book/book.html:178 +#: bookwyrm/templates/book/book.html:187 msgid "Add read dates" msgstr "Engadir datas de lectura" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:196 msgid "Create" msgstr "Crear" -#: bookwyrm/templates/book/book.html:197 +#: bookwyrm/templates/book/book.html:206 msgid "You don't have any reading activity for this book." msgstr "Non tes actividade lectora neste libro." -#: bookwyrm/templates/book/book.html:223 +#: bookwyrm/templates/book/book.html:232 msgid "Your reviews" msgstr "As túas recensións" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:238 msgid "Your comments" msgstr "Os teus comentarios" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:244 msgid "Your quotes" msgstr "As túas citas" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:280 msgid "Subjects" msgstr "Temas" -#: bookwyrm/templates/book/book.html:283 +#: bookwyrm/templates/book/book.html:292 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:294 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:303 bookwyrm/templates/layout.html:75 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -492,15 +490,15 @@ msgstr "Lugares" msgid "Lists" msgstr "Listaxes" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:314 msgid "Add to list" msgstr "Engadir a listaxe" -#: bookwyrm/templates/book/book.html:315 +#: bookwyrm/templates/book/book.html:324 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:182 -#: bookwyrm/templates/settings/email_blocklist/domain_form.html:26 -#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 msgid "Add" msgstr "Engadir" @@ -509,22 +507,22 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:15 -#: bookwyrm/templates/book/edit/edit_book_form.html:232 +#: bookwyrm/templates/book/edit/edit_book_form.html:274 msgid "OCLC Number:" msgstr "Número OCLC:" #: bookwyrm/templates/book/book_identifiers.html:22 -#: bookwyrm/templates/book/edit/edit_book_form.html:240 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:143 +#: bookwyrm/templates/book/edit/edit_book_form.html:173 msgid "Upload cover:" msgstr "Subir portada:" #: bookwyrm/templates/book/cover_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:148 +#: bookwyrm/templates/book/edit/edit_book_form.html:179 msgid "Load cover from url:" msgstr "Cargar portada desde url:" @@ -576,110 +574,120 @@ msgstr "Este é un novo traballo" #: bookwyrm/templates/book/edit/edit_book.html:108 #: bookwyrm/templates/groups/members.html:16 -#: bookwyrm/templates/landing/password_reset.html:30 +#: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:16 msgid "Confirm" msgstr "Confirmar" #: bookwyrm/templates/book/edit/edit_book.html:110 -#: bookwyrm/templates/feed/status.html:9 +#: bookwyrm/templates/feed/status.html:21 msgid "Back" msgstr "Atrás" -#: bookwyrm/templates/book/edit/edit_book_form.html:18 +#: bookwyrm/templates/book/edit/edit_book_form.html:21 #: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "Título:" -#: bookwyrm/templates/book/edit/edit_book_form.html:26 +#: bookwyrm/templates/book/edit/edit_book_form.html:30 msgid "Subtitle:" msgstr "Subtítulo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:50 msgid "Series:" msgstr "Serie:" -#: bookwyrm/templates/book/edit/edit_book_form.html:53 +#: bookwyrm/templates/book/edit/edit_book_form.html:60 msgid "Series number:" msgstr "Número da serie:" -#: bookwyrm/templates/book/edit/edit_book_form.html:63 +#: bookwyrm/templates/book/edit/edit_book_form.html:71 msgid "Languages:" msgstr "Idiomas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:74 +#: bookwyrm/templates/book/edit/edit_book_form.html:85 msgid "Publication" msgstr "Publicación" -#: bookwyrm/templates/book/edit/edit_book_form.html:77 +#: bookwyrm/templates/book/edit/edit_book_form.html:90 msgid "Publisher:" msgstr "Editorial:" -#: bookwyrm/templates/book/edit/edit_book_form.html:86 +#: bookwyrm/templates/book/edit/edit_book_form.html:102 msgid "First published date:" msgstr "Data da primeira edición:" -#: bookwyrm/templates/book/edit/edit_book_form.html:94 +#: bookwyrm/templates/book/edit/edit_book_form.html:111 msgid "Published date:" msgstr "Data de publicación:" -#: bookwyrm/templates/book/edit/edit_book_form.html:104 +#: bookwyrm/templates/book/edit/edit_book_form.html:122 msgid "Authors" msgstr "Autoras" -#: bookwyrm/templates/book/edit/edit_book_form.html:112 +#: bookwyrm/templates/book/edit/edit_book_form.html:131 #, python-format msgid "Remove %(name)s" msgstr "Eliminar %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:115 +#: bookwyrm/templates/book/edit/edit_book_form.html:134 #, python-format msgid "Author page for %(name)s" msgstr "Páxina de autora para %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:122 +#: bookwyrm/templates/book/edit/edit_book_form.html:142 msgid "Add Authors:" msgstr "Engadir autoras:" -#: bookwyrm/templates/book/edit/edit_book_form.html:123 -msgid "John Doe, Jane Smith" -msgstr "Xoán Díaz, Noela Rubio" +#: bookwyrm/templates/book/edit/edit_book_form.html:145 +#: bookwyrm/templates/book/edit/edit_book_form.html:148 +msgid "Add Author" +msgstr "Engadir Autora" -#: bookwyrm/templates/book/edit/edit_book_form.html:132 -#: bookwyrm/templates/shelf/shelf.html:140 +#: bookwyrm/templates/book/edit/edit_book_form.html:146 +#: bookwyrm/templates/book/edit/edit_book_form.html:149 +msgid "Jane Doe" +msgstr "Xoana Pedre" + +#: bookwyrm/templates/book/edit/edit_book_form.html:152 +msgid "Add Another Author" +msgstr "Engade outra Autora" + +#: bookwyrm/templates/book/edit/edit_book_form.html:160 +#: bookwyrm/templates/shelf/shelf.html:143 msgid "Cover" msgstr "Portada" -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:192 msgid "Physical Properties" msgstr "Propiedades físicas" -#: bookwyrm/templates/book/edit/edit_book_form.html:166 +#: bookwyrm/templates/book/edit/edit_book_form.html:199 #: bookwyrm/templates/book/editions/format_filter.html:5 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Format details:" msgstr "Detalles do formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:187 +#: bookwyrm/templates/book/edit/edit_book_form.html:222 msgid "Pages:" msgstr "Páxinas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:197 +#: bookwyrm/templates/book/edit/edit_book_form.html:233 msgid "Book Identifiers" msgstr "Identificadores do libro" -#: bookwyrm/templates/book/edit/edit_book_form.html:200 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:208 +#: bookwyrm/templates/book/edit/edit_book_form.html:247 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:256 msgid "Openlibrary ID:" msgstr "ID en Openlibrary:" @@ -811,7 +819,7 @@ msgid "Confirmation code:" msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 -#: bookwyrm/templates/landing/layout.html:73 +#: bookwyrm/templates/landing/layout.html:72 #: bookwyrm/templates/settings/dashboard/dashboard.html:93 #: bookwyrm/templates/snippets/report_modal.html:33 msgid "Submit" @@ -828,8 +836,8 @@ msgstr "Reenviar ligazón de confirmación" #: bookwyrm/templates/confirm_email/resend_form.html:11 #: bookwyrm/templates/landing/layout.html:67 #: bookwyrm/templates/landing/password_reset_request.html:18 -#: bookwyrm/templates/preferences/edit_user.html:56 -#: bookwyrm/templates/snippets/register_form.html:13 +#: bookwyrm/templates/preferences/edit_user.html:53 +#: bookwyrm/templates/snippets/register_form.html:12 msgid "Email address:" msgstr "Enderezo de email:" @@ -859,12 +867,17 @@ msgstr "Directorio" msgid "Make your profile discoverable to other BookWyrm users." msgstr "Permite que outras usuarias de BookWyrm poidan descubrir o teu perfil." +#: bookwyrm/templates/directory/directory.html:21 +msgid "Join Directory" +msgstr "Incluír no directorio" + #: bookwyrm/templates/directory/directory.html:24 #, python-format msgid "You can opt-out at any time in your profile settings." msgstr "Podes retirar o permiso en calquera momento nos axustes do perfil." #: bookwyrm/templates/directory/directory.html:29 +#: bookwyrm/templates/directory/directory.html:31 #: bookwyrm/templates/feed/goal_card.html:17 #: bookwyrm/templates/snippets/announcement.html:34 msgid "Dismiss message" @@ -1093,28 +1106,28 @@ msgstr "Tódalas mensaxes" msgid "You have no messages right now." msgstr "Non tes mensaxes por agora." -#: bookwyrm/templates/feed/feed.html:23 +#: bookwyrm/templates/feed/feed.html:27 msgid "Feed settings" msgstr "Axustes da cronoloxía" -#: bookwyrm/templates/feed/feed.html:26 +#: bookwyrm/templates/feed/feed.html:39 msgid "Saved!" msgstr "Gardados!" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:53 msgid "Save settings" msgstr "Gardar axustes" -#: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/feed/feed.html:63 #, python-format msgid "load 0 unread status(es)" msgstr "cargar 0 estado(s) non lidos" -#: bookwyrm/templates/feed/feed.html:72 +#: bookwyrm/templates/feed/feed.html:80 msgid "There aren't any activities right now! Try following a user to get started" msgstr "Non hai actividade por agora! Proba a seguir algunha persoa para comezar" -#: bookwyrm/templates/feed/feed.html:73 +#: bookwyrm/templates/feed/feed.html:81 msgid "Alternatively, you can try enabling more status types" msgstr "De xeito alternativo, podes activar máis tipos de estados" @@ -1143,22 +1156,35 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "Aínda non tes libros! Busca algún co que comezar" #: bookwyrm/templates/feed/layout.html:25 +#: bookwyrm/templates/get_started/book_preview.html:10 #: bookwyrm/templates/shelf/shelf.html:38 +#: bookwyrm/templates/shelf/shelf.html:83 +#: bookwyrm/templates/snippets/shelf_selector.html:28 #: bookwyrm/templates/user/books_header.html:4 +#: bookwyrm/templates/user/user.html:33 msgid "To Read" msgstr "Pendentes" #: bookwyrm/templates/feed/layout.html:26 +#: bookwyrm/templates/get_started/book_preview.html:11 #: bookwyrm/templates/shelf/shelf.html:40 +#: bookwyrm/templates/shelf/shelf.html:84 +#: bookwyrm/templates/snippets/shelf_selector.html:29 #: bookwyrm/templates/user/books_header.html:6 +#: bookwyrm/templates/user/user.html:34 msgid "Currently Reading" msgstr "Lectura actual" #: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/get_started/book_preview.html:12 #: bookwyrm/templates/shelf/shelf.html:42 +#: bookwyrm/templates/shelf/shelf.html:85 +#: bookwyrm/templates/snippets/shelf_selector.html:30 +#: bookwyrm/templates/snippets/shelf_selector.html:49 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 #: bookwyrm/templates/user/books_header.html:8 +#: bookwyrm/templates/user/user.html:35 msgid "Read" msgstr "Lido" @@ -1180,6 +1206,10 @@ msgstr "Ver directorio" msgid "Have you read %(book_title)s?" msgstr "Liches %(book_title)s?" +#: bookwyrm/templates/get_started/book_preview.html:7 +msgid "Add to your books" +msgstr "Engadir aos teus libros" + #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" msgstr "Que estás a ler?" @@ -1226,7 +1256,7 @@ msgid "No books found" msgstr "Non se atopan libros" #: bookwyrm/templates/get_started/books.html:63 -#: bookwyrm/templates/get_started/profile.html:54 +#: bookwyrm/templates/get_started/profile.html:51 msgid "Save & continue" msgstr "Gardar & continuar" @@ -1266,35 +1296,33 @@ msgid "Finish" msgstr "Rematar" #: bookwyrm/templates/get_started/profile.html:15 -#: bookwyrm/templates/preferences/edit_user.html:42 +#: bookwyrm/templates/preferences/edit_user.html:41 msgid "Display name:" msgstr "Nome público:" -#: bookwyrm/templates/get_started/profile.html:22 -#: bookwyrm/templates/preferences/edit_user.html:49 +#: bookwyrm/templates/get_started/profile.html:21 +#: bookwyrm/templates/preferences/edit_user.html:47 msgid "Summary:" msgstr "Resumo:" -#: bookwyrm/templates/get_started/profile.html:23 +#: bookwyrm/templates/get_started/profile.html:22 msgid "A little bit about you" msgstr "Algo acerca de ti" -#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/get_started/profile.html:30 #: bookwyrm/templates/preferences/edit_user.html:27 msgid "Avatar:" msgstr "Avatar:" -#: bookwyrm/templates/get_started/profile.html:42 -#: bookwyrm/templates/preferences/edit_user.html:110 +#: bookwyrm/templates/get_started/profile.html:39 msgid "Manually approve followers:" msgstr "Aprobar seguimentos manualmente:" -#: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:80 +#: bookwyrm/templates/get_started/profile.html:45 msgid "Show this account in suggested users:" msgstr "Mostar esta conta en usuarias suxeridas:" -#: bookwyrm/templates/get_started/profile.html:52 +#: bookwyrm/templates/get_started/profile.html:49 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "A túa conta aparecerá no directorio e pode ser recomendada a outras usuarias de BookWyrm." @@ -1498,8 +1526,8 @@ msgid "Row" msgstr "Fila" #: bookwyrm/templates/import/import_status.html:103 -#: bookwyrm/templates/shelf/shelf.html:141 -#: bookwyrm/templates/shelf/shelf.html:163 +#: bookwyrm/templates/shelf/shelf.html:144 +#: bookwyrm/templates/shelf/shelf.html:166 msgid "Title" msgstr "Título" @@ -1508,8 +1536,8 @@ msgid "ISBN" msgstr "ISBN" #: bookwyrm/templates/import/import_status.html:109 -#: bookwyrm/templates/shelf/shelf.html:142 -#: bookwyrm/templates/shelf/shelf.html:166 +#: bookwyrm/templates/shelf/shelf.html:145 +#: bookwyrm/templates/shelf/shelf.html:169 msgid "Author" msgstr "Autor" @@ -1632,7 +1660,7 @@ msgstr "Política de Privacidade" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 -#: bookwyrm/templates/landing/login.html:49 +#: bookwyrm/templates/landing/login.html:48 msgid "Create an Account" msgstr "Crear unha Conta" @@ -1678,7 +1706,7 @@ msgstr "%(name)s ten o rexistro pechado" msgid "Thank you! Your request has been received." msgstr "Grazas! A solicitude foi recibida." -#: bookwyrm/templates/landing/layout.html:82 +#: bookwyrm/templates/landing/layout.html:81 msgid "Your Account" msgstr "A túa Conta" @@ -1687,7 +1715,7 @@ msgid "Login" msgstr "Conectar" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:37 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 msgid "Log in" msgstr "Conecta" @@ -1701,21 +1729,21 @@ msgid "Username:" msgstr "Nome de usuaria:" #: bookwyrm/templates/landing/login.html:27 -#: bookwyrm/templates/landing/password_reset.html:17 +#: bookwyrm/templates/landing/password_reset.html:26 #: bookwyrm/templates/layout.html:174 -#: bookwyrm/templates/snippets/register_form.html:22 +#: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Contrasinal:" -#: bookwyrm/templates/landing/login.html:40 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 msgid "Forgot your password?" msgstr "Esqueceches o contrasinal?" -#: bookwyrm/templates/landing/login.html:62 +#: bookwyrm/templates/landing/login.html:61 msgid "More about this site" msgstr "Máis acerca deste sitio" -#: bookwyrm/templates/landing/password_reset.html:23 +#: bookwyrm/templates/landing/password_reset.html:34 #: bookwyrm/templates/preferences/change_password.html:18 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" @@ -1942,7 +1970,6 @@ msgstr "Establecer" #: bookwyrm/templates/lists/list.html:92 #: bookwyrm/templates/snippets/remove_from_group_button.html:19 -#: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "Eliminar" @@ -2188,9 +2215,9 @@ msgstr "Novo contrasinal:" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/delete_user.html:25 #: bookwyrm/templates/preferences/layout.html:24 -#: bookwyrm/templates/settings/users/delete_user_form.html:23 +#: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "Eliminar conta" @@ -2215,7 +2242,7 @@ msgid "Profile" msgstr "Perfil" #: bookwyrm/templates/preferences/edit_user.html:13 -#: bookwyrm/templates/preferences/edit_user.html:68 +#: bookwyrm/templates/preferences/edit_user.html:64 msgid "Display preferences" msgstr "Preferencias da interface" @@ -2224,13 +2251,17 @@ msgstr "Preferencias da interface" msgid "Privacy" msgstr "Privacidade" -#: bookwyrm/templates/preferences/edit_user.html:72 -msgid "Show reading goal prompt in feed:" -msgstr "Mostrar obxectivo de lectura na fonte:" +#: bookwyrm/templates/preferences/edit_user.html:69 +msgid "Show reading goal prompt in feed" +msgstr "Mostrar info do obxectivo de lectura na cronoloxía" -#: bookwyrm/templates/preferences/edit_user.html:76 -msgid "Show suggested users:" -msgstr "Mostrar en usuarias suxeridas:" +#: bookwyrm/templates/preferences/edit_user.html:75 +msgid "Show suggested users" +msgstr "Mostrar usuarias suxeridas" + +#: bookwyrm/templates/preferences/edit_user.html:81 +msgid "Show this account in suggested users" +msgstr "Mostrar esta conta en usuarias suxeridas" #: bookwyrm/templates/preferences/edit_user.html:85 #, python-format @@ -2241,6 +2272,10 @@ msgstr "A túa conta aparecerá no directorio, e poder msgid "Preferred Timezone: " msgstr "Zona horaria preferida: " +#: bookwyrm/templates/preferences/edit_user.html:111 +msgid "Manually approve followers" +msgstr "Aprobar manualmente os seguimentos" + #: bookwyrm/templates/preferences/edit_user.html:116 msgid "Default post privacy:" msgstr "Privacidade por defecto:" @@ -2268,6 +2303,10 @@ msgstr "Comecei \"%(book_title)s\"" msgid "Want to Read \"%(book_title)s\"" msgstr "Quero ler \"%(book_title)s\"" +#: bookwyrm/templates/search/book.html:42 +msgid "Results from" +msgstr "Resultados de" + #: bookwyrm/templates/search/book.html:47 #: bookwyrm/templates/settings/reports/reports.html:25 #: bookwyrm/templates/snippets/announcement.html:16 @@ -2341,19 +2380,19 @@ msgid "False" msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:47 -#: bookwyrm/templates/settings/announcements/announcement_form.html:40 +#: bookwyrm/templates/settings/announcements/announcement_form.html:44 #: bookwyrm/templates/settings/dashboard/dashboard.html:71 msgid "Start date:" msgstr "Data de inicio:" #: bookwyrm/templates/settings/announcements/announcement.html:54 -#: bookwyrm/templates/settings/announcements/announcement_form.html:49 +#: bookwyrm/templates/settings/announcements/announcement_form.html:54 #: bookwyrm/templates/settings/dashboard/dashboard.html:77 msgid "End date:" msgstr "Data de fin:" #: bookwyrm/templates/settings/announcements/announcement.html:60 -#: bookwyrm/templates/settings/announcements/announcement_form.html:58 +#: bookwyrm/templates/settings/announcements/announcement_form.html:64 msgid "Active:" msgstr "Activo:" @@ -2362,15 +2401,15 @@ msgstr "Activo:" msgid "Create Announcement" msgstr "Crear Anuncio" -#: bookwyrm/templates/settings/announcements/announcement_form.html:16 +#: bookwyrm/templates/settings/announcements/announcement_form.html:17 msgid "Preview:" msgstr "Vista previa:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:23 +#: bookwyrm/templates/settings/announcements/announcement_form.html:25 msgid "Content:" msgstr "Contido:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:30 +#: bookwyrm/templates/settings/announcements/announcement_form.html:33 msgid "Event date:" msgstr "Data do evento:" @@ -2547,29 +2586,29 @@ msgstr "Volver á lista de instancias" msgid "Import block list" msgstr "Importar lista de bloqueo" -#: bookwyrm/templates/settings/federation/edit_instance.html:30 +#: bookwyrm/templates/settings/federation/edit_instance.html:31 msgid "Instance:" msgstr "Instancia:" -#: bookwyrm/templates/settings/federation/edit_instance.html:39 +#: bookwyrm/templates/settings/federation/edit_instance.html:40 #: bookwyrm/templates/settings/federation/instance.html:28 #: bookwyrm/templates/settings/users/user_info.html:106 msgid "Status:" msgstr "Estado:" -#: bookwyrm/templates/settings/federation/edit_instance.html:52 +#: bookwyrm/templates/settings/federation/edit_instance.html:54 #: bookwyrm/templates/settings/federation/instance.html:22 #: bookwyrm/templates/settings/users/user_info.html:100 msgid "Software:" msgstr "Software:" -#: bookwyrm/templates/settings/federation/edit_instance.html:61 +#: bookwyrm/templates/settings/federation/edit_instance.html:64 #: bookwyrm/templates/settings/federation/instance.html:25 #: bookwyrm/templates/settings/users/user_info.html:103 msgid "Version:" msgstr "Versión:" -#: bookwyrm/templates/settings/federation/edit_instance.html:70 +#: bookwyrm/templates/settings/federation/edit_instance.html:74 msgid "Notes:" msgstr "Notas:" @@ -3162,42 +3201,42 @@ msgstr "Tódolos libros" msgid "Create shelf" msgstr "Crear estante" -#: bookwyrm/templates/shelf/shelf.html:90 +#: bookwyrm/templates/shelf/shelf.html:93 #, python-format msgid "%(formatted_count)s book" msgid_plural "%(formatted_count)s books" msgstr[0] "%(formatted_count)s libro" msgstr[1] "%(formatted_count)s libros" -#: bookwyrm/templates/shelf/shelf.html:97 +#: bookwyrm/templates/shelf/shelf.html:100 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "(mostrando %(start)s-%(end)s)" -#: bookwyrm/templates/shelf/shelf.html:109 +#: bookwyrm/templates/shelf/shelf.html:112 msgid "Edit shelf" msgstr "Editar estante" -#: bookwyrm/templates/shelf/shelf.html:117 +#: bookwyrm/templates/shelf/shelf.html:120 msgid "Delete shelf" msgstr "Eliminar estante" -#: bookwyrm/templates/shelf/shelf.html:145 -#: bookwyrm/templates/shelf/shelf.html:171 +#: bookwyrm/templates/shelf/shelf.html:148 +#: bookwyrm/templates/shelf/shelf.html:174 msgid "Shelved" msgstr "No estante" -#: bookwyrm/templates/shelf/shelf.html:146 -#: bookwyrm/templates/shelf/shelf.html:174 +#: bookwyrm/templates/shelf/shelf.html:149 +#: bookwyrm/templates/shelf/shelf.html:177 msgid "Started" msgstr "Comezado" -#: bookwyrm/templates/shelf/shelf.html:147 -#: bookwyrm/templates/shelf/shelf.html:177 +#: bookwyrm/templates/shelf/shelf.html:150 +#: bookwyrm/templates/shelf/shelf.html:180 msgid "Finished" msgstr "Rematado" -#: bookwyrm/templates/shelf/shelf.html:203 +#: bookwyrm/templates/shelf/shelf.html:206 msgid "This shelf is empty." msgstr "Este estante esta baleiro." @@ -3552,13 +3591,13 @@ msgstr "Valorar" msgid "Finish \"%(book_title)s\"" msgstr "Rematei \"%(book_title)s\"" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:23 -#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:24 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:21 #: bookwyrm/templates/snippets/readthrough_form.html:7 msgid "Started reading" msgstr "Comecei a ler" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:31 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:32 #: bookwyrm/templates/snippets/readthrough_form.html:20 msgid "Finished reading" msgstr "Rematei de ler" @@ -3586,7 +3625,7 @@ msgstr "Quero ler \"%(book_title)s\"" msgid "Progress" msgstr "Progreso" -#: bookwyrm/templates/snippets/register_form.html:32 +#: bookwyrm/templates/snippets/register_form.html:30 msgid "Sign Up" msgstr "Inscribirse" @@ -3608,24 +3647,31 @@ msgstr "Esta denuncia vaise enviar á moderación en %(site_name)s para o seu an msgid "More info about this report:" msgstr "Máis info acerca desta denuncia:" -#: bookwyrm/templates/snippets/shelf_selector.html:4 +#: bookwyrm/templates/snippets/shelf_selector.html:7 msgid "Move book" msgstr "Mover libro" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 -msgid "More shelves" -msgstr "Máis estantes" - +#: bookwyrm/templates/snippets/shelf_selector.html:42 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24 msgid "Start reading" msgstr "Comezar a ler" +#: bookwyrm/templates/snippets/shelf_selector.html:55 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Want to read" msgstr "Quero ler" +#: bookwyrm/templates/snippets/shelf_selector.html:73 +#: bookwyrm/templates/snippets/shelf_selector.html:84 +msgid "Remove from" +msgstr "Eliminar de" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 +msgid "More shelves" +msgstr "Máis estantes" + #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62 #, python-format msgid "Remove from %(name)s" @@ -3840,24 +3886,29 @@ msgstr "%(username)s non segue a ninguén" msgid "Edit profile" msgstr "Editar perfil" -#: bookwyrm/templates/user/user.html:33 +#: bookwyrm/templates/user/user.html:37 #, python-format msgid "View all %(size)s" msgstr "Ver tódolos %(size)s" -#: bookwyrm/templates/user/user.html:46 +#: bookwyrm/templates/user/user.html:51 msgid "View all books" msgstr "Ver tódolos libros" -#: bookwyrm/templates/user/user.html:59 +#: bookwyrm/templates/user/user.html:58 +#, python-format +msgid "%(current_year)s Reading Goal" +msgstr "Obxectivo de Lectura para %(current_year)s" + +#: bookwyrm/templates/user/user.html:65 msgid "User Activity" msgstr "Actividade da usuaria" -#: bookwyrm/templates/user/user.html:63 +#: bookwyrm/templates/user/user.html:69 msgid "RSS feed" msgstr "Fonte RSS" -#: bookwyrm/templates/user/user.html:74 +#: bookwyrm/templates/user/user.html:80 msgid "No activities yet!" msgstr "Sen actividade!" diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo index 5e6f27c380d6b43a4334d32063624d26e96b5ddf..5ead7f97c88f910c6339f4efdff6e9e53ce30af0 100644 GIT binary patch delta 18838 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 delta 18327 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 Y7JsYXKMx9O<`4eki%kBX?%v7%e+Aq#82|tP diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index db956d3b7..aeb0aec18 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-02 18:24+0000\n" -"PO-Revision-Date: 2021-12-04 18:09\n" +"POT-Creation-Date: 2021-12-04 22:38+0000\n" +"PO-Revision-Date: 2021-12-07 12:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:350 msgid "A user with this email already exists." msgstr "Vartotojas su šiuo el. pašto adresu jau yra." -#: bookwyrm/forms.py:276 +#: bookwyrm/forms.py:364 msgid "One Day" msgstr "Diena" -#: bookwyrm/forms.py:277 +#: bookwyrm/forms.py:365 msgid "One Week" msgstr "Savaitė" -#: bookwyrm/forms.py:278 +#: bookwyrm/forms.py:366 msgid "One Month" msgstr "Mėnuo" -#: bookwyrm/forms.py:279 +#: bookwyrm/forms.py:367 msgid "Does Not Expire" msgstr "Galiojimas nesibaigia" -#: bookwyrm/forms.py:283 +#: bookwyrm/forms.py:371 #, python-brace-format msgid "{i} uses" msgstr "{i} naudoja" -#: bookwyrm/forms.py:284 +#: bookwyrm/forms.py:372 msgid "Unlimited" msgstr "Neribota" -#: bookwyrm/forms.py:352 +#: bookwyrm/forms.py:468 msgid "List Order" msgstr "Kaip pridėta į sąrašą" -#: bookwyrm/forms.py:353 +#: bookwyrm/forms.py:469 msgid "Book Title" msgstr "Knygos antraštė" -#: bookwyrm/forms.py:354 bookwyrm/templates/shelf/shelf.html:149 -#: bookwyrm/templates/shelf/shelf.html:181 +#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Įvertinimas" -#: bookwyrm/forms.py:356 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Rūšiuoti pagal" -#: bookwyrm/forms.py:360 +#: bookwyrm/forms.py:476 msgid "Ascending" msgstr "Didėjančia tvarka" -#: bookwyrm/forms.py:361 +#: bookwyrm/forms.py:477 msgid "Descending" msgstr "Mažėjančia tvarka" @@ -122,13 +122,13 @@ msgid "Paperback" msgstr "Knyga minkštais viršeliais" #: bookwyrm/models/federated_server.py:11 -#: bookwyrm/templates/settings/federation/edit_instance.html:42 +#: bookwyrm/templates/settings/federation/edit_instance.html:43 #: bookwyrm/templates/settings/federation/instance_list.html:19 msgid "Federated" msgstr "Susijungę" #: bookwyrm/models/federated_server.py:12 -#: bookwyrm/templates/settings/federation/edit_instance.html:43 +#: bookwyrm/templates/settings/federation/edit_instance.html:44 #: bookwyrm/templates/settings/federation/instance.html:10 #: bookwyrm/templates/settings/federation/instance_list.html:23 msgid "Blocked" @@ -152,7 +152,7 @@ msgstr "naudotojo vardas" msgid "A user with that username already exists." msgstr "Toks naudotojo vardas jau egzistuoja." -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:218 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:227 msgid "Reviews" msgstr "Apžvalgos" @@ -248,7 +248,7 @@ msgid "Edit Author" msgstr "Keisti autorių" #: bookwyrm/templates/author/author.html:35 -#: bookwyrm/templates/author/edit_author.html:43 +#: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" msgstr "Pseudonimai:" @@ -311,7 +311,7 @@ msgid "Last edited by:" msgstr "Pastarąjį kartą redagavo:" #: bookwyrm/templates/author/edit_author.html:33 -#: bookwyrm/templates/book/edit/edit_book_form.html:15 +#: bookwyrm/templates/book/edit/edit_book_form.html:16 msgid "Metadata" msgstr "Meta duomenys" @@ -320,51 +320,50 @@ msgstr "Meta duomenys" msgid "Name:" msgstr "Vardas:" -#: bookwyrm/templates/author/edit_author.html:45 -#: bookwyrm/templates/book/edit/edit_book_form.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:79 -#: bookwyrm/templates/book/edit/edit_book_form.html:124 +#: bookwyrm/templates/author/edit_author.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:75 +#: bookwyrm/templates/book/edit/edit_book_form.html:94 msgid "Separate multiple values with commas." msgstr "Reikšmes atskirkite kableliais." -#: bookwyrm/templates/author/edit_author.html:52 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "Biografija:" -#: bookwyrm/templates/author/edit_author.html:59 +#: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" msgstr "Nuoroda į wikipediją:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:61 msgid "Birth date:" msgstr "Gimimo data:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:68 msgid "Death date:" msgstr "Mirties data:" -#: bookwyrm/templates/author/edit_author.html:81 +#: bookwyrm/templates/author/edit_author.html:75 msgid "Author Identifiers" msgstr "Autoriaus identifikatoriai" -#: bookwyrm/templates/author/edit_author.html:83 +#: bookwyrm/templates/author/edit_author.html:77 msgid "Openlibrary key:" msgstr "„Openlibrary“ raktas:" -#: bookwyrm/templates/author/edit_author.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:224 +#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/book/edit/edit_book_form.html:265 msgid "Inventaire ID:" msgstr "„Inventaire“ ID:" -#: bookwyrm/templates/author/edit_author.html:99 +#: bookwyrm/templates/author/edit_author.html:91 msgid "Librarything key:" msgstr "„Librarything“ raktas:" -#: bookwyrm/templates/author/edit_author.html:107 +#: bookwyrm/templates/author/edit_author.html:98 msgid "Goodreads key:" msgstr "„Goodreads“ raktas:" -#: bookwyrm/templates/author/edit_author.html:118 +#: bookwyrm/templates/author/edit_author.html:108 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -372,18 +371,18 @@ msgstr "„Goodreads“ raktas:" #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/form.html:75 #: bookwyrm/templates/preferences/edit_user.html:124 -#: bookwyrm/templates/settings/announcements/announcement_form.html:69 -#: bookwyrm/templates/settings/federation/edit_instance.html:74 +#: bookwyrm/templates/settings/announcements/announcement_form.html:76 +#: bookwyrm/templates/settings/federation/edit_instance.html:82 #: bookwyrm/templates/settings/federation/instance.html:87 -#: bookwyrm/templates/settings/site.html:134 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:64 +#: bookwyrm/templates/settings/site.html:133 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:68 #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" msgstr "Išsaugoti" -#: bookwyrm/templates/author/edit_author.html:119 -#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 @@ -430,7 +429,7 @@ msgid "Add Description" msgstr "Pridėti aprašymą" #: bookwyrm/templates/book/book.html:136 -#: bookwyrm/templates/book/edit/edit_book_form.html:34 +#: bookwyrm/templates/book/edit/edit_book_form.html:39 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Aprašymas:" @@ -441,52 +440,51 @@ msgid "%(count)s editions" msgstr "%(count)s leidimai (-ų)" #: bookwyrm/templates/book/book.html:158 -#, python-format -msgid "This edition is on your %(shelf_name)s shelf." -msgstr "Šis leidimas yra jūsų %(shelf_name)s lentynoje." +msgid "You have shelved this edition in:" +msgstr "Šis leidimas įdėtas į:" -#: bookwyrm/templates/book/book.html:164 +#: bookwyrm/templates/book/book.html:173 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "kitas šios knygos leidimas yra jūsų %(shelf_name)s lentynoje." -#: bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:184 msgid "Your reading activity" msgstr "Jūsų skaitymo veikla" -#: bookwyrm/templates/book/book.html:178 +#: bookwyrm/templates/book/book.html:187 msgid "Add read dates" msgstr "Pridėti skaitymo datas" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:196 msgid "Create" msgstr "Kurti" -#: bookwyrm/templates/book/book.html:197 +#: bookwyrm/templates/book/book.html:206 msgid "You don't have any reading activity for this book." msgstr "Šios knygos neskaitote." -#: bookwyrm/templates/book/book.html:223 +#: bookwyrm/templates/book/book.html:232 msgid "Your reviews" msgstr "Tavo atsiliepimai" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:238 msgid "Your comments" msgstr "Tavo komentarai" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:244 msgid "Your quotes" msgstr "Jūsų citatos" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:280 msgid "Subjects" msgstr "Temos" -#: bookwyrm/templates/book/book.html:283 +#: bookwyrm/templates/book/book.html:292 msgid "Places" msgstr "Vietos" -#: bookwyrm/templates/book/book.html:294 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:303 bookwyrm/templates/layout.html:75 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -494,15 +492,15 @@ msgstr "Vietos" msgid "Lists" msgstr "Sąrašai" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:314 msgid "Add to list" msgstr "Pridėti prie sąrašo" -#: bookwyrm/templates/book/book.html:315 +#: bookwyrm/templates/book/book.html:324 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:182 -#: bookwyrm/templates/settings/email_blocklist/domain_form.html:26 -#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 msgid "Add" msgstr "Pridėti" @@ -511,22 +509,22 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:15 -#: bookwyrm/templates/book/edit/edit_book_form.html:232 +#: bookwyrm/templates/book/edit/edit_book_form.html:274 msgid "OCLC Number:" msgstr "OCLC numeris:" #: bookwyrm/templates/book/book_identifiers.html:22 -#: bookwyrm/templates/book/edit/edit_book_form.html:240 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:143 +#: bookwyrm/templates/book/edit/edit_book_form.html:173 msgid "Upload cover:" msgstr "Įkelti viršelį:" #: bookwyrm/templates/book/cover_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:148 +#: bookwyrm/templates/book/edit/edit_book_form.html:179 msgid "Load cover from url:" msgstr "Įkelti viršelį iš url:" @@ -578,110 +576,120 @@ msgstr "Tai naujas darbas" #: bookwyrm/templates/book/edit/edit_book.html:108 #: bookwyrm/templates/groups/members.html:16 -#: bookwyrm/templates/landing/password_reset.html:30 +#: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:16 msgid "Confirm" msgstr "Patvirtinti" #: bookwyrm/templates/book/edit/edit_book.html:110 -#: bookwyrm/templates/feed/status.html:9 +#: bookwyrm/templates/feed/status.html:21 msgid "Back" msgstr "Atgal" -#: bookwyrm/templates/book/edit/edit_book_form.html:18 +#: bookwyrm/templates/book/edit/edit_book_form.html:21 #: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "Pavadinimas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:26 +#: bookwyrm/templates/book/edit/edit_book_form.html:30 msgid "Subtitle:" msgstr "Paantraštė:" -#: bookwyrm/templates/book/edit/edit_book_form.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:50 msgid "Series:" msgstr "Serija:" -#: bookwyrm/templates/book/edit/edit_book_form.html:53 +#: bookwyrm/templates/book/edit/edit_book_form.html:60 msgid "Series number:" msgstr "Serijos numeris:" -#: bookwyrm/templates/book/edit/edit_book_form.html:63 +#: bookwyrm/templates/book/edit/edit_book_form.html:71 msgid "Languages:" msgstr "Kalbos:" -#: bookwyrm/templates/book/edit/edit_book_form.html:74 +#: bookwyrm/templates/book/edit/edit_book_form.html:85 msgid "Publication" msgstr "Leidimas" -#: bookwyrm/templates/book/edit/edit_book_form.html:77 +#: bookwyrm/templates/book/edit/edit_book_form.html:90 msgid "Publisher:" msgstr "Leidėjas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:86 +#: bookwyrm/templates/book/edit/edit_book_form.html:102 msgid "First published date:" msgstr "Pirmoji publikavimo data:" -#: bookwyrm/templates/book/edit/edit_book_form.html:94 +#: bookwyrm/templates/book/edit/edit_book_form.html:111 msgid "Published date:" msgstr "Publikavimo data:" -#: bookwyrm/templates/book/edit/edit_book_form.html:104 +#: bookwyrm/templates/book/edit/edit_book_form.html:122 msgid "Authors" msgstr "Autoriai" -#: bookwyrm/templates/book/edit/edit_book_form.html:112 +#: bookwyrm/templates/book/edit/edit_book_form.html:131 #, python-format msgid "Remove %(name)s" msgstr "Pašalinti %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:115 +#: bookwyrm/templates/book/edit/edit_book_form.html:134 #, python-format msgid "Author page for %(name)s" msgstr "Autoriaus puslapis %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:122 +#: bookwyrm/templates/book/edit/edit_book_form.html:142 msgid "Add Authors:" msgstr "Pridėti autorius:" -#: bookwyrm/templates/book/edit/edit_book_form.html:123 -msgid "John Doe, Jane Smith" -msgstr "John Doe, Jane Smith" +#: bookwyrm/templates/book/edit/edit_book_form.html:145 +#: bookwyrm/templates/book/edit/edit_book_form.html:148 +msgid "Add Author" +msgstr "Pridėti autorių" -#: bookwyrm/templates/book/edit/edit_book_form.html:132 -#: bookwyrm/templates/shelf/shelf.html:140 +#: bookwyrm/templates/book/edit/edit_book_form.html:146 +#: bookwyrm/templates/book/edit/edit_book_form.html:149 +msgid "Jane Doe" +msgstr "Jonas Jonaitė" + +#: bookwyrm/templates/book/edit/edit_book_form.html:152 +msgid "Add Another Author" +msgstr "Pridėti dar vieną autorių" + +#: bookwyrm/templates/book/edit/edit_book_form.html:160 +#: bookwyrm/templates/shelf/shelf.html:143 msgid "Cover" msgstr "Viršelis" -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:192 msgid "Physical Properties" msgstr "Fizinės savybės" -#: bookwyrm/templates/book/edit/edit_book_form.html:166 +#: bookwyrm/templates/book/edit/edit_book_form.html:199 #: bookwyrm/templates/book/editions/format_filter.html:5 msgid "Format:" msgstr "Formatas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Format details:" msgstr "Informacija apie formatą:" -#: bookwyrm/templates/book/edit/edit_book_form.html:187 +#: bookwyrm/templates/book/edit/edit_book_form.html:222 msgid "Pages:" msgstr "Puslapiai:" -#: bookwyrm/templates/book/edit/edit_book_form.html:197 +#: bookwyrm/templates/book/edit/edit_book_form.html:233 msgid "Book Identifiers" msgstr "Knygos identifikatoriai" -#: bookwyrm/templates/book/edit/edit_book_form.html:200 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:208 +#: bookwyrm/templates/book/edit/edit_book_form.html:247 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:256 msgid "Openlibrary ID:" msgstr "„Openlibrary“ ID:" @@ -813,7 +821,7 @@ msgid "Confirmation code:" msgstr "Patvirtinimo kodas:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 -#: bookwyrm/templates/landing/layout.html:73 +#: bookwyrm/templates/landing/layout.html:72 #: bookwyrm/templates/settings/dashboard/dashboard.html:93 #: bookwyrm/templates/snippets/report_modal.html:33 msgid "Submit" @@ -830,8 +838,8 @@ msgstr "Dar kartą išsiųsti patvirtinimo nuorodą" #: bookwyrm/templates/confirm_email/resend_form.html:11 #: bookwyrm/templates/landing/layout.html:67 #: bookwyrm/templates/landing/password_reset_request.html:18 -#: bookwyrm/templates/preferences/edit_user.html:56 -#: bookwyrm/templates/snippets/register_form.html:13 +#: bookwyrm/templates/preferences/edit_user.html:53 +#: bookwyrm/templates/snippets/register_form.html:12 msgid "Email address:" msgstr "El. pašto adresas:" @@ -861,12 +869,17 @@ msgstr "Bendruomenė" msgid "Make your profile discoverable to other BookWyrm users." msgstr "Savo paskyrą leiskite atrasti kitiems „BookWyrm“ nariems." +#: bookwyrm/templates/directory/directory.html:21 +msgid "Join Directory" +msgstr "Prisijungti prie bendruomenės" + #: bookwyrm/templates/directory/directory.html:24 #, python-format msgid "You can opt-out at any time in your profile settings." msgstr "Tai galite visada atšaukti paskyros nustatymuose." #: bookwyrm/templates/directory/directory.html:29 +#: bookwyrm/templates/directory/directory.html:31 #: bookwyrm/templates/feed/goal_card.html:17 #: bookwyrm/templates/snippets/announcement.html:34 msgid "Dismiss message" @@ -1099,28 +1112,28 @@ msgstr "Visos žinutės" msgid "You have no messages right now." msgstr "Neturite žinučių." -#: bookwyrm/templates/feed/feed.html:23 +#: bookwyrm/templates/feed/feed.html:27 msgid "Feed settings" msgstr "Srauto nustatymai" -#: bookwyrm/templates/feed/feed.html:26 +#: bookwyrm/templates/feed/feed.html:39 msgid "Saved!" msgstr "Išsaugota!" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:53 msgid "Save settings" msgstr "Išsaugoti nustatymus" -#: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/feed/feed.html:63 #, python-format msgid "load 0 unread status(es)" msgstr "įkelti 0 neperskaitytų būsena" -#: bookwyrm/templates/feed/feed.html:72 +#: bookwyrm/templates/feed/feed.html:80 msgid "There aren't any activities right now! Try following a user to get started" msgstr "Šiuo metu įrašų nėra. Norėdami matyti, sekite narį." -#: bookwyrm/templates/feed/feed.html:73 +#: bookwyrm/templates/feed/feed.html:81 msgid "Alternatively, you can try enabling more status types" msgstr "Taip pat galite pasirinkti daugiau būsenos tipų" @@ -1149,22 +1162,35 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "Knygų neturite. Raskite knygą ir pradėkite." #: bookwyrm/templates/feed/layout.html:25 +#: bookwyrm/templates/get_started/book_preview.html:10 #: bookwyrm/templates/shelf/shelf.html:38 +#: bookwyrm/templates/shelf/shelf.html:83 +#: bookwyrm/templates/snippets/shelf_selector.html:28 #: bookwyrm/templates/user/books_header.html:4 +#: bookwyrm/templates/user/user.html:33 msgid "To Read" -msgstr "Perskaityti" +msgstr "Norimos perskaityti" #: bookwyrm/templates/feed/layout.html:26 +#: bookwyrm/templates/get_started/book_preview.html:11 #: bookwyrm/templates/shelf/shelf.html:40 +#: bookwyrm/templates/shelf/shelf.html:84 +#: bookwyrm/templates/snippets/shelf_selector.html:29 #: bookwyrm/templates/user/books_header.html:6 +#: bookwyrm/templates/user/user.html:34 msgid "Currently Reading" msgstr "Šiuo metu skaitoma" #: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/get_started/book_preview.html:12 #: bookwyrm/templates/shelf/shelf.html:42 +#: bookwyrm/templates/shelf/shelf.html:85 +#: bookwyrm/templates/snippets/shelf_selector.html:30 +#: bookwyrm/templates/snippets/shelf_selector.html:49 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 #: bookwyrm/templates/user/books_header.html:8 +#: bookwyrm/templates/user/user.html:35 msgid "Read" msgstr "Perskaityta" @@ -1186,6 +1212,10 @@ msgstr "Žiūrėti katalogą" msgid "Have you read %(book_title)s?" msgstr "Ar skaitėte „%(book_title)s“?" +#: bookwyrm/templates/get_started/book_preview.html:7 +msgid "Add to your books" +msgstr "Pridėti prie savo knygų" + #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" msgstr "Ką skaitome?" @@ -1232,7 +1262,7 @@ msgid "No books found" msgstr "Knygų nerasta" #: bookwyrm/templates/get_started/books.html:63 -#: bookwyrm/templates/get_started/profile.html:54 +#: bookwyrm/templates/get_started/profile.html:51 msgid "Save & continue" msgstr "Išsaugoti ir tęsti" @@ -1272,35 +1302,33 @@ msgid "Finish" msgstr "Baigti" #: bookwyrm/templates/get_started/profile.html:15 -#: bookwyrm/templates/preferences/edit_user.html:42 +#: bookwyrm/templates/preferences/edit_user.html:41 msgid "Display name:" msgstr "Rodyti vardą:" -#: bookwyrm/templates/get_started/profile.html:22 -#: bookwyrm/templates/preferences/edit_user.html:49 +#: bookwyrm/templates/get_started/profile.html:21 +#: bookwyrm/templates/preferences/edit_user.html:47 msgid "Summary:" msgstr "Santrauka:" -#: bookwyrm/templates/get_started/profile.html:23 +#: bookwyrm/templates/get_started/profile.html:22 msgid "A little bit about you" msgstr "Šiek tiek apie jus" -#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/get_started/profile.html:30 #: bookwyrm/templates/preferences/edit_user.html:27 msgid "Avatar:" msgstr "Avataras:" -#: bookwyrm/templates/get_started/profile.html:42 -#: bookwyrm/templates/preferences/edit_user.html:110 +#: bookwyrm/templates/get_started/profile.html:39 msgid "Manually approve followers:" msgstr "Noriu tvirtinti sekėjus:" -#: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:80 +#: bookwyrm/templates/get_started/profile.html:45 msgid "Show this account in suggested users:" msgstr "Paskyrą įtraukti į siūlomus narius:" -#: bookwyrm/templates/get_started/profile.html:52 +#: bookwyrm/templates/get_started/profile.html:49 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "Jūsų paskyra atsiras kataloge ir gali būti rekomenduota kitiems „BookWyrm“ nariams." @@ -1512,8 +1540,8 @@ msgid "Row" msgstr "Eilutė" #: bookwyrm/templates/import/import_status.html:103 -#: bookwyrm/templates/shelf/shelf.html:141 -#: bookwyrm/templates/shelf/shelf.html:163 +#: bookwyrm/templates/shelf/shelf.html:144 +#: bookwyrm/templates/shelf/shelf.html:166 msgid "Title" msgstr "Pavadinimas" @@ -1522,8 +1550,8 @@ msgid "ISBN" msgstr "ISBN" #: bookwyrm/templates/import/import_status.html:109 -#: bookwyrm/templates/shelf/shelf.html:142 -#: bookwyrm/templates/shelf/shelf.html:166 +#: bookwyrm/templates/shelf/shelf.html:145 +#: bookwyrm/templates/shelf/shelf.html:169 msgid "Author" msgstr "Autorius" @@ -1646,7 +1674,7 @@ msgstr "Privatumo politika" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 -#: bookwyrm/templates/landing/login.html:49 +#: bookwyrm/templates/landing/login.html:48 msgid "Create an Account" msgstr "Kurti paskyrą" @@ -1692,7 +1720,7 @@ msgstr "%(name)s – registracija uždaryta" msgid "Thank you! Your request has been received." msgstr "Dėkojame, jūsų prašymas gautas." -#: bookwyrm/templates/landing/layout.html:82 +#: bookwyrm/templates/landing/layout.html:81 msgid "Your Account" msgstr "Jūsų paskyra" @@ -1701,7 +1729,7 @@ msgid "Login" msgstr "Prisijungti" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:37 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 msgid "Log in" msgstr "Prisijunkite" @@ -1715,21 +1743,21 @@ msgid "Username:" msgstr "Naudotojo vardas:" #: bookwyrm/templates/landing/login.html:27 -#: bookwyrm/templates/landing/password_reset.html:17 +#: bookwyrm/templates/landing/password_reset.html:26 #: bookwyrm/templates/layout.html:174 -#: bookwyrm/templates/snippets/register_form.html:22 +#: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Slaptažodis:" -#: bookwyrm/templates/landing/login.html:40 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 msgid "Forgot your password?" msgstr "Pamiršote slaptažodį?" -#: bookwyrm/templates/landing/login.html:62 +#: bookwyrm/templates/landing/login.html:61 msgid "More about this site" msgstr "Daugiau apie šią svetainę" -#: bookwyrm/templates/landing/password_reset.html:23 +#: bookwyrm/templates/landing/password_reset.html:34 #: bookwyrm/templates/preferences/change_password.html:18 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" @@ -1956,7 +1984,6 @@ msgstr "Nustatyti" #: bookwyrm/templates/lists/list.html:92 #: bookwyrm/templates/snippets/remove_from_group_button.html:19 -#: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "Pašalinti" @@ -2202,9 +2229,9 @@ msgstr "Naujas slaptažodis:" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/delete_user.html:25 #: bookwyrm/templates/preferences/layout.html:24 -#: bookwyrm/templates/settings/users/delete_user_form.html:23 +#: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "Pašalinti paskyrą" @@ -2229,7 +2256,7 @@ msgid "Profile" msgstr "Profilis" #: bookwyrm/templates/preferences/edit_user.html:13 -#: bookwyrm/templates/preferences/edit_user.html:68 +#: bookwyrm/templates/preferences/edit_user.html:64 msgid "Display preferences" msgstr "Vaizdo nustatymai" @@ -2238,13 +2265,17 @@ msgstr "Vaizdo nustatymai" msgid "Privacy" msgstr "Privatumas" -#: bookwyrm/templates/preferences/edit_user.html:72 -msgid "Show reading goal prompt in feed:" -msgstr "Rodyti skaitymo tikslą sienoje:" +#: bookwyrm/templates/preferences/edit_user.html:69 +msgid "Show reading goal prompt in feed" +msgstr "Rodyti skaitymo tikslą sienoje" -#: bookwyrm/templates/preferences/edit_user.html:76 -msgid "Show suggested users:" -msgstr "Rodyti siūlomus narius:" +#: bookwyrm/templates/preferences/edit_user.html:75 +msgid "Show suggested users" +msgstr "Rodyti siūlomus narius" + +#: bookwyrm/templates/preferences/edit_user.html:81 +msgid "Show this account in suggested users" +msgstr "Paskyrą įtraukti į siūlomus narius" #: bookwyrm/templates/preferences/edit_user.html:85 #, python-format @@ -2255,6 +2286,10 @@ msgstr "Jūsų paskyra atsiras kataloge ir gali būti msgid "Preferred Timezone: " msgstr "Laiko juosta: " +#: bookwyrm/templates/preferences/edit_user.html:111 +msgid "Manually approve followers" +msgstr "Noriu tvirtinti sekėjus" + #: bookwyrm/templates/preferences/edit_user.html:116 msgid "Default post privacy:" msgstr "Numatytasis įrašo privatumas:" @@ -2282,6 +2317,10 @@ msgstr "Pradėti „%(book_title)s“" msgid "Want to Read \"%(book_title)s\"" msgstr "Noriu perskaityti „%(book_title)s“" +#: bookwyrm/templates/search/book.html:42 +msgid "Results from" +msgstr "Rezultatai iš" + #: bookwyrm/templates/search/book.html:47 #: bookwyrm/templates/settings/reports/reports.html:25 #: bookwyrm/templates/snippets/announcement.html:16 @@ -2355,19 +2394,19 @@ msgid "False" msgstr "Netiesa" #: bookwyrm/templates/settings/announcements/announcement.html:47 -#: bookwyrm/templates/settings/announcements/announcement_form.html:40 +#: bookwyrm/templates/settings/announcements/announcement_form.html:44 #: bookwyrm/templates/settings/dashboard/dashboard.html:71 msgid "Start date:" msgstr "Pradžios data:" #: bookwyrm/templates/settings/announcements/announcement.html:54 -#: bookwyrm/templates/settings/announcements/announcement_form.html:49 +#: bookwyrm/templates/settings/announcements/announcement_form.html:54 #: bookwyrm/templates/settings/dashboard/dashboard.html:77 msgid "End date:" msgstr "Pabaigos data:" #: bookwyrm/templates/settings/announcements/announcement.html:60 -#: bookwyrm/templates/settings/announcements/announcement_form.html:58 +#: bookwyrm/templates/settings/announcements/announcement_form.html:64 msgid "Active:" msgstr "Aktyvu:" @@ -2376,15 +2415,15 @@ msgstr "Aktyvu:" msgid "Create Announcement" msgstr "Sukurti pranešimą" -#: bookwyrm/templates/settings/announcements/announcement_form.html:16 +#: bookwyrm/templates/settings/announcements/announcement_form.html:17 msgid "Preview:" msgstr "Peržiūra:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:23 +#: bookwyrm/templates/settings/announcements/announcement_form.html:25 msgid "Content:" msgstr "Turinys:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:30 +#: bookwyrm/templates/settings/announcements/announcement_form.html:33 msgid "Event date:" msgstr "Įvykio data:" @@ -2567,29 +2606,29 @@ msgstr "Grįžti į serverių sąrašą" msgid "Import block list" msgstr "Importuoti blokuojamų sąrašą" -#: bookwyrm/templates/settings/federation/edit_instance.html:30 +#: bookwyrm/templates/settings/federation/edit_instance.html:31 msgid "Instance:" msgstr "Serveris:" -#: bookwyrm/templates/settings/federation/edit_instance.html:39 +#: bookwyrm/templates/settings/federation/edit_instance.html:40 #: bookwyrm/templates/settings/federation/instance.html:28 #: bookwyrm/templates/settings/users/user_info.html:106 msgid "Status:" msgstr "Būsena:" -#: bookwyrm/templates/settings/federation/edit_instance.html:52 +#: bookwyrm/templates/settings/federation/edit_instance.html:54 #: bookwyrm/templates/settings/federation/instance.html:22 #: bookwyrm/templates/settings/users/user_info.html:100 msgid "Software:" msgstr "Programinė įranga:" -#: bookwyrm/templates/settings/federation/edit_instance.html:61 +#: bookwyrm/templates/settings/federation/edit_instance.html:64 #: bookwyrm/templates/settings/federation/instance.html:25 #: bookwyrm/templates/settings/users/user_info.html:103 msgid "Version:" msgstr "Versija:" -#: bookwyrm/templates/settings/federation/edit_instance.html:70 +#: bookwyrm/templates/settings/federation/edit_instance.html:74 msgid "Notes:" msgstr "Užrašai:" @@ -3182,7 +3221,7 @@ msgstr "Visos knygos" msgid "Create shelf" msgstr "Sukurti lentyną" -#: bookwyrm/templates/shelf/shelf.html:90 +#: bookwyrm/templates/shelf/shelf.html:93 #, python-format msgid "%(formatted_count)s book" msgid_plural "%(formatted_count)s books" @@ -3191,35 +3230,35 @@ msgstr[1] "%(formatted_count)s knygos" msgstr[2] "%(formatted_count)s knygų" msgstr[3] "%(formatted_count)s knygos" -#: bookwyrm/templates/shelf/shelf.html:97 +#: bookwyrm/templates/shelf/shelf.html:100 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "(rodoma %(start)s–%(end)s)" -#: bookwyrm/templates/shelf/shelf.html:109 +#: bookwyrm/templates/shelf/shelf.html:112 msgid "Edit shelf" msgstr "Redaguoti lentyną" -#: bookwyrm/templates/shelf/shelf.html:117 +#: bookwyrm/templates/shelf/shelf.html:120 msgid "Delete shelf" msgstr "Ištrinti lentyną" -#: bookwyrm/templates/shelf/shelf.html:145 -#: bookwyrm/templates/shelf/shelf.html:171 +#: bookwyrm/templates/shelf/shelf.html:148 +#: bookwyrm/templates/shelf/shelf.html:174 msgid "Shelved" msgstr "Sudėta į lentynas" -#: bookwyrm/templates/shelf/shelf.html:146 -#: bookwyrm/templates/shelf/shelf.html:174 +#: bookwyrm/templates/shelf/shelf.html:149 +#: bookwyrm/templates/shelf/shelf.html:177 msgid "Started" msgstr "Pradėta" -#: bookwyrm/templates/shelf/shelf.html:147 -#: bookwyrm/templates/shelf/shelf.html:177 +#: bookwyrm/templates/shelf/shelf.html:150 +#: bookwyrm/templates/shelf/shelf.html:180 msgid "Finished" msgstr "Baigta" -#: bookwyrm/templates/shelf/shelf.html:203 +#: bookwyrm/templates/shelf/shelf.html:206 msgid "This shelf is empty." msgstr "Ši lentyna tuščia." @@ -3586,13 +3625,13 @@ msgstr "Įvertinti" msgid "Finish \"%(book_title)s\"" msgstr "Užbaigti „%(book_title)s“" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:23 -#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:24 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:21 #: bookwyrm/templates/snippets/readthrough_form.html:7 msgid "Started reading" msgstr "Pradėta skaityti" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:31 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:32 #: bookwyrm/templates/snippets/readthrough_form.html:20 msgid "Finished reading" msgstr "Baigta skaityti" @@ -3620,7 +3659,7 @@ msgstr "Noriu perskaityti „%(book_title)s“" msgid "Progress" msgstr "Progresas" -#: bookwyrm/templates/snippets/register_form.html:32 +#: bookwyrm/templates/snippets/register_form.html:30 msgid "Sign Up" msgstr "Registruotis" @@ -3642,24 +3681,31 @@ msgstr "Šis pranešimas bus nusiųstas peržiūrėti %(site_name)s puslapio mod msgid "More info about this report:" msgstr "Daugiau informacijos apie šį pranešimą:" -#: bookwyrm/templates/snippets/shelf_selector.html:4 +#: bookwyrm/templates/snippets/shelf_selector.html:7 msgid "Move book" msgstr "Perkelti knygą" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 -msgid "More shelves" -msgstr "Daugiau lentynų" - +#: bookwyrm/templates/snippets/shelf_selector.html:42 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24 msgid "Start reading" msgstr "Pradėti skaityti" +#: bookwyrm/templates/snippets/shelf_selector.html:55 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Want to read" msgstr "Noriu perskaityti" +#: bookwyrm/templates/snippets/shelf_selector.html:73 +#: bookwyrm/templates/snippets/shelf_selector.html:84 +msgid "Remove from" +msgstr "Panaikinti iš" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 +msgid "More shelves" +msgstr "Daugiau lentynų" + #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62 #, python-format msgid "Remove from %(name)s" @@ -3874,24 +3920,29 @@ msgstr "%(username)s nieko neseka" msgid "Edit profile" msgstr "Redaguoti paskyrą" -#: bookwyrm/templates/user/user.html:33 +#: bookwyrm/templates/user/user.html:37 #, python-format msgid "View all %(size)s" msgstr "Žiūrėti visas %(size)s" -#: bookwyrm/templates/user/user.html:46 +#: bookwyrm/templates/user/user.html:51 msgid "View all books" msgstr "Žiūrėti visas knygas" -#: bookwyrm/templates/user/user.html:59 +#: bookwyrm/templates/user/user.html:58 +#, python-format +msgid "%(current_year)s Reading Goal" +msgstr "%(current_year)s skaitymo tikslas" + +#: bookwyrm/templates/user/user.html:65 msgid "User Activity" msgstr "Naudotojo aktyvumas" -#: bookwyrm/templates/user/user.html:63 +#: bookwyrm/templates/user/user.html:69 msgid "RSS feed" msgstr "RSS srautas" -#: bookwyrm/templates/user/user.html:74 +#: bookwyrm/templates/user/user.html:80 msgid "No activities yet!" msgstr "Įrašų dar nėra" diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo index cec040992a771e771dd5e1a5eb07657998933e67..f9c760e99d5b5328b7bafef79ac3ef816b6635e0 100644 GIT binary patch delta 18904 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 J-==;6 z=`fYq=)0Z#yVjuzyyUGhiCS9<>by=^z` zp!0dsJnQ%t`433nkaU%x{vY}t#C?<}lj2D|t^ZcqLdX}w3M{5OZQqgCF@Ht=`L)ve z`{w71%XclNV>uei;xinN!K4pJuafeTCXjBE%8~Zcr>+h3GA2`}tGU&sQeICgL^%!r zrmZA)CVfs_RTk*|fy%WM_&LP)ADPTRT_JSpPAWyJM#m4S+eP|Gja*}?KZ7-C+sOTe z@xRw=w0}g!AyR4bx^`n$`s#{6exzvX`N0~!IFVG2#z-1pBpswYlX5IhvKx!wP|Ay~ zT!DPn^nA5K)1zx;^^T+WMw0KN9!ipmlJtLX)=v#F^nT2p$>jHt*A+xLi2O?OwXANQ zuZ3TCSlMHJ zf3&0`m5NZ(4pKDbt+;~pK50MYUr|>j@^4xGZ>&nnM_rsn>vQs>tbGf4U7zAcQabs| zSc|?(@lD@y-Mh?7b zd73=q=y!vZhx=Qof~zF?h59&2r{fSBH&OXJ`KB~n#U-R{x(T0RS?W9bZe>B#?IYEv zE`YZG@1nfrKNXAUr)wSl=(6q?h4lN9`F&S9g@4JFx6Tpd0~x$G^`ptZOxmnIv`-~J zh4lQ2B=d$9df5H(c#Zx;@O9cck>6^4s*u+;5WRh@a00(~^`6n>XOVA5s%`DH$RD+K zQPUYZ=X^f-kr@vq63MPNa?u&I*Uf*9i?opXYx=0$%O&`;E$~vlF ze)7}sGu%unKx#w3xu|Q9P3TH|j!@o7;Wevx)hxjR7jjQgQVr@J=>0#ff(`H`&LW+q z?nSH9z3VCKs>cBDU@gjdXm3Tj=WB6)bO7t>`%B=rHpYD_htoERa%<9f%5_L#djFqa zC&>)3!dOhOa9*L~Zqg^z3CV*p<3q`YgvzsOwWw zCCc8v>7Z-1!}ojBaWqVz{4;G;7~~tQKzTa#JIQ~7Gf45|_uvxRrjXB0nrP!3Apbh4 zzLkF^f1JJxP*+LvS@rqf&6PcYR1~0b0I4+j->g1>d|&DcSTq{qZ`A2(f^%rgVr{Am zCjW#wT?wQzmREU>{^06MT25N5_y4hVc&rw#>e5Ch3$`+81m9L;2XJz$iYlDoky5(4t^b2iO)xoa6 zs4GvJO#iF+h1GwDRVhEeZdhg}{T7k;-uzGFO!C{PtVe3hVg}P`68UDf2(rFwp53$R zKlkc)D`iR5t?w)3N0M~4pl%p_?~%gD=c8^v>7k$E&sCR(+;(FL@@1HOfR&4q|DUfH z-+I&?CKaZ9-Rfd!KS2It>i2SQ3Q55Vh;rf+VR zJ9BBXLBZ*99cHC_d*)ByzNAoQK*wicp{WCgMmJ9F8ynpsd1&A0c0*Ez4@l27s8D9r zL0hwA1`q9&BlERUOZ+lpMo;wjOH5xnwwPaH=FPE>vu5wxCuMj_>d^H6wJn(5y;sik z@7soFULL`jcS3CuF<@QJF_~xAM=dx36qa=CETY z{4zWJoHJ{UME)<7!-l6Nr$xUyqSxS*-pRX`>{^ui|0;)#=-+qP@Lk{Z9TwfEZ}f;^ uBX%uFOGzD;n0e?_TDBa?(JWp!q<^`zxGg@fU&YM2=aYjnw_abD=l=lLi%zis diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index edb6926a1..9034de1c1 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-02 18:24+0000\n" -"PO-Revision-Date: 2021-12-02 21:40\n" +"POT-Creation-Date: 2021-12-04 22:38+0000\n" +"PO-Revision-Date: 2021-12-05 14:06\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:350 msgid "A user with this email already exists." msgstr "Já existe um usuário com este endereço de e-mail." -#: bookwyrm/forms.py:276 +#: bookwyrm/forms.py:364 msgid "One Day" msgstr "Um dia" -#: bookwyrm/forms.py:277 +#: bookwyrm/forms.py:365 msgid "One Week" msgstr "Uma semana" -#: bookwyrm/forms.py:278 +#: bookwyrm/forms.py:366 msgid "One Month" msgstr "Um mês" -#: bookwyrm/forms.py:279 +#: bookwyrm/forms.py:367 msgid "Does Not Expire" msgstr "Não expira" -#: bookwyrm/forms.py:283 +#: bookwyrm/forms.py:371 #, python-brace-format msgid "{i} uses" msgstr "{i} usos" -#: bookwyrm/forms.py:284 +#: bookwyrm/forms.py:372 msgid "Unlimited" msgstr "Ilimitado" -#: bookwyrm/forms.py:352 +#: bookwyrm/forms.py:468 msgid "List Order" msgstr "Ordem de inserção" -#: bookwyrm/forms.py:353 +#: bookwyrm/forms.py:469 msgid "Book Title" msgstr "Título do livro" -#: bookwyrm/forms.py:354 bookwyrm/templates/shelf/shelf.html:149 -#: bookwyrm/templates/shelf/shelf.html:181 +#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Avaliação" -#: bookwyrm/forms.py:356 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Organizar por" -#: bookwyrm/forms.py:360 +#: bookwyrm/forms.py:476 msgid "Ascending" msgstr "Crescente" -#: bookwyrm/forms.py:361 +#: bookwyrm/forms.py:477 msgid "Descending" msgstr "Decrescente" @@ -122,13 +122,13 @@ msgid "Paperback" msgstr "Capa mole" #: bookwyrm/models/federated_server.py:11 -#: bookwyrm/templates/settings/federation/edit_instance.html:42 +#: bookwyrm/templates/settings/federation/edit_instance.html:43 #: bookwyrm/templates/settings/federation/instance_list.html:19 msgid "Federated" msgstr "Federado" #: bookwyrm/models/federated_server.py:12 -#: bookwyrm/templates/settings/federation/edit_instance.html:43 +#: bookwyrm/templates/settings/federation/edit_instance.html:44 #: bookwyrm/templates/settings/federation/instance.html:10 #: bookwyrm/templates/settings/federation/instance_list.html:23 msgid "Blocked" @@ -152,7 +152,7 @@ msgstr "nome de usuário" msgid "A user with that username already exists." msgstr "Já existe um usuário com este nome." -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:218 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:227 msgid "Reviews" msgstr "Resenhas" @@ -248,7 +248,7 @@ msgid "Edit Author" msgstr "Editar autor" #: bookwyrm/templates/author/author.html:35 -#: bookwyrm/templates/author/edit_author.html:43 +#: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" msgstr "Pseudônimos:" @@ -311,7 +311,7 @@ msgid "Last edited by:" msgstr "Editado pela última vez por:" #: bookwyrm/templates/author/edit_author.html:33 -#: bookwyrm/templates/book/edit/edit_book_form.html:15 +#: bookwyrm/templates/book/edit/edit_book_form.html:16 msgid "Metadata" msgstr "Metadados" @@ -320,51 +320,50 @@ msgstr "Metadados" msgid "Name:" msgstr "Nome:" -#: bookwyrm/templates/author/edit_author.html:45 -#: bookwyrm/templates/book/edit/edit_book_form.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:79 -#: bookwyrm/templates/book/edit/edit_book_form.html:124 +#: bookwyrm/templates/author/edit_author.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:75 +#: bookwyrm/templates/book/edit/edit_book_form.html:94 msgid "Separate multiple values with commas." msgstr "Separe com vírgulas." -#: bookwyrm/templates/author/edit_author.html:52 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "Sobre mim:" -#: bookwyrm/templates/author/edit_author.html:59 +#: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" msgstr "Link da Wikipédia:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:61 msgid "Birth date:" msgstr "Data de nascimento:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:68 msgid "Death date:" msgstr "Data da morte:" -#: bookwyrm/templates/author/edit_author.html:81 +#: bookwyrm/templates/author/edit_author.html:75 msgid "Author Identifiers" msgstr "Identificadores do autor" -#: bookwyrm/templates/author/edit_author.html:83 +#: bookwyrm/templates/author/edit_author.html:77 msgid "Openlibrary key:" msgstr "Chave Openlibrary:" -#: bookwyrm/templates/author/edit_author.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:224 +#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/book/edit/edit_book_form.html:265 msgid "Inventaire ID:" msgstr "ID Inventaire:" -#: bookwyrm/templates/author/edit_author.html:99 +#: bookwyrm/templates/author/edit_author.html:91 msgid "Librarything key:" msgstr "Chave Librarything:" -#: bookwyrm/templates/author/edit_author.html:107 +#: bookwyrm/templates/author/edit_author.html:98 msgid "Goodreads key:" msgstr "Chave Goodreads:" -#: bookwyrm/templates/author/edit_author.html:118 +#: bookwyrm/templates/author/edit_author.html:108 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -372,18 +371,18 @@ msgstr "Chave Goodreads:" #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/form.html:75 #: bookwyrm/templates/preferences/edit_user.html:124 -#: bookwyrm/templates/settings/announcements/announcement_form.html:69 -#: bookwyrm/templates/settings/federation/edit_instance.html:74 +#: bookwyrm/templates/settings/announcements/announcement_form.html:76 +#: bookwyrm/templates/settings/federation/edit_instance.html:82 #: bookwyrm/templates/settings/federation/instance.html:87 -#: bookwyrm/templates/settings/site.html:134 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:64 +#: bookwyrm/templates/settings/site.html:133 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:68 #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" msgstr "Salvar" -#: bookwyrm/templates/author/edit_author.html:119 -#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 @@ -428,7 +427,7 @@ msgid "Add Description" msgstr "Adicionar descrição" #: bookwyrm/templates/book/book.html:136 -#: bookwyrm/templates/book/edit/edit_book_form.html:34 +#: bookwyrm/templates/book/edit/edit_book_form.html:39 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Descrição:" @@ -439,52 +438,51 @@ msgid "%(count)s editions" msgstr "%(count)s edições" #: bookwyrm/templates/book/book.html:158 -#, python-format -msgid "This edition is on your %(shelf_name)s shelf." -msgstr "Esta edição está em sua estante %(shelf_name)s." +msgid "You have shelved this edition in:" +msgstr "Você acabou esta edição em:" -#: bookwyrm/templates/book/book.html:164 +#: bookwyrm/templates/book/book.html:173 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Uma edição diferente deste livro está em sua estante %(shelf_name)s." -#: bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:184 msgid "Your reading activity" msgstr "Sua atividade de leitura" -#: bookwyrm/templates/book/book.html:178 +#: bookwyrm/templates/book/book.html:187 msgid "Add read dates" msgstr "Adicionar datas de leitura" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:196 msgid "Create" msgstr "Criar" -#: bookwyrm/templates/book/book.html:197 +#: bookwyrm/templates/book/book.html:206 msgid "You don't have any reading activity for this book." msgstr "Você ainda não registrou seu progresso para este livro." -#: bookwyrm/templates/book/book.html:223 +#: bookwyrm/templates/book/book.html:232 msgid "Your reviews" msgstr "Suas resenhas" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:238 msgid "Your comments" msgstr "Seus comentários" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:244 msgid "Your quotes" msgstr "Suas citações" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:280 msgid "Subjects" msgstr "Assuntos" -#: bookwyrm/templates/book/book.html:283 +#: bookwyrm/templates/book/book.html:292 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:294 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:303 bookwyrm/templates/layout.html:75 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -492,15 +490,15 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:314 msgid "Add to list" msgstr "Adicionar à lista" -#: bookwyrm/templates/book/book.html:315 +#: bookwyrm/templates/book/book.html:324 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:182 -#: bookwyrm/templates/settings/email_blocklist/domain_form.html:26 -#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 msgid "Add" msgstr "Adicionar" @@ -509,22 +507,22 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:15 -#: bookwyrm/templates/book/edit/edit_book_form.html:232 +#: bookwyrm/templates/book/edit/edit_book_form.html:274 msgid "OCLC Number:" msgstr "Número OCLC:" #: bookwyrm/templates/book/book_identifiers.html:22 -#: bookwyrm/templates/book/edit/edit_book_form.html:240 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:143 +#: bookwyrm/templates/book/edit/edit_book_form.html:173 msgid "Upload cover:" msgstr "Enviar capa:" #: bookwyrm/templates/book/cover_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:148 +#: bookwyrm/templates/book/edit/edit_book_form.html:179 msgid "Load cover from url:" msgstr "Carregar capa do endereço:" @@ -576,110 +574,120 @@ msgstr "É uma nova obra" #: bookwyrm/templates/book/edit/edit_book.html:108 #: bookwyrm/templates/groups/members.html:16 -#: bookwyrm/templates/landing/password_reset.html:30 +#: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:16 msgid "Confirm" msgstr "Confirmar" #: bookwyrm/templates/book/edit/edit_book.html:110 -#: bookwyrm/templates/feed/status.html:9 +#: bookwyrm/templates/feed/status.html:21 msgid "Back" msgstr "Voltar" -#: bookwyrm/templates/book/edit/edit_book_form.html:18 +#: bookwyrm/templates/book/edit/edit_book_form.html:21 #: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "Título:" -#: bookwyrm/templates/book/edit/edit_book_form.html:26 +#: bookwyrm/templates/book/edit/edit_book_form.html:30 msgid "Subtitle:" msgstr "Subtítulo:" -#: bookwyrm/templates/book/edit/edit_book_form.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:50 msgid "Series:" msgstr "Série:" -#: bookwyrm/templates/book/edit/edit_book_form.html:53 +#: bookwyrm/templates/book/edit/edit_book_form.html:60 msgid "Series number:" msgstr "Número na série:" -#: bookwyrm/templates/book/edit/edit_book_form.html:63 +#: bookwyrm/templates/book/edit/edit_book_form.html:71 msgid "Languages:" msgstr "Idiomas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:74 +#: bookwyrm/templates/book/edit/edit_book_form.html:85 msgid "Publication" msgstr "Publicação" -#: bookwyrm/templates/book/edit/edit_book_form.html:77 +#: bookwyrm/templates/book/edit/edit_book_form.html:90 msgid "Publisher:" msgstr "Editora:" -#: bookwyrm/templates/book/edit/edit_book_form.html:86 +#: bookwyrm/templates/book/edit/edit_book_form.html:102 msgid "First published date:" msgstr "Data da primeira publicação:" -#: bookwyrm/templates/book/edit/edit_book_form.html:94 +#: bookwyrm/templates/book/edit/edit_book_form.html:111 msgid "Published date:" msgstr "Data de publicação:" -#: bookwyrm/templates/book/edit/edit_book_form.html:104 +#: bookwyrm/templates/book/edit/edit_book_form.html:122 msgid "Authors" msgstr "Autores" -#: bookwyrm/templates/book/edit/edit_book_form.html:112 +#: bookwyrm/templates/book/edit/edit_book_form.html:131 #, python-format msgid "Remove %(name)s" msgstr "Remover %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:115 +#: bookwyrm/templates/book/edit/edit_book_form.html:134 #, python-format msgid "Author page for %(name)s" msgstr "Página de autor de %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:122 +#: bookwyrm/templates/book/edit/edit_book_form.html:142 msgid "Add Authors:" msgstr "Adicionar autores:" -#: bookwyrm/templates/book/edit/edit_book_form.html:123 -msgid "John Doe, Jane Smith" -msgstr "Fulano da Silva, Sicrano de Oliveira" +#: bookwyrm/templates/book/edit/edit_book_form.html:145 +#: bookwyrm/templates/book/edit/edit_book_form.html:148 +msgid "Add Author" +msgstr "Adicionar autor/a" -#: bookwyrm/templates/book/edit/edit_book_form.html:132 -#: bookwyrm/templates/shelf/shelf.html:140 +#: bookwyrm/templates/book/edit/edit_book_form.html:146 +#: bookwyrm/templates/book/edit/edit_book_form.html:149 +msgid "Jane Doe" +msgstr "Joana Sem-nome" + +#: bookwyrm/templates/book/edit/edit_book_form.html:152 +msgid "Add Another Author" +msgstr "Adicionar outro autor/a" + +#: bookwyrm/templates/book/edit/edit_book_form.html:160 +#: bookwyrm/templates/shelf/shelf.html:143 msgid "Cover" msgstr "Capa" -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:192 msgid "Physical Properties" msgstr "Propriedades físicas" -#: bookwyrm/templates/book/edit/edit_book_form.html:166 +#: bookwyrm/templates/book/edit/edit_book_form.html:199 #: bookwyrm/templates/book/editions/format_filter.html:5 msgid "Format:" msgstr "Formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Format details:" msgstr "Detalhes do formato:" -#: bookwyrm/templates/book/edit/edit_book_form.html:187 +#: bookwyrm/templates/book/edit/edit_book_form.html:222 msgid "Pages:" msgstr "Páginas:" -#: bookwyrm/templates/book/edit/edit_book_form.html:197 +#: bookwyrm/templates/book/edit/edit_book_form.html:233 msgid "Book Identifiers" msgstr "Identificadores do livro" -#: bookwyrm/templates/book/edit/edit_book_form.html:200 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:208 +#: bookwyrm/templates/book/edit/edit_book_form.html:247 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:256 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" @@ -811,7 +819,7 @@ msgid "Confirmation code:" msgstr "Código de confirmação:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 -#: bookwyrm/templates/landing/layout.html:73 +#: bookwyrm/templates/landing/layout.html:72 #: bookwyrm/templates/settings/dashboard/dashboard.html:93 #: bookwyrm/templates/snippets/report_modal.html:33 msgid "Submit" @@ -828,8 +836,8 @@ msgstr "Reenviar link de confirmação" #: bookwyrm/templates/confirm_email/resend_form.html:11 #: bookwyrm/templates/landing/layout.html:67 #: bookwyrm/templates/landing/password_reset_request.html:18 -#: bookwyrm/templates/preferences/edit_user.html:56 -#: bookwyrm/templates/snippets/register_form.html:13 +#: bookwyrm/templates/preferences/edit_user.html:53 +#: bookwyrm/templates/snippets/register_form.html:12 msgid "Email address:" msgstr "Endereço de e-mail:" @@ -859,12 +867,17 @@ msgstr "Diretório" msgid "Make your profile discoverable to other BookWyrm users." msgstr "Listar seu perfil no diretório para que outros usuários da BookWyrm te descubram." +#: bookwyrm/templates/directory/directory.html:21 +msgid "Join Directory" +msgstr "Junte-se ao diretório publico" + #: bookwyrm/templates/directory/directory.html:24 #, python-format msgid "You can opt-out at any time in your profile settings." msgstr "Você pode desabilitar esta opção a qualquer momento em suas configurações de perfil." #: bookwyrm/templates/directory/directory.html:29 +#: bookwyrm/templates/directory/directory.html:31 #: bookwyrm/templates/feed/goal_card.html:17 #: bookwyrm/templates/snippets/announcement.html:34 msgid "Dismiss message" @@ -1093,28 +1106,28 @@ msgstr "Todas as mensagens" msgid "You have no messages right now." msgstr "Você não tem mensagens." -#: bookwyrm/templates/feed/feed.html:23 +#: bookwyrm/templates/feed/feed.html:27 msgid "Feed settings" msgstr "Configurações das atualizações" -#: bookwyrm/templates/feed/feed.html:26 +#: bookwyrm/templates/feed/feed.html:39 msgid "Saved!" msgstr "Salvo!" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:53 msgid "Save settings" msgstr "Salvar configurações" -#: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/feed/feed.html:63 #, python-format msgid "load 0 unread status(es)" msgstr "carregar 0 publicações não lida(s)" -#: bookwyrm/templates/feed/feed.html:72 +#: bookwyrm/templates/feed/feed.html:80 msgid "There aren't any activities right now! Try following a user to get started" msgstr "Não há nenhuma atividade! Tente seguir um usuário para começar" -#: bookwyrm/templates/feed/feed.html:73 +#: bookwyrm/templates/feed/feed.html:81 msgid "Alternatively, you can try enabling more status types" msgstr "Uma outra opção é habilitar mais tipos de publicação" @@ -1143,22 +1156,35 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "Não há nenhum livro aqui! Tente pesquisar livros para começar" #: bookwyrm/templates/feed/layout.html:25 +#: bookwyrm/templates/get_started/book_preview.html:10 #: bookwyrm/templates/shelf/shelf.html:38 +#: bookwyrm/templates/shelf/shelf.html:83 +#: bookwyrm/templates/snippets/shelf_selector.html:28 #: bookwyrm/templates/user/books_header.html:4 +#: bookwyrm/templates/user/user.html:33 msgid "To Read" msgstr "Quero ler" #: bookwyrm/templates/feed/layout.html:26 +#: bookwyrm/templates/get_started/book_preview.html:11 #: bookwyrm/templates/shelf/shelf.html:40 +#: bookwyrm/templates/shelf/shelf.html:84 +#: bookwyrm/templates/snippets/shelf_selector.html:29 #: bookwyrm/templates/user/books_header.html:6 +#: bookwyrm/templates/user/user.html:34 msgid "Currently Reading" msgstr "Lendo atualmente" #: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/get_started/book_preview.html:12 #: bookwyrm/templates/shelf/shelf.html:42 +#: bookwyrm/templates/shelf/shelf.html:85 +#: bookwyrm/templates/snippets/shelf_selector.html:30 +#: bookwyrm/templates/snippets/shelf_selector.html:49 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 #: bookwyrm/templates/user/books_header.html:8 +#: bookwyrm/templates/user/user.html:35 msgid "Read" msgstr "Lido" @@ -1180,6 +1206,10 @@ msgstr "Ver diretório" msgid "Have you read %(book_title)s?" msgstr "Você leu %(book_title)s?" +#: bookwyrm/templates/get_started/book_preview.html:7 +msgid "Add to your books" +msgstr "Adicionar aos seus livros" + #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" msgstr "O que você está lendo?" @@ -1226,7 +1256,7 @@ msgid "No books found" msgstr "Nenhum livro encontrado" #: bookwyrm/templates/get_started/books.html:63 -#: bookwyrm/templates/get_started/profile.html:54 +#: bookwyrm/templates/get_started/profile.html:51 msgid "Save & continue" msgstr "Salvar & continuar" @@ -1266,35 +1296,33 @@ msgid "Finish" msgstr "Finalizar" #: bookwyrm/templates/get_started/profile.html:15 -#: bookwyrm/templates/preferences/edit_user.html:42 +#: bookwyrm/templates/preferences/edit_user.html:41 msgid "Display name:" msgstr "Nome de exibição:" -#: bookwyrm/templates/get_started/profile.html:22 -#: bookwyrm/templates/preferences/edit_user.html:49 +#: bookwyrm/templates/get_started/profile.html:21 +#: bookwyrm/templates/preferences/edit_user.html:47 msgid "Summary:" msgstr "Bio:" -#: bookwyrm/templates/get_started/profile.html:23 +#: bookwyrm/templates/get_started/profile.html:22 msgid "A little bit about you" msgstr "Um pouco sobre você" -#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/get_started/profile.html:30 #: bookwyrm/templates/preferences/edit_user.html:27 msgid "Avatar:" msgstr "Imagem de perfil:" -#: bookwyrm/templates/get_started/profile.html:42 -#: bookwyrm/templates/preferences/edit_user.html:110 +#: bookwyrm/templates/get_started/profile.html:39 msgid "Manually approve followers:" msgstr "Aprovar seguidores manualmente:" -#: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:80 +#: bookwyrm/templates/get_started/profile.html:45 msgid "Show this account in suggested users:" msgstr "Mostrar conta nas sugestões de usuários:" -#: bookwyrm/templates/get_started/profile.html:52 +#: bookwyrm/templates/get_started/profile.html:49 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "Sua conta aparecerá no diretório e poderá ser recomendada para outros usuários da BookWyrm." @@ -1498,8 +1526,8 @@ msgid "Row" msgstr "Linha" #: bookwyrm/templates/import/import_status.html:103 -#: bookwyrm/templates/shelf/shelf.html:141 -#: bookwyrm/templates/shelf/shelf.html:163 +#: bookwyrm/templates/shelf/shelf.html:144 +#: bookwyrm/templates/shelf/shelf.html:166 msgid "Title" msgstr "Título" @@ -1508,8 +1536,8 @@ msgid "ISBN" msgstr "ISBN" #: bookwyrm/templates/import/import_status.html:109 -#: bookwyrm/templates/shelf/shelf.html:142 -#: bookwyrm/templates/shelf/shelf.html:166 +#: bookwyrm/templates/shelf/shelf.html:145 +#: bookwyrm/templates/shelf/shelf.html:169 msgid "Author" msgstr "Autor" @@ -1632,7 +1660,7 @@ msgstr "Política de privacidade" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 -#: bookwyrm/templates/landing/login.html:49 +#: bookwyrm/templates/landing/login.html:48 msgid "Create an Account" msgstr "Criar conta" @@ -1678,7 +1706,7 @@ msgstr "O cadastro em %(name)s está fechado" msgid "Thank you! Your request has been received." msgstr "Obrigado! Sua solicitação foi recebida." -#: bookwyrm/templates/landing/layout.html:82 +#: bookwyrm/templates/landing/layout.html:81 msgid "Your Account" msgstr "Sua conta" @@ -1687,7 +1715,7 @@ msgid "Login" msgstr "Entrar" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:37 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 msgid "Log in" msgstr "Entrar" @@ -1701,21 +1729,21 @@ msgid "Username:" msgstr "Usuário:" #: bookwyrm/templates/landing/login.html:27 -#: bookwyrm/templates/landing/password_reset.html:17 +#: bookwyrm/templates/landing/password_reset.html:26 #: bookwyrm/templates/layout.html:174 -#: bookwyrm/templates/snippets/register_form.html:22 +#: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Senha:" -#: bookwyrm/templates/landing/login.html:40 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 msgid "Forgot your password?" msgstr "Esqueceu sua senha?" -#: bookwyrm/templates/landing/login.html:62 +#: bookwyrm/templates/landing/login.html:61 msgid "More about this site" msgstr "Mais sobre este site" -#: bookwyrm/templates/landing/password_reset.html:23 +#: bookwyrm/templates/landing/password_reset.html:34 #: bookwyrm/templates/preferences/change_password.html:18 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" @@ -1942,7 +1970,6 @@ msgstr "Definir" #: bookwyrm/templates/lists/list.html:92 #: bookwyrm/templates/snippets/remove_from_group_button.html:19 -#: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "Remover" @@ -2188,9 +2215,9 @@ msgstr "Nova senha:" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/delete_user.html:25 #: bookwyrm/templates/preferences/layout.html:24 -#: bookwyrm/templates/settings/users/delete_user_form.html:23 +#: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "Excluir conta" @@ -2215,7 +2242,7 @@ msgid "Profile" msgstr "Perfil" #: bookwyrm/templates/preferences/edit_user.html:13 -#: bookwyrm/templates/preferences/edit_user.html:68 +#: bookwyrm/templates/preferences/edit_user.html:64 msgid "Display preferences" msgstr "Preferências da interface" @@ -2224,13 +2251,17 @@ msgstr "Preferências da interface" msgid "Privacy" msgstr "Privacidade" -#: bookwyrm/templates/preferences/edit_user.html:72 -msgid "Show reading goal prompt in feed:" -msgstr "Mostrar sugestão de meta de leitura:" +#: bookwyrm/templates/preferences/edit_user.html:69 +msgid "Show reading goal prompt in feed" +msgstr "Mostrar sugestão de meta de leitura na linha de tempo" -#: bookwyrm/templates/preferences/edit_user.html:76 -msgid "Show suggested users:" -msgstr "Mostrar sugestões de usuários:" +#: bookwyrm/templates/preferences/edit_user.html:75 +msgid "Show suggested users" +msgstr "Mostrar usuários sugeridos" + +#: bookwyrm/templates/preferences/edit_user.html:81 +msgid "Show this account in suggested users" +msgstr "Mostrar esta conta nos usuários sugeridos" #: bookwyrm/templates/preferences/edit_user.html:85 #, python-format @@ -2241,6 +2272,10 @@ msgstr "Sua conta aparecerá no diretório e poderá se msgid "Preferred Timezone: " msgstr "Fuso horário preferido: " +#: bookwyrm/templates/preferences/edit_user.html:111 +msgid "Manually approve followers" +msgstr "Aprovar manualmente seguidores" + #: bookwyrm/templates/preferences/edit_user.html:116 msgid "Default post privacy:" msgstr "Privacidade padrão das publicações:" @@ -2268,6 +2303,10 @@ msgstr "Começar \"%(book_title)s\"" msgid "Want to Read \"%(book_title)s\"" msgstr "Quero ler \"%(book_title)s\"" +#: bookwyrm/templates/search/book.html:42 +msgid "Results from" +msgstr "Resultados de" + #: bookwyrm/templates/search/book.html:47 #: bookwyrm/templates/settings/reports/reports.html:25 #: bookwyrm/templates/snippets/announcement.html:16 @@ -2341,19 +2380,19 @@ msgid "False" msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:47 -#: bookwyrm/templates/settings/announcements/announcement_form.html:40 +#: bookwyrm/templates/settings/announcements/announcement_form.html:44 #: bookwyrm/templates/settings/dashboard/dashboard.html:71 msgid "Start date:" msgstr "Data de início:" #: bookwyrm/templates/settings/announcements/announcement.html:54 -#: bookwyrm/templates/settings/announcements/announcement_form.html:49 +#: bookwyrm/templates/settings/announcements/announcement_form.html:54 #: bookwyrm/templates/settings/dashboard/dashboard.html:77 msgid "End date:" msgstr "Data final:" #: bookwyrm/templates/settings/announcements/announcement.html:60 -#: bookwyrm/templates/settings/announcements/announcement_form.html:58 +#: bookwyrm/templates/settings/announcements/announcement_form.html:64 msgid "Active:" msgstr "Ativo:" @@ -2362,15 +2401,15 @@ msgstr "Ativo:" msgid "Create Announcement" msgstr "Criar aviso" -#: bookwyrm/templates/settings/announcements/announcement_form.html:16 +#: bookwyrm/templates/settings/announcements/announcement_form.html:17 msgid "Preview:" msgstr "Pré-visualização:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:23 +#: bookwyrm/templates/settings/announcements/announcement_form.html:25 msgid "Content:" msgstr "Conteúdo:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:30 +#: bookwyrm/templates/settings/announcements/announcement_form.html:33 msgid "Event date:" msgstr "Data do evento:" @@ -2547,29 +2586,29 @@ msgstr "Voltar à lista de instâncias" msgid "Import block list" msgstr "Importar lista de bloqueio" -#: bookwyrm/templates/settings/federation/edit_instance.html:30 +#: bookwyrm/templates/settings/federation/edit_instance.html:31 msgid "Instance:" msgstr "Instância:" -#: bookwyrm/templates/settings/federation/edit_instance.html:39 +#: bookwyrm/templates/settings/federation/edit_instance.html:40 #: bookwyrm/templates/settings/federation/instance.html:28 #: bookwyrm/templates/settings/users/user_info.html:106 msgid "Status:" msgstr "Status:" -#: bookwyrm/templates/settings/federation/edit_instance.html:52 +#: bookwyrm/templates/settings/federation/edit_instance.html:54 #: bookwyrm/templates/settings/federation/instance.html:22 #: bookwyrm/templates/settings/users/user_info.html:100 msgid "Software:" msgstr "Software:" -#: bookwyrm/templates/settings/federation/edit_instance.html:61 +#: bookwyrm/templates/settings/federation/edit_instance.html:64 #: bookwyrm/templates/settings/federation/instance.html:25 #: bookwyrm/templates/settings/users/user_info.html:103 msgid "Version:" msgstr "Versão:" -#: bookwyrm/templates/settings/federation/edit_instance.html:70 +#: bookwyrm/templates/settings/federation/edit_instance.html:74 msgid "Notes:" msgstr "Notas:" @@ -3162,42 +3201,42 @@ msgstr "Todos os livros" msgid "Create shelf" msgstr "Criar estante" -#: bookwyrm/templates/shelf/shelf.html:90 +#: bookwyrm/templates/shelf/shelf.html:93 #, python-format msgid "%(formatted_count)s book" msgid_plural "%(formatted_count)s books" msgstr[0] "%(formatted_count)s livro" msgstr[1] "%(formatted_count)s livros" -#: bookwyrm/templates/shelf/shelf.html:97 +#: bookwyrm/templates/shelf/shelf.html:100 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "(mostrando %(start)s-%(end)s)" -#: bookwyrm/templates/shelf/shelf.html:109 +#: bookwyrm/templates/shelf/shelf.html:112 msgid "Edit shelf" msgstr "Editar estante" -#: bookwyrm/templates/shelf/shelf.html:117 +#: bookwyrm/templates/shelf/shelf.html:120 msgid "Delete shelf" msgstr "Excluir estante" -#: bookwyrm/templates/shelf/shelf.html:145 -#: bookwyrm/templates/shelf/shelf.html:171 +#: bookwyrm/templates/shelf/shelf.html:148 +#: bookwyrm/templates/shelf/shelf.html:174 msgid "Shelved" msgstr "Adicionado" -#: bookwyrm/templates/shelf/shelf.html:146 -#: bookwyrm/templates/shelf/shelf.html:174 +#: bookwyrm/templates/shelf/shelf.html:149 +#: bookwyrm/templates/shelf/shelf.html:177 msgid "Started" msgstr "Iniciado" -#: bookwyrm/templates/shelf/shelf.html:147 -#: bookwyrm/templates/shelf/shelf.html:177 +#: bookwyrm/templates/shelf/shelf.html:150 +#: bookwyrm/templates/shelf/shelf.html:180 msgid "Finished" msgstr "Terminado" -#: bookwyrm/templates/shelf/shelf.html:203 +#: bookwyrm/templates/shelf/shelf.html:206 msgid "This shelf is empty." msgstr "Esta estante está vazia." @@ -3552,13 +3591,13 @@ msgstr "Avaliar" msgid "Finish \"%(book_title)s\"" msgstr "Terminar \"%(book_title)s\"" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:23 -#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:24 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:21 #: bookwyrm/templates/snippets/readthrough_form.html:7 msgid "Started reading" msgstr "Começou a ler" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:31 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:32 #: bookwyrm/templates/snippets/readthrough_form.html:20 msgid "Finished reading" msgstr "Terminou de ler" @@ -3586,7 +3625,7 @@ msgstr "Quero ler \"%(book_title)s\"" msgid "Progress" msgstr "Progresso" -#: bookwyrm/templates/snippets/register_form.html:32 +#: bookwyrm/templates/snippets/register_form.html:30 msgid "Sign Up" msgstr "Cadastrar" @@ -3608,24 +3647,31 @@ msgstr "Esta denúncia será encaminhada à equipe de moderadores de %(site_name msgid "More info about this report:" msgstr "Mais informações sobre esta denúncia:" -#: bookwyrm/templates/snippets/shelf_selector.html:4 +#: bookwyrm/templates/snippets/shelf_selector.html:7 msgid "Move book" msgstr "Mover livro" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 -msgid "More shelves" -msgstr "Mais estantes" - +#: bookwyrm/templates/snippets/shelf_selector.html:42 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24 msgid "Start reading" msgstr "Começar a ler" +#: bookwyrm/templates/snippets/shelf_selector.html:55 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Want to read" msgstr "Quero ler" +#: bookwyrm/templates/snippets/shelf_selector.html:73 +#: bookwyrm/templates/snippets/shelf_selector.html:84 +msgid "Remove from" +msgstr "Remover de" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 +msgid "More shelves" +msgstr "Mais estantes" + #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62 #, python-format msgid "Remove from %(name)s" @@ -3840,24 +3886,29 @@ msgstr "%(username)s não segue ninguém" msgid "Edit profile" msgstr "Editar perfil" -#: bookwyrm/templates/user/user.html:33 +#: bookwyrm/templates/user/user.html:37 #, python-format msgid "View all %(size)s" msgstr "Ver todos os %(size)s" -#: bookwyrm/templates/user/user.html:46 +#: bookwyrm/templates/user/user.html:51 msgid "View all books" msgstr "Ver todos os livros" -#: bookwyrm/templates/user/user.html:59 +#: bookwyrm/templates/user/user.html:58 +#, python-format +msgid "%(current_year)s Reading Goal" +msgstr "Meta de leitura para %(current_year)s" + +#: bookwyrm/templates/user/user.html:65 msgid "User Activity" msgstr "Atividade do usuário" -#: bookwyrm/templates/user/user.html:63 +#: bookwyrm/templates/user/user.html:69 msgid "RSS feed" msgstr "Feed RSS" -#: bookwyrm/templates/user/user.html:74 +#: bookwyrm/templates/user/user.html:80 msgid "No activities yet!" msgstr "Nenhuma atividade ainda!" diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index 1d1227f8092b70c68bb692fb532759090142aa83..47795aa3b107ed7785d2d54e1f7437c77220fe7a 100644 GIT binary patch literal 58899 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

hX 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 delta 17102 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 J!6l2F{{xGmDNq0a diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 74067a989..203ce2098 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-02 18:24+0000\n" -"PO-Revision-Date: 2021-12-02 21:41\n" +"POT-Creation-Date: 2021-12-04 22:38+0000\n" +"PO-Revision-Date: 2021-12-04 23:56\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:350 msgid "A user with this email already exists." msgstr "已经存在使用该邮箱的用户。" -#: bookwyrm/forms.py:276 +#: bookwyrm/forms.py:364 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:277 +#: bookwyrm/forms.py:365 msgid "One Week" msgstr "一周" -#: bookwyrm/forms.py:278 +#: bookwyrm/forms.py:366 msgid "One Month" msgstr "一个月" -#: bookwyrm/forms.py:279 +#: bookwyrm/forms.py:367 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:283 +#: bookwyrm/forms.py:371 #, python-brace-format msgid "{i} uses" msgstr "{i} 次使用" -#: bookwyrm/forms.py:284 +#: bookwyrm/forms.py:372 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:352 +#: bookwyrm/forms.py:468 msgid "List Order" msgstr "列表顺序" -#: bookwyrm/forms.py:353 +#: bookwyrm/forms.py:469 msgid "Book Title" msgstr "书名" -#: bookwyrm/forms.py:354 bookwyrm/templates/shelf/shelf.html:149 -#: bookwyrm/templates/shelf/shelf.html:181 +#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "评价" -#: bookwyrm/forms.py:356 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:360 +#: bookwyrm/forms.py:476 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:361 +#: bookwyrm/forms.py:477 msgid "Descending" msgstr "降序" @@ -122,13 +122,13 @@ msgid "Paperback" msgstr "平装" #: bookwyrm/models/federated_server.py:11 -#: bookwyrm/templates/settings/federation/edit_instance.html:42 +#: bookwyrm/templates/settings/federation/edit_instance.html:43 #: bookwyrm/templates/settings/federation/instance_list.html:19 msgid "Federated" msgstr "跨站" #: bookwyrm/models/federated_server.py:12 -#: bookwyrm/templates/settings/federation/edit_instance.html:43 +#: bookwyrm/templates/settings/federation/edit_instance.html:44 #: bookwyrm/templates/settings/federation/instance.html:10 #: bookwyrm/templates/settings/federation/instance_list.html:23 msgid "Blocked" @@ -152,7 +152,7 @@ msgstr "用户名" msgid "A user with that username already exists." msgstr "已经存在使用该用户名的用户。" -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:218 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:227 msgid "Reviews" msgstr "书评" @@ -248,7 +248,7 @@ msgid "Edit Author" msgstr "编辑作者" #: bookwyrm/templates/author/author.html:35 -#: bookwyrm/templates/author/edit_author.html:43 +#: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" msgstr "别名:" @@ -311,7 +311,7 @@ msgid "Last edited by:" msgstr "最后编辑人:" #: bookwyrm/templates/author/edit_author.html:33 -#: bookwyrm/templates/book/edit/edit_book_form.html:15 +#: bookwyrm/templates/book/edit/edit_book_form.html:16 msgid "Metadata" msgstr "元数据" @@ -320,51 +320,50 @@ msgstr "元数据" msgid "Name:" msgstr "名称:" -#: bookwyrm/templates/author/edit_author.html:45 -#: bookwyrm/templates/book/edit/edit_book_form.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:79 -#: bookwyrm/templates/book/edit/edit_book_form.html:124 +#: bookwyrm/templates/author/edit_author.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:75 +#: bookwyrm/templates/book/edit/edit_book_form.html:94 msgid "Separate multiple values with commas." msgstr "请用英文逗号(,)分隔多个值。" -#: bookwyrm/templates/author/edit_author.html:52 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "简介:" -#: bookwyrm/templates/author/edit_author.html:59 +#: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" msgstr "维基百科链接:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:61 msgid "Birth date:" msgstr "出生日期:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:68 msgid "Death date:" msgstr "死亡日期:" -#: bookwyrm/templates/author/edit_author.html:81 +#: bookwyrm/templates/author/edit_author.html:75 msgid "Author Identifiers" msgstr "作者标识号:" -#: bookwyrm/templates/author/edit_author.html:83 +#: bookwyrm/templates/author/edit_author.html:77 msgid "Openlibrary key:" msgstr "Openlibrary key:" -#: bookwyrm/templates/author/edit_author.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:224 +#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/book/edit/edit_book_form.html:265 msgid "Inventaire ID:" msgstr "Inventaire ID:" -#: bookwyrm/templates/author/edit_author.html:99 +#: bookwyrm/templates/author/edit_author.html:91 msgid "Librarything key:" msgstr "Librarything key:" -#: bookwyrm/templates/author/edit_author.html:107 +#: bookwyrm/templates/author/edit_author.html:98 msgid "Goodreads key:" msgstr "Goodreads key:" -#: bookwyrm/templates/author/edit_author.html:118 +#: bookwyrm/templates/author/edit_author.html:108 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -372,18 +371,18 @@ msgstr "Goodreads key:" #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/form.html:75 #: bookwyrm/templates/preferences/edit_user.html:124 -#: bookwyrm/templates/settings/announcements/announcement_form.html:69 -#: bookwyrm/templates/settings/federation/edit_instance.html:74 +#: bookwyrm/templates/settings/announcements/announcement_form.html:76 +#: bookwyrm/templates/settings/federation/edit_instance.html:82 #: bookwyrm/templates/settings/federation/instance.html:87 -#: bookwyrm/templates/settings/site.html:134 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:64 +#: bookwyrm/templates/settings/site.html:133 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:68 #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" msgstr "保存" -#: bookwyrm/templates/author/edit_author.html:119 -#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 @@ -427,7 +426,7 @@ msgid "Add Description" msgstr "添加描述" #: bookwyrm/templates/book/book.html:136 -#: bookwyrm/templates/book/edit/edit_book_form.html:34 +#: bookwyrm/templates/book/edit/edit_book_form.html:39 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "描述:" @@ -438,52 +437,51 @@ msgid "%(count)s editions" msgstr "%(count)s 个版本" #: bookwyrm/templates/book/book.html:158 -#, python-format -msgid "This edition is on your %(shelf_name)s shelf." -msgstr "此版本在你的 %(shelf_name)s 书架上。" +msgid "You have shelved this edition in:" +msgstr "" -#: bookwyrm/templates/book/book.html:164 +#: bookwyrm/templates/book/book.html:173 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "本书的 另一个版本 在你的 %(shelf_name)s 书架上。" -#: bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:184 msgid "Your reading activity" msgstr "你的阅读活动" -#: bookwyrm/templates/book/book.html:178 +#: bookwyrm/templates/book/book.html:187 msgid "Add read dates" msgstr "添加阅读日期" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:196 msgid "Create" msgstr "创建" -#: bookwyrm/templates/book/book.html:197 +#: bookwyrm/templates/book/book.html:206 msgid "You don't have any reading activity for this book." msgstr "你还没有任何这本书的阅读活动。" -#: bookwyrm/templates/book/book.html:223 +#: bookwyrm/templates/book/book.html:232 msgid "Your reviews" msgstr "你的书评" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:238 msgid "Your comments" msgstr "你的评论" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:244 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:280 msgid "Subjects" msgstr "主题" -#: bookwyrm/templates/book/book.html:283 +#: bookwyrm/templates/book/book.html:292 msgid "Places" msgstr "地点" -#: bookwyrm/templates/book/book.html:294 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:303 bookwyrm/templates/layout.html:75 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -491,15 +489,15 @@ msgstr "地点" msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:314 msgid "Add to list" msgstr "添加到列表" -#: bookwyrm/templates/book/book.html:315 +#: bookwyrm/templates/book/book.html:324 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:182 -#: bookwyrm/templates/settings/email_blocklist/domain_form.html:26 -#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 msgid "Add" msgstr "添加" @@ -508,22 +506,22 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:15 -#: bookwyrm/templates/book/edit/edit_book_form.html:232 +#: bookwyrm/templates/book/edit/edit_book_form.html:274 msgid "OCLC Number:" msgstr "OCLC 号:" #: bookwyrm/templates/book/book_identifiers.html:22 -#: bookwyrm/templates/book/edit/edit_book_form.html:240 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:143 +#: bookwyrm/templates/book/edit/edit_book_form.html:173 msgid "Upload cover:" msgstr "上传封面:" #: bookwyrm/templates/book/cover_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:148 +#: bookwyrm/templates/book/edit/edit_book_form.html:179 msgid "Load cover from url:" msgstr "从网址加载封面:" @@ -575,110 +573,120 @@ msgstr "这是一个新的作品。" #: bookwyrm/templates/book/edit/edit_book.html:108 #: bookwyrm/templates/groups/members.html:16 -#: bookwyrm/templates/landing/password_reset.html:30 +#: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:16 msgid "Confirm" msgstr "确认" #: bookwyrm/templates/book/edit/edit_book.html:110 -#: bookwyrm/templates/feed/status.html:9 +#: bookwyrm/templates/feed/status.html:21 msgid "Back" msgstr "返回" -#: bookwyrm/templates/book/edit/edit_book_form.html:18 +#: bookwyrm/templates/book/edit/edit_book_form.html:21 #: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "标题:" -#: bookwyrm/templates/book/edit/edit_book_form.html:26 +#: bookwyrm/templates/book/edit/edit_book_form.html:30 msgid "Subtitle:" msgstr "副标题:" -#: bookwyrm/templates/book/edit/edit_book_form.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:50 msgid "Series:" msgstr "系列:" -#: bookwyrm/templates/book/edit/edit_book_form.html:53 +#: bookwyrm/templates/book/edit/edit_book_form.html:60 msgid "Series number:" msgstr "系列编号:" -#: bookwyrm/templates/book/edit/edit_book_form.html:63 +#: bookwyrm/templates/book/edit/edit_book_form.html:71 msgid "Languages:" msgstr "语言:" -#: bookwyrm/templates/book/edit/edit_book_form.html:74 +#: bookwyrm/templates/book/edit/edit_book_form.html:85 msgid "Publication" msgstr "出版" -#: bookwyrm/templates/book/edit/edit_book_form.html:77 +#: bookwyrm/templates/book/edit/edit_book_form.html:90 msgid "Publisher:" msgstr "出版社:" -#: bookwyrm/templates/book/edit/edit_book_form.html:86 +#: bookwyrm/templates/book/edit/edit_book_form.html:102 msgid "First published date:" msgstr "初版时间:" -#: bookwyrm/templates/book/edit/edit_book_form.html:94 +#: bookwyrm/templates/book/edit/edit_book_form.html:111 msgid "Published date:" msgstr "出版时间:" -#: bookwyrm/templates/book/edit/edit_book_form.html:104 +#: bookwyrm/templates/book/edit/edit_book_form.html:122 msgid "Authors" msgstr "作者" -#: bookwyrm/templates/book/edit/edit_book_form.html:112 +#: bookwyrm/templates/book/edit/edit_book_form.html:131 #, python-format msgid "Remove %(name)s" msgstr "移除 %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:115 +#: bookwyrm/templates/book/edit/edit_book_form.html:134 #, python-format msgid "Author page for %(name)s" msgstr "%(name)s 的作者页面" -#: bookwyrm/templates/book/edit/edit_book_form.html:122 +#: bookwyrm/templates/book/edit/edit_book_form.html:142 msgid "Add Authors:" msgstr "添加作者:" -#: bookwyrm/templates/book/edit/edit_book_form.html:123 -msgid "John Doe, Jane Smith" -msgstr "张三, 李四" +#: bookwyrm/templates/book/edit/edit_book_form.html:145 +#: bookwyrm/templates/book/edit/edit_book_form.html:148 +msgid "Add Author" +msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:132 -#: bookwyrm/templates/shelf/shelf.html:140 +#: bookwyrm/templates/book/edit/edit_book_form.html:146 +#: bookwyrm/templates/book/edit/edit_book_form.html:149 +msgid "Jane Doe" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:152 +msgid "Add Another Author" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:160 +#: bookwyrm/templates/shelf/shelf.html:143 msgid "Cover" msgstr "封面" -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:192 msgid "Physical Properties" msgstr "实体性质" -#: bookwyrm/templates/book/edit/edit_book_form.html:166 +#: bookwyrm/templates/book/edit/edit_book_form.html:199 #: bookwyrm/templates/book/editions/format_filter.html:5 msgid "Format:" msgstr "格式:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Format details:" msgstr "装订细节:" -#: bookwyrm/templates/book/edit/edit_book_form.html:187 +#: bookwyrm/templates/book/edit/edit_book_form.html:222 msgid "Pages:" msgstr "页数:" -#: bookwyrm/templates/book/edit/edit_book_form.html:197 +#: bookwyrm/templates/book/edit/edit_book_form.html:233 msgid "Book Identifiers" msgstr "书目标识号" -#: bookwyrm/templates/book/edit/edit_book_form.html:200 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:208 +#: bookwyrm/templates/book/edit/edit_book_form.html:247 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:256 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" @@ -810,7 +818,7 @@ msgid "Confirmation code:" msgstr "确认代码:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 -#: bookwyrm/templates/landing/layout.html:73 +#: bookwyrm/templates/landing/layout.html:72 #: bookwyrm/templates/settings/dashboard/dashboard.html:93 #: bookwyrm/templates/snippets/report_modal.html:33 msgid "Submit" @@ -827,8 +835,8 @@ msgstr "重新发送确认链接" #: bookwyrm/templates/confirm_email/resend_form.html:11 #: bookwyrm/templates/landing/layout.html:67 #: bookwyrm/templates/landing/password_reset_request.html:18 -#: bookwyrm/templates/preferences/edit_user.html:56 -#: bookwyrm/templates/snippets/register_form.html:13 +#: bookwyrm/templates/preferences/edit_user.html:53 +#: bookwyrm/templates/snippets/register_form.html:12 msgid "Email address:" msgstr "邮箱地址:" @@ -858,12 +866,17 @@ msgstr "目录" msgid "Make your profile discoverable to other BookWyrm users." msgstr "使你的个人资料可以被其它 BookWyrm 用户发现。" +#: bookwyrm/templates/directory/directory.html:21 +msgid "Join Directory" +msgstr "" + #: bookwyrm/templates/directory/directory.html:24 #, python-format msgid "You can opt-out at any time in your profile settings." msgstr "你可以在任何时候从你的 个人资料设定 中退出。" #: bookwyrm/templates/directory/directory.html:29 +#: bookwyrm/templates/directory/directory.html:31 #: bookwyrm/templates/feed/goal_card.html:17 #: bookwyrm/templates/snippets/announcement.html:34 msgid "Dismiss message" @@ -1090,28 +1103,28 @@ msgstr "所有消息" msgid "You have no messages right now." msgstr "你现在没有消息。" -#: bookwyrm/templates/feed/feed.html:23 +#: bookwyrm/templates/feed/feed.html:27 msgid "Feed settings" msgstr "" -#: bookwyrm/templates/feed/feed.html:26 +#: bookwyrm/templates/feed/feed.html:39 msgid "Saved!" msgstr "" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:53 msgid "Save settings" msgstr "" -#: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/feed/feed.html:63 #, python-format msgid "load 0 unread status(es)" msgstr "加载 0 条未读状态" -#: bookwyrm/templates/feed/feed.html:72 +#: bookwyrm/templates/feed/feed.html:80 msgid "There aren't any activities right now! Try following a user to get started" msgstr "现在还没有任何活动！尝试从关注一个用户开始吧" -#: bookwyrm/templates/feed/feed.html:73 +#: bookwyrm/templates/feed/feed.html:81 msgid "Alternatively, you can try enabling more status types" msgstr "" @@ -1140,22 +1153,35 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "现在这里还没有任何书目！尝试着从搜索某本书开始吧" #: bookwyrm/templates/feed/layout.html:25 +#: bookwyrm/templates/get_started/book_preview.html:10 #: bookwyrm/templates/shelf/shelf.html:38 +#: bookwyrm/templates/shelf/shelf.html:83 +#: bookwyrm/templates/snippets/shelf_selector.html:28 #: bookwyrm/templates/user/books_header.html:4 +#: bookwyrm/templates/user/user.html:33 msgid "To Read" msgstr "想读" #: bookwyrm/templates/feed/layout.html:26 +#: bookwyrm/templates/get_started/book_preview.html:11 #: bookwyrm/templates/shelf/shelf.html:40 +#: bookwyrm/templates/shelf/shelf.html:84 +#: bookwyrm/templates/snippets/shelf_selector.html:29 #: bookwyrm/templates/user/books_header.html:6 +#: bookwyrm/templates/user/user.html:34 msgid "Currently Reading" msgstr "在读" #: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/get_started/book_preview.html:12 #: bookwyrm/templates/shelf/shelf.html:42 +#: bookwyrm/templates/shelf/shelf.html:85 +#: bookwyrm/templates/snippets/shelf_selector.html:30 +#: bookwyrm/templates/snippets/shelf_selector.html:49 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 #: bookwyrm/templates/user/books_header.html:8 +#: bookwyrm/templates/user/user.html:35 msgid "Read" msgstr "读过" @@ -1177,6 +1203,10 @@ msgstr "查看目录" msgid "Have you read %(book_title)s?" msgstr "你读过 %(book_title)s 了吗？" +#: bookwyrm/templates/get_started/book_preview.html:7 +msgid "Add to your books" +msgstr "" + #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" msgstr "你在阅读什么？" @@ -1223,7 +1253,7 @@ msgid "No books found" msgstr "没有找到书目" #: bookwyrm/templates/get_started/books.html:63 -#: bookwyrm/templates/get_started/profile.html:54 +#: bookwyrm/templates/get_started/profile.html:51 msgid "Save & continue" msgstr "保存 & 继续" @@ -1263,35 +1293,33 @@ msgid "Finish" msgstr "完成" #: bookwyrm/templates/get_started/profile.html:15 -#: bookwyrm/templates/preferences/edit_user.html:42 +#: bookwyrm/templates/preferences/edit_user.html:41 msgid "Display name:" msgstr "显示名称:" -#: bookwyrm/templates/get_started/profile.html:22 -#: bookwyrm/templates/preferences/edit_user.html:49 +#: bookwyrm/templates/get_started/profile.html:21 +#: bookwyrm/templates/preferences/edit_user.html:47 msgid "Summary:" msgstr "概要:" -#: bookwyrm/templates/get_started/profile.html:23 +#: bookwyrm/templates/get_started/profile.html:22 msgid "A little bit about you" msgstr "少许关于你的信息" -#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/get_started/profile.html:30 #: bookwyrm/templates/preferences/edit_user.html:27 msgid "Avatar:" msgstr "头像:" -#: bookwyrm/templates/get_started/profile.html:42 -#: bookwyrm/templates/preferences/edit_user.html:110 +#: bookwyrm/templates/get_started/profile.html:39 msgid "Manually approve followers:" msgstr "手动批准关注者:" -#: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:80 +#: bookwyrm/templates/get_started/profile.html:45 msgid "Show this account in suggested users:" msgstr "在推荐的用户中显示此帐号:" -#: bookwyrm/templates/get_started/profile.html:52 +#: bookwyrm/templates/get_started/profile.html:49 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "你的帐号会显示在目录中，并且可能会受其它 BookWyrm 用户推荐。" @@ -1491,8 +1519,8 @@ msgid "Row" msgstr "行" #: bookwyrm/templates/import/import_status.html:103 -#: bookwyrm/templates/shelf/shelf.html:141 -#: bookwyrm/templates/shelf/shelf.html:163 +#: bookwyrm/templates/shelf/shelf.html:144 +#: bookwyrm/templates/shelf/shelf.html:166 msgid "Title" msgstr "标题" @@ -1501,8 +1529,8 @@ msgid "ISBN" msgstr "ISBN" #: bookwyrm/templates/import/import_status.html:109 -#: bookwyrm/templates/shelf/shelf.html:142 -#: bookwyrm/templates/shelf/shelf.html:166 +#: bookwyrm/templates/shelf/shelf.html:145 +#: bookwyrm/templates/shelf/shelf.html:169 msgid "Author" msgstr "作者" @@ -1625,7 +1653,7 @@ msgstr "隐私政策" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 -#: bookwyrm/templates/landing/login.html:49 +#: bookwyrm/templates/landing/login.html:48 msgid "Create an Account" msgstr "创建帐号" @@ -1671,7 +1699,7 @@ msgstr "%(name)s 注册已关闭" msgid "Thank you! Your request has been received." msgstr "谢谢你！我们已经收到了你的请求。" -#: bookwyrm/templates/landing/layout.html:82 +#: bookwyrm/templates/landing/layout.html:81 msgid "Your Account" msgstr "你的帐号" @@ -1680,7 +1708,7 @@ msgid "Login" msgstr "登录" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:37 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 msgid "Log in" msgstr "登录" @@ -1694,21 +1722,21 @@ msgid "Username:" msgstr "用户名:" #: bookwyrm/templates/landing/login.html:27 -#: bookwyrm/templates/landing/password_reset.html:17 +#: bookwyrm/templates/landing/password_reset.html:26 #: bookwyrm/templates/layout.html:174 -#: bookwyrm/templates/snippets/register_form.html:22 +#: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "密码:" -#: bookwyrm/templates/landing/login.html:40 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 msgid "Forgot your password?" msgstr "忘记了密码？" -#: bookwyrm/templates/landing/login.html:62 +#: bookwyrm/templates/landing/login.html:61 msgid "More about this site" msgstr "更多关于本站点的信息" -#: bookwyrm/templates/landing/password_reset.html:23 +#: bookwyrm/templates/landing/password_reset.html:34 #: bookwyrm/templates/preferences/change_password.html:18 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" @@ -1935,7 +1963,6 @@ msgstr "设定" #: bookwyrm/templates/lists/list.html:92 #: bookwyrm/templates/snippets/remove_from_group_button.html:19 -#: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "移除" @@ -2181,9 +2208,9 @@ msgstr "新密码:" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/delete_user.html:25 #: bookwyrm/templates/preferences/layout.html:24 -#: bookwyrm/templates/settings/users/delete_user_form.html:23 +#: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "删除帐号" @@ -2208,7 +2235,7 @@ msgid "Profile" msgstr "个人资料" #: bookwyrm/templates/preferences/edit_user.html:13 -#: bookwyrm/templates/preferences/edit_user.html:68 +#: bookwyrm/templates/preferences/edit_user.html:64 msgid "Display preferences" msgstr "显示偏好" @@ -2217,13 +2244,17 @@ msgstr "显示偏好" msgid "Privacy" msgstr "隐私" -#: bookwyrm/templates/preferences/edit_user.html:72 -msgid "Show reading goal prompt in feed:" -msgstr "在状态流中显示阅读目标提示:" +#: bookwyrm/templates/preferences/edit_user.html:69 +msgid "Show reading goal prompt in feed" +msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:76 -msgid "Show suggested users:" -msgstr "显示推荐用户:" +#: bookwyrm/templates/preferences/edit_user.html:75 +msgid "Show suggested users" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:81 +msgid "Show this account in suggested users" +msgstr "" #: bookwyrm/templates/preferences/edit_user.html:85 #, python-format @@ -2234,6 +2265,10 @@ msgstr "你的帐号会显示在 目录 中，并可能 msgid "Preferred Timezone: " msgstr "偏好的时区:" +#: bookwyrm/templates/preferences/edit_user.html:111 +msgid "Manually approve followers" +msgstr "" + #: bookwyrm/templates/preferences/edit_user.html:116 msgid "Default post privacy:" msgstr "默认发文隐私:" @@ -2261,6 +2296,10 @@ msgstr "开始《%(book_title)s》" msgid "Want to Read \"%(book_title)s\"" msgstr "想要阅读《%(book_title)s》" +#: bookwyrm/templates/search/book.html:42 +msgid "Results from" +msgstr "" + #: bookwyrm/templates/search/book.html:47 #: bookwyrm/templates/settings/reports/reports.html:25 #: bookwyrm/templates/snippets/announcement.html:16 @@ -2334,19 +2373,19 @@ msgid "False" msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:47 -#: bookwyrm/templates/settings/announcements/announcement_form.html:40 +#: bookwyrm/templates/settings/announcements/announcement_form.html:44 #: bookwyrm/templates/settings/dashboard/dashboard.html:71 msgid "Start date:" msgstr "开始日期:" #: bookwyrm/templates/settings/announcements/announcement.html:54 -#: bookwyrm/templates/settings/announcements/announcement_form.html:49 +#: bookwyrm/templates/settings/announcements/announcement_form.html:54 #: bookwyrm/templates/settings/dashboard/dashboard.html:77 msgid "End date:" msgstr "结束日期:" #: bookwyrm/templates/settings/announcements/announcement.html:60 -#: bookwyrm/templates/settings/announcements/announcement_form.html:58 +#: bookwyrm/templates/settings/announcements/announcement_form.html:64 msgid "Active:" msgstr "活跃:" @@ -2355,15 +2394,15 @@ msgstr "活跃:" msgid "Create Announcement" msgstr "创建公告" -#: bookwyrm/templates/settings/announcements/announcement_form.html:16 +#: bookwyrm/templates/settings/announcements/announcement_form.html:17 msgid "Preview:" msgstr "预览:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:23 +#: bookwyrm/templates/settings/announcements/announcement_form.html:25 msgid "Content:" msgstr "内容:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:30 +#: bookwyrm/templates/settings/announcements/announcement_form.html:33 msgid "Event date:" msgstr "事件日期:" @@ -2537,29 +2576,29 @@ msgstr "回到实例列表" msgid "Import block list" msgstr "导入屏蔽列表" -#: bookwyrm/templates/settings/federation/edit_instance.html:30 +#: bookwyrm/templates/settings/federation/edit_instance.html:31 msgid "Instance:" msgstr "实例:" -#: bookwyrm/templates/settings/federation/edit_instance.html:39 +#: bookwyrm/templates/settings/federation/edit_instance.html:40 #: bookwyrm/templates/settings/federation/instance.html:28 #: bookwyrm/templates/settings/users/user_info.html:106 msgid "Status:" msgstr "状态:" -#: bookwyrm/templates/settings/federation/edit_instance.html:52 +#: bookwyrm/templates/settings/federation/edit_instance.html:54 #: bookwyrm/templates/settings/federation/instance.html:22 #: bookwyrm/templates/settings/users/user_info.html:100 msgid "Software:" msgstr "软件:" -#: bookwyrm/templates/settings/federation/edit_instance.html:61 +#: bookwyrm/templates/settings/federation/edit_instance.html:64 #: bookwyrm/templates/settings/federation/instance.html:25 #: bookwyrm/templates/settings/users/user_info.html:103 msgid "Version:" msgstr "版本:" -#: bookwyrm/templates/settings/federation/edit_instance.html:70 +#: bookwyrm/templates/settings/federation/edit_instance.html:74 msgid "Notes:" msgstr "备注:" @@ -3152,41 +3191,41 @@ msgstr "所有书目" msgid "Create shelf" msgstr "创建书架" -#: bookwyrm/templates/shelf/shelf.html:90 +#: bookwyrm/templates/shelf/shelf.html:93 #, python-format msgid "%(formatted_count)s book" msgid_plural "%(formatted_count)s books" msgstr[0] "%(formatted_count)s 本书籍" -#: bookwyrm/templates/shelf/shelf.html:97 +#: bookwyrm/templates/shelf/shelf.html:100 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "（正在显示 %(start)s 到 %(end)s）" -#: bookwyrm/templates/shelf/shelf.html:109 +#: bookwyrm/templates/shelf/shelf.html:112 msgid "Edit shelf" msgstr "编辑书架" -#: bookwyrm/templates/shelf/shelf.html:117 +#: bookwyrm/templates/shelf/shelf.html:120 msgid "Delete shelf" msgstr "删除书架" -#: bookwyrm/templates/shelf/shelf.html:145 -#: bookwyrm/templates/shelf/shelf.html:171 +#: bookwyrm/templates/shelf/shelf.html:148 +#: bookwyrm/templates/shelf/shelf.html:174 msgid "Shelved" msgstr "上架时间" -#: bookwyrm/templates/shelf/shelf.html:146 -#: bookwyrm/templates/shelf/shelf.html:174 +#: bookwyrm/templates/shelf/shelf.html:149 +#: bookwyrm/templates/shelf/shelf.html:177 msgid "Started" msgstr "开始时间" -#: bookwyrm/templates/shelf/shelf.html:147 -#: bookwyrm/templates/shelf/shelf.html:177 +#: bookwyrm/templates/shelf/shelf.html:150 +#: bookwyrm/templates/shelf/shelf.html:180 msgid "Finished" msgstr "完成时间" -#: bookwyrm/templates/shelf/shelf.html:203 +#: bookwyrm/templates/shelf/shelf.html:206 msgid "This shelf is empty." msgstr "此书架是空的。" @@ -3535,13 +3574,13 @@ msgstr "评价" msgid "Finish \"%(book_title)s\"" msgstr "完成《%(book_title)s》" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:23 -#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:24 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:21 #: bookwyrm/templates/snippets/readthrough_form.html:7 msgid "Started reading" msgstr "已开始阅读" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:31 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:32 #: bookwyrm/templates/snippets/readthrough_form.html:20 msgid "Finished reading" msgstr "已完成阅读" @@ -3569,7 +3608,7 @@ msgstr "想要阅读《%(book_title)s》" msgid "Progress" msgstr "进度" -#: bookwyrm/templates/snippets/register_form.html:32 +#: bookwyrm/templates/snippets/register_form.html:30 msgid "Sign Up" msgstr "注册" @@ -3591,24 +3630,31 @@ msgstr "本报告会被发送至 %(site_name)s 的监察员以复查。" msgid "More info about this report:" msgstr "关于本报告的更多信息" -#: bookwyrm/templates/snippets/shelf_selector.html:4 +#: bookwyrm/templates/snippets/shelf_selector.html:7 msgid "Move book" msgstr "移动书目" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 -msgid "More shelves" -msgstr "更多书架" - +#: bookwyrm/templates/snippets/shelf_selector.html:42 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24 msgid "Start reading" msgstr "开始阅读" +#: bookwyrm/templates/snippets/shelf_selector.html:55 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Want to read" msgstr "想要阅读" +#: bookwyrm/templates/snippets/shelf_selector.html:73 +#: bookwyrm/templates/snippets/shelf_selector.html:84 +msgid "Remove from" +msgstr "" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 +msgid "More shelves" +msgstr "更多书架" + #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62 #, python-format msgid "Remove from %(name)s" @@ -3823,24 +3869,29 @@ msgstr "%(username)s 没有关注任何用户" msgid "Edit profile" msgstr "编辑个人资料" -#: bookwyrm/templates/user/user.html:33 +#: bookwyrm/templates/user/user.html:37 #, python-format msgid "View all %(size)s" msgstr "查看所有 %(size)s 本" -#: bookwyrm/templates/user/user.html:46 +#: bookwyrm/templates/user/user.html:51 msgid "View all books" msgstr "查看所有书目" -#: bookwyrm/templates/user/user.html:59 +#: bookwyrm/templates/user/user.html:58 +#, python-format +msgid "%(current_year)s Reading Goal" +msgstr "" + +#: bookwyrm/templates/user/user.html:65 msgid "User Activity" msgstr "用户活动" -#: bookwyrm/templates/user/user.html:63 +#: bookwyrm/templates/user/user.html:69 msgid "RSS feed" msgstr "RSS 流" -#: bookwyrm/templates/user/user.html:74 +#: bookwyrm/templates/user/user.html:80 msgid "No activities yet!" msgstr "还没有活动！" diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo index f9ca27be9b891b3b13c30e68d084e0cd54184a43..0e8092c9697d5895f6d0925600958af2903c42a0 100644 GIT binary patch delta 13305 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 delta 14397 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\n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:350 msgid "A user with this email already exists." msgstr "已經存在使用該郵箱的使用者。" -#: bookwyrm/forms.py:276 +#: bookwyrm/forms.py:364 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:277 +#: bookwyrm/forms.py:365 msgid "One Week" msgstr "一週" -#: bookwyrm/forms.py:278 +#: bookwyrm/forms.py:366 msgid "One Month" msgstr "一個月" -#: bookwyrm/forms.py:279 +#: bookwyrm/forms.py:367 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:283 +#: bookwyrm/forms.py:371 #, python-brace-format msgid "{i} uses" msgstr "" -#: bookwyrm/forms.py:284 +#: bookwyrm/forms.py:372 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:352 +#: bookwyrm/forms.py:468 msgid "List Order" msgstr "列表順序" -#: bookwyrm/forms.py:353 +#: bookwyrm/forms.py:469 msgid "Book Title" msgstr "書名" -#: bookwyrm/forms.py:354 bookwyrm/templates/shelf/shelf.html:149 -#: bookwyrm/templates/shelf/shelf.html:181 +#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "評價" -#: bookwyrm/forms.py:356 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:360 +#: bookwyrm/forms.py:476 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:361 +#: bookwyrm/forms.py:477 msgid "Descending" msgstr "降序" @@ -122,13 +122,13 @@ msgid "Paperback" msgstr "" #: bookwyrm/models/federated_server.py:11 -#: bookwyrm/templates/settings/federation/edit_instance.html:42 +#: bookwyrm/templates/settings/federation/edit_instance.html:43 #: bookwyrm/templates/settings/federation/instance_list.html:19 msgid "Federated" msgstr "跨站" #: bookwyrm/models/federated_server.py:12 -#: bookwyrm/templates/settings/federation/edit_instance.html:43 +#: bookwyrm/templates/settings/federation/edit_instance.html:44 #: bookwyrm/templates/settings/federation/instance.html:10 #: bookwyrm/templates/settings/federation/instance_list.html:23 msgid "Blocked" @@ -152,7 +152,7 @@ msgstr "使用者名稱" msgid "A user with that username already exists." msgstr "已經存在使用該名稱的使用者。" -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:218 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:227 msgid "Reviews" msgstr "書評" @@ -248,7 +248,7 @@ msgid "Edit Author" msgstr "編輯作者" #: bookwyrm/templates/author/author.html:35 -#: bookwyrm/templates/author/edit_author.html:43 +#: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" msgstr "別名:" @@ -311,7 +311,7 @@ msgid "Last edited by:" msgstr "最後編輯者:" #: bookwyrm/templates/author/edit_author.html:33 -#: bookwyrm/templates/book/edit/edit_book_form.html:15 +#: bookwyrm/templates/book/edit/edit_book_form.html:16 msgid "Metadata" msgstr "元資料" @@ -320,51 +320,50 @@ msgstr "元資料" msgid "Name:" msgstr "名稱:" -#: bookwyrm/templates/author/edit_author.html:45 -#: bookwyrm/templates/book/edit/edit_book_form.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:79 -#: bookwyrm/templates/book/edit/edit_book_form.html:124 +#: bookwyrm/templates/author/edit_author.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:75 +#: bookwyrm/templates/book/edit/edit_book_form.html:94 msgid "Separate multiple values with commas." msgstr "請用逗號(,)分隔多個值。" -#: bookwyrm/templates/author/edit_author.html:52 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "簡介:" -#: bookwyrm/templates/author/edit_author.html:59 +#: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" msgstr "維基百科連結:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:61 msgid "Birth date:" msgstr "出生日期:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:68 msgid "Death date:" msgstr "死亡日期:" -#: bookwyrm/templates/author/edit_author.html:81 +#: bookwyrm/templates/author/edit_author.html:75 msgid "Author Identifiers" msgstr "作者標識號:" -#: bookwyrm/templates/author/edit_author.html:83 +#: bookwyrm/templates/author/edit_author.html:77 msgid "Openlibrary key:" msgstr "Openlibrary key:" -#: bookwyrm/templates/author/edit_author.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:224 +#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/book/edit/edit_book_form.html:265 msgid "Inventaire ID:" msgstr "Inventaire ID:" -#: bookwyrm/templates/author/edit_author.html:99 +#: bookwyrm/templates/author/edit_author.html:91 msgid "Librarything key:" msgstr "Librarything key:" -#: bookwyrm/templates/author/edit_author.html:107 +#: bookwyrm/templates/author/edit_author.html:98 msgid "Goodreads key:" msgstr "Goodreads key:" -#: bookwyrm/templates/author/edit_author.html:118 +#: bookwyrm/templates/author/edit_author.html:108 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -372,18 +371,18 @@ msgstr "Goodreads key:" #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/form.html:75 #: bookwyrm/templates/preferences/edit_user.html:124 -#: bookwyrm/templates/settings/announcements/announcement_form.html:69 -#: bookwyrm/templates/settings/federation/edit_instance.html:74 +#: bookwyrm/templates/settings/announcements/announcement_form.html:76 +#: bookwyrm/templates/settings/federation/edit_instance.html:82 #: bookwyrm/templates/settings/federation/instance.html:87 -#: bookwyrm/templates/settings/site.html:134 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:64 +#: bookwyrm/templates/settings/site.html:133 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:68 #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" msgstr "儲存" -#: bookwyrm/templates/author/edit_author.html:119 -#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 @@ -427,7 +426,7 @@ msgid "Add Description" msgstr "新增描述" #: bookwyrm/templates/book/book.html:136 -#: bookwyrm/templates/book/edit/edit_book_form.html:34 +#: bookwyrm/templates/book/edit/edit_book_form.html:39 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "描述:" @@ -438,52 +437,51 @@ msgid "%(count)s editions" msgstr "%(count)s 個版本" #: bookwyrm/templates/book/book.html:158 -#, python-format -msgid "This edition is on your %(shelf_name)s shelf." -msgstr "此版本在你的 %(shelf_name)s 書架上。" +msgid "You have shelved this edition in:" +msgstr "" -#: bookwyrm/templates/book/book.html:164 +#: bookwyrm/templates/book/book.html:173 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "本書的 另一個版本 在你的 %(shelf_name)s 書架上。" -#: bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:184 msgid "Your reading activity" msgstr "你的閱讀活動" -#: bookwyrm/templates/book/book.html:178 +#: bookwyrm/templates/book/book.html:187 msgid "Add read dates" msgstr "新增閱讀日期" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:196 msgid "Create" msgstr "建立" -#: bookwyrm/templates/book/book.html:197 +#: bookwyrm/templates/book/book.html:206 msgid "You don't have any reading activity for this book." msgstr "你還未閱讀這本書。" -#: bookwyrm/templates/book/book.html:223 +#: bookwyrm/templates/book/book.html:232 msgid "Your reviews" msgstr "你的書評" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:238 msgid "Your comments" msgstr "你的評論" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:244 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:280 msgid "Subjects" msgstr "主題" -#: bookwyrm/templates/book/book.html:283 +#: bookwyrm/templates/book/book.html:292 msgid "Places" msgstr "地點" -#: bookwyrm/templates/book/book.html:294 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:303 bookwyrm/templates/layout.html:75 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -491,15 +489,15 @@ msgstr "地點" msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:314 msgid "Add to list" msgstr "新增到列表" -#: bookwyrm/templates/book/book.html:315 +#: bookwyrm/templates/book/book.html:324 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:182 -#: bookwyrm/templates/settings/email_blocklist/domain_form.html:26 -#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 msgid "Add" msgstr "新增" @@ -508,22 +506,22 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:15 -#: bookwyrm/templates/book/edit/edit_book_form.html:232 +#: bookwyrm/templates/book/edit/edit_book_form.html:274 msgid "OCLC Number:" msgstr "OCLC 號:" #: bookwyrm/templates/book/book_identifiers.html:22 -#: bookwyrm/templates/book/edit/edit_book_form.html:240 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:143 +#: bookwyrm/templates/book/edit/edit_book_form.html:173 msgid "Upload cover:" msgstr "上載封面:" #: bookwyrm/templates/book/cover_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:148 +#: bookwyrm/templates/book/edit/edit_book_form.html:179 msgid "Load cover from url:" msgstr "從網址載入封面:" @@ -575,110 +573,120 @@ msgstr "這是一個新的作品。" #: bookwyrm/templates/book/edit/edit_book.html:108 #: bookwyrm/templates/groups/members.html:16 -#: bookwyrm/templates/landing/password_reset.html:30 +#: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:16 msgid "Confirm" msgstr "確認" #: bookwyrm/templates/book/edit/edit_book.html:110 -#: bookwyrm/templates/feed/status.html:9 +#: bookwyrm/templates/feed/status.html:21 msgid "Back" msgstr "返回" -#: bookwyrm/templates/book/edit/edit_book_form.html:18 +#: bookwyrm/templates/book/edit/edit_book_form.html:21 #: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "標題:" -#: bookwyrm/templates/book/edit/edit_book_form.html:26 +#: bookwyrm/templates/book/edit/edit_book_form.html:30 msgid "Subtitle:" msgstr "副標題:" -#: bookwyrm/templates/book/edit/edit_book_form.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:50 msgid "Series:" msgstr "系列:" -#: bookwyrm/templates/book/edit/edit_book_form.html:53 +#: bookwyrm/templates/book/edit/edit_book_form.html:60 msgid "Series number:" msgstr "系列編號:" -#: bookwyrm/templates/book/edit/edit_book_form.html:63 +#: bookwyrm/templates/book/edit/edit_book_form.html:71 msgid "Languages:" msgstr "語言:" -#: bookwyrm/templates/book/edit/edit_book_form.html:74 +#: bookwyrm/templates/book/edit/edit_book_form.html:85 msgid "Publication" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:77 +#: bookwyrm/templates/book/edit/edit_book_form.html:90 msgid "Publisher:" msgstr "出版社:" -#: bookwyrm/templates/book/edit/edit_book_form.html:86 +#: bookwyrm/templates/book/edit/edit_book_form.html:102 msgid "First published date:" msgstr "初版時間:" -#: bookwyrm/templates/book/edit/edit_book_form.html:94 +#: bookwyrm/templates/book/edit/edit_book_form.html:111 msgid "Published date:" msgstr "出版時間:" -#: bookwyrm/templates/book/edit/edit_book_form.html:104 +#: bookwyrm/templates/book/edit/edit_book_form.html:122 msgid "Authors" msgstr "作者" -#: bookwyrm/templates/book/edit/edit_book_form.html:112 +#: bookwyrm/templates/book/edit/edit_book_form.html:131 #, python-format msgid "Remove %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:115 +#: bookwyrm/templates/book/edit/edit_book_form.html:134 #, python-format msgid "Author page for %(name)s" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:122 +#: bookwyrm/templates/book/edit/edit_book_form.html:142 msgid "Add Authors:" msgstr "新增作者:" -#: bookwyrm/templates/book/edit/edit_book_form.html:123 -msgid "John Doe, Jane Smith" -msgstr "John Doe, Jane Smith" +#: bookwyrm/templates/book/edit/edit_book_form.html:145 +#: bookwyrm/templates/book/edit/edit_book_form.html:148 +msgid "Add Author" +msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:132 -#: bookwyrm/templates/shelf/shelf.html:140 +#: bookwyrm/templates/book/edit/edit_book_form.html:146 +#: bookwyrm/templates/book/edit/edit_book_form.html:149 +msgid "Jane Doe" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:152 +msgid "Add Another Author" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:160 +#: bookwyrm/templates/shelf/shelf.html:143 msgid "Cover" msgstr "封面" -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:192 msgid "Physical Properties" msgstr "實體性質" -#: bookwyrm/templates/book/edit/edit_book_form.html:166 +#: bookwyrm/templates/book/edit/edit_book_form.html:199 #: bookwyrm/templates/book/editions/format_filter.html:5 msgid "Format:" msgstr "格式:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Format details:" msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:187 +#: bookwyrm/templates/book/edit/edit_book_form.html:222 msgid "Pages:" msgstr "頁數:" -#: bookwyrm/templates/book/edit/edit_book_form.html:197 +#: bookwyrm/templates/book/edit/edit_book_form.html:233 msgid "Book Identifiers" msgstr "書目標識號" -#: bookwyrm/templates/book/edit/edit_book_form.html:200 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:208 +#: bookwyrm/templates/book/edit/edit_book_form.html:247 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:256 msgid "Openlibrary ID:" msgstr "Openlibrary ID:" @@ -810,7 +818,7 @@ msgid "Confirmation code:" msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 -#: bookwyrm/templates/landing/layout.html:73 +#: bookwyrm/templates/landing/layout.html:72 #: bookwyrm/templates/settings/dashboard/dashboard.html:93 #: bookwyrm/templates/snippets/report_modal.html:33 msgid "Submit" @@ -827,8 +835,8 @@ msgstr "" #: bookwyrm/templates/confirm_email/resend_form.html:11 #: bookwyrm/templates/landing/layout.html:67 #: bookwyrm/templates/landing/password_reset_request.html:18 -#: bookwyrm/templates/preferences/edit_user.html:56 -#: bookwyrm/templates/snippets/register_form.html:13 +#: bookwyrm/templates/preferences/edit_user.html:53 +#: bookwyrm/templates/snippets/register_form.html:12 msgid "Email address:" msgstr "郵箱地址:" @@ -858,12 +866,17 @@ msgstr "目錄" msgid "Make your profile discoverable to other BookWyrm users." msgstr "使你的使用者資料可以被其它 BookWyrm 使用者發現。" +#: bookwyrm/templates/directory/directory.html:21 +msgid "Join Directory" +msgstr "" + #: bookwyrm/templates/directory/directory.html:24 #, python-format msgid "You can opt-out at any time in your profile settings." msgstr "你可以在任何時候從你的 使用者資料設定 中退出。" #: bookwyrm/templates/directory/directory.html:29 +#: bookwyrm/templates/directory/directory.html:31 #: bookwyrm/templates/feed/goal_card.html:17 #: bookwyrm/templates/snippets/announcement.html:34 msgid "Dismiss message" @@ -1090,28 +1103,28 @@ msgstr "所有訊息" msgid "You have no messages right now." msgstr "你現在沒有訊息。" -#: bookwyrm/templates/feed/feed.html:23 +#: bookwyrm/templates/feed/feed.html:27 msgid "Feed settings" msgstr "" -#: bookwyrm/templates/feed/feed.html:26 +#: bookwyrm/templates/feed/feed.html:39 msgid "Saved!" msgstr "" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:53 msgid "Save settings" msgstr "" -#: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/feed/feed.html:63 #, python-format msgid "load 0 unread status(es)" msgstr "" -#: bookwyrm/templates/feed/feed.html:72 +#: bookwyrm/templates/feed/feed.html:80 msgid "There aren't any activities right now! Try following a user to get started" msgstr "現在還沒有任何活動！嘗試著從關注一個使用者開始吧" -#: bookwyrm/templates/feed/feed.html:73 +#: bookwyrm/templates/feed/feed.html:81 msgid "Alternatively, you can try enabling more status types" msgstr "" @@ -1140,22 +1153,35 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "現在這裡還沒有任何書目！嘗試著從搜尋某本書開始吧" #: bookwyrm/templates/feed/layout.html:25 +#: bookwyrm/templates/get_started/book_preview.html:10 #: bookwyrm/templates/shelf/shelf.html:38 +#: bookwyrm/templates/shelf/shelf.html:83 +#: bookwyrm/templates/snippets/shelf_selector.html:28 #: bookwyrm/templates/user/books_header.html:4 +#: bookwyrm/templates/user/user.html:33 msgid "To Read" msgstr "想讀" #: bookwyrm/templates/feed/layout.html:26 +#: bookwyrm/templates/get_started/book_preview.html:11 #: bookwyrm/templates/shelf/shelf.html:40 +#: bookwyrm/templates/shelf/shelf.html:84 +#: bookwyrm/templates/snippets/shelf_selector.html:29 #: bookwyrm/templates/user/books_header.html:6 +#: bookwyrm/templates/user/user.html:34 msgid "Currently Reading" msgstr "在讀" #: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/get_started/book_preview.html:12 #: bookwyrm/templates/shelf/shelf.html:42 +#: bookwyrm/templates/shelf/shelf.html:85 +#: bookwyrm/templates/snippets/shelf_selector.html:30 +#: bookwyrm/templates/snippets/shelf_selector.html:49 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 #: bookwyrm/templates/user/books_header.html:8 +#: bookwyrm/templates/user/user.html:35 msgid "Read" msgstr "讀過" @@ -1177,6 +1203,10 @@ msgstr "" msgid "Have you read %(book_title)s?" msgstr "你讀過 %(book_title)s 了嗎？" +#: bookwyrm/templates/get_started/book_preview.html:7 +msgid "Add to your books" +msgstr "" + #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" msgstr "你在閱讀什麼？" @@ -1223,7 +1253,7 @@ msgid "No books found" msgstr "沒有找到書目" #: bookwyrm/templates/get_started/books.html:63 -#: bookwyrm/templates/get_started/profile.html:54 +#: bookwyrm/templates/get_started/profile.html:51 msgid "Save & continue" msgstr "儲存 & 繼續" @@ -1263,35 +1293,33 @@ msgid "Finish" msgstr "完成" #: bookwyrm/templates/get_started/profile.html:15 -#: bookwyrm/templates/preferences/edit_user.html:42 +#: bookwyrm/templates/preferences/edit_user.html:41 msgid "Display name:" msgstr "顯示名稱:" -#: bookwyrm/templates/get_started/profile.html:22 -#: bookwyrm/templates/preferences/edit_user.html:49 +#: bookwyrm/templates/get_started/profile.html:21 +#: bookwyrm/templates/preferences/edit_user.html:47 msgid "Summary:" msgstr "概要:" -#: bookwyrm/templates/get_started/profile.html:23 +#: bookwyrm/templates/get_started/profile.html:22 msgid "A little bit about you" msgstr "少許關於你的資訊" -#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/get_started/profile.html:30 #: bookwyrm/templates/preferences/edit_user.html:27 msgid "Avatar:" msgstr "頭像:" -#: bookwyrm/templates/get_started/profile.html:42 -#: bookwyrm/templates/preferences/edit_user.html:110 +#: bookwyrm/templates/get_started/profile.html:39 msgid "Manually approve followers:" msgstr "手動批准關注者:" -#: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:80 +#: bookwyrm/templates/get_started/profile.html:45 msgid "Show this account in suggested users:" msgstr "在推薦的使用者中顯示此帳號:" -#: bookwyrm/templates/get_started/profile.html:52 +#: bookwyrm/templates/get_started/profile.html:49 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "你的帳號會顯示在目錄中，並且可能會受其它 BookWyrm 使用者推薦。" @@ -1491,8 +1519,8 @@ msgid "Row" msgstr "" #: bookwyrm/templates/import/import_status.html:103 -#: bookwyrm/templates/shelf/shelf.html:141 -#: bookwyrm/templates/shelf/shelf.html:163 +#: bookwyrm/templates/shelf/shelf.html:144 +#: bookwyrm/templates/shelf/shelf.html:166 msgid "Title" msgstr "標題" @@ -1501,8 +1529,8 @@ msgid "ISBN" msgstr "" #: bookwyrm/templates/import/import_status.html:109 -#: bookwyrm/templates/shelf/shelf.html:142 -#: bookwyrm/templates/shelf/shelf.html:166 +#: bookwyrm/templates/shelf/shelf.html:145 +#: bookwyrm/templates/shelf/shelf.html:169 msgid "Author" msgstr "作者" @@ -1625,7 +1653,7 @@ msgstr "隱私政策" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 -#: bookwyrm/templates/landing/login.html:49 +#: bookwyrm/templates/landing/login.html:48 msgid "Create an Account" msgstr "建立帳號" @@ -1671,7 +1699,7 @@ msgstr "" msgid "Thank you! Your request has been received." msgstr "謝謝你！我們已經受到了你的請求。" -#: bookwyrm/templates/landing/layout.html:82 +#: bookwyrm/templates/landing/layout.html:81 msgid "Your Account" msgstr "你的帳號" @@ -1680,7 +1708,7 @@ msgid "Login" msgstr "登入" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:37 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 msgid "Log in" msgstr "登入" @@ -1694,21 +1722,21 @@ msgid "Username:" msgstr "使用者名稱:" #: bookwyrm/templates/landing/login.html:27 -#: bookwyrm/templates/landing/password_reset.html:17 +#: bookwyrm/templates/landing/password_reset.html:26 #: bookwyrm/templates/layout.html:174 -#: bookwyrm/templates/snippets/register_form.html:22 +#: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "密碼:" -#: bookwyrm/templates/landing/login.html:40 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 msgid "Forgot your password?" msgstr "忘記了密碼？" -#: bookwyrm/templates/landing/login.html:62 +#: bookwyrm/templates/landing/login.html:61 msgid "More about this site" msgstr "關於本網站的更多" -#: bookwyrm/templates/landing/password_reset.html:23 +#: bookwyrm/templates/landing/password_reset.html:34 #: bookwyrm/templates/preferences/change_password.html:18 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" @@ -1935,7 +1963,6 @@ msgstr "設定" #: bookwyrm/templates/lists/list.html:92 #: bookwyrm/templates/snippets/remove_from_group_button.html:19 -#: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "移除" @@ -2181,9 +2208,9 @@ msgstr "新密碼:" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/delete_user.html:25 #: bookwyrm/templates/preferences/layout.html:24 -#: bookwyrm/templates/settings/users/delete_user_form.html:23 +#: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "" @@ -2208,7 +2235,7 @@ msgid "Profile" msgstr "使用者資料" #: bookwyrm/templates/preferences/edit_user.html:13 -#: bookwyrm/templates/preferences/edit_user.html:68 +#: bookwyrm/templates/preferences/edit_user.html:64 msgid "Display preferences" msgstr "" @@ -2217,12 +2244,16 @@ msgstr "" msgid "Privacy" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:72 -msgid "Show reading goal prompt in feed:" +#: bookwyrm/templates/preferences/edit_user.html:69 +msgid "Show reading goal prompt in feed" msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:76 -msgid "Show suggested users:" +#: bookwyrm/templates/preferences/edit_user.html:75 +msgid "Show suggested users" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:81 +msgid "Show this account in suggested users" msgstr "" #: bookwyrm/templates/preferences/edit_user.html:85 @@ -2234,6 +2265,10 @@ msgstr "你的帳號會顯示在 目錄 中，並可能 msgid "Preferred Timezone: " msgstr "偏好時區:" +#: bookwyrm/templates/preferences/edit_user.html:111 +msgid "Manually approve followers" +msgstr "" + #: bookwyrm/templates/preferences/edit_user.html:116 msgid "Default post privacy:" msgstr "" @@ -2261,6 +2296,10 @@ msgstr "" msgid "Want to Read \"%(book_title)s\"" msgstr "" +#: bookwyrm/templates/search/book.html:42 +msgid "Results from" +msgstr "" + #: bookwyrm/templates/search/book.html:47 #: bookwyrm/templates/settings/reports/reports.html:25 #: bookwyrm/templates/snippets/announcement.html:16 @@ -2334,19 +2373,19 @@ msgid "False" msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:47 -#: bookwyrm/templates/settings/announcements/announcement_form.html:40 +#: bookwyrm/templates/settings/announcements/announcement_form.html:44 #: bookwyrm/templates/settings/dashboard/dashboard.html:71 msgid "Start date:" msgstr "開始日期:" #: bookwyrm/templates/settings/announcements/announcement.html:54 -#: bookwyrm/templates/settings/announcements/announcement_form.html:49 +#: bookwyrm/templates/settings/announcements/announcement_form.html:54 #: bookwyrm/templates/settings/dashboard/dashboard.html:77 msgid "End date:" msgstr "結束日期:" #: bookwyrm/templates/settings/announcements/announcement.html:60 -#: bookwyrm/templates/settings/announcements/announcement_form.html:58 +#: bookwyrm/templates/settings/announcements/announcement_form.html:64 msgid "Active:" msgstr "活躍:" @@ -2355,15 +2394,15 @@ msgstr "活躍:" msgid "Create Announcement" msgstr "建立公告" -#: bookwyrm/templates/settings/announcements/announcement_form.html:16 +#: bookwyrm/templates/settings/announcements/announcement_form.html:17 msgid "Preview:" msgstr "" -#: bookwyrm/templates/settings/announcements/announcement_form.html:23 +#: bookwyrm/templates/settings/announcements/announcement_form.html:25 msgid "Content:" msgstr "" -#: bookwyrm/templates/settings/announcements/announcement_form.html:30 +#: bookwyrm/templates/settings/announcements/announcement_form.html:33 msgid "Event date:" msgstr "" @@ -2537,29 +2576,29 @@ msgstr "回到實例列表" msgid "Import block list" msgstr "匯入封鎖列表" -#: bookwyrm/templates/settings/federation/edit_instance.html:30 +#: bookwyrm/templates/settings/federation/edit_instance.html:31 msgid "Instance:" msgstr "實例:" -#: bookwyrm/templates/settings/federation/edit_instance.html:39 +#: bookwyrm/templates/settings/federation/edit_instance.html:40 #: bookwyrm/templates/settings/federation/instance.html:28 #: bookwyrm/templates/settings/users/user_info.html:106 msgid "Status:" msgstr "狀態:" -#: bookwyrm/templates/settings/federation/edit_instance.html:52 +#: bookwyrm/templates/settings/federation/edit_instance.html:54 #: bookwyrm/templates/settings/federation/instance.html:22 #: bookwyrm/templates/settings/users/user_info.html:100 msgid "Software:" msgstr "軟件:" -#: bookwyrm/templates/settings/federation/edit_instance.html:61 +#: bookwyrm/templates/settings/federation/edit_instance.html:64 #: bookwyrm/templates/settings/federation/instance.html:25 #: bookwyrm/templates/settings/users/user_info.html:103 msgid "Version:" msgstr "版本:" -#: bookwyrm/templates/settings/federation/edit_instance.html:70 +#: bookwyrm/templates/settings/federation/edit_instance.html:74 msgid "Notes:" msgstr "備註:" @@ -3152,41 +3191,41 @@ msgstr "所有書目" msgid "Create shelf" msgstr "建立書架" -#: bookwyrm/templates/shelf/shelf.html:90 +#: bookwyrm/templates/shelf/shelf.html:93 #, python-format msgid "%(formatted_count)s book" msgid_plural "%(formatted_count)s books" msgstr[0] "" -#: bookwyrm/templates/shelf/shelf.html:97 +#: bookwyrm/templates/shelf/shelf.html:100 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:109 +#: bookwyrm/templates/shelf/shelf.html:112 msgid "Edit shelf" msgstr "編輯書架" -#: bookwyrm/templates/shelf/shelf.html:117 +#: bookwyrm/templates/shelf/shelf.html:120 msgid "Delete shelf" msgstr "刪除書架" -#: bookwyrm/templates/shelf/shelf.html:145 -#: bookwyrm/templates/shelf/shelf.html:171 +#: bookwyrm/templates/shelf/shelf.html:148 +#: bookwyrm/templates/shelf/shelf.html:174 msgid "Shelved" msgstr "上架時間" -#: bookwyrm/templates/shelf/shelf.html:146 -#: bookwyrm/templates/shelf/shelf.html:174 +#: bookwyrm/templates/shelf/shelf.html:149 +#: bookwyrm/templates/shelf/shelf.html:177 msgid "Started" msgstr "開始時間" -#: bookwyrm/templates/shelf/shelf.html:147 -#: bookwyrm/templates/shelf/shelf.html:177 +#: bookwyrm/templates/shelf/shelf.html:150 +#: bookwyrm/templates/shelf/shelf.html:180 msgid "Finished" msgstr "完成時間" -#: bookwyrm/templates/shelf/shelf.html:203 +#: bookwyrm/templates/shelf/shelf.html:206 msgid "This shelf is empty." msgstr "此書架是空的。" @@ -3535,13 +3574,13 @@ msgstr "評價" msgid "Finish \"%(book_title)s\"" msgstr "完成 \"%(book_title)s\"" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:23 -#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:24 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:21 #: bookwyrm/templates/snippets/readthrough_form.html:7 msgid "Started reading" msgstr "已開始閱讀" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:31 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:32 #: bookwyrm/templates/snippets/readthrough_form.html:20 msgid "Finished reading" msgstr "已完成閱讀" @@ -3569,7 +3608,7 @@ msgstr "想要閱讀 \"%(book_title)s\"" msgid "Progress" msgstr "進度" -#: bookwyrm/templates/snippets/register_form.html:32 +#: bookwyrm/templates/snippets/register_form.html:30 msgid "Sign Up" msgstr "註冊" @@ -3591,24 +3630,31 @@ msgstr "本舉報會被發送至 %(site_name)s 的監察員以複查。" msgid "More info about this report:" msgstr "關於本舉報的更多資訊" -#: bookwyrm/templates/snippets/shelf_selector.html:4 +#: bookwyrm/templates/snippets/shelf_selector.html:7 msgid "Move book" msgstr "移動書目" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 -msgid "More shelves" -msgstr "更多書架" - +#: bookwyrm/templates/snippets/shelf_selector.html:42 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24 msgid "Start reading" msgstr "開始閱讀" +#: bookwyrm/templates/snippets/shelf_selector.html:55 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Want to read" msgstr "想要閱讀" +#: bookwyrm/templates/snippets/shelf_selector.html:73 +#: bookwyrm/templates/snippets/shelf_selector.html:84 +msgid "Remove from" +msgstr "" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 +msgid "More shelves" +msgstr "更多書架" + #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62 #, python-format msgid "Remove from %(name)s" @@ -3823,24 +3869,29 @@ msgstr "%(username)s 沒有關注任何使用者" msgid "Edit profile" msgstr "編輯使用者資料" -#: bookwyrm/templates/user/user.html:33 +#: bookwyrm/templates/user/user.html:37 #, python-format msgid "View all %(size)s" msgstr "檢視所有 %(size)s 本" -#: bookwyrm/templates/user/user.html:46 +#: bookwyrm/templates/user/user.html:51 msgid "View all books" msgstr "檢視所有書目" -#: bookwyrm/templates/user/user.html:59 +#: bookwyrm/templates/user/user.html:58 +#, python-format +msgid "%(current_year)s Reading Goal" +msgstr "" + +#: bookwyrm/templates/user/user.html:65 msgid "User Activity" msgstr "使用者活動" -#: bookwyrm/templates/user/user.html:63 +#: bookwyrm/templates/user/user.html:69 msgid "RSS feed" msgstr "RSS 訂閱" -#: bookwyrm/templates/user/user.html:74 +#: bookwyrm/templates/user/user.html:80 msgid "No activities yet!" msgstr "還沒有活動！" From 7dbb9b4b26984b0c4b929fffda96dcaf2ce784e2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 11:23:01 -0800 Subject: [PATCH 49/57] Cleans up styling on author page Better mobile display, trim long text blocks --- bookwyrm/templates/author/author.html | 164 ++++++++++-------- bookwyrm/templates/snippets/trimmed_list.html | 34 ++++ 2 files changed, 123 insertions(+), 75 deletions(-) create mode 100644 bookwyrm/templates/snippets/trimmed_list.html diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index bf2c8f3fd..0d7d102d0 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -23,114 +23,128 @@

F4NZKj?#gS^+O}y9 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 literal 30883 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\n" "Language-Team: German\n" "Language: de\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:262 +#: bookwyrm/forms.py:350 msgid "A user with this email already exists." msgstr "Es existiert bereits ein Benutzer*inkonto mit dieser E-Mail-Adresse." -#: bookwyrm/forms.py:276 +#: bookwyrm/forms.py:364 msgid "One Day" msgstr "Ein Tag" -#: bookwyrm/forms.py:277 +#: bookwyrm/forms.py:365 msgid "One Week" msgstr "Eine Woche" -#: bookwyrm/forms.py:278 +#: bookwyrm/forms.py:366 msgid "One Month" msgstr "Ein Monat" -#: bookwyrm/forms.py:279 +#: bookwyrm/forms.py:367 msgid "Does Not Expire" msgstr "Läuft nicht ab" -#: bookwyrm/forms.py:283 +#: bookwyrm/forms.py:371 #, python-brace-format msgid "{i} uses" msgstr "{i}-mal verwendbar" -#: bookwyrm/forms.py:284 +#: bookwyrm/forms.py:372 msgid "Unlimited" msgstr "Unbegrenzt" -#: bookwyrm/forms.py:352 +#: bookwyrm/forms.py:468 msgid "List Order" msgstr "Reihenfolge der Liste" -#: bookwyrm/forms.py:353 +#: bookwyrm/forms.py:469 msgid "Book Title" msgstr "Buchtitel" -#: bookwyrm/forms.py:354 bookwyrm/templates/shelf/shelf.html:149 -#: bookwyrm/templates/shelf/shelf.html:181 +#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Bewertung" -#: bookwyrm/forms.py:356 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Sortieren nach" -#: bookwyrm/forms.py:360 +#: bookwyrm/forms.py:476 msgid "Ascending" msgstr "Aufsteigend" -#: bookwyrm/forms.py:361 +#: bookwyrm/forms.py:477 msgid "Descending" msgstr "Absteigend" @@ -122,13 +122,13 @@ msgid "Paperback" msgstr "Taschenbuch" #: bookwyrm/models/federated_server.py:11 -#: bookwyrm/templates/settings/federation/edit_instance.html:42 +#: bookwyrm/templates/settings/federation/edit_instance.html:43 #: bookwyrm/templates/settings/federation/instance_list.html:19 msgid "Federated" msgstr "Föderiert" #: bookwyrm/models/federated_server.py:12 -#: bookwyrm/templates/settings/federation/edit_instance.html:43 +#: bookwyrm/templates/settings/federation/edit_instance.html:44 #: bookwyrm/templates/settings/federation/instance.html:10 #: bookwyrm/templates/settings/federation/instance_list.html:23 msgid "Blocked" @@ -152,7 +152,7 @@ msgstr "Benutzer*inname" msgid "A user with that username already exists." msgstr "Dieser Benutzer*inname ist bereits vergeben." -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:218 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:227 msgid "Reviews" msgstr "Besprechungen" @@ -248,7 +248,7 @@ msgid "Edit Author" msgstr "Autor*in bearbeiten" #: bookwyrm/templates/author/author.html:35 -#: bookwyrm/templates/author/edit_author.html:43 +#: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" msgstr "Alternative Namen:" @@ -311,7 +311,7 @@ msgid "Last edited by:" msgstr "Zuletzt bearbeitet von:" #: bookwyrm/templates/author/edit_author.html:33 -#: bookwyrm/templates/book/edit/edit_book_form.html:15 +#: bookwyrm/templates/book/edit/edit_book_form.html:16 msgid "Metadata" msgstr "Metadaten" @@ -320,51 +320,50 @@ msgstr "Metadaten" msgid "Name:" msgstr "Name:" -#: bookwyrm/templates/author/edit_author.html:45 -#: bookwyrm/templates/book/edit/edit_book_form.html:65 -#: bookwyrm/templates/book/edit/edit_book_form.html:79 -#: bookwyrm/templates/book/edit/edit_book_form.html:124 +#: bookwyrm/templates/author/edit_author.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:75 +#: bookwyrm/templates/book/edit/edit_book_form.html:94 msgid "Separate multiple values with commas." msgstr "Mehrere Werte durch Kommas getrennt eingeben." -#: bookwyrm/templates/author/edit_author.html:52 +#: bookwyrm/templates/author/edit_author.html:50 msgid "Bio:" msgstr "Über mich:" -#: bookwyrm/templates/author/edit_author.html:59 +#: bookwyrm/templates/author/edit_author.html:56 msgid "Wikipedia link:" msgstr "Wikipedialink:" -#: bookwyrm/templates/author/edit_author.html:65 +#: bookwyrm/templates/author/edit_author.html:61 msgid "Birth date:" msgstr "Geburtsdatum:" -#: bookwyrm/templates/author/edit_author.html:73 +#: bookwyrm/templates/author/edit_author.html:68 msgid "Death date:" msgstr "Todesdatum:" -#: bookwyrm/templates/author/edit_author.html:81 +#: bookwyrm/templates/author/edit_author.html:75 msgid "Author Identifiers" msgstr "Autor*in-Identifikatoren" -#: bookwyrm/templates/author/edit_author.html:83 +#: bookwyrm/templates/author/edit_author.html:77 msgid "Openlibrary key:" msgstr "Openlibrary-Schlüssel:" -#: bookwyrm/templates/author/edit_author.html:91 -#: bookwyrm/templates/book/edit/edit_book_form.html:224 +#: bookwyrm/templates/author/edit_author.html:84 +#: bookwyrm/templates/book/edit/edit_book_form.html:265 msgid "Inventaire ID:" msgstr "Inventaire-ID:" -#: bookwyrm/templates/author/edit_author.html:99 +#: bookwyrm/templates/author/edit_author.html:91 msgid "Librarything key:" msgstr "Librarything-Schlüssel:" -#: bookwyrm/templates/author/edit_author.html:107 +#: bookwyrm/templates/author/edit_author.html:98 msgid "Goodreads key:" msgstr "Goodreads-Schlüssel:" -#: bookwyrm/templates/author/edit_author.html:118 +#: bookwyrm/templates/author/edit_author.html:108 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -372,18 +371,18 @@ msgstr "Goodreads-Schlüssel:" #: bookwyrm/templates/lists/bookmark_button.html:15 #: bookwyrm/templates/lists/form.html:75 #: bookwyrm/templates/preferences/edit_user.html:124 -#: bookwyrm/templates/settings/announcements/announcement_form.html:69 -#: bookwyrm/templates/settings/federation/edit_instance.html:74 +#: bookwyrm/templates/settings/announcements/announcement_form.html:76 +#: bookwyrm/templates/settings/federation/edit_instance.html:82 #: bookwyrm/templates/settings/federation/instance.html:87 -#: bookwyrm/templates/settings/site.html:134 -#: bookwyrm/templates/settings/users/user_moderation_actions.html:64 +#: bookwyrm/templates/settings/site.html:133 +#: bookwyrm/templates/settings/users/user_moderation_actions.html:68 #: bookwyrm/templates/shelf/form.html:25 #: bookwyrm/templates/snippets/reading_modals/layout.html:18 msgid "Save" msgstr "Speichern" -#: bookwyrm/templates/author/edit_author.html:119 -#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 +#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 @@ -428,7 +427,7 @@ msgid "Add Description" msgstr "Beschreibung hinzufügen" #: bookwyrm/templates/book/book.html:136 -#: bookwyrm/templates/book/edit/edit_book_form.html:34 +#: bookwyrm/templates/book/edit/edit_book_form.html:39 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "Beschreibung:" @@ -439,52 +438,51 @@ msgid "%(count)s editions" msgstr "%(count)s Ausgaben" #: bookwyrm/templates/book/book.html:158 -#, python-format -msgid "This edition is on your %(shelf_name)s shelf." -msgstr "Diese Ausgabe befindet sich in deinem %(shelf_name)s Regal." +msgid "You have shelved this edition in:" +msgstr "" -#: bookwyrm/templates/book/book.html:164 +#: bookwyrm/templates/book/book.html:173 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Eine andere Ausgabe dieses Buches befindet sich in deinem %(shelf_name)s Regal." -#: bookwyrm/templates/book/book.html:175 +#: bookwyrm/templates/book/book.html:184 msgid "Your reading activity" msgstr "Deine Leseaktivität" -#: bookwyrm/templates/book/book.html:178 +#: bookwyrm/templates/book/book.html:187 msgid "Add read dates" msgstr "Lesedaten hinzufügen" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:196 msgid "Create" msgstr "Erstellen" -#: bookwyrm/templates/book/book.html:197 +#: bookwyrm/templates/book/book.html:206 msgid "You don't have any reading activity for this book." msgstr "Du hast keine Leseaktivität für dieses Buch." -#: bookwyrm/templates/book/book.html:223 +#: bookwyrm/templates/book/book.html:232 msgid "Your reviews" msgstr "Deine Besprechungen" -#: bookwyrm/templates/book/book.html:229 +#: bookwyrm/templates/book/book.html:238 msgid "Your comments" msgstr "Deine Kommentare" -#: bookwyrm/templates/book/book.html:235 +#: bookwyrm/templates/book/book.html:244 msgid "Your quotes" msgstr "Deine Zitate" -#: bookwyrm/templates/book/book.html:271 +#: bookwyrm/templates/book/book.html:280 msgid "Subjects" msgstr "Themen" -#: bookwyrm/templates/book/book.html:283 +#: bookwyrm/templates/book/book.html:292 msgid "Places" msgstr "Orte" -#: bookwyrm/templates/book/book.html:294 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:303 bookwyrm/templates/layout.html:75 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -492,15 +490,15 @@ msgstr "Orte" msgid "Lists" msgstr "Listen" -#: bookwyrm/templates/book/book.html:305 +#: bookwyrm/templates/book/book.html:314 msgid "Add to list" msgstr "Zur Liste hinzufügen" -#: bookwyrm/templates/book/book.html:315 +#: bookwyrm/templates/book/book.html:324 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:182 -#: bookwyrm/templates/settings/email_blocklist/domain_form.html:26 -#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:32 +#: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 +#: bookwyrm/templates/settings/ip_blocklist/ip_address_form.html:31 msgid "Add" msgstr "Hinzufügen" @@ -509,22 +507,22 @@ msgid "ISBN:" msgstr "ISBN:" #: bookwyrm/templates/book/book_identifiers.html:15 -#: bookwyrm/templates/book/edit/edit_book_form.html:232 +#: bookwyrm/templates/book/edit/edit_book_form.html:274 msgid "OCLC Number:" msgstr "OCLC-Nummer:" #: bookwyrm/templates/book/book_identifiers.html:22 -#: bookwyrm/templates/book/edit/edit_book_form.html:240 +#: bookwyrm/templates/book/edit/edit_book_form.html:283 msgid "ASIN:" msgstr "ASIN:" #: bookwyrm/templates/book/cover_modal.html:17 -#: bookwyrm/templates/book/edit/edit_book_form.html:143 +#: bookwyrm/templates/book/edit/edit_book_form.html:173 msgid "Upload cover:" msgstr "Titelbild hochladen:" #: bookwyrm/templates/book/cover_modal.html:23 -#: bookwyrm/templates/book/edit/edit_book_form.html:148 +#: bookwyrm/templates/book/edit/edit_book_form.html:179 msgid "Load cover from url:" msgstr "Titelbild von URL laden:" @@ -576,110 +574,120 @@ msgstr "Dies ist ein neues Werk." #: bookwyrm/templates/book/edit/edit_book.html:108 #: bookwyrm/templates/groups/members.html:16 -#: bookwyrm/templates/landing/password_reset.html:30 +#: bookwyrm/templates/landing/password_reset.html:42 #: bookwyrm/templates/snippets/remove_from_group_button.html:16 msgid "Confirm" msgstr "Bestätigen" #: bookwyrm/templates/book/edit/edit_book.html:110 -#: bookwyrm/templates/feed/status.html:9 +#: bookwyrm/templates/feed/status.html:21 msgid "Back" msgstr "Zurück" -#: bookwyrm/templates/book/edit/edit_book_form.html:18 +#: bookwyrm/templates/book/edit/edit_book_form.html:21 #: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "Titel:" -#: bookwyrm/templates/book/edit/edit_book_form.html:26 +#: bookwyrm/templates/book/edit/edit_book_form.html:30 msgid "Subtitle:" msgstr "Untertitel:" -#: bookwyrm/templates/book/edit/edit_book_form.html:44 +#: bookwyrm/templates/book/edit/edit_book_form.html:50 msgid "Series:" msgstr "Serie:" -#: bookwyrm/templates/book/edit/edit_book_form.html:53 +#: bookwyrm/templates/book/edit/edit_book_form.html:60 msgid "Series number:" msgstr "Nummer in der Serie:" -#: bookwyrm/templates/book/edit/edit_book_form.html:63 +#: bookwyrm/templates/book/edit/edit_book_form.html:71 msgid "Languages:" msgstr "Sprachen:" -#: bookwyrm/templates/book/edit/edit_book_form.html:74 +#: bookwyrm/templates/book/edit/edit_book_form.html:85 msgid "Publication" msgstr "Veröffentlichung" -#: bookwyrm/templates/book/edit/edit_book_form.html:77 +#: bookwyrm/templates/book/edit/edit_book_form.html:90 msgid "Publisher:" msgstr "Verlag:" -#: bookwyrm/templates/book/edit/edit_book_form.html:86 +#: bookwyrm/templates/book/edit/edit_book_form.html:102 msgid "First published date:" msgstr "Erstveröffentlichungsdatum:" -#: bookwyrm/templates/book/edit/edit_book_form.html:94 +#: bookwyrm/templates/book/edit/edit_book_form.html:111 msgid "Published date:" msgstr "Veröffentlichungsdatum:" -#: bookwyrm/templates/book/edit/edit_book_form.html:104 +#: bookwyrm/templates/book/edit/edit_book_form.html:122 msgid "Authors" msgstr "Autor*innen" -#: bookwyrm/templates/book/edit/edit_book_form.html:112 +#: bookwyrm/templates/book/edit/edit_book_form.html:131 #, python-format msgid "Remove %(name)s" msgstr "%(name)s entfernen" -#: bookwyrm/templates/book/edit/edit_book_form.html:115 +#: bookwyrm/templates/book/edit/edit_book_form.html:134 #, python-format msgid "Author page for %(name)s" msgstr "Autor*inseite für %(name)s" -#: bookwyrm/templates/book/edit/edit_book_form.html:122 +#: bookwyrm/templates/book/edit/edit_book_form.html:142 msgid "Add Authors:" msgstr "Autor*innen hinzufügen:" -#: bookwyrm/templates/book/edit/edit_book_form.html:123 -msgid "John Doe, Jane Smith" -msgstr "Max Mustermann, Maria Musterfrau" +#: bookwyrm/templates/book/edit/edit_book_form.html:145 +#: bookwyrm/templates/book/edit/edit_book_form.html:148 +msgid "Add Author" +msgstr "" -#: bookwyrm/templates/book/edit/edit_book_form.html:132 -#: bookwyrm/templates/shelf/shelf.html:140 +#: bookwyrm/templates/book/edit/edit_book_form.html:146 +#: bookwyrm/templates/book/edit/edit_book_form.html:149 +msgid "Jane Doe" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:152 +msgid "Add Another Author" +msgstr "" + +#: bookwyrm/templates/book/edit/edit_book_form.html:160 +#: bookwyrm/templates/shelf/shelf.html:143 msgid "Cover" msgstr "Titelbild" -#: bookwyrm/templates/book/edit/edit_book_form.html:161 +#: bookwyrm/templates/book/edit/edit_book_form.html:192 msgid "Physical Properties" msgstr "Physikalische Eigenschaften" -#: bookwyrm/templates/book/edit/edit_book_form.html:166 +#: bookwyrm/templates/book/edit/edit_book_form.html:199 #: bookwyrm/templates/book/editions/format_filter.html:5 msgid "Format:" msgstr "Format:" -#: bookwyrm/templates/book/edit/edit_book_form.html:177 +#: bookwyrm/templates/book/edit/edit_book_form.html:211 msgid "Format details:" msgstr "Formatdetails:" -#: bookwyrm/templates/book/edit/edit_book_form.html:187 +#: bookwyrm/templates/book/edit/edit_book_form.html:222 msgid "Pages:" msgstr "Seiten:" -#: bookwyrm/templates/book/edit/edit_book_form.html:197 +#: bookwyrm/templates/book/edit/edit_book_form.html:233 msgid "Book Identifiers" msgstr "Buch-Identifikatoren" -#: bookwyrm/templates/book/edit/edit_book_form.html:200 +#: bookwyrm/templates/book/edit/edit_book_form.html:238 msgid "ISBN 13:" msgstr "ISBN 13:" -#: bookwyrm/templates/book/edit/edit_book_form.html:208 +#: bookwyrm/templates/book/edit/edit_book_form.html:247 msgid "ISBN 10:" msgstr "ISBN 10:" -#: bookwyrm/templates/book/edit/edit_book_form.html:216 +#: bookwyrm/templates/book/edit/edit_book_form.html:256 msgid "Openlibrary ID:" msgstr "OpenLibrary-ID:" @@ -811,7 +819,7 @@ msgid "Confirmation code:" msgstr "Bestätigungscode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 -#: bookwyrm/templates/landing/layout.html:73 +#: bookwyrm/templates/landing/layout.html:72 #: bookwyrm/templates/settings/dashboard/dashboard.html:93 #: bookwyrm/templates/snippets/report_modal.html:33 msgid "Submit" @@ -828,8 +836,8 @@ msgstr "Bestätigungslink erneut senden" #: bookwyrm/templates/confirm_email/resend_form.html:11 #: bookwyrm/templates/landing/layout.html:67 #: bookwyrm/templates/landing/password_reset_request.html:18 -#: bookwyrm/templates/preferences/edit_user.html:56 -#: bookwyrm/templates/snippets/register_form.html:13 +#: bookwyrm/templates/preferences/edit_user.html:53 +#: bookwyrm/templates/snippets/register_form.html:12 msgid "Email address:" msgstr "E-Mail-Adresse:" @@ -859,12 +867,17 @@ msgstr "Verzeichnis" msgid "Make your profile discoverable to other BookWyrm users." msgstr "Mach dein Profil entdeckbar für andere BookWyrm-Benutzer*innen." +#: bookwyrm/templates/directory/directory.html:21 +msgid "Join Directory" +msgstr "" + #: bookwyrm/templates/directory/directory.html:24 #, python-format msgid "You can opt-out at any time in your profile settings." msgstr "Du kannst dich jederzeit in deinen Profileinstellungen abmelden." #: bookwyrm/templates/directory/directory.html:29 +#: bookwyrm/templates/directory/directory.html:31 #: bookwyrm/templates/feed/goal_card.html:17 #: bookwyrm/templates/snippets/announcement.html:34 msgid "Dismiss message" @@ -1093,28 +1106,28 @@ msgstr "Alle Nachrichten" msgid "You have no messages right now." msgstr "Du hast momentan keine Nachrichten." -#: bookwyrm/templates/feed/feed.html:23 +#: bookwyrm/templates/feed/feed.html:27 msgid "Feed settings" msgstr "" -#: bookwyrm/templates/feed/feed.html:26 +#: bookwyrm/templates/feed/feed.html:39 msgid "Saved!" msgstr "" -#: bookwyrm/templates/feed/feed.html:47 +#: bookwyrm/templates/feed/feed.html:53 msgid "Save settings" msgstr "" -#: bookwyrm/templates/feed/feed.html:56 +#: bookwyrm/templates/feed/feed.html:63 #, python-format msgid "load 0 unread status(es)" msgstr "lade 0 ungelesene Statusmeldung(en)" -#: bookwyrm/templates/feed/feed.html:72 +#: bookwyrm/templates/feed/feed.html:80 msgid "There aren't any activities right now! Try following a user to get started" msgstr "Hier sind noch keine Aktivitäten! Folge Anderen, um loszulegen" -#: bookwyrm/templates/feed/feed.html:73 +#: bookwyrm/templates/feed/feed.html:81 msgid "Alternatively, you can try enabling more status types" msgstr "" @@ -1143,22 +1156,35 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "Hier sind noch keine Bücher! Versuche, nach Büchern zu suchen, um loszulegen" #: bookwyrm/templates/feed/layout.html:25 +#: bookwyrm/templates/get_started/book_preview.html:10 #: bookwyrm/templates/shelf/shelf.html:38 +#: bookwyrm/templates/shelf/shelf.html:83 +#: bookwyrm/templates/snippets/shelf_selector.html:28 #: bookwyrm/templates/user/books_header.html:4 +#: bookwyrm/templates/user/user.html:33 msgid "To Read" msgstr "Zu lesen" #: bookwyrm/templates/feed/layout.html:26 +#: bookwyrm/templates/get_started/book_preview.html:11 #: bookwyrm/templates/shelf/shelf.html:40 +#: bookwyrm/templates/shelf/shelf.html:84 +#: bookwyrm/templates/snippets/shelf_selector.html:29 #: bookwyrm/templates/user/books_header.html:6 +#: bookwyrm/templates/user/user.html:34 msgid "Currently Reading" msgstr "Lese ich gerade" #: bookwyrm/templates/feed/layout.html:27 +#: bookwyrm/templates/get_started/book_preview.html:12 #: bookwyrm/templates/shelf/shelf.html:42 +#: bookwyrm/templates/shelf/shelf.html:85 +#: bookwyrm/templates/snippets/shelf_selector.html:30 +#: bookwyrm/templates/snippets/shelf_selector.html:49 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:23 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 #: bookwyrm/templates/user/books_header.html:8 +#: bookwyrm/templates/user/user.html:35 msgid "Read" msgstr "Gelesen" @@ -1180,6 +1206,10 @@ msgstr "Verzeichnis anzeigen" msgid "Have you read %(book_title)s?" msgstr "Hast du %(book_title)s gelesen?" +#: bookwyrm/templates/get_started/book_preview.html:7 +msgid "Add to your books" +msgstr "" + #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" msgstr "Was liest du gerade?" @@ -1226,7 +1256,7 @@ msgid "No books found" msgstr "Keine Bücher gefunden" #: bookwyrm/templates/get_started/books.html:63 -#: bookwyrm/templates/get_started/profile.html:54 +#: bookwyrm/templates/get_started/profile.html:51 msgid "Save & continue" msgstr "Speichern & fortfahren" @@ -1266,35 +1296,33 @@ msgid "Finish" msgstr "Fertigstellen" #: bookwyrm/templates/get_started/profile.html:15 -#: bookwyrm/templates/preferences/edit_user.html:42 +#: bookwyrm/templates/preferences/edit_user.html:41 msgid "Display name:" msgstr "Anzeigename:" -#: bookwyrm/templates/get_started/profile.html:22 -#: bookwyrm/templates/preferences/edit_user.html:49 +#: bookwyrm/templates/get_started/profile.html:21 +#: bookwyrm/templates/preferences/edit_user.html:47 msgid "Summary:" msgstr "Zusammenfassung:" -#: bookwyrm/templates/get_started/profile.html:23 +#: bookwyrm/templates/get_started/profile.html:22 msgid "A little bit about you" msgstr "Einige Angaben zu dir" -#: bookwyrm/templates/get_started/profile.html:32 +#: bookwyrm/templates/get_started/profile.html:30 #: bookwyrm/templates/preferences/edit_user.html:27 msgid "Avatar:" msgstr "Avatar:" -#: bookwyrm/templates/get_started/profile.html:42 -#: bookwyrm/templates/preferences/edit_user.html:110 +#: bookwyrm/templates/get_started/profile.html:39 msgid "Manually approve followers:" msgstr "Follower*innen manuell bestätigen:" -#: bookwyrm/templates/get_started/profile.html:48 -#: bookwyrm/templates/preferences/edit_user.html:80 +#: bookwyrm/templates/get_started/profile.html:45 msgid "Show this account in suggested users:" msgstr "Dieses Benutzer*inkonto in vorgeschlagene Benutzer*innen einschließen:" -#: bookwyrm/templates/get_started/profile.html:52 +#: bookwyrm/templates/get_started/profile.html:49 msgid "Your account will show up in the directory, and may be recommended to other BookWyrm users." msgstr "Dein Benutzer*inkonto wird im Verzeichnis gezeigt und möglicherweise anderen Benutzer*innen vorgeschlagen." @@ -1498,8 +1526,8 @@ msgid "Row" msgstr "" #: bookwyrm/templates/import/import_status.html:103 -#: bookwyrm/templates/shelf/shelf.html:141 -#: bookwyrm/templates/shelf/shelf.html:163 +#: bookwyrm/templates/shelf/shelf.html:144 +#: bookwyrm/templates/shelf/shelf.html:166 msgid "Title" msgstr "Titel" @@ -1508,8 +1536,8 @@ msgid "ISBN" msgstr "" #: bookwyrm/templates/import/import_status.html:109 -#: bookwyrm/templates/shelf/shelf.html:142 -#: bookwyrm/templates/shelf/shelf.html:166 +#: bookwyrm/templates/shelf/shelf.html:145 +#: bookwyrm/templates/shelf/shelf.html:169 msgid "Author" msgstr "Autor*in" @@ -1632,7 +1660,7 @@ msgstr "Datenschutzerklärung" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 -#: bookwyrm/templates/landing/login.html:49 +#: bookwyrm/templates/landing/login.html:48 msgid "Create an Account" msgstr "Erstelle ein Benutzer*inkonto" @@ -1678,7 +1706,7 @@ msgstr "%(name)s erlaubt keine Selbtregistrierung" msgid "Thank you! Your request has been received." msgstr "Danke! Deine Anfrage ist eingegangen." -#: bookwyrm/templates/landing/layout.html:82 +#: bookwyrm/templates/landing/layout.html:81 msgid "Your Account" msgstr "Dein Benutzer*inkonto" @@ -1687,7 +1715,7 @@ msgid "Login" msgstr "Anmeldung" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:37 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 msgid "Log in" msgstr "Anmelden" @@ -1701,21 +1729,21 @@ msgid "Username:" msgstr "Benutzer*inname:" #: bookwyrm/templates/landing/login.html:27 -#: bookwyrm/templates/landing/password_reset.html:17 +#: bookwyrm/templates/landing/password_reset.html:26 #: bookwyrm/templates/layout.html:174 -#: bookwyrm/templates/snippets/register_form.html:22 +#: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Passwort:" -#: bookwyrm/templates/landing/login.html:40 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: bookwyrm/templates/landing/login.html:62 +#: bookwyrm/templates/landing/login.html:61 msgid "More about this site" msgstr "Mehr über diese Seite" -#: bookwyrm/templates/landing/password_reset.html:23 +#: bookwyrm/templates/landing/password_reset.html:34 #: bookwyrm/templates/preferences/change_password.html:18 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" @@ -1942,7 +1970,6 @@ msgstr "Übernehmen" #: bookwyrm/templates/lists/list.html:92 #: bookwyrm/templates/snippets/remove_from_group_button.html:19 -#: bookwyrm/templates/snippets/shelf_selector.html:26 msgid "Remove" msgstr "Entfernen" @@ -2188,9 +2215,9 @@ msgstr "Neues Passwort:" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:26 +#: bookwyrm/templates/preferences/delete_user.html:25 #: bookwyrm/templates/preferences/layout.html:24 -#: bookwyrm/templates/settings/users/delete_user_form.html:23 +#: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "Benutzer*inkonto löschen" @@ -2215,7 +2242,7 @@ msgid "Profile" msgstr "Profil" #: bookwyrm/templates/preferences/edit_user.html:13 -#: bookwyrm/templates/preferences/edit_user.html:68 +#: bookwyrm/templates/preferences/edit_user.html:64 msgid "Display preferences" msgstr "Anzeigeeinstellungen" @@ -2224,13 +2251,17 @@ msgstr "Anzeigeeinstellungen" msgid "Privacy" msgstr "Privatsphäre" -#: bookwyrm/templates/preferences/edit_user.html:72 -msgid "Show reading goal prompt in feed:" -msgstr "Frage Leseziel im Feed ab:" +#: bookwyrm/templates/preferences/edit_user.html:69 +msgid "Show reading goal prompt in feed" +msgstr "" -#: bookwyrm/templates/preferences/edit_user.html:76 -msgid "Show suggested users:" -msgstr "Zeige vorgeschlagene Benutzer*innen:" +#: bookwyrm/templates/preferences/edit_user.html:75 +msgid "Show suggested users" +msgstr "" + +#: bookwyrm/templates/preferences/edit_user.html:81 +msgid "Show this account in suggested users" +msgstr "" #: bookwyrm/templates/preferences/edit_user.html:85 #, python-format @@ -2241,6 +2272,10 @@ msgstr "Dein Benutzer*inkonto wird im Verzeichnis angez msgid "Preferred Timezone: " msgstr "Bevorzugte Zeitzone:" +#: bookwyrm/templates/preferences/edit_user.html:111 +msgid "Manually approve followers" +msgstr "" + #: bookwyrm/templates/preferences/edit_user.html:116 msgid "Default post privacy:" msgstr "Voreinstellung für Beitragssichtbarkeit:" @@ -2268,6 +2303,10 @@ msgstr "„%(book_title)s“ beginnen" msgid "Want to Read \"%(book_title)s\"" msgstr "„%(book_title)s“ auf Leseliste setzen" +#: bookwyrm/templates/search/book.html:42 +msgid "Results from" +msgstr "" + #: bookwyrm/templates/search/book.html:47 #: bookwyrm/templates/settings/reports/reports.html:25 #: bookwyrm/templates/snippets/announcement.html:16 @@ -2341,19 +2380,19 @@ msgid "False" msgstr "Nein" #: bookwyrm/templates/settings/announcements/announcement.html:47 -#: bookwyrm/templates/settings/announcements/announcement_form.html:40 +#: bookwyrm/templates/settings/announcements/announcement_form.html:44 #: bookwyrm/templates/settings/dashboard/dashboard.html:71 msgid "Start date:" msgstr "Startdatum:" #: bookwyrm/templates/settings/announcements/announcement.html:54 -#: bookwyrm/templates/settings/announcements/announcement_form.html:49 +#: bookwyrm/templates/settings/announcements/announcement_form.html:54 #: bookwyrm/templates/settings/dashboard/dashboard.html:77 msgid "End date:" msgstr "Enddatum:" #: bookwyrm/templates/settings/announcements/announcement.html:60 -#: bookwyrm/templates/settings/announcements/announcement_form.html:58 +#: bookwyrm/templates/settings/announcements/announcement_form.html:64 msgid "Active:" msgstr "Aktiv:" @@ -2362,15 +2401,15 @@ msgstr "Aktiv:" msgid "Create Announcement" msgstr "Ankündigung erstellen" -#: bookwyrm/templates/settings/announcements/announcement_form.html:16 +#: bookwyrm/templates/settings/announcements/announcement_form.html:17 msgid "Preview:" msgstr "Vorschau:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:23 +#: bookwyrm/templates/settings/announcements/announcement_form.html:25 msgid "Content:" msgstr "Inhalt:" -#: bookwyrm/templates/settings/announcements/announcement_form.html:30 +#: bookwyrm/templates/settings/announcements/announcement_form.html:33 msgid "Event date:" msgstr "Ereignisdatum:" @@ -2547,29 +2586,29 @@ msgstr "Zurück zur Instanzenliste" msgid "Import block list" msgstr "Sperrliste importieren" -#: bookwyrm/templates/settings/federation/edit_instance.html:30 +#: bookwyrm/templates/settings/federation/edit_instance.html:31 msgid "Instance:" msgstr "Instanz:" -#: bookwyrm/templates/settings/federation/edit_instance.html:39 +#: bookwyrm/templates/settings/federation/edit_instance.html:40 #: bookwyrm/templates/settings/federation/instance.html:28 #: bookwyrm/templates/settings/users/user_info.html:106 msgid "Status:" msgstr "Status:" -#: bookwyrm/templates/settings/federation/edit_instance.html:52 +#: bookwyrm/templates/settings/federation/edit_instance.html:54 #: bookwyrm/templates/settings/federation/instance.html:22 #: bookwyrm/templates/settings/users/user_info.html:100 msgid "Software:" msgstr "Software:" -#: bookwyrm/templates/settings/federation/edit_instance.html:61 +#: bookwyrm/templates/settings/federation/edit_instance.html:64 #: bookwyrm/templates/settings/federation/instance.html:25 #: bookwyrm/templates/settings/users/user_info.html:103 msgid "Version:" msgstr "Version:" -#: bookwyrm/templates/settings/federation/edit_instance.html:70 +#: bookwyrm/templates/settings/federation/edit_instance.html:74 msgid "Notes:" msgstr "Anmerkungen:" @@ -3162,42 +3201,42 @@ msgstr "Alle Bücher" msgid "Create shelf" msgstr "Regal erstellen" -#: bookwyrm/templates/shelf/shelf.html:90 +#: bookwyrm/templates/shelf/shelf.html:93 #, python-format msgid "%(formatted_count)s book" msgid_plural "%(formatted_count)s books" msgstr[0] "%(formatted_count)s Buch" msgstr[1] "%(formatted_count)s Bücher" -#: bookwyrm/templates/shelf/shelf.html:97 +#: bookwyrm/templates/shelf/shelf.html:100 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "(Anzeige: %(start)s&endash;%(end)s)" -#: bookwyrm/templates/shelf/shelf.html:109 +#: bookwyrm/templates/shelf/shelf.html:112 msgid "Edit shelf" msgstr "Regal bearbeiten" -#: bookwyrm/templates/shelf/shelf.html:117 +#: bookwyrm/templates/shelf/shelf.html:120 msgid "Delete shelf" msgstr "Regal löschen" -#: bookwyrm/templates/shelf/shelf.html:145 -#: bookwyrm/templates/shelf/shelf.html:171 +#: bookwyrm/templates/shelf/shelf.html:148 +#: bookwyrm/templates/shelf/shelf.html:174 msgid "Shelved" msgstr "Ins Regal gestellt" -#: bookwyrm/templates/shelf/shelf.html:146 -#: bookwyrm/templates/shelf/shelf.html:174 +#: bookwyrm/templates/shelf/shelf.html:149 +#: bookwyrm/templates/shelf/shelf.html:177 msgid "Started" msgstr "Gestartet" -#: bookwyrm/templates/shelf/shelf.html:147 -#: bookwyrm/templates/shelf/shelf.html:177 +#: bookwyrm/templates/shelf/shelf.html:150 +#: bookwyrm/templates/shelf/shelf.html:180 msgid "Finished" msgstr "Abgeschlossen" -#: bookwyrm/templates/shelf/shelf.html:203 +#: bookwyrm/templates/shelf/shelf.html:206 msgid "This shelf is empty." msgstr "Dieses Regal ist leer." @@ -3552,13 +3591,13 @@ msgstr "Bewerten" msgid "Finish \"%(book_title)s\"" msgstr "„%(book_title)s“ abschließen" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:23 -#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:24 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:21 #: bookwyrm/templates/snippets/readthrough_form.html:7 msgid "Started reading" msgstr "Zu lesen angefangen" -#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:31 +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:32 #: bookwyrm/templates/snippets/readthrough_form.html:20 msgid "Finished reading" msgstr "Lesen abgeschlossen" @@ -3586,7 +3625,7 @@ msgstr "„%(book_title)s“ auf Leseliste setzen" msgid "Progress" msgstr "Fortschritt" -#: bookwyrm/templates/snippets/register_form.html:32 +#: bookwyrm/templates/snippets/register_form.html:30 msgid "Sign Up" msgstr "Registrieren" @@ -3608,24 +3647,31 @@ msgstr "Diese Meldung wird an die Moderato*innen von %(site_name)s weitergeleite msgid "More info about this report:" msgstr "Weitere Angaben zu dieser Meldung:" -#: bookwyrm/templates/snippets/shelf_selector.html:4 +#: bookwyrm/templates/snippets/shelf_selector.html:7 msgid "Move book" msgstr "Buch verschieben" -#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 -msgid "More shelves" -msgstr "Mehr Regale" - +#: bookwyrm/templates/snippets/shelf_selector.html:42 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:17 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:24 msgid "Start reading" msgstr "Zu lesen beginnen" +#: bookwyrm/templates/snippets/shelf_selector.html:55 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:29 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:36 msgid "Want to read" msgstr "Auf Leseliste setzen" +#: bookwyrm/templates/snippets/shelf_selector.html:73 +#: bookwyrm/templates/snippets/shelf_selector.html:84 +msgid "Remove from" +msgstr "" + +#: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 +msgid "More shelves" +msgstr "Mehr Regale" + #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:62 #, python-format msgid "Remove from %(name)s" @@ -3840,24 +3886,29 @@ msgstr "%(username)s folgt niemandem" msgid "Edit profile" msgstr "Profil bearbeiten" -#: bookwyrm/templates/user/user.html:33 +#: bookwyrm/templates/user/user.html:37 #, python-format msgid "View all %(size)s" msgstr "Alle %(size)s anzeigen" -#: bookwyrm/templates/user/user.html:46 +#: bookwyrm/templates/user/user.html:51 msgid "View all books" msgstr "Alle Bücher anzeigen" -#: bookwyrm/templates/user/user.html:59 +#: bookwyrm/templates/user/user.html:58 +#, python-format +msgid "%(current_year)s Reading Goal" +msgstr "" + +#: bookwyrm/templates/user/user.html:65 msgid "User Activity" msgstr "Benutzer*innenaktivität" -#: bookwyrm/templates/user/user.html:63 +#: bookwyrm/templates/user/user.html:69 msgid "RSS feed" msgstr "RSS-Feed" -#: bookwyrm/templates/user/user.html:74 +#: bookwyrm/templates/user/user.html:80 msgid "No activities yet!" msgstr "Noch keine Aktivitäten!" @@ -3870,8 +3921,8 @@ msgstr "Am %(date)s beigetreten" #, python-format msgid "%(counter)s follower" msgid_plural "%(counter)s followers" -msgstr[0] "%(counter)s Follower*innen" -msgstr[1] "%(counter)s Folgende" +msgstr[0] "%(counter)s Follower*in" +msgstr[1] "%(counter)s Follower*innen" #: bookwyrm/templates/user/user_preview.html:27 #, python-format diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index fbc1f14e2..935b3b52e 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-04 22:38+0000\n" +"POT-Creation-Date: 2021-12-07 17:35+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,58 +18,58 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:350 +#: bookwyrm/forms.py:351 msgid "A user with this email already exists." msgstr "" -#: bookwyrm/forms.py:364 +#: bookwyrm/forms.py:365 msgid "One Day" msgstr "" -#: bookwyrm/forms.py:365 +#: bookwyrm/forms.py:366 msgid "One Week" msgstr "" -#: bookwyrm/forms.py:366 +#: bookwyrm/forms.py:367 msgid "One Month" msgstr "" -#: bookwyrm/forms.py:367 +#: bookwyrm/forms.py:368 msgid "Does Not Expire" msgstr "" -#: bookwyrm/forms.py:371 +#: bookwyrm/forms.py:372 #, python-brace-format msgid "{i} uses" msgstr "" -#: bookwyrm/forms.py:372 +#: bookwyrm/forms.py:373 msgid "Unlimited" msgstr "" -#: bookwyrm/forms.py:468 +#: bookwyrm/forms.py:469 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:469 +#: bookwyrm/forms.py:470 msgid "Book Title" msgstr "" -#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/forms.py:471 bookwyrm/templates/shelf/shelf.html:152 #: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "" -#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:476 +#: bookwyrm/forms.py:477 msgid "Ascending" msgstr "" -#: bookwyrm/forms.py:477 +#: bookwyrm/forms.py:478 msgid "Descending" msgstr "" @@ -146,6 +146,7 @@ msgid "%(value)s is not a valid username" msgstr "" #: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "" @@ -183,7 +184,7 @@ msgstr "" #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:88 +#: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "" @@ -364,7 +365,11 @@ msgstr "" msgid "Goodreads key:" msgstr "" -#: bookwyrm/templates/author/edit_author.html:108 +#: bookwyrm/templates/author/edit_author.html:105 +msgid "ISNI:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -382,7 +387,7 @@ msgstr "" msgid "Save" msgstr "" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 @@ -487,7 +492,7 @@ msgstr "" #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 -#: bookwyrm/templates/user/layout.html:82 +#: bookwyrm/templates/user/layout.html:85 msgid "Lists" msgstr "" @@ -898,6 +903,12 @@ msgstr "" #: bookwyrm/templates/directory/user_card.html:17 #: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:21 +#: bookwyrm/templates/ostatus/remote_follow.html:22 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:17 +#: bookwyrm/templates/ostatus/success.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1717,6 +1728,7 @@ msgstr "" #: bookwyrm/templates/landing/login.html:7 #: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "" @@ -1725,18 +1737,20 @@ msgid "Success! Email address confirmed." msgstr "" #: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "" #: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "" @@ -1801,7 +1815,7 @@ msgstr "" msgid "Notifications" msgstr "" -#: bookwyrm/templates/layout.html:175 +#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "" @@ -2193,6 +2207,120 @@ msgstr "" msgid "You're all caught up!" msgstr "" +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:6 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:33 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:40 +msgid "User handle to follow from:" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "Follow!" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:8 +msgid "Follow on Fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:12 +msgid "This link opens in a pop-up window" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "" + +#: bookwyrm/templates/ostatus/success.html:28 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/layout.html:31 @@ -2618,7 +2746,7 @@ msgid "Details" msgstr "" #: bookwyrm/templates/settings/federation/instance.html:35 -#: bookwyrm/templates/user/layout.html:64 +#: bookwyrm/templates/user/layout.html:67 msgid "Activity" msgstr "" @@ -3847,15 +3975,15 @@ msgstr "" msgid "User Profile" msgstr "" -#: bookwyrm/templates/user/layout.html:45 +#: bookwyrm/templates/user/layout.html:48 msgid "Follow Requests" msgstr "" -#: bookwyrm/templates/user/layout.html:70 +#: bookwyrm/templates/user/layout.html:73 msgid "Reading Goal" msgstr "" -#: bookwyrm/templates/user/layout.html:76 +#: bookwyrm/templates/user/layout.html:79 msgid "Groups" msgstr "" diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo index 85e7236f525654fb78c50422611bc7d5c2ad8f65..22fe90c0343c8044eed05d143ce48974e0bb2d78 100644 GIT binary patch delta 19381 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

-
+
+ {% if author.bio %} +
+ {% include "snippets/trimmed_text.html" with full=author.bio trim_length=200 %} +
+ {% endif %} - {% if author.aliases or author.born or author.died or author.wikipedia_link or author.openlibrary_key or author.inventaire_id or author.isni %} + {% firstof author.aliases author.born author.died as details %} + {% firstof author.wikipedia_link author.openlibrary_key author.inventaire_id author.isni as links %} + {% if details or links %}
-
-
+ {% if details %} +
+

{% trans "Author details" %}

+
{% if author.aliases %} -
+
{% trans "Aliases:" %}
- {% for alias in author.aliases %} -
- {{alias}}{% if not forloop.last %}, {% endif %} -
- {% endfor %} +
+ {% include "snippets/trimmed_list.html" with items=author.aliases itemprop="alternateName" %} +
{% endif %} {% if author.born %} -
+
{% trans "Born:" %}
{{ author.born|naturalday }}
{% endif %} {% if author.died %} -
+
{% trans "Died:" %}
{{ author.died|naturalday }}
{% endif %}
+
+ {% endif %} - {% if author.wikipedia_link %} -

- - {% trans "Wikipedia" %} - -

- {% endif %} - - {% if author.isni %} -

- - {% trans "View ISNI record" %} - -

- {% endif %} - - {% if author.openlibrary_key %} -

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

- {% csrf_token %} - -
+ {% if links %} +
+

{% trans "External links" %}

+
+ {% if author.wikipedia_link %} +

+ + {% trans "Wikipedia" %} + +

{% endif %} -

- {% endif %} - {% if author.inventaire_id %} -

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

- {% csrf_token %} - -
+ {% if author.isni %} +

+ + {% trans "View ISNI record" %} + +

{% endif %} -

- {% endif %} - {% if author.librarything_key %} -

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

- {% endif %} + {% if author.openlibrary_key %} +

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

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

+ {% endif %} - {% if author.goodreads_key %} -

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

- {% endif %} -
-
- {% endif %} -
- {% if author.bio %} - {{ author.bio|to_markdown|safe }} + {% if author.inventaire_id %} +

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

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

+ {% endif %} + + {% if author.librarything_key %} +

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

+ {% endif %} + + {% if author.goodreads_key %} +

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

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

{% blocktrans with name=author.name %}Books by {{ name }}{% endblocktrans %}

+

{% blocktrans with name=author.name %}Books by {{ name }}{% endblocktrans %}

{% for book in books %} -
- {% include 'landing/small-book.html' with book=book %} +
+
+ {% include 'landing/small-book.html' with book=book %} +
{% include 'snippets/shelve_button/shelve_button.html' with book=book %}
{% endfor %} diff --git a/bookwyrm/templates/snippets/trimmed_list.html b/bookwyrm/templates/snippets/trimmed_list.html new file mode 100644 index 000000000..2e5f4595b --- /dev/null +++ b/bookwyrm/templates/snippets/trimmed_list.html @@ -0,0 +1,34 @@ +{% spaceless %} +{% load i18n %} +{% load humanize %} +{% firstof limit 3 as limit %} +{% with subtraction_value='-'|add:limit %} +{% with remainder_count=items|length|add:subtraction_value %} +{% with remainder_count_display=remainder_count|intcomma %} + +
+ + {% for item in items|slice:limit %} + {{ item }}{% if not forloop.last %}, {% elif remainder_count > 0 %}, {% blocktrans trimmed count counter=remainder_count %} + and {{ remainder_count_display }} other + {% plural %} + and {{ remainder_count_display }} others + {% endblocktrans %} + {% endif %} + {% endfor %} + + + {% for item in items|slice:"3:" %} + {{ item }}{% if not forloop.last %}, {% endif %} + {% endfor %} +
+ + +{% endwith %} +{% endwith %} +{% endwith %} +{% endspaceless %} From 4973e0a0103b652e26cc9fcad6271c8f8cadc72f Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 12:30:21 -0800 Subject: [PATCH 50/57] Adds confirm modal for loading data --- bookwyrm/static/css/fonts/icomoon.eot | Bin 10404 -> 10460 bytes bookwyrm/static/css/fonts/icomoon.svg | 1 + bookwyrm/static/css/fonts/icomoon.ttf | Bin 10240 -> 10296 bytes bookwyrm/static/css/fonts/icomoon.woff | Bin 10316 -> 10372 bytes bookwyrm/static/css/vendor/icons.css | 13 +++--- bookwyrm/templates/author/author.html | 46 +++++++++++----------- bookwyrm/templates/author/sync_modal.html | 30 ++++++++++++++ 7 files changed, 63 insertions(+), 27 deletions(-) create mode 100644 bookwyrm/templates/author/sync_modal.html diff --git a/bookwyrm/static/css/fonts/icomoon.eot b/bookwyrm/static/css/fonts/icomoon.eot index 8eba8692fa04b6c1de810e316dadb480c17c633a..7b1f2d9d9f9d3ff8805e56d83c6c2ceba7654a8f 100644 GIT binary patch delta 407 zcmW-d&r1S96vyA}uAzBIODiI9!xRrHU0j2HNuBDpx9FmanjYL-P{_K}K|Hq%1VM*A z7<4cYyhsG~CkPQ`80^KvdiNB$y^&$&&FA}_H{W5J@<4VBA^@AZBPqzSVP8+3Uu^)u z3(ibdRkZgfy#+v4k?RGeqG9zQ8(5u%(#2`Km+m4z0t7R~ypjvd2k?BziM~`s!RZzx z`;HX*I0x(dDr!{}`JH)guekhzOk>Za;V^+9q%EZ+I6t$eI@i2gID1lk15o5|e`oyN$2~pg)Ys z>ACGOxP>YIe5m(q!zwjGNfM=Bp_YKANbBKapSO)B>y2_Nz&;CrWAPn3{6PKz8eMM3 delta 349 zcmcZ;xFnEui3S4$!$ekdmd95FnbnVsQbG z769^R0BMf&oXWIzyP`%Qe*pu7vPDK}Vv3w*pBn>%$_=2rSq4ymgPX;afk73hhe0JH zx1?f@9j7voZvy16$;nSnT*tLz8j$}0$dAZPtSDeG(PIKyre*;YP{>QnO`Yk*`5VZO z09w*kkY8NFzzmdOP=5d<6d0J9&rMEYv}fd+yoAx(GXW?j0(2fT0}BHqgThPEmkKYd zUbelw^@{8N-~a!CvOqmA8D5HmMXy6e8UH^PXAx%>TO~GM%wG&>CIjQ-gBqfnU74Je z6~TI%1+P4g=ePOFz|8{Y-%V6`31Wcg$rn`38MP;KsI8g2LoI?0XfFeU_GT&dLyQ1e C-e1)K diff --git a/bookwyrm/static/css/fonts/icomoon.svg b/bookwyrm/static/css/fonts/icomoon.svg index 82e413294..7dbbe0dc5 100644 --- a/bookwyrm/static/css/fonts/icomoon.svg +++ b/bookwyrm/static/css/fonts/icomoon.svg @@ -46,4 +46,5 @@ + \ No newline at end of file diff --git a/bookwyrm/static/css/fonts/icomoon.ttf b/bookwyrm/static/css/fonts/icomoon.ttf index 5bf90a0a7ee19d304097a5d19cec297eb296e1fa..151f2b782e011873be7120240fc65777f3771917 100644 GIT binary patch delta 400 zcmZn&*bz|Az{tSBz|GLWz|3IaAFOZ0FT`#D6xjpB3CX#M1((-OT*JV?CtQ)hZ{{s!_V z04-@N$S*DdIur;rBtY^E%*+=i9g_oi)6<$`oYkfqWAne@#w)vSZ>pt{u~W0uO)!5xI#K1q>!kK+DuDfP96##N5=GUYx&y z{0N{WZ3X$oB|wJ)f%*d=p}@e*d~V_adq%EFjMjz;KoJq3&08`&p AF#rGn diff --git a/bookwyrm/static/css/fonts/icomoon.woff b/bookwyrm/static/css/fonts/icomoon.woff index 6ce6834d5addfd8b1a478d05ec802eded9a45b33..bc08184133a6ada4b7b8e59d5290d6019c817132 100644 GIT binary patch delta 447 zcmX>T&=M$8?(gQtz{mgu8Z8XmVA^7`p@zgn9pQR|0tal-PM@DL53Il^`2vCg~2+Iq}ugL%k0>yfOd=(Jp z;ASz)$StV=ifsV$!FYikr*lqzGEkkLS^`io3WWFX+A%FRu>xqZ+8!WZ0gO$VWbzVo zQ-NZ4fR?v`@Juhx-v#-_B|zT*Er+UO2C|r$FHGiPv}ZJ%?89j75Au*0g8&0F0~^rq z3NJ-pD!iu{eu3v)C%J`C|TJ3Zh?u zW-tQ7OMLTFMki%Yh5rwjA21&P8q2`Ss3-`8Obm<<{yq5D@b7^F;{zs!e;|VyK?DQC z&8ND7@%%Pl8Ms-%{JU3k=YSX>da{SAIit?x2GunzKuLwkI%*MIf}rpL>DAfXrFMuB E0NgKiQUCw| delta 409 zcmZn(JQE;X?(gQtz{mgu8a@o%V0v<)hVbMD4VH;oqV-J4xrqe~42&5-nHmt@>$G=8 zdSWq1>{% trans "External links" %}
{% if author.wikipedia_link %} -

+

{% endif %} {% if author.isni %} -

+

{% trans "View ISNI record" %} -

+
{% endif %} + {% trans "Load data" as button_text %} {% if author.openlibrary_key %} -

- +

+ {% trans "View on OpenLibrary" %} {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} -
- {% csrf_token %} - -
+ {% with controls_text="ol_sync" controls_uid=author.id %} + {% include 'snippets/toggle/toggle_button.html' with text=button_text focus="modal_title_ol_sync" class="is-small" icon_with_text="download" %} + {% include "author/sync_modal.html" with source="opnlibrary.org" source_name="OpenLibrary" %} + {% endwith %} {% endif %} -

+
{% endif %} {% if author.inventaire_id %} -

- +

+ {% trans "View on Inventaire" %} + {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} -
- {% csrf_token %} - -
+ {% with controls_text="iv_sync" controls_uid=author.id %} + {% include 'snippets/toggle/toggle_button.html' with text=button_text focus="modal_title_iv_sync" class="is-small" icon_with_text="download" %} + {% include "author/sync_modal.html" with source="inventaire.io" source_name="Inventaire" %} + {% endwith %} {% endif %} -

+
{% endif %} {% if author.librarything_key %} -

+

{% trans "View on LibraryThing" %} -

+
{% endif %} {% if author.goodreads_key %} -

+

{% endif %}
diff --git a/bookwyrm/templates/author/sync_modal.html b/bookwyrm/templates/author/sync_modal.html new file mode 100644 index 000000000..a061ada80 --- /dev/null +++ b/bookwyrm/templates/author/sync_modal.html @@ -0,0 +1,30 @@ +{% extends 'components/modal.html' %} +{% load i18n %} + +{% block modal-title %} +{% trans "Load data" %} +{% endblock %} + +{% block modal-form-open %} +
+ {% csrf_token %} +{% endblock %} + +{% block modal-body %} +

+ {% blocktrans trimmed %} + Loading data will connect to {{ source_name }} and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten. + {% endblocktrans %} +

+{% endblock %} + +{% block modal-footer %} + + +{% trans "Cancel" as button_text %} +{% include 'snippets/toggle/toggle_button.html' with text=button_text %} +{% endblock %} + +{% block modal-form-close %}
{% endblock %} From e500f5312589a9c6d1ce8fa8baefad1071a61152 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 12:41:11 -0800 Subject: [PATCH 51/57] Sync button for books --- bookwyrm/templates/author/author.html | 2 +- bookwyrm/templates/book/book.html | 17 +++++++------- bookwyrm/templates/book/sync_modal.html | 30 +++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 bookwyrm/templates/book/sync_modal.html diff --git a/bookwyrm/templates/author/author.html b/bookwyrm/templates/author/author.html index 3fe4b7abc..66ecb0625 100644 --- a/bookwyrm/templates/author/author.html +++ b/bookwyrm/templates/author/author.html @@ -94,7 +94,7 @@ {% if request.user.is_authenticated and perms.bookwyrm.edit_book %} {% with controls_text="ol_sync" controls_uid=author.id %} {% include 'snippets/toggle/toggle_button.html' with text=button_text focus="modal_title_ol_sync" class="is-small" icon_with_text="download" %} - {% include "author/sync_modal.html" with source="opnlibrary.org" source_name="OpenLibrary" %} + {% include "author/sync_modal.html" with source="openlibrary.org" source_name="OpenLibrary" %} {% endwith %} {% endif %}
diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 6d8ce72b8..27d061a28 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -90,14 +90,15 @@
{% endwith %} + {% trans "Load data" as button_text %} {% if book.openlibrary_key %}

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

- {% csrf_token %} - -
+ {% with controls_text="ol_sync" controls_uid=book.id %} + {% include 'snippets/toggle/toggle_button.html' with text=button_text focus="modal_title_ol_sync" class="is-small" icon_with_text="download" %} + {% include "book/sync_modal.html" with source="openlibrary.org" source_name="OpenLibrary" %} + {% endwith %} {% endif %}

{% endif %} @@ -105,10 +106,10 @@

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

- {% csrf_token %} - -
+ {% with controls_text="iv_sync" controls_uid=book.id %} + {% include 'snippets/toggle/toggle_button.html' with text=button_text focus="modal_title_iv_sync" class="is-small" icon_with_text="download" %} + {% include "book/sync_modal.html" with source="inventaire.io" source_name="Inventaire" %} + {% endwith %} {% endif %}

{% endif %} diff --git a/bookwyrm/templates/book/sync_modal.html b/bookwyrm/templates/book/sync_modal.html new file mode 100644 index 000000000..d80bf25fd --- /dev/null +++ b/bookwyrm/templates/book/sync_modal.html @@ -0,0 +1,30 @@ +{% extends 'components/modal.html' %} +{% load i18n %} + +{% block modal-title %} +{% trans "Load data" %} +{% endblock %} + +{% block modal-form-open %} +
+ {% csrf_token %} +{% endblock %} + +{% block modal-body %} +

+ {% blocktrans trimmed %} + Loading data will connect to {{ source_name }} and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten. + {% endblocktrans %} +

+{% endblock %} + +{% block modal-footer %} + + +{% trans "Cancel" as button_text %} +{% include 'snippets/toggle/toggle_button.html' with text=button_text %} +{% endblock %} + +{% block modal-form-close %}
{% endblock %} From cf26f48d5c19beb7b949d311f38acd82ff2acc2c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 13:05:31 -0800 Subject: [PATCH 52/57] Adds view tests --- bookwyrm/tests/views/books/test_book.py | 22 ++++++++++++++++++++++ bookwyrm/tests/views/test_author.py | 23 +++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/bookwyrm/tests/views/books/test_book.py b/bookwyrm/tests/views/books/test_book.py index 561e21928..cb73e3813 100644 --- a/bookwyrm/tests/views/books/test_book.py +++ b/bookwyrm/tests/views/books/test_book.py @@ -209,6 +209,28 @@ class BookViews(TestCase): self.assertEqual(self.book.description, "new description hi") self.assertEqual(self.book.last_edited_by, self.local_user) + def test_update_book_from_remote(self): + """call out to sync with remote connector""" + models.Connector.objects.create( + identifier="openlibrary.org", + name="OpenLibrary", + connector_file="openlibrary", + base_url="https://openlibrary.org", + books_url="https://openlibrary.org", + covers_url="https://covers.openlibrary.org", + search_url="https://openlibrary.org/search?q=", + isbn_search_url="https://openlibrary.org/isbn", + ) + self.local_user.groups.add(self.group) + request = self.factory.post("") + request.user = self.local_user + + with patch( + "bookwyrm.connectors.openlibrary.Connector.update_book_from_remote" + ) as mock: + views.update_book_from_remote(request, self.book.id, "openlibrary.org") + self.assertEqual(mock.call_count, 1) + def _setup_cover_url(): """creates cover url mock""" diff --git a/bookwyrm/tests/views/test_author.py b/bookwyrm/tests/views/test_author.py index 32b1565e3..03166932f 100644 --- a/bookwyrm/tests/views/test_author.py +++ b/bookwyrm/tests/views/test_author.py @@ -148,3 +148,26 @@ class AuthorViews(TestCase): self.assertEqual(author.name, "Test Author") validate_html(resp.render()) self.assertEqual(resp.status_code, 200) + + def test_update_author_from_remote(self): + """call out to sync with remote connector""" + author = models.Author.objects.create(name="Test Author") + models.Connector.objects.create( + identifier="openlibrary.org", + name="OpenLibrary", + connector_file="openlibrary", + base_url="https://openlibrary.org", + books_url="https://openlibrary.org", + covers_url="https://covers.openlibrary.org", + search_url="https://openlibrary.org/search?q=", + isbn_search_url="https://openlibrary.org/isbn", + ) + self.local_user.groups.add(self.group) + request = self.factory.post("") + request.user = self.local_user + + with patch( + "bookwyrm.connectors.openlibrary.Connector.update_author_from_remote" + ) as mock: + views.update_author_from_remote(request, author.id, "openlibrary.org") + self.assertEqual(mock.call_count, 1) From 31883a9f7c3f6ac03fb3832ed43b0680eab35bb1 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 13:08:25 -0800 Subject: [PATCH 53/57] Linting fixes --- bookwyrm/tests/connectors/test_abstract_connector.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index a453f6133..0b46d6075 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -88,7 +88,7 @@ class AbstractConnector(TestCase): """find an existing book by remote/origin id""" self.assertEqual(models.Book.objects.count(), 1) self.assertEqual( - self.book.remote_id, "https://%s/book/%d" % (DOMAIN, self.book.id) + self.book.remote_id, f"https://{DOMAIN}/book/{self.book.id}" ) self.assertEqual(self.book.origin_id, "https://example.com/book/1234") @@ -99,7 +99,7 @@ class AbstractConnector(TestCase): # dedupe by remote id result = self.connector.get_or_create_book( - "https://%s/book/%d" % (DOMAIN, self.book.id) + f"https://{DOMAIN}/book/{self.book.id}" ) self.assertEqual(models.Book.objects.count(), 1) self.assertEqual(result, self.book) @@ -119,7 +119,8 @@ class AbstractConnector(TestCase): @responses.activate def test_get_or_create_author(self): """load an author""" - self.connector.author_mappings = [ # pylint: disable=attribute-defined-outside-init # pylint: disable=attribute-defined-outside-init + # pylint: disable=attribute-defined-outside-init + self.connector.author_mappings = [ Mapping("id"), Mapping("name"), ] From b6071da3fce4255057d6201336d87130391d49a2 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 13:48:22 -0800 Subject: [PATCH 54/57] Connector tests --- .../connectors/test_abstract_connector.py | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/bookwyrm/tests/connectors/test_abstract_connector.py b/bookwyrm/tests/connectors/test_abstract_connector.py index 0b46d6075..90e77b797 100644 --- a/bookwyrm/tests/connectors/test_abstract_connector.py +++ b/bookwyrm/tests/connectors/test_abstract_connector.py @@ -40,6 +40,8 @@ class AbstractConnector(TestCase): class TestConnector(abstract_connector.AbstractConnector): """nothing added here""" + generated_remote_link_field = "openlibrary_link" + def format_search_result(self, search_result): return search_result @@ -87,9 +89,7 @@ class AbstractConnector(TestCase): def test_get_or_create_book_existing(self): """find an existing book by remote/origin id""" self.assertEqual(models.Book.objects.count(), 1) - self.assertEqual( - self.book.remote_id, f"https://{DOMAIN}/book/{self.book.id}" - ) + self.assertEqual(self.book.remote_id, f"https://{DOMAIN}/book/{self.book.id}") self.assertEqual(self.book.origin_id, "https://example.com/book/1234") # dedupe by origin id @@ -140,3 +140,26 @@ class AbstractConnector(TestCase): author = models.Author.objects.create(name="Test Author") result = self.connector.get_or_create_author(author.remote_id) self.assertEqual(author, result) + + @responses.activate + def test_update_author_from_remote(self): + """trigger the function that looks up the remote data""" + author = models.Author.objects.create(name="Test", openlibrary_key="OL123A") + # pylint: disable=attribute-defined-outside-init + self.connector.author_mappings = [ + Mapping("id"), + Mapping("name"), + Mapping("isni"), + ] + + responses.add( + responses.GET, + "https://openlibrary.org/authors/OL123A", + json={"id": "https://www.example.com/author", "name": "Beep", "isni": "hi"}, + ) + + self.connector.update_author_from_remote(author) + + author.refresh_from_db() + self.assertEqual(author.name, "Test") + self.assertEqual(author.isni, "hi") From 6ee1a628b0e4c056985fd6e26689bf361289c49d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 13:53:25 -0800 Subject: [PATCH 55/57] inventaire remote id test --- bookwyrm/tests/connectors/test_inventaire_connector.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bookwyrm/tests/connectors/test_inventaire_connector.py b/bookwyrm/tests/connectors/test_inventaire_connector.py index 65325d02f..55727a600 100644 --- a/bookwyrm/tests/connectors/test_inventaire_connector.py +++ b/bookwyrm/tests/connectors/test_inventaire_connector.py @@ -306,3 +306,11 @@ class Inventaire(TestCase): extract = self.connector.get_description({"enwiki": "test_path"}) self.assertEqual(extract, "hi hi") + + def test_remote_id_from_model(self): + """figure out a url from an id""" + obj = models.Author.objects.create(name="hello", inventaire_id="123") + self.assertEqual( + self.connector.get_remote_id_from_model(obj), + "https://inventaire.io?action=by-uris&uris=123", + ) From 4248c23c49f6e20f33d9acdb5d6b59a03a596c2b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 13:58:23 -0800 Subject: [PATCH 56/57] Test loading ISNI from openlibrary --- bookwyrm/tests/connectors/test_openlibrary_connector.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bookwyrm/tests/connectors/test_openlibrary_connector.py b/bookwyrm/tests/connectors/test_openlibrary_connector.py index 75a273d63..c05eb1a94 100644 --- a/bookwyrm/tests/connectors/test_openlibrary_connector.py +++ b/bookwyrm/tests/connectors/test_openlibrary_connector.py @@ -98,6 +98,9 @@ class Openlibrary(TestCase): "type": "/type/datetime", "value": "2008-08-31 10:09:33.413686", }, + "remote_ids": { + "isni": "000111", + }, "key": "/authors/OL453734A", "type": {"key": "/type/author"}, "id": 1259965, @@ -110,6 +113,7 @@ class Openlibrary(TestCase): self.assertIsInstance(result, models.Author) self.assertEqual(result.name, "George Elliott") self.assertEqual(result.openlibrary_key, "OL453734A") + self.assertEqual(result.isni, "000111") def test_get_cover_url(self): """formats a url that should contain the cover image""" From 14452dcccf2e799aa9b348375145f64172759706 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 7 Dec 2021 14:20:24 -0800 Subject: [PATCH 57/57] Adds strings for load data feature Plus, updated locales --- locale/de_DE/LC_MESSAGES/django.mo | Bin 60361 -> 60361 bytes locale/de_DE/LC_MESSAGES/django.po | 178 ++++++++++++++++++++---- locale/en_US/LC_MESSAGES/django.po | 124 ++++++++++------- locale/es_ES/LC_MESSAGES/django.mo | Bin 65497 -> 65497 bytes locale/es_ES/LC_MESSAGES/django.po | 178 ++++++++++++++++++++---- locale/fr_FR/LC_MESSAGES/django.mo | Bin 67209 -> 70177 bytes locale/fr_FR/LC_MESSAGES/django.po | 178 ++++++++++++++++++++---- locale/gl_ES/LC_MESSAGES/django.mo | Bin 64021 -> 64021 bytes locale/gl_ES/LC_MESSAGES/django.po | 178 ++++++++++++++++++++---- locale/lt_LT/LC_MESSAGES/django.mo | Bin 66495 -> 69316 bytes locale/lt_LT/LC_MESSAGES/django.po | 178 ++++++++++++++++++++---- locale/pt_BR/LC_MESSAGES/django.mo | Bin 64372 -> 67193 bytes locale/pt_BR/LC_MESSAGES/django.po | 196 ++++++++++++++++++++++----- locale/zh_Hans/LC_MESSAGES/django.mo | Bin 58899 -> 58899 bytes locale/zh_Hans/LC_MESSAGES/django.po | 178 ++++++++++++++++++++---- locale/zh_Hant/LC_MESSAGES/django.mo | Bin 37183 -> 37183 bytes locale/zh_Hant/LC_MESSAGES/django.po | 178 ++++++++++++++++++++---- 17 files changed, 1310 insertions(+), 256 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index a3ee72875231fa43e9606d325475dec0d0f36d63..1c7baeb56f9b274e7e6c8f1180a97d380809aa9e 100644 GIT binary patch delta 19 acmX?ko%!T-<_-CMEEZNqrkjiV!eRkhY6v(0 delta 19 acmX?ko%!T-<_-CMET&c_=9`QA!eRkhX$Uz0 diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 6550dc2e9..5a1f73490 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-04 22:38+0000\n" -"PO-Revision-Date: 2021-12-07 15:47\n" +"POT-Creation-Date: 2021-12-07 17:35+0000\n" +"PO-Revision-Date: 2021-12-07 18:25\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:350 +#: bookwyrm/forms.py:351 msgid "A user with this email already exists." msgstr "Es existiert bereits ein Benutzer*inkonto mit dieser E-Mail-Adresse." -#: bookwyrm/forms.py:364 +#: bookwyrm/forms.py:365 msgid "One Day" msgstr "Ein Tag" -#: bookwyrm/forms.py:365 +#: bookwyrm/forms.py:366 msgid "One Week" msgstr "Eine Woche" -#: bookwyrm/forms.py:366 +#: bookwyrm/forms.py:367 msgid "One Month" msgstr "Ein Monat" -#: bookwyrm/forms.py:367 +#: bookwyrm/forms.py:368 msgid "Does Not Expire" msgstr "Läuft nicht ab" -#: bookwyrm/forms.py:371 +#: bookwyrm/forms.py:372 #, python-brace-format msgid "{i} uses" msgstr "{i}-mal verwendbar" -#: bookwyrm/forms.py:372 +#: bookwyrm/forms.py:373 msgid "Unlimited" msgstr "Unbegrenzt" -#: bookwyrm/forms.py:468 +#: bookwyrm/forms.py:469 msgid "List Order" msgstr "Reihenfolge der Liste" -#: bookwyrm/forms.py:469 +#: bookwyrm/forms.py:470 msgid "Book Title" msgstr "Buchtitel" -#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/forms.py:471 bookwyrm/templates/shelf/shelf.html:152 #: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Bewertung" -#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Sortieren nach" -#: bookwyrm/forms.py:476 +#: bookwyrm/forms.py:477 msgid "Ascending" msgstr "Aufsteigend" -#: bookwyrm/forms.py:477 +#: bookwyrm/forms.py:478 msgid "Descending" msgstr "Absteigend" @@ -145,6 +145,7 @@ msgid "%(value)s is not a valid username" msgstr "%(value)s ist kein gültiger Benutzer*inname" #: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "Benutzer*inname" @@ -182,7 +183,7 @@ msgstr "Bücher-Zeitleiste" #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:88 +#: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Bücher" @@ -363,7 +364,11 @@ msgstr "Librarything-Schlüssel:" msgid "Goodreads key:" msgstr "Goodreads-Schlüssel:" -#: bookwyrm/templates/author/edit_author.html:108 +#: bookwyrm/templates/author/edit_author.html:105 +msgid "ISNI:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -381,7 +386,7 @@ msgstr "Goodreads-Schlüssel:" msgid "Save" msgstr "Speichern" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 @@ -486,7 +491,7 @@ msgstr "Orte" #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 -#: bookwyrm/templates/user/layout.html:82 +#: bookwyrm/templates/user/layout.html:85 msgid "Lists" msgstr "Listen" @@ -897,6 +902,12 @@ msgstr "Empfohlen" #: bookwyrm/templates/directory/user_card.html:17 #: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:21 +#: bookwyrm/templates/ostatus/remote_follow.html:22 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:17 +#: bookwyrm/templates/ostatus/success.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1716,6 +1727,7 @@ msgstr "Anmeldung" #: bookwyrm/templates/landing/login.html:7 #: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "Anmelden" @@ -1724,18 +1736,20 @@ msgid "Success! Email address confirmed." msgstr "Alles klar! E-Mail-Adresse bestätigt." #: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Benutzer*inname:" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Passwort:" #: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "Passwort vergessen?" @@ -1800,7 +1814,7 @@ msgstr "Abmelden" msgid "Notifications" msgstr "Benachrichtigungen" -#: bookwyrm/templates/layout.html:175 +#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "Passwort" @@ -2192,6 +2206,120 @@ msgstr "Erwähnungen" msgid "You're all caught up!" msgstr "Du bist auf dem neusten Stand!" +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:6 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:33 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:40 +msgid "User handle to follow from:" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "Follow!" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:8 +msgid "Follow on Fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:12 +msgid "This link opens in a pop-up window" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "" + +#: bookwyrm/templates/ostatus/success.html:28 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/layout.html:31 @@ -2617,7 +2745,7 @@ msgid "Details" msgstr "Details" #: bookwyrm/templates/settings/federation/instance.html:35 -#: bookwyrm/templates/user/layout.html:64 +#: bookwyrm/templates/user/layout.html:67 msgid "Activity" msgstr "Aktivität" @@ -3846,15 +3974,15 @@ msgstr "Gruppe erstellen" msgid "User Profile" msgstr "Benutzer*inprofil" -#: bookwyrm/templates/user/layout.html:45 +#: bookwyrm/templates/user/layout.html:48 msgid "Follow Requests" msgstr "Folgeanfragen" -#: bookwyrm/templates/user/layout.html:70 +#: bookwyrm/templates/user/layout.html:73 msgid "Reading Goal" msgstr "Leseziel" -#: bookwyrm/templates/user/layout.html:76 +#: bookwyrm/templates/user/layout.html:79 msgid "Groups" msgstr "Gruppen" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 935b3b52e..bc166b520 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-07 17:35+0000\n" +"POT-Creation-Date: 2021-12-07 22:16+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -102,23 +102,23 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:233 +#: bookwyrm/models/book.py:243 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:234 +#: bookwyrm/models/book.py:244 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:235 +#: bookwyrm/models/book.py:245 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:236 +#: bookwyrm/models/book.py:246 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:237 +#: bookwyrm/models/book.py:247 msgid "Paperback" msgstr "" @@ -154,7 +154,7 @@ msgstr "" msgid "A user with that username already exists." msgstr "" -#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:227 +#: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:244 msgid "Reviews" msgstr "" @@ -249,46 +249,61 @@ msgstr "" msgid "Edit Author" msgstr "" -#: bookwyrm/templates/author/author.html:35 +#: bookwyrm/templates/author/author.html:40 +msgid "Author details" +msgstr "" + +#: bookwyrm/templates/author/author.html:44 #: bookwyrm/templates/author/edit_author.html:42 msgid "Aliases:" msgstr "" -#: bookwyrm/templates/author/author.html:46 +#: bookwyrm/templates/author/author.html:53 msgid "Born:" msgstr "" -#: bookwyrm/templates/author/author.html:53 +#: bookwyrm/templates/author/author.html:60 msgid "Died:" msgstr "" -#: bookwyrm/templates/author/author.html:62 +#: bookwyrm/templates/author/author.html:70 +msgid "External links" +msgstr "" + +#: bookwyrm/templates/author/author.html:75 msgid "Wikipedia" msgstr "" -#: bookwyrm/templates/author/author.html:70 +#: bookwyrm/templates/author/author.html:83 msgid "View ISNI record" msgstr "" -#: bookwyrm/templates/author/author.html:78 -#: bookwyrm/templates/book/book.html:94 +#: bookwyrm/templates/author/author.html:88 +#: bookwyrm/templates/author/sync_modal.html:5 +#: bookwyrm/templates/book/book.html:93 +#: bookwyrm/templates/book/sync_modal.html:5 +msgid "Load data" +msgstr "" + +#: bookwyrm/templates/author/author.html:92 +#: bookwyrm/templates/book/book.html:96 msgid "View on OpenLibrary" msgstr "" -#: bookwyrm/templates/author/author.html:86 -#: bookwyrm/templates/book/book.html:97 +#: bookwyrm/templates/author/author.html:106 +#: bookwyrm/templates/book/book.html:107 msgid "View on Inventaire" msgstr "" -#: bookwyrm/templates/author/author.html:94 +#: bookwyrm/templates/author/author.html:121 msgid "View on LibraryThing" msgstr "" -#: bookwyrm/templates/author/author.html:102 +#: bookwyrm/templates/author/author.html:129 msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:117 +#: bookwyrm/templates/author/author.html:143 #, python-format msgid "Books by %(name)s" msgstr "" @@ -370,7 +385,7 @@ msgid "ISNI:" msgstr "" #: bookwyrm/templates/author/edit_author.html:115 -#: bookwyrm/templates/book/book.html:140 +#: bookwyrm/templates/book/book.html:157 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/groups/form.html:24 @@ -388,11 +403,13 @@ msgid "Save" msgstr "" #: bookwyrm/templates/author/edit_author.html:116 -#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 +#: bookwyrm/templates/author/sync_modal.html:26 +#: bookwyrm/templates/book/book.html:158 bookwyrm/templates/book/book.html:216 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 #: bookwyrm/templates/book/edit/edit_book.html:126 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/book/sync_modal.html:26 #: bookwyrm/templates/groups/delete_group_modal.html:17 #: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/settings/federation/instance.html:88 @@ -401,6 +418,20 @@ msgstr "" msgid "Cancel" msgstr "" +#: bookwyrm/templates/author/sync_modal.html:15 +#, python-format +msgid "Loading data will connect to %(source_name)s and check for any metadata about this author which aren't present here. Existing metadata will not be overwritten." +msgstr "" + +#: bookwyrm/templates/author/sync_modal.html:23 +#: bookwyrm/templates/book/edit/edit_book.html:108 +#: bookwyrm/templates/book/sync_modal.html:23 +#: bookwyrm/templates/groups/members.html:16 +#: bookwyrm/templates/landing/password_reset.html:42 +#: bookwyrm/templates/snippets/remove_from_group_button.html:16 +msgid "Confirm" +msgstr "" + #: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 @@ -421,74 +452,74 @@ msgstr "" msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:117 +#: bookwyrm/templates/book/book.html:134 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:129 +#: bookwyrm/templates/book/book.html:146 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:136 +#: bookwyrm/templates/book/book.html:153 #: bookwyrm/templates/book/edit/edit_book_form.html:39 #: bookwyrm/templates/lists/form.html:13 bookwyrm/templates/shelf/form.html:17 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:150 +#: bookwyrm/templates/book/book.html:167 #, python-format msgid "%(count)s editions" msgstr "" -#: bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:175 msgid "You have shelved this edition in:" msgstr "" -#: bookwyrm/templates/book/book.html:173 +#: bookwyrm/templates/book/book.html:190 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:184 +#: bookwyrm/templates/book/book.html:201 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:187 +#: bookwyrm/templates/book/book.html:204 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:196 +#: bookwyrm/templates/book/book.html:213 msgid "Create" msgstr "" -#: bookwyrm/templates/book/book.html:206 +#: bookwyrm/templates/book/book.html:223 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:232 +#: bookwyrm/templates/book/book.html:249 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:238 +#: bookwyrm/templates/book/book.html:255 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:244 +#: bookwyrm/templates/book/book.html:261 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:280 +#: bookwyrm/templates/book/book.html:297 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:292 +#: bookwyrm/templates/book/book.html:309 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:303 bookwyrm/templates/layout.html:75 +#: bookwyrm/templates/book/book.html:320 bookwyrm/templates/layout.html:75 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -496,11 +527,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:331 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:324 +#: bookwyrm/templates/book/book.html:341 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:182 #: bookwyrm/templates/settings/email_blocklist/domain_form.html:24 @@ -578,13 +609,6 @@ msgstr "" msgid "This is a new work" msgstr "" -#: bookwyrm/templates/book/edit/edit_book.html:108 -#: bookwyrm/templates/groups/members.html:16 -#: bookwyrm/templates/landing/password_reset.html:42 -#: bookwyrm/templates/snippets/remove_from_group_button.html:16 -msgid "Confirm" -msgstr "" - #: bookwyrm/templates/book/edit/edit_book.html:110 #: bookwyrm/templates/feed/status.html:21 msgid "Back" @@ -784,6 +808,11 @@ msgstr "" msgid "Delete these read dates" msgstr "" +#: bookwyrm/templates/book/sync_modal.html:15 +#, python-format +msgid "Loading data will connect to %(source_name)s and check for any metadata about this book which aren't present here. Existing metadata will not be overwritten." +msgstr "" + #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/components/modal.html:11 #: bookwyrm/templates/components/tooltip.html:7 @@ -3388,6 +3417,7 @@ msgid "Posted by %(username)s" msgstr "" #: bookwyrm/templates/snippets/authors.html:22 +#: bookwyrm/templates/snippets/trimmed_list.html:14 #, python-format msgid "and %(remainder_count_display)s other" msgid_plural "and %(remainder_count_display)s others" @@ -4073,7 +4103,7 @@ msgstr "" msgid "File exceeds maximum size: 10MB" msgstr "" -#: bookwyrm/templatetags/utilities.py:34 +#: bookwyrm/templatetags/utilities.py:33 #, python-format msgid "%(title)s: %(subtitle)s" msgstr "" diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo index 22fe90c0343c8044eed05d143ce48974e0bb2d78..5c04a33cbeef541ba3de2df4eb3ee512cc65f781 100644 GIT binary patch delta 19 bcmcclpZVs0<_!;Lu~=9cnQneM>q`m%YRw8s delta 19 bcmcclpZVs0<_!;Lv6xz!m~VbM>q`m%YRn2s diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po index c1c9342c9..776c43968 100644 --- a/locale/es_ES/LC_MESSAGES/django.po +++ b/locale/es_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-04 22:38+0000\n" -"PO-Revision-Date: 2021-12-07 15:47\n" +"POT-Creation-Date: 2021-12-07 17:35+0000\n" +"PO-Revision-Date: 2021-12-07 18:25\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:350 +#: bookwyrm/forms.py:351 msgid "A user with this email already exists." msgstr "Ya existe un usuario con ese correo electrónico." -#: bookwyrm/forms.py:364 +#: bookwyrm/forms.py:365 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:365 +#: bookwyrm/forms.py:366 msgid "One Week" msgstr "Una semana" -#: bookwyrm/forms.py:366 +#: bookwyrm/forms.py:367 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:367 +#: bookwyrm/forms.py:368 msgid "Does Not Expire" msgstr "No expira" -#: bookwyrm/forms.py:371 +#: bookwyrm/forms.py:372 #, python-brace-format msgid "{i} uses" msgstr "{i} usos" -#: bookwyrm/forms.py:372 +#: bookwyrm/forms.py:373 msgid "Unlimited" msgstr "Sin límite" -#: bookwyrm/forms.py:468 +#: bookwyrm/forms.py:469 msgid "List Order" msgstr "Orden de la lista" -#: bookwyrm/forms.py:469 +#: bookwyrm/forms.py:470 msgid "Book Title" msgstr "Título" -#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/forms.py:471 bookwyrm/templates/shelf/shelf.html:152 #: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Calificación" -#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Ordenar por" -#: bookwyrm/forms.py:476 +#: bookwyrm/forms.py:477 msgid "Ascending" msgstr "Ascendente" -#: bookwyrm/forms.py:477 +#: bookwyrm/forms.py:478 msgid "Descending" msgstr "Descendente" @@ -145,6 +145,7 @@ msgid "%(value)s is not a valid username" msgstr "%(value)s no es un usuario válido" #: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "nombre de usuario" @@ -182,7 +183,7 @@ msgstr "Línea temporal de libros" #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:88 +#: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Libros" @@ -363,7 +364,11 @@ msgstr "Clave Librarything:" msgid "Goodreads key:" msgstr "Clave Goodreads:" -#: bookwyrm/templates/author/edit_author.html:108 +#: bookwyrm/templates/author/edit_author.html:105 +msgid "ISNI:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -381,7 +386,7 @@ msgstr "Clave Goodreads:" msgid "Save" msgstr "Guardar" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 @@ -486,7 +491,7 @@ msgstr "Lugares" #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 -#: bookwyrm/templates/user/layout.html:82 +#: bookwyrm/templates/user/layout.html:85 msgid "Lists" msgstr "Listas" @@ -897,6 +902,12 @@ msgstr "Sugerido" #: bookwyrm/templates/directory/user_card.html:17 #: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:21 +#: bookwyrm/templates/ostatus/remote_follow.html:22 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:17 +#: bookwyrm/templates/ostatus/success.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1716,6 +1727,7 @@ msgstr "Iniciar sesión" #: bookwyrm/templates/landing/login.html:7 #: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "Iniciar sesión" @@ -1724,18 +1736,20 @@ msgid "Success! Email address confirmed." msgstr "¡Éxito! Dirección de correo electrónico confirmada." #: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Nombre de usuario:" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Contraseña:" #: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "¿Olvidaste tu contraseña?" @@ -1800,7 +1814,7 @@ msgstr "Cerrar sesión" msgid "Notifications" msgstr "Notificaciones" -#: bookwyrm/templates/layout.html:175 +#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "contraseña" @@ -2192,6 +2206,120 @@ msgstr "Menciones" msgid "You're all caught up!" msgstr "¡Estás al día!" +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:6 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:33 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:40 +msgid "User handle to follow from:" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "Follow!" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:8 +msgid "Follow on Fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:12 +msgid "This link opens in a pop-up window" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "" + +#: bookwyrm/templates/ostatus/success.html:28 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/layout.html:31 @@ -2617,7 +2745,7 @@ msgid "Details" msgstr "Detalles" #: bookwyrm/templates/settings/federation/instance.html:35 -#: bookwyrm/templates/user/layout.html:64 +#: bookwyrm/templates/user/layout.html:67 msgid "Activity" msgstr "Actividad" @@ -3846,15 +3974,15 @@ msgstr "Crear grupo" msgid "User Profile" msgstr "Perfil de usuario" -#: bookwyrm/templates/user/layout.html:45 +#: bookwyrm/templates/user/layout.html:48 msgid "Follow Requests" msgstr "Solicitudes de seguidor" -#: bookwyrm/templates/user/layout.html:70 +#: bookwyrm/templates/user/layout.html:73 msgid "Reading Goal" msgstr "Objetivo de lectura" -#: bookwyrm/templates/user/layout.html:76 +#: bookwyrm/templates/user/layout.html:79 msgid "Groups" msgstr "Grupos" diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 88f3631ae0c7e200a93aa2d8500126dd03dac960..88d8816cf66edb32402cd36cf8ac94547584d97f 100644 GIT binary patch delta 21250 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 delta 18533 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 diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 8a82c2a0c..c443d6c56 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-04 22:38+0000\n" -"PO-Revision-Date: 2021-12-05 11:45\n" +"POT-Creation-Date: 2021-12-07 17:35+0000\n" +"PO-Revision-Date: 2021-12-07 19:43\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:350 +#: bookwyrm/forms.py:351 msgid "A user with this email already exists." msgstr "Cet email est déjà associé à un compte." -#: bookwyrm/forms.py:364 +#: bookwyrm/forms.py:365 msgid "One Day" msgstr "Un jour" -#: bookwyrm/forms.py:365 +#: bookwyrm/forms.py:366 msgid "One Week" msgstr "Une semaine" -#: bookwyrm/forms.py:366 +#: bookwyrm/forms.py:367 msgid "One Month" msgstr "Un mois" -#: bookwyrm/forms.py:367 +#: bookwyrm/forms.py:368 msgid "Does Not Expire" msgstr "Sans expiration" -#: bookwyrm/forms.py:371 +#: bookwyrm/forms.py:372 #, python-brace-format msgid "{i} uses" msgstr "{i} utilisations" -#: bookwyrm/forms.py:372 +#: bookwyrm/forms.py:373 msgid "Unlimited" msgstr "Sans limite" -#: bookwyrm/forms.py:468 +#: bookwyrm/forms.py:469 msgid "List Order" msgstr "Ordre de la liste" -#: bookwyrm/forms.py:469 +#: bookwyrm/forms.py:470 msgid "Book Title" msgstr "Titre du livre" -#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/forms.py:471 bookwyrm/templates/shelf/shelf.html:152 #: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Note" -#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Trier par" -#: bookwyrm/forms.py:476 +#: bookwyrm/forms.py:477 msgid "Ascending" msgstr "Ordre croissant" -#: bookwyrm/forms.py:477 +#: bookwyrm/forms.py:478 msgid "Descending" msgstr "Ordre décroissant" @@ -145,6 +145,7 @@ msgid "%(value)s is not a valid username" msgstr "%(value)s n’est pas un nom de compte valide." #: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "nom du compte :" @@ -182,7 +183,7 @@ msgstr "Actualité de mes livres" #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:88 +#: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Livres" @@ -363,7 +364,11 @@ msgstr "Clé Librarything :" msgid "Goodreads key:" msgstr "Clé Goodreads :" -#: bookwyrm/templates/author/edit_author.html:108 +#: bookwyrm/templates/author/edit_author.html:105 +msgid "ISNI:" +msgstr "ISNI :" + +#: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -381,7 +386,7 @@ msgstr "Clé Goodreads :" msgid "Save" msgstr "Enregistrer" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 @@ -486,7 +491,7 @@ msgstr "Lieux" #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 -#: bookwyrm/templates/user/layout.html:82 +#: bookwyrm/templates/user/layout.html:85 msgid "Lists" msgstr "Listes" @@ -897,6 +902,12 @@ msgstr "Suggéré" #: bookwyrm/templates/directory/user_card.html:17 #: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:21 +#: bookwyrm/templates/ostatus/remote_follow.html:22 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:17 +#: bookwyrm/templates/ostatus/success.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1716,6 +1727,7 @@ msgstr "Connexion" #: bookwyrm/templates/landing/login.html:7 #: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "Se connecter" @@ -1724,18 +1736,20 @@ msgid "Success! Email address confirmed." msgstr "Bravo ! L’adresse email a été confirmée." #: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Nom du compte :" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Mot de passe :" #: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "Mot de passe oublié ?" @@ -1800,7 +1814,7 @@ msgstr "Se déconnecter" msgid "Notifications" msgstr "Notifications" -#: bookwyrm/templates/layout.html:175 +#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "Mot de passe" @@ -2192,6 +2206,120 @@ msgstr "Mentions" msgid "You're all caught up!" msgstr "Aucune nouvelle notification !" +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "%(account)s n’est pas un nom de compte valide" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "Vérifiez que vous avez le nom de compte correct avant de réessayer" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "Le compte %(account)s n’a pas pu être trouvé ou %(remote_domain)s ne supporte pas la découverte d’identité" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "Le compte %(account)s a été trouvé mais %(remote_domain)s ne supporte pas le “suivi à distance”" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "Tentez plutôt de rechercher %(user)s sur %(remote_domain)s" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "Une erreur s’est produite en essayant de suivre %(account)s" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "Vérifiez que vous avez le nom de compte correct avant de réessayer." + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "Vous avez bloqué %(account)s" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "%(account)s a bloqué votre compte" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "Vous suivez déjà %(account)s" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "Vous avez déjà demandé à suivre %(account)s" + +#: bookwyrm/templates/ostatus/remote_follow.html:6 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "Suivez %(username)s sur le Fédiverse" + +#: bookwyrm/templates/ostatus/remote_follow.html:33 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "Suivez %(username)s depuis un autre compte du Fédiverse comme BookWyrm, Mastodon, ou Pleroma." + +#: bookwyrm/templates/ostatus/remote_follow.html:40 +msgid "User handle to follow from:" +msgstr "Compte depuis lequel vous voulez vous abonner :" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "Follow!" +msgstr "S’abonner !" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:8 +msgid "Follow on Fediverse" +msgstr "Suivre sur le Fédiverse" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:12 +msgid "This link opens in a pop-up window" +msgstr "Ce lien ouvre une nouvelle fenêtre" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "Se connecter à %(sitename)s" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "Erreur d’abonnement depuis %(sitename)s" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "S’abonner depuis %(sitename)s" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "Oups…" + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "Connectez-vous d'abord…" + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "S’abonner à @%(username)s" + +#: bookwyrm/templates/ostatus/success.html:28 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "Vous suivez maintenant %(display_name)s !" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/layout.html:31 @@ -2617,7 +2745,7 @@ msgid "Details" msgstr "Détails" #: bookwyrm/templates/settings/federation/instance.html:35 -#: bookwyrm/templates/user/layout.html:64 +#: bookwyrm/templates/user/layout.html:67 msgid "Activity" msgstr "Activité" @@ -3846,15 +3974,15 @@ msgstr "Créer un groupe" msgid "User Profile" msgstr "Profil" -#: bookwyrm/templates/user/layout.html:45 +#: bookwyrm/templates/user/layout.html:48 msgid "Follow Requests" msgstr "Demandes d’abonnement" -#: bookwyrm/templates/user/layout.html:70 +#: bookwyrm/templates/user/layout.html:73 msgid "Reading Goal" msgstr "Défi lecture" -#: bookwyrm/templates/user/layout.html:76 +#: bookwyrm/templates/user/layout.html:79 msgid "Groups" msgstr "Groupes" diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo index c12abdac0950180e78fdff95d406ad4ae22c9f47..8b3a61491b07219c763f1ca56778b56c58c540a3 100644 GIT binary patch delta 22 ecmbRGg?Z{1<_-5|v70LxT38vGZhkt;ARYj8ISFb2 delta 22 ecmbRGg?Z{1<_-5|v70IwSXdbwZGJk-ARYj83<+fb diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po index 1944de649..bbf692111 100644 --- a/locale/gl_ES/LC_MESSAGES/django.po +++ b/locale/gl_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-04 22:38+0000\n" -"PO-Revision-Date: 2021-12-05 08:32\n" +"POT-Creation-Date: 2021-12-07 17:35+0000\n" +"PO-Revision-Date: 2021-12-07 18:25\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:350 +#: bookwyrm/forms.py:351 msgid "A user with this email already exists." msgstr "Xa existe unha usuaria con este email." -#: bookwyrm/forms.py:364 +#: bookwyrm/forms.py:365 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:365 +#: bookwyrm/forms.py:366 msgid "One Week" msgstr "Unha semana" -#: bookwyrm/forms.py:366 +#: bookwyrm/forms.py:367 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:367 +#: bookwyrm/forms.py:368 msgid "Does Not Expire" msgstr "Non caduca" -#: bookwyrm/forms.py:371 +#: bookwyrm/forms.py:372 #, python-brace-format msgid "{i} uses" msgstr "{i} usos" -#: bookwyrm/forms.py:372 +#: bookwyrm/forms.py:373 msgid "Unlimited" msgstr "Sen límite" -#: bookwyrm/forms.py:468 +#: bookwyrm/forms.py:469 msgid "List Order" msgstr "Orde da listaxe" -#: bookwyrm/forms.py:469 +#: bookwyrm/forms.py:470 msgid "Book Title" msgstr "Título do libro" -#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/forms.py:471 bookwyrm/templates/shelf/shelf.html:152 #: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Puntuación" -#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Ordenar por" -#: bookwyrm/forms.py:476 +#: bookwyrm/forms.py:477 msgid "Ascending" msgstr "Ascendente" -#: bookwyrm/forms.py:477 +#: bookwyrm/forms.py:478 msgid "Descending" msgstr "Descendente" @@ -145,6 +145,7 @@ msgid "%(value)s is not a valid username" msgstr "%(value)s non é un nome de usuaria válido" #: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "nome de usuaria" @@ -182,7 +183,7 @@ msgstr "Cronoloxía de libros" #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:88 +#: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Libros" @@ -363,7 +364,11 @@ msgstr "Chave en Librarything:" msgid "Goodreads key:" msgstr "Chave en Goodreads:" -#: bookwyrm/templates/author/edit_author.html:108 +#: bookwyrm/templates/author/edit_author.html:105 +msgid "ISNI:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -381,7 +386,7 @@ msgstr "Chave en Goodreads:" msgid "Save" msgstr "Gardar" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 @@ -486,7 +491,7 @@ msgstr "Lugares" #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 -#: bookwyrm/templates/user/layout.html:82 +#: bookwyrm/templates/user/layout.html:85 msgid "Lists" msgstr "Listaxes" @@ -897,6 +902,12 @@ msgstr "Suxerido" #: bookwyrm/templates/directory/user_card.html:17 #: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:21 +#: bookwyrm/templates/ostatus/remote_follow.html:22 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:17 +#: bookwyrm/templates/ostatus/success.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1716,6 +1727,7 @@ msgstr "Conectar" #: bookwyrm/templates/landing/login.html:7 #: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "Conecta" @@ -1724,18 +1736,20 @@ msgid "Success! Email address confirmed." msgstr "Correcto! Enderezo de email confirmado." #: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Nome de usuaria:" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Contrasinal:" #: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "Esqueceches o contrasinal?" @@ -1800,7 +1814,7 @@ msgstr "Desconectar" msgid "Notifications" msgstr "Notificacións" -#: bookwyrm/templates/layout.html:175 +#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "contrasinal" @@ -2192,6 +2206,120 @@ msgstr "Mencións" msgid "You're all caught up!" msgstr "Estás ao día!" +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:6 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:33 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:40 +msgid "User handle to follow from:" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "Follow!" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:8 +msgid "Follow on Fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:12 +msgid "This link opens in a pop-up window" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "" + +#: bookwyrm/templates/ostatus/success.html:28 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/layout.html:31 @@ -2617,7 +2745,7 @@ msgid "Details" msgstr "Detalles" #: bookwyrm/templates/settings/federation/instance.html:35 -#: bookwyrm/templates/user/layout.html:64 +#: bookwyrm/templates/user/layout.html:67 msgid "Activity" msgstr "Actividade" @@ -3846,15 +3974,15 @@ msgstr "Crear grupo" msgid "User Profile" msgstr "Perfil da usuaria" -#: bookwyrm/templates/user/layout.html:45 +#: bookwyrm/templates/user/layout.html:48 msgid "Follow Requests" msgstr "Solicitudes de seguimento" -#: bookwyrm/templates/user/layout.html:70 +#: bookwyrm/templates/user/layout.html:73 msgid "Reading Goal" msgstr "Obxectivo de lectura" -#: bookwyrm/templates/user/layout.html:76 +#: bookwyrm/templates/user/layout.html:79 msgid "Groups" msgstr "Grupos" diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo index 5ead7f97c88f910c6339f4efdff6e9e53ce30af0..6c6d140732dd66c8fa2c97a70d8e5223b72fdd2f 100644 GIT binary patch delta 21190 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 delta 18530 zcmZA91$b3QzqjEPCm{+XXh;YS!GabD65N9XcP;Kk%f_{MaVQkmB0)-_xD|>ODU<@m zi#shXrRVwW8T#?P>pGKr=0CDV*4jIv?{y9>^4>en+jT9K_bi92u9xFv!sQtp$K~xf zu|*YioLp5LClBVvaBP5)*aZ`CJeI~2m>*MAb)1G+99!WO%!p4g4g;#0@!~OpTRESS zDMy716LB9F#IWj)6NL#Ff^9J^_Q7bJh&6E?rolgLeNYWE!R*+8cm>RXb8UPts{K`r z;r`AGGFb?OGn!Ud9MfYh)Qvk~5gdR4xZcKhV0Ow!F&H1CR{9RJV!B#p#ig+)<(}5- z*n@JN+KyA7`#XEcw8m6*9H%|@#in=(n_ywKr8!Q!=C7>aXH?N?(;+<}_V!6f#-5Sa@Ev@$;)U3CaXttbk$136Ix=0gos5;d`E zs0GwRO|YT0HEN<=Q2hp@?lTVKa3_Z2BNrL1+_RB6lW>ftTm#jy8)}OOp>8}5b;H@% z73ZTKUf;%M;9RKo%}@*IjI*#eE=4~c2u*Y?YA0MpGP&bplOWHjIuRKwY*vssQ>@pe?l z!>FSd(vrz*qL$zCjYPShB!F{L&okcw(m#sHZTmR73zs4}V|NoHD4MJKNBT+NW ziy1H;btH|gU2!VqVW=Agw=@%oKusVA>c+(}3d^A;+!{6Ej;PnUJG!)@5o9!hDX6nq zh>EX9ZQVB1gbvyGMO3?6w)_+|;5*cjgtju@1vRiM<-w?l+(k{;x3w8BxHbE)Er}+e zGtGm#aZy`NKuxTcEjL3=s3Yo`=#Ob|Fls_mQSBF?j&coZ#d}fxj-bZBfNFoUwaX0f z#8!Cmd8z?IF)e0BJ)7O0M$(LFKiaMTJX+VU(^yTvxX-nzra51=M|+QzS=#(#jC$Qxt_TuxYf zvo+OG9THJz)f%;RJy9zfj@prNsEJKOt!zH(XqKX$g>ANc9CgF1sB!P3+P}4WaBlAR z-=B;+MxYwxMIS7Ty5T3N8z!K(yr#7^dQzFFJ4D2 zfsv;L^3*%4&m9_OXP!mW*4b;-s_qFvdOhJ6KbuwyVv#}~J zL`~!l>L?z4%Kj_h-PxEDbp)wU6Ud6XVL^<*GN_$NLQSj_>T{qkYD=eL3S5kSxEj@N zla232wL6SDiVH3>8t@_NM*pC;Hf0wR&wy$ei<(#hs$G5b$2QiksDAxX3mT2O(InJP zEkI3Z6K2J4F(4gt|d0)PT{b`U0o{OQ3FC6$7vyro*)>8-lfQ z66&q^1vTDZm=gWFx!b#(a5CE3oT%5S45~o|Tdsq;Q3KQftxyx}fjZlvsE2eUYNfL= z2G`m8Q>gLIqx%1b+M%bIndi@WLq=N@-rWosiRzHmmJ6T;E{esmItJoM%#Tx1{r8}D z;0Wpy?h@+Rc!`-Xq=(tbSkz~KQI+-n_plWMP%9mddW|Mozd}u5v-JpSz$>VU{Au;+ zX^tipYG*Q`b|wacuo$XeMbu8WL6<(EI+D@M$D?jMA9W-fFc=SEW;}=a@CE9bi0);! zIydTds)_2~9yQ(oEPxYG&&*C6KWM$si~ZMD-y;x>FHtK^)7$>hiQ2*js0s8!4Kx+i zZXRmuzd@~dJL+tAqgH$nwL@o76TXIOe-Aaz)86dAD&7*{MQ}X(m^1B;8gLVobsC)5rMvW~?#$}=$yx{i?1Os=4I;+FN1jlV`c z1OK2_9@yXf)td>`FTq+J)xREU!p%?<>5iK40Mt7;1$XY&;4zp&Y0Q=f_eQk7_pvwG+coJ3h%>=KSZ8QHPbN32Z|R zblBa%aZX}-%D+#m?GWf7<&$ZE^EQ4=m^%kemca&?Tw%cyaD2OERYi*f|Ij|}y2M-Aru zwWWm#=mzCcGpvHTL49je)Yi5^?L=>k#!MNi= zHyWbG>Et4#v+8FZhS8MAqb9TlwW4j94UeNH_7pX6_~&LNk*JC0MNOn6YTOE#9&2Gv z?1Xu7D(YL(wTp}fx`yg-7d69YsIB%GX0|>xMo`X*QCJf7nl?pEv;%5Od!xp4p^j`E z>L};f@>iIa@;AuC>2i*cQHRHs$DMBLt6;-)a#$pGGJ%a zc%xAh`U2H&K5E?MsIA|MDY(D0pVWlFaa4zF!_8L4p&FJ)t-Lns#vM=}wLS0?oQL`F z99Bn<5yqOBpYj}x#3QJc-^MNY4%2W?XX8loa2&!+lz+wqe1$su;-kz~*F-&3jZiz% z0=3fiHr@?&6n#)D9fo?Cr=TW2)4C9~BP-DT`~OBV8fXWq<6hKTaT?X}7HS6`*|OJY zGe97!J_5CKQKfvrVmi^aj(~E!xbfL;iQ4iH-)C7*A zR`@Hb;{(+D{La>gj59ly4Rr)1tQAr16Hyasi+UEiVh)_(BBK>=LapF?^uvRw_x1#8 zB6n~q{*9W*r154)=ApKH8LEFWs(vRX;!!M$=_Z(mwl;2}JP2!|E6+r>fy@BRj2AHu zUt>MYHOaj1Lof^F1<0qV^F8Lp5?`2qu5XW;=q%KP)?s$sg__6>td4P$%}#xev3mcf zlL@3^4+h`~OoU}5yd z@z_W2|5P$H33yI3TT}QGPy7jb%Q~utvZGkF!f9`fkvqE3M`NJQ3K}vl7GIzBB&i0j#|(c z*2}g&$1HPHeXt_+%h1(;%#+=Di)PjCrXx{(Qi%h#($XuMBi`ajT#qs-!cN6E~GJJ<8aLHox zrP6JQ`TJlT@>TD=z|`2|YkoJtk$4zGmzpiUh*>H7F<3C>#c(W%oiGt;;(Y5OqmR~R z%gvWVAJliiL~M+!Fg-de%zzm%EyXgJ9UEdS4n?(FgL;h*q8_@NsAud2>e=YC(!__M zcHT9GOa?N$(f#Fv(Uf0d2@GGwKTcw8?1P7KAeLCo7ZGm8uIRtUe2(~cAq$)uwqVm*Jor~?kdo~X0CkCiZfgW2*?sApjg7Q-L0A$omd zcBCohr#u{ea3ks=-iCg7%z6exwKtb+;6Cc1dT#y8#=SP0BT9)HAO?Lg52}43)XtT} zFl>anVP_1%q1G=@&&)#WCdG9&hsdbIc?`vSsDb`OooT=(bLQDl&q`@jygnAf?&yz; zZT%Y5ME79`9z#77mu&eD45aM0ne+E1lZH$%rbkueLd~=&YJh5(2b*9%9F3a57F4?* zu@L@-F_>zLdDx0t%cI7xg_>A%Y=`Z)u>U#893v2qPf<6_muv=z$9a^iA^+#x;zw$n zv(+5IIt-w^1$7kPqaNlXs2#b18S$a5_uFRTp{Qpg!#4ImicBV^kw`~+&^Kim3yHvS5ABWJrgLSGD{m>H9>po@%Nm$4X*H;^~a`2+Qk zeYL~fa0TiHTWt9NYJ#UxTYB4;AE8$6@vYgZl&GzbvgQ1!`UI=1CYewI4N)`egxbHEGk|f`OI^=BNOM}|GzWue|l7d zIMmkGM7>r?s2TS`ZRJqZfFn^Wn{CT0Pz%_JTF?nw|Eu+(^)FOA|6TU|&qzjF8H>fS zJjUW6Y>O*V&xHSOGm%)-1d5?{sygb1NjBaQbyR~<6P#$v^Dv0=8r0G5K>bnU?6DOW zQ5|oiw)PcjQJgJTKs_^!P!Df+>u}WjJ`*+07Ss{_gxcW;m=V4Au>Wny zM3d1Dj6|LJ9MlSz+4v6BjDNJ{bC^K+chtj|cdvOi3Zu&9P!q3;+M#+Ffh|xw(hqe6 zqxN$C+LBoWw32100d}G~>_PEe6c_eCK zGf_LXYM;wwz9XQHCvC+wOh@^-EeGs3?IKY(E{H|34r<57*!XnR4K|?`bO`m<{DNBO zJ=6}oM%~Zbb-d+Fk;%=yppV|5`s2k1247eWE?kH*p&)WLSs3Ulc zI^sW36AL7+xTVc6RXz`X1sJiaQ@nw7y=p~zpbc%I;&c!vu=%QHw5+3JPvc< zR@4q$vGos7?cbozKJ2*JiGrx{6VMkMp%&Is|K_8!>_|WzhoiP?0XD#IF*^pGFas1u zt+*IQRB?UtbW?Lr;RX;i-(E;4!=AEFw1{b*K}8B}SmiN}%eKPy=-6G7Bq(+R+N={`p6syD2z7tMsqp?0h`s$WxU2UP!F zm>Nf+j%p5Syu%kcf34&s0p0i_>Q|%RPy@ZQ4gG#L?LtrkrNgWki+b7>Nf;+ zgR!U;PqF1$sEIB@wOivNqt|FFM&N#o#!FZa-=aFyykw4~F}iPrI*K8vr+ptVug{9XqQutj2gB=O<*!=0*g^IUyB;}B{(JN2oxA8NwGQP03s)I^q|CcGWf>iyqGriTYxj>V~{a@A~=3pJ6+s4bgo%S$i~ z<#ia2`)vH8jo&~`WUvcj5G$Ny!b+Hx0Pz_h1c4h}^XYQa@ z@`p9xx;gtuRR0pF3D?AEY=ogW5Ve2_sBx#GcHnDtwIj2RjBXI}n;9SrszWSl;3C$l zsI6~~+Sk=E%LMSKbBM*C3D${Eaozhh1exnZ7x;y2iT-Jl`?J!Fkh<=&_*9)nu( zeAK`jP+NBr)8iY|3PW$2_E|8Jaxu(|4Q#oubvkMy8&M0mc++KOdWV2^;5F*Z{BD_Y zC~7BSQ1LuAUKnF3SF-Uw)*+~gk4Ak|&qMWJjC%c6p*|0`VQ$>*BBL$3i<=TgzdL5dF_@KdAo<9$#Ae~#Lr38-gdK5D17qIP%>YQh&W1wKGO zz5g$5#owqKhuk*_IpuB@Du87c!rvw z^U%E3Vd(zf|CS}=OS~@nVPn+8)fzR^$(Rvmqi(PTwZcQFm0iPv_y)CroR7>=l}4R) zbJS})9Q7>BL5;Ts-M{~zBBRgjN2rGWkB!k7O}RL_Cx$sFx5ffE4mF`2=#M|3j_4dl z<4p`guP1yHVi>C3Tq;W<-@237qBDxyfnWV zbwh3aPE@~h7>u5;%u2&h9%Q`Unuo{- z)v*|+!gAL7s3Yo#MX@+R!-jYWb>ocxn4?I<`ji);27Zp3K!x}Ey`I+*wSY6IEx(0X@HuLM zssGjM&G|=?Q6LZMbt{7TFdntCuGo$(T7YWzFZ>(b;&C-5Ud6xWY+n*|z^O(X`f*ow5f9MoTESDX$Cg!B2uB_zOn5;9z z4x(aL@&%}KVR73wH}Pe547K4+c7COP8?g@m#a#?Y@HK&-X>bHTqgQWA+wrPo3x*l zjk;E({Nx|erv<*WeWS>`_x~3fj3iwrwI(q^%p3F;^PnJf1E}hq!5C9mH&6e+0LtoTqLEVJRWl~nNMupt^Znc zT=cI*d^xdcHm>iM^~7)DbK7SNGlbpF@LEFsX2q-!K;J+UbmjNzp3Rl$|j@ZV2w zCX$-OcZ&NeZH*!pNx#vI`KgUY&u{u8`n8+}YLgKVZz0?8pwu$3F> z{NXA~eu?V2E@KT+Ve%gI)x~#>lY>0pzRthYRV0OyblpQ&2U}2J9*x)G64LMFOOSNw z>sMDrJ7`twAJpGBRZeB{IT>sFN8{Nl_ix7wZTvp%rjUx6vRVH(1a^^55}ZY^5~Np@ zPuUT=S<7?dG2~m=!Df@sOgg$otkS|PqcIw7?a{nd-N0CZV zQ5;j)PEW}rl=aJq4`~-k*O$br+X<~O zAt#J>x-z?{I6$GfDgXDgBb{{J#6F|}6zZ%316LmeTe< zDVB0$;&Ie3z`?|RB)@^wnsOp(BC(pJaPqpA;w8QRy~yOY!8SOHMju~oiTzBhE5UE@ zJKOd*@`s3Jz(!cbcG_g?zq947l#7xANY_a1Nrgxk=+{rbu^c4TBK<|MJXT>fc}e5R z>qj81-?1vO93(&T4M~y2C*bGAMvzZ|-gb;b#50kvLQGdK(mwJnNq5LUCVfIakqNBw zBb>p|UBQY*?CsPiJ0hVl=jv*d>p|KF<|bqRL7+T?X5lB$vF zQr@Wm*JSrk)_;UxE8FmdJE-6B&0o4I_OpYXw&uq%v@gembm{+dg04Vf_3()ut32&| z$RD-kK-#sTemLd7sf!`m=bzurZKGsjKTwf{a$1tF9Xu^DFPo={^M+KGG*p9dC6OAC zu2SwzzfR;!VkK;3+w3M^lvpp!$XIoVyS5V0^_moH8>$>cT1VN3hGp!H>(I6cX)N##hpY=5#&KH6-?K-%Xazu49- z()+KgjJ<&=nV*xW%VGoHe>9jv8%cSHtt2%gKb!v3NViA}N!^L7%eUlHU^JE^{Y3hg z^nw&ca^2>~ep=2^YpyN0f><#5>Zofmenq?>`GM{TuMx3J#2#W3V!zq=2a<_LQ}D$u zw3|qND*128mn2_@v_~g;lFVt+Eh^rUvavnWa3rZ29nw;cC*OlMx(XSbc9?^>u3@y( zwE@%9{==1*%mI==@pq(@v_C+qX8V1v@BhwJ{7H(k!Qbgn#^yE9V$vY$b)_Qyp8Sut zY@(bm@#Vxkxp{p|PkBC-nJCZ1^Q7ve1j-|*`->O~iFdc< zI&}7=TnHnGWudJfj>8XE73w#V;y;S5r*a2rtZj50ds6?9cCPFUrfVOm7-={a`AB}G z=afHOqsi=~gRa{2Nkh6wn`6YjBLz@yZ|l|OC3Q_nsYvrllSr3|ccRUU|JTmtyrxi# zifx#aM!KRkxNVe~^53LSNJEJguxSZsWPmMn_;2AuMO9_8`{X+bVy}1Y8rhJanltv|O z{08OHq#cy!<5Yc|>WZ)pCgRs7CKFDk4H@zMtZ|prJG`ai8c0My-j@y>(HzBKMa^*?sy=Kmy zQY$&-)Ns$4ZKu~yzBRphh)ci{IWy{Hw&Z~) z2YM#IIX%ZadG+}M9?7pR#Dpg&K3wKAGyU_wl6$@w@0pzUbqep9&E8f?-v2hA=gi#i M>LxFL7oF<=08v*U9smFU diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index aeb0aec18..440d818eb 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-04 22:38+0000\n" -"PO-Revision-Date: 2021-12-07 12:22\n" +"POT-Creation-Date: 2021-12-07 17:35+0000\n" +"PO-Revision-Date: 2021-12-07 20:53\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:350 +#: bookwyrm/forms.py:351 msgid "A user with this email already exists." msgstr "Vartotojas su šiuo el. pašto adresu jau yra." -#: bookwyrm/forms.py:364 +#: bookwyrm/forms.py:365 msgid "One Day" msgstr "Diena" -#: bookwyrm/forms.py:365 +#: bookwyrm/forms.py:366 msgid "One Week" msgstr "Savaitė" -#: bookwyrm/forms.py:366 +#: bookwyrm/forms.py:367 msgid "One Month" msgstr "Mėnuo" -#: bookwyrm/forms.py:367 +#: bookwyrm/forms.py:368 msgid "Does Not Expire" msgstr "Galiojimas nesibaigia" -#: bookwyrm/forms.py:371 +#: bookwyrm/forms.py:372 #, python-brace-format msgid "{i} uses" msgstr "{i} naudoja" -#: bookwyrm/forms.py:372 +#: bookwyrm/forms.py:373 msgid "Unlimited" msgstr "Neribota" -#: bookwyrm/forms.py:468 +#: bookwyrm/forms.py:469 msgid "List Order" msgstr "Kaip pridėta į sąrašą" -#: bookwyrm/forms.py:469 +#: bookwyrm/forms.py:470 msgid "Book Title" msgstr "Knygos antraštė" -#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/forms.py:471 bookwyrm/templates/shelf/shelf.html:152 #: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Įvertinimas" -#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Rūšiuoti pagal" -#: bookwyrm/forms.py:476 +#: bookwyrm/forms.py:477 msgid "Ascending" msgstr "Didėjančia tvarka" -#: bookwyrm/forms.py:477 +#: bookwyrm/forms.py:478 msgid "Descending" msgstr "Mažėjančia tvarka" @@ -145,6 +145,7 @@ msgid "%(value)s is not a valid username" msgstr "%(value)s yra negaliojantis naudotojo vardas" #: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "naudotojo vardas" @@ -182,7 +183,7 @@ msgstr "Knygų siena" #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:88 +#: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Knygos" @@ -363,7 +364,11 @@ msgstr "„Librarything“ raktas:" msgid "Goodreads key:" msgstr "„Goodreads“ raktas:" -#: bookwyrm/templates/author/edit_author.html:108 +#: bookwyrm/templates/author/edit_author.html:105 +msgid "ISNI:" +msgstr "ISNI:" + +#: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -381,7 +386,7 @@ msgstr "„Goodreads“ raktas:" msgid "Save" msgstr "Išsaugoti" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 @@ -488,7 +493,7 @@ msgstr "Vietos" #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 -#: bookwyrm/templates/user/layout.html:82 +#: bookwyrm/templates/user/layout.html:85 msgid "Lists" msgstr "Sąrašai" @@ -899,6 +904,12 @@ msgstr "Pasiūlyta" #: bookwyrm/templates/directory/user_card.html:17 #: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:21 +#: bookwyrm/templates/ostatus/remote_follow.html:22 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:17 +#: bookwyrm/templates/ostatus/success.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1730,6 +1741,7 @@ msgstr "Prisijungti" #: bookwyrm/templates/landing/login.html:7 #: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "Prisijunkite" @@ -1738,18 +1750,20 @@ msgid "Success! Email address confirmed." msgstr "Džiugu, el. pašto adresas patvirtintas." #: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Naudotojo vardas:" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Slaptažodis:" #: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "Pamiršote slaptažodį?" @@ -1814,7 +1828,7 @@ msgstr "Atsijungti" msgid "Notifications" msgstr "Pranešimai" -#: bookwyrm/templates/layout.html:175 +#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "slaptažodis" @@ -2206,6 +2220,120 @@ msgstr "Paminėjimai" msgid "You're all caught up!" msgstr "Viską peržiūrėjote!" +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "%(account)s vardas negalioja" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "Prieš bandydami dar kartą, patikrinkite, ar naudotojo vardas teisingas" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "%(account)s nerastas arba %(remote_domain)s nepalaiko identiteto tikrinimo" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "%(account)s rastas, bet %(remote_domain)s nepalaiko „nuotolinio sekimo“" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "Geriau bandykite paieškoti %(user)s, %(remote_domain)s" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "Įvyko klaida, bandant sekti %(account)s" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "Prieš bandydami dar kartą, patikrinkite, ar turite teisingą naudotojo vardą." + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "Užblokavote %(account)s" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "%(account)s jus užblokavo" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "Jau sekate %(account)s" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "Jau paprašėte leidimo sekti %(account)s" + +#: bookwyrm/templates/ostatus/remote_follow.html:6 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "Sekite %(username)s „Fediverse“" + +#: bookwyrm/templates/ostatus/remote_follow.html:33 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "Sekite %(username)s iš kitos „Fediverse“ paskyros, pavyzdžiui, „BookWyrm“, „Mastodon“ arba „Pleroma“." + +#: bookwyrm/templates/ostatus/remote_follow.html:40 +msgid "User handle to follow from:" +msgstr "Pasirinkite slapyvardį, kuriuo norėtumėte sekti:" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "Follow!" +msgstr "Sekti!" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:8 +msgid "Follow on Fediverse" +msgstr "Sekti „Fediverse“" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:12 +msgid "This link opens in a pop-up window" +msgstr "Ši nuoroda atsidaro kitame langelyje" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "Prisijunkite į %(sitename)s" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "Klaida, sekant iš %(sitename)s" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "Sekite iš %(sitename)s" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "Ak..." + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "Pirmiausia prisijunkite..." + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "Sekite %(username)s" + +#: bookwyrm/templates/ostatus/success.html:28 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "Dabar sekate %(display_name)s!" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/layout.html:31 @@ -2637,7 +2765,7 @@ msgid "Details" msgstr "Išsami informacija" #: bookwyrm/templates/settings/federation/instance.html:35 -#: bookwyrm/templates/user/layout.html:64 +#: bookwyrm/templates/user/layout.html:67 msgid "Activity" msgstr "Veikla" @@ -3880,15 +4008,15 @@ msgstr "Sukurti grupę" msgid "User Profile" msgstr "Naudotojo paskyra" -#: bookwyrm/templates/user/layout.html:45 +#: bookwyrm/templates/user/layout.html:48 msgid "Follow Requests" msgstr "Sekti prašymus" -#: bookwyrm/templates/user/layout.html:70 +#: bookwyrm/templates/user/layout.html:73 msgid "Reading Goal" msgstr "Skaitymo tikslas" -#: bookwyrm/templates/user/layout.html:76 +#: bookwyrm/templates/user/layout.html:79 msgid "Groups" msgstr "Grupės" diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo index f9c760e99d5b5328b7bafef79ac3ef816b6635e0..9bcb242a411a83260b75778d7be82d7e7d0aad82 100644 GIT binary patch delta 21256 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 HmxcZZm}Je) delta 18692 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 diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index 9034de1c1..4e688ee1a 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-04 22:38+0000\n" -"PO-Revision-Date: 2021-12-05 14:06\n" +"POT-Creation-Date: 2021-12-07 17:35+0000\n" +"PO-Revision-Date: 2021-12-07 20:54\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:350 +#: bookwyrm/forms.py:351 msgid "A user with this email already exists." msgstr "Já existe um usuário com este endereço de e-mail." -#: bookwyrm/forms.py:364 +#: bookwyrm/forms.py:365 msgid "One Day" msgstr "Um dia" -#: bookwyrm/forms.py:365 +#: bookwyrm/forms.py:366 msgid "One Week" msgstr "Uma semana" -#: bookwyrm/forms.py:366 +#: bookwyrm/forms.py:367 msgid "One Month" msgstr "Um mês" -#: bookwyrm/forms.py:367 +#: bookwyrm/forms.py:368 msgid "Does Not Expire" msgstr "Não expira" -#: bookwyrm/forms.py:371 +#: bookwyrm/forms.py:372 #, python-brace-format msgid "{i} uses" msgstr "{i} usos" -#: bookwyrm/forms.py:372 +#: bookwyrm/forms.py:373 msgid "Unlimited" msgstr "Ilimitado" -#: bookwyrm/forms.py:468 +#: bookwyrm/forms.py:469 msgid "List Order" msgstr "Ordem de inserção" -#: bookwyrm/forms.py:469 +#: bookwyrm/forms.py:470 msgid "Book Title" msgstr "Título do livro" -#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/forms.py:471 bookwyrm/templates/shelf/shelf.html:152 #: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "Avaliação" -#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "Organizar por" -#: bookwyrm/forms.py:476 +#: bookwyrm/forms.py:477 msgid "Ascending" msgstr "Crescente" -#: bookwyrm/forms.py:477 +#: bookwyrm/forms.py:478 msgid "Descending" msgstr "Decrescente" @@ -145,6 +145,7 @@ msgid "%(value)s is not a valid username" msgstr "%(value)s não é um nome de usuário válido" #: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "nome de usuário" @@ -182,7 +183,7 @@ msgstr "Linha do tempo dos livros" #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:88 +#: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "Livros" @@ -363,7 +364,11 @@ msgstr "Chave Librarything:" msgid "Goodreads key:" msgstr "Chave Goodreads:" -#: bookwyrm/templates/author/edit_author.html:108 +#: bookwyrm/templates/author/edit_author.html:105 +msgid "ISNI:" +msgstr "ISNI:" + +#: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -381,7 +386,7 @@ msgstr "Chave Goodreads:" msgid "Save" msgstr "Salvar" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 @@ -439,7 +444,7 @@ msgstr "%(count)s edições" #: bookwyrm/templates/book/book.html:158 msgid "You have shelved this edition in:" -msgstr "Você acabou esta edição em:" +msgstr "Você colocou esta edição na estante em:" #: bookwyrm/templates/book/book.html:173 #, python-format @@ -486,7 +491,7 @@ msgstr "Lugares" #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 -#: bookwyrm/templates/user/layout.html:82 +#: bookwyrm/templates/user/layout.html:85 msgid "Lists" msgstr "Listas" @@ -647,11 +652,11 @@ msgstr "Adicionar autor/a" #: bookwyrm/templates/book/edit/edit_book_form.html:146 #: bookwyrm/templates/book/edit/edit_book_form.html:149 msgid "Jane Doe" -msgstr "Joana Sem-nome" +msgstr "Fulana" #: bookwyrm/templates/book/edit/edit_book_form.html:152 msgid "Add Another Author" -msgstr "Adicionar outro autor/a" +msgstr "Adicionar outro/a autor/a" #: bookwyrm/templates/book/edit/edit_book_form.html:160 #: bookwyrm/templates/shelf/shelf.html:143 @@ -869,7 +874,7 @@ msgstr "Listar seu perfil no diretório para que outros usuários da BookWyrm te #: bookwyrm/templates/directory/directory.html:21 msgid "Join Directory" -msgstr "Junte-se ao diretório publico" +msgstr "Junte-se ao diretório" #: bookwyrm/templates/directory/directory.html:24 #, python-format @@ -897,6 +902,12 @@ msgstr "Sugerido" #: bookwyrm/templates/directory/user_card.html:17 #: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:21 +#: bookwyrm/templates/ostatus/remote_follow.html:22 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:17 +#: bookwyrm/templates/ostatus/success.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1716,6 +1727,7 @@ msgstr "Entrar" #: bookwyrm/templates/landing/login.html:7 #: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "Entrar" @@ -1724,18 +1736,20 @@ msgid "Success! Email address confirmed." msgstr "Endereço de e-mail confirmado com sucesso." #: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Usuário:" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "Senha:" #: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "Esqueceu sua senha?" @@ -1800,7 +1814,7 @@ msgstr "Sair" msgid "Notifications" msgstr "Notificações" -#: bookwyrm/templates/layout.html:175 +#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "senha" @@ -2192,6 +2206,120 @@ msgstr "Menções" msgid "You're all caught up!" msgstr "Nenhuma notificação nova!" +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "%(account)s não é um nome de usuário válido" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "Verifique se o nome de usuário está correto antes de tentar novamente" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "%(account)s não pode ser encontrado(a) ou %(remote_domain)s não permite a descoberta de identidade" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "%(account)s foi encontrado(a) mas %(remote_domain)s não permite seguir remotamente" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "Em vez disso, tente procurar %(user)s em %(remote_domain)s" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "Algo deu errado ao tentar seguir %(account)s" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "Verifique se o nome de usuário está correto antes de tentar novamente." + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "Você bloqueou %(account)s" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "%(account)s te bloqueou" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "Você já está seguindo %(account)s" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "Você já pediu para seguir %(account)s" + +#: bookwyrm/templates/ostatus/remote_follow.html:6 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "Siga %(username)s no fediverso" + +#: bookwyrm/templates/ostatus/remote_follow.html:33 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "Siga %(username)s de outra conta no fediverso, como BookWyrm, Mastodon ou Pleroma." + +#: bookwyrm/templates/ostatus/remote_follow.html:40 +msgid "User handle to follow from:" +msgstr "Seu nome de usuário:" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "Follow!" +msgstr "Seguir!" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:8 +msgid "Follow on Fediverse" +msgstr "Seguir no fediverso" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:12 +msgid "This link opens in a pop-up window" +msgstr "Este link abrirá em uma janela pop-up" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "Entrar em %(sitename)s" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "Erro ao seguir de %(sitename)s" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "Seguir de %(sitename)s" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "Ah não..." + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "Vamos entrar primeiro..." + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "Seguir %(username)s" + +#: bookwyrm/templates/ostatus/success.html:28 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "Agora você está seguindo %(display_name)s!" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/layout.html:31 @@ -2253,15 +2381,15 @@ msgstr "Privacidade" #: bookwyrm/templates/preferences/edit_user.html:69 msgid "Show reading goal prompt in feed" -msgstr "Mostrar sugestão de meta de leitura na linha de tempo" +msgstr "Mostrar sugestão de meta de leitura na linha do tempo" #: bookwyrm/templates/preferences/edit_user.html:75 msgid "Show suggested users" -msgstr "Mostrar usuários sugeridos" +msgstr "Mostrar sugestões de usuários" #: bookwyrm/templates/preferences/edit_user.html:81 msgid "Show this account in suggested users" -msgstr "Mostrar esta conta nos usuários sugeridos" +msgstr "Mostrar conta nas sugestões de usuários" #: bookwyrm/templates/preferences/edit_user.html:85 #, python-format @@ -2274,7 +2402,7 @@ msgstr "Fuso horário preferido: " #: bookwyrm/templates/preferences/edit_user.html:111 msgid "Manually approve followers" -msgstr "Aprovar manualmente seguidores" +msgstr "Aprovar seguidores manualmente" #: bookwyrm/templates/preferences/edit_user.html:116 msgid "Default post privacy:" @@ -2617,7 +2745,7 @@ msgid "Details" msgstr "Detalhes" #: bookwyrm/templates/settings/federation/instance.html:35 -#: bookwyrm/templates/user/layout.html:64 +#: bookwyrm/templates/user/layout.html:67 msgid "Activity" msgstr "Atividade" @@ -2695,7 +2823,7 @@ msgstr "Sucesso!" #: bookwyrm/templates/settings/federation/instance_blocklist.html:30 msgid "Successfully blocked:" -msgstr "Bloqueada co msucesso:" +msgstr "Bloqueada com sucesso:" #: bookwyrm/templates/settings/federation/instance_blocklist.html:32 msgid "Failed:" @@ -3846,15 +3974,15 @@ msgstr "Criar grupo" msgid "User Profile" msgstr "Perfil do usuário" -#: bookwyrm/templates/user/layout.html:45 +#: bookwyrm/templates/user/layout.html:48 msgid "Follow Requests" msgstr "Solicitações para seguir" -#: bookwyrm/templates/user/layout.html:70 +#: bookwyrm/templates/user/layout.html:73 msgid "Reading Goal" msgstr "Meta de leitura" -#: bookwyrm/templates/user/layout.html:76 +#: bookwyrm/templates/user/layout.html:79 msgid "Groups" msgstr "Grupos" diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index 47795aa3b107ed7785d2d54e1f7437c77220fe7a..ba086077e417e980b749737ac8ee853fcf888a89 100644 GIT binary patch delta 22 ecmbPyhI#TC<_({wvYRUyT38vGZ2mb_DgXd(wFwRY delta 22 ecmbPyhI#TC<_({wvYRLv8C#i}ZT>k`DgXd(j|mI_ diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 203ce2098..4e5b8797e 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-04 22:38+0000\n" -"PO-Revision-Date: 2021-12-04 23:56\n" +"POT-Creation-Date: 2021-12-07 17:35+0000\n" +"PO-Revision-Date: 2021-12-07 18:24\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:350 +#: bookwyrm/forms.py:351 msgid "A user with this email already exists." msgstr "已经存在使用该邮箱的用户。" -#: bookwyrm/forms.py:364 +#: bookwyrm/forms.py:365 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:365 +#: bookwyrm/forms.py:366 msgid "One Week" msgstr "一周" -#: bookwyrm/forms.py:366 +#: bookwyrm/forms.py:367 msgid "One Month" msgstr "一个月" -#: bookwyrm/forms.py:367 +#: bookwyrm/forms.py:368 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:371 +#: bookwyrm/forms.py:372 #, python-brace-format msgid "{i} uses" msgstr "{i} 次使用" -#: bookwyrm/forms.py:372 +#: bookwyrm/forms.py:373 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:468 +#: bookwyrm/forms.py:469 msgid "List Order" msgstr "列表顺序" -#: bookwyrm/forms.py:469 +#: bookwyrm/forms.py:470 msgid "Book Title" msgstr "书名" -#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/forms.py:471 bookwyrm/templates/shelf/shelf.html:152 #: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "评价" -#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:476 +#: bookwyrm/forms.py:477 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:477 +#: bookwyrm/forms.py:478 msgid "Descending" msgstr "降序" @@ -145,6 +145,7 @@ msgid "%(value)s is not a valid username" msgstr "%(value)s 不是有效的用户名" #: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "用户名" @@ -182,7 +183,7 @@ msgstr "书目时间线" #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:88 +#: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "书目" @@ -363,7 +364,11 @@ msgstr "Librarything key:" msgid "Goodreads key:" msgstr "Goodreads key:" -#: bookwyrm/templates/author/edit_author.html:108 +#: bookwyrm/templates/author/edit_author.html:105 +msgid "ISNI:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -381,7 +386,7 @@ msgstr "Goodreads key:" msgid "Save" msgstr "保存" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 @@ -485,7 +490,7 @@ msgstr "地点" #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 -#: bookwyrm/templates/user/layout.html:82 +#: bookwyrm/templates/user/layout.html:85 msgid "Lists" msgstr "列表" @@ -896,6 +901,12 @@ msgstr "受推荐" #: bookwyrm/templates/directory/user_card.html:17 #: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:21 +#: bookwyrm/templates/ostatus/remote_follow.html:22 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:17 +#: bookwyrm/templates/ostatus/success.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1709,6 +1720,7 @@ msgstr "登录" #: bookwyrm/templates/landing/login.html:7 #: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "登录" @@ -1717,18 +1729,20 @@ msgid "Success! Email address confirmed." msgstr "成功！邮箱地址已确认。" #: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "用户名:" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "密码:" #: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "忘记了密码？" @@ -1793,7 +1807,7 @@ msgstr "登出" msgid "Notifications" msgstr "通知" -#: bookwyrm/templates/layout.html:175 +#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "密码" @@ -2185,6 +2199,120 @@ msgstr "提及" msgid "You're all caught up!" msgstr "你什么也没错过！" +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:6 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:33 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:40 +msgid "User handle to follow from:" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "Follow!" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:8 +msgid "Follow on Fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:12 +msgid "This link opens in a pop-up window" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "" + +#: bookwyrm/templates/ostatus/success.html:28 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/layout.html:31 @@ -2607,7 +2735,7 @@ msgid "Details" msgstr "详细" #: bookwyrm/templates/settings/federation/instance.html:35 -#: bookwyrm/templates/user/layout.html:64 +#: bookwyrm/templates/user/layout.html:67 msgid "Activity" msgstr "活动" @@ -3829,15 +3957,15 @@ msgstr "创建群组" msgid "User Profile" msgstr "用户个人资料" -#: bookwyrm/templates/user/layout.html:45 +#: bookwyrm/templates/user/layout.html:48 msgid "Follow Requests" msgstr "关注请求" -#: bookwyrm/templates/user/layout.html:70 +#: bookwyrm/templates/user/layout.html:73 msgid "Reading Goal" msgstr "阅读目标" -#: bookwyrm/templates/user/layout.html:76 +#: bookwyrm/templates/user/layout.html:79 msgid "Groups" msgstr "群组" diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo index 0e8092c9697d5895f6d0925600958af2903c42a0..9c41d921579b73785a96a8ad7af2d0c13618817a 100644 GIT binary patch delta 22 dcmdnLh-v>KrVYjk?B)uF7FI?ko2?R94FO#{2J`>` delta 22 dcmdnLh-v>KrVYjk>?R6E##W|go2?R94FO#h2J!#^ diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index a82e3cfef..b1408f93e 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-04 22:38+0000\n" -"PO-Revision-Date: 2021-12-04 23:56\n" +"POT-Creation-Date: 2021-12-07 17:35+0000\n" +"PO-Revision-Date: 2021-12-07 18:24\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -17,58 +17,58 @@ msgstr "" "X-Crowdin-File: /[bookwyrm-social.bookwyrm] main/locale/en_US/LC_MESSAGES/django.po\n" "X-Crowdin-File-ID: 1553\n" -#: bookwyrm/forms.py:350 +#: bookwyrm/forms.py:351 msgid "A user with this email already exists." msgstr "已經存在使用該郵箱的使用者。" -#: bookwyrm/forms.py:364 +#: bookwyrm/forms.py:365 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:365 +#: bookwyrm/forms.py:366 msgid "One Week" msgstr "一週" -#: bookwyrm/forms.py:366 +#: bookwyrm/forms.py:367 msgid "One Month" msgstr "一個月" -#: bookwyrm/forms.py:367 +#: bookwyrm/forms.py:368 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:371 +#: bookwyrm/forms.py:372 #, python-brace-format msgid "{i} uses" msgstr "" -#: bookwyrm/forms.py:372 +#: bookwyrm/forms.py:373 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:468 +#: bookwyrm/forms.py:469 msgid "List Order" msgstr "列表順序" -#: bookwyrm/forms.py:469 +#: bookwyrm/forms.py:470 msgid "Book Title" msgstr "書名" -#: bookwyrm/forms.py:470 bookwyrm/templates/shelf/shelf.html:152 +#: bookwyrm/forms.py:471 bookwyrm/templates/shelf/shelf.html:152 #: bookwyrm/templates/shelf/shelf.html:184 #: bookwyrm/templates/snippets/create_status/review.html:33 msgid "Rating" msgstr "評價" -#: bookwyrm/forms.py:472 bookwyrm/templates/lists/list.html:110 +#: bookwyrm/forms.py:473 bookwyrm/templates/lists/list.html:110 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:476 +#: bookwyrm/forms.py:477 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:477 +#: bookwyrm/forms.py:478 msgid "Descending" msgstr "降序" @@ -145,6 +145,7 @@ msgid "%(value)s is not a valid username" msgstr "%(value)s 不是有效的使用者名稱" #: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:171 +#: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "使用者名稱" @@ -182,7 +183,7 @@ msgstr "" #: bookwyrm/settings.py:119 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 -#: bookwyrm/templates/user/layout.html:88 +#: bookwyrm/templates/user/layout.html:91 msgid "Books" msgstr "書目" @@ -363,7 +364,11 @@ msgstr "Librarything key:" msgid "Goodreads key:" msgstr "Goodreads key:" -#: bookwyrm/templates/author/edit_author.html:108 +#: bookwyrm/templates/author/edit_author.html:105 +msgid "ISNI:" +msgstr "" + +#: bookwyrm/templates/author/edit_author.html:115 #: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit/edit_book.html:121 #: bookwyrm/templates/book/readthrough.html:76 @@ -381,7 +386,7 @@ msgstr "Goodreads key:" msgid "Save" msgstr "儲存" -#: bookwyrm/templates/author/edit_author.html:109 +#: bookwyrm/templates/author/edit_author.html:116 #: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:199 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit/edit_book.html:123 @@ -485,7 +490,7 @@ msgstr "地點" #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 -#: bookwyrm/templates/user/layout.html:82 +#: bookwyrm/templates/user/layout.html:85 msgid "Lists" msgstr "列表" @@ -896,6 +901,12 @@ msgstr "受推薦" #: bookwyrm/templates/directory/user_card.html:17 #: bookwyrm/templates/directory/user_card.html:18 +#: bookwyrm/templates/ostatus/remote_follow.html:21 +#: bookwyrm/templates/ostatus/remote_follow.html:22 +#: bookwyrm/templates/ostatus/subscribe.html:41 +#: bookwyrm/templates/ostatus/subscribe.html:42 +#: bookwyrm/templates/ostatus/success.html:17 +#: bookwyrm/templates/ostatus/success.html:18 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1709,6 +1720,7 @@ msgstr "登入" #: bookwyrm/templates/landing/login.html:7 #: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "登入" @@ -1717,18 +1729,20 @@ msgid "Success! Email address confirmed." msgstr "" #: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:170 +#: bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "使用者名稱:" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 -#: bookwyrm/templates/layout.html:174 +#: bookwyrm/templates/layout.html:174 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/snippets/register_form.html:20 msgid "Password:" msgstr "密碼:" #: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:176 +#: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "忘記了密碼？" @@ -1793,7 +1807,7 @@ msgstr "登出" msgid "Notifications" msgstr "通知" -#: bookwyrm/templates/layout.html:175 +#: bookwyrm/templates/layout.html:175 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "密碼" @@ -2185,6 +2199,120 @@ msgstr "提及" msgid "You're all caught up!" msgstr "你什麼也沒錯過！" +#: bookwyrm/templates/ostatus/error.html:7 +#, python-format +msgid "%(account)s is not a valid username" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:8 +#: bookwyrm/templates/ostatus/error.html:13 +msgid "Check you have the correct username before trying again" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:12 +#, python-format +msgid "%(account)s could not be found or %(remote_domain)s does not support identity discovery" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:17 +#, python-format +msgid "%(account)s was found but %(remote_domain)s does not support 'remote follow'" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:18 +#, python-format +msgid "Try searching for %(user)s on %(remote_domain)s instead" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:46 +#, python-format +msgid "Something went wrong trying to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:47 +msgid "Check you have the correct username before trying again." +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:51 +#, python-format +msgid "You have blocked %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:55 +#, python-format +msgid "%(account)s has blocked you" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:59 +#, python-format +msgid "You are already following %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/error.html:63 +#, python-format +msgid "You have already requested to follow %(account)s" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:6 +#, python-format +msgid "Follow %(username)s on the fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:33 +#, python-format +msgid "Follow %(username)s from another Fediverse account like BookWyrm, Mastodon, or Pleroma." +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:40 +msgid "User handle to follow from:" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow.html:42 +msgid "Follow!" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:8 +msgid "Follow on Fediverse" +msgstr "" + +#: bookwyrm/templates/ostatus/remote_follow_button.html:12 +msgid "This link opens in a pop-up window" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:8 +#, python-format +msgid "Log in to %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:10 +#, python-format +msgid "Error following from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:12 +#: bookwyrm/templates/ostatus/subscribe.html:22 +#, python-format +msgid "Follow from %(sitename)s" +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:18 +msgid "Uh oh..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:20 +msgid "Let's log in first..." +msgstr "" + +#: bookwyrm/templates/ostatus/subscribe.html:51 +#, python-format +msgid "Follow %(username)s" +msgstr "" + +#: bookwyrm/templates/ostatus/success.html:28 +#, python-format +msgid "You are now following %(display_name)s!" +msgstr "" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 #: bookwyrm/templates/preferences/layout.html:31 @@ -2607,7 +2735,7 @@ msgid "Details" msgstr "詳細" #: bookwyrm/templates/settings/federation/instance.html:35 -#: bookwyrm/templates/user/layout.html:64 +#: bookwyrm/templates/user/layout.html:67 msgid "Activity" msgstr "活動" @@ -3829,15 +3957,15 @@ msgstr "" msgid "User Profile" msgstr "使用者使用者資料" -#: bookwyrm/templates/user/layout.html:45 +#: bookwyrm/templates/user/layout.html:48 msgid "Follow Requests" msgstr "關注請求" -#: bookwyrm/templates/user/layout.html:70 +#: bookwyrm/templates/user/layout.html:73 msgid "Reading Goal" msgstr "閱讀目標" -#: bookwyrm/templates/user/layout.html:76 +#: bookwyrm/templates/user/layout.html:79 msgid "Groups" msgstr ""