diff --git a/README.md b/README.md index cf40d284d..558d42d45 100644 --- a/README.md +++ b/README.md @@ -1,60 +1,45 @@ # BookWyrm -Social reading and reviewing, decentralized with ActivityPub +[![](https://img.shields.io/github/release/bookwyrm-social/bookwyrm.svg?colorB=58839b)](https://github.com/bookwyrm-social/bookwyrm/releases) +[![Run Python Tests](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/django-tests.yml/badge.svg)](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/django-tests.yml) +[![Pylint](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/pylint.yml/badge.svg)](https://github.com/bookwyrm-social/bookwyrm/actions/workflows/pylint.yml) -## Contents -- [Joining BookWyrm](#joining-bookwyrm) -- [Contributing](#contributing) -- [About BookWyrm](#about-bookwyrm) - - [What it is and isn't](#what-it-is-and-isnt) - - [The role of federation](#the-role-of-federation) - - [Features](#features) -- [Set up BookWyrm](#set-up-bookwyrm) - -## Joining BookWyrm -If you'd like to join an instance, you can check out the [instances](https://joinbookwyrm.com/instances/) list. +BookWyrm is a social network for tracking your reading, talking about books, writing reviews, and discovering what to read next. Federation allows BookWyrm users to join small, trusted communities that can connect with one another, and with other ActivityPub services like [Mastodon](https://joinmastodon.org/) and [Pleroma](http://pleroma.social/). -## Contributing -See [contributing](https://docs.joinbookwyrm.com/contributing.html) for code, translation or monetary contributions. +## Links + +[![Mastodon Follow](https://img.shields.io/mastodon/follow/000146121?domain=https%3A%2F%2Ftech.lgbt&style=social)](https://tech.lgbt/@bookwyrm) +[![Twitter Follow](https://img.shields.io/twitter/follow/BookWyrmSocial?style=social)](https://twitter.com/BookWyrmSocial) + + - [Project homepage](https://joinbookwyrm.com/) + - [Support](https://patreon.com/bookwyrm) + - [Documentation](https://docs.joinbookwyrm.com/) + ## About BookWyrm -### What it is and isn't BookWyrm is a platform for social reading. You can use it to track what you're reading, review books, and follow your friends. It isn't primarily meant for cataloguing or as a data-source for books, but it does do both of those things to some degree. -### The role of federation +## Federation BookWyrm is built on [ActivityPub](http://activitypub.rocks/). With ActivityPub, it inter-operates with different instances of BookWyrm, and other ActivityPub compliant services, like Mastodon. This means you can run an instance for your book club, and still follow your friend who posts on a server devoted to 20th century Russian speculative fiction. It also means that your friend on mastodon can read and comment on a book review that you post on your BookWyrm instance. Federation makes it possible to have small, self-determining communities, in contrast to the monolithic service you find on GoodReads or Twitter. An instance can be focused on a particular interest, be just for a group of friends, or anything else that brings people together. Each community can choose which other instances they want to federate with, and moderate and run their community autonomously. Check out https://runyourown.social/ to get a sense of the philosophy and logistics behind small, high-trust social networks. -### Features -Since the project is still in its early stages, the features are growing every day, and there is plenty of room for suggestions and ideas. Open an [issue](https://github.com/bookwyrm-social/bookwyrm/issues) to get the conversation going! -- Posting about books - - Compose reviews, with or without ratings, which are aggregated in the book page - - Compose other kinds of statuses about books, such as: - - Comments on a book - - Quotes or excerpts - - Reply to statuses - - View aggregate reviews of a book across connected BookWyrm instances - - Differentiate local and federated reviews and rating in your activity feed -- Track reading activity - - Shelve books on default "to-read," "currently reading," and "read" shelves - - Create custom shelves - - Store started reading/finished reading dates, as well as progress updates along the way - - Update followers about reading activity (optionally, and with granular privacy controls) - - Create lists of books which can be open to submissions from anyone, curated, or only edited by the creator -- Federation with ActivityPub - - Broadcast and receive user statuses and activity - - Share book data between instances to create a networked database of metadata - - Identify shared books across instances and aggregate related content - - Follow and interact with users across BookWyrm instances - - Inter-operate with non-BookWyrm ActivityPub services (currently, Mastodon is supported) -- Granular privacy controls - - Private, followers-only, and public privacy levels for posting, shelves, and lists - - Option for users to manually approve followers - - Allow blocking and flagging for moderation +## Features -### The Tech Stack +### Post about books +Compose reviews, comment on what you're reading, and post quotes from books. You can converse with other BookWyrm users across the network about what they're reading. + +### Track reading activity +Keep track of what books you've read, and what books you'd like to read in the future. + +### Federation with ActivityPub +Federation allows you to interact with users on other instances and services, and also shares metadata about books and authors, which collaboratively builds a decentralized database of books. + +### Privacy and moderation +Users and administrators can control who can see thier posts and what other instances to federate with. + +## Tech Stack Web backend - [Django](https://www.djangoproject.com/) web server - [PostgreSQL](https://www.postgresql.org/) database diff --git a/bookwyrm/connectors/connector_manager.py b/bookwyrm/connectors/connector_manager.py index 37b093aa9..385880e5a 100644 --- a/bookwyrm/connectors/connector_manager.py +++ b/bookwyrm/connectors/connector_manager.py @@ -53,7 +53,7 @@ async def get_results(session, url, min_confidence, query, connector): except asyncio.TimeoutError: logger.info("Connection timed out for url: %s", url) except aiohttp.ClientError as err: - logger.exception(err) + logger.info(err) async def async_connector_search(query, items, min_confidence): diff --git a/bookwyrm/forms/edit_user.py b/bookwyrm/forms/edit_user.py index d609f15dc..a291c6441 100644 --- a/bookwyrm/forms/edit_user.py +++ b/bookwyrm/forms/edit_user.py @@ -1,5 +1,8 @@ """ using django model forms """ from django import forms +from django.contrib.auth.password_validation import validate_password +from django.core.exceptions import ValidationError +from django.utils.translation import gettext_lazy as _ from bookwyrm import models from bookwyrm.models.fields import ClearableFileInputWithWarning @@ -66,3 +69,33 @@ class DeleteUserForm(CustomForm): class Meta: model = models.User fields = ["password"] + + +class ChangePasswordForm(CustomForm): + current_password = forms.CharField(widget=forms.PasswordInput) + confirm_password = forms.CharField(widget=forms.PasswordInput) + + class Meta: + model = models.User + fields = ["password"] + widgets = { + "password": forms.PasswordInput(), + } + + def clean(self): + """Make sure passwords match and are valid""" + current_password = self.data.get("current_password") + if not self.instance.check_password(current_password): + self.add_error("current_password", _("Incorrect password")) + + cleaned_data = super().clean() + new_password = cleaned_data.get("password") + confirm_password = self.data.get("confirm_password") + + if new_password != confirm_password: + self.add_error("confirm_password", _("Password does not match")) + + try: + validate_password(new_password) + except ValidationError as err: + self.add_error("password", err) diff --git a/bookwyrm/forms/landing.py b/bookwyrm/forms/landing.py index b01c2cc98..a31e8a7c4 100644 --- a/bookwyrm/forms/landing.py +++ b/bookwyrm/forms/landing.py @@ -1,5 +1,7 @@ """ Forms for the landing pages """ -from django.forms import PasswordInput +from django import forms +from django.contrib.auth.password_validation import validate_password +from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ from bookwyrm import models @@ -13,7 +15,7 @@ class LoginForm(CustomForm): fields = ["localname", "password"] help_texts = {f: None for f in fields} widgets = { - "password": PasswordInput(), + "password": forms.PasswordInput(), } @@ -22,12 +24,16 @@ class RegisterForm(CustomForm): model = models.User fields = ["localname", "email", "password"] help_texts = {f: None for f in fields} - widgets = {"password": PasswordInput()} + widgets = {"password": forms.PasswordInput()} def clean(self): """Check if the username is taken""" cleaned_data = super().clean() localname = cleaned_data.get("localname").strip() + try: + validate_password(cleaned_data.get("password")) + except ValidationError as err: + self.add_error("password", err) if models.User.objects.filter(localname=localname).first(): self.add_error("localname", _("User with this username already exists")) @@ -43,3 +49,28 @@ class InviteRequestForm(CustomForm): class Meta: model = models.InviteRequest fields = ["email", "answer"] + + +class PasswordResetForm(CustomForm): + confirm_password = forms.CharField(widget=forms.PasswordInput) + + class Meta: + model = models.User + fields = ["password"] + widgets = { + "password": forms.PasswordInput(), + } + + def clean(self): + """Make sure the passwords match and are valid""" + cleaned_data = super().clean() + new_password = cleaned_data.get("password") + confirm_password = self.data.get("confirm_password") + + if new_password != confirm_password: + self.add_error("confirm_password", _("Password does not match")) + + try: + validate_password(new_password) + except ValidationError as err: + self.add_error("password", err) diff --git a/bookwyrm/models/notification.py b/bookwyrm/models/notification.py index 921174924..b0b75a169 100644 --- a/bookwyrm/models/notification.py +++ b/bookwyrm/models/notification.py @@ -300,8 +300,10 @@ def notify_user_on_follow(sender, instance, created, *args, **kwargs): notification.read = False notification.save() else: + # Only group unread follows Notification.notify( instance.user_object, instance.user_subject, notification_type=Notification.FOLLOW, + read=False, ) diff --git a/bookwyrm/templates/confirm_email/resend_modal.html b/bookwyrm/templates/confirm_email/resend_modal.html index beb9318a9..4d155cbb6 100644 --- a/bookwyrm/templates/confirm_email/resend_modal.html +++ b/bookwyrm/templates/confirm_email/resend_modal.html @@ -19,16 +19,8 @@ name="email" class="input" id="email" - aria-described-by="id_email_errors" required > - {% if error %} -
-

- {% trans "No user matching this email address found." %} -

-
- {% endif %} {% endblock %} diff --git a/bookwyrm/templates/landing/password_reset.html b/bookwyrm/templates/landing/password_reset.html index 8348efd4f..786eaa0ab 100644 --- a/bookwyrm/templates/landing/password_reset.html +++ b/bookwyrm/templates/landing/password_reset.html @@ -26,7 +26,16 @@ {% trans "Password:" %}
- + + {% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_password" %}
@@ -34,7 +43,8 @@ {% trans "Confirm password:" %}
- + {{ form.confirm_password }} + {% include 'snippets/form_errors.html' with errors_list=form.confirm_password.errors id="desc_confirm_password" %}
diff --git a/bookwyrm/templates/notifications/items/layout.html b/bookwyrm/templates/notifications/items/layout.html index 3830e7e40..8acbb9fec 100644 --- a/bookwyrm/templates/notifications/items/layout.html +++ b/bookwyrm/templates/notifications/items/layout.html @@ -2,7 +2,7 @@ {% load humanize %} {% related_status notification as related_status %} -{% with related_users=notification.related_users.all.distinct %} +{% get_related_users notification as related_users %} {% with related_user_count=notification.related_users.count %}
@@ -16,7 +16,7 @@ {% if related_user_count > 1 %}
{% endwith %} -{% endwith %} diff --git a/bookwyrm/templates/preferences/change_password.html b/bookwyrm/templates/preferences/change_password.html index 563bdee4d..3b816779d 100644 --- a/bookwyrm/templates/preferences/change_password.html +++ b/bookwyrm/templates/preferences/change_password.html @@ -8,15 +8,31 @@ {% endblock %} {% block panel %} +{% if success %} +
+ + + {% trans "Successfully changed password" %} + +
+{% endif %}
{% csrf_token %} +
+ + {{ form.current_password }} + {% include 'snippets/form_errors.html' with errors_list=form.current_password.errors id="desc_current_password" %} +
+
- + {{ form.password }} + {% include 'snippets/form_errors.html' with errors_list=form.password.errors id="desc_current_password" %}
- + {{ form.confirm_password }} + {% include 'snippets/form_errors.html' with errors_list=form.confirm_password.errors id="desc_confirm_password" %}
diff --git a/bookwyrm/templates/preferences/export.html b/bookwyrm/templates/preferences/export.html index 865051442..61933be3e 100644 --- a/bookwyrm/templates/preferences/export.html +++ b/bookwyrm/templates/preferences/export.html @@ -13,10 +13,13 @@ {% trans "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." %}

- - - Download file - +

+ {% csrf_token %} + +

{% endblock %} diff --git a/bookwyrm/templatetags/notification_page_tags.py b/bookwyrm/templatetags/notification_page_tags.py index 28fa2afb5..7a365e689 100644 --- a/bookwyrm/templatetags/notification_page_tags.py +++ b/bookwyrm/templatetags/notification_page_tags.py @@ -12,3 +12,9 @@ def related_status(notification): if not notification.related_status: return None return load_subclass(notification.related_status) + + +@register.simple_tag(takes_context=False) +def get_related_users(notification): + """Who actually was it who liked your post""" + return list(reversed(list(notification.related_users.distinct())))[:10] diff --git a/bookwyrm/tests/views/landing/test_password.py b/bookwyrm/tests/views/landing/test_password.py index b1f7e59f0..c7c7e05d5 100644 --- a/bookwyrm/tests/views/landing/test_password.py +++ b/bookwyrm/tests/views/landing/test_password.py @@ -104,7 +104,9 @@ class PasswordViews(TestCase): """reset from code""" view = views.PasswordReset.as_view() code = models.PasswordReset.objects.create(user=self.local_user) - request = self.factory.post("", {"password": "hi", "confirm-password": "hi"}) + request = self.factory.post( + "", {"password": "longwordsecure", "confirm_password": "longwordsecure"} + ) with patch("bookwyrm.views.landing.password.login"): resp = view(request, code.code) self.assertEqual(resp.status_code, 302) @@ -114,7 +116,9 @@ class PasswordViews(TestCase): """reset from code""" view = views.PasswordReset.as_view() models.PasswordReset.objects.create(user=self.local_user) - request = self.factory.post("", {"password": "hi", "confirm-password": "hi"}) + request = self.factory.post( + "", {"password": "longwordsecure", "confirm_password": "longwordsecure"} + ) resp = view(request, "jhgdkfjgdf") validate_html(resp.render()) self.assertTrue(models.PasswordReset.objects.exists()) @@ -123,7 +127,18 @@ class PasswordViews(TestCase): """reset from code""" view = views.PasswordReset.as_view() code = models.PasswordReset.objects.create(user=self.local_user) - request = self.factory.post("", {"password": "hi", "confirm-password": "hihi"}) + request = self.factory.post( + "", {"password": "longwordsecure", "confirm_password": "hihi"} + ) + resp = view(request, code.code) + validate_html(resp.render()) + self.assertTrue(models.PasswordReset.objects.exists()) + + def test_password_reset_invalid(self): + """reset from code""" + view = views.PasswordReset.as_view() + code = models.PasswordReset.objects.create(user=self.local_user) + request = self.factory.post("", {"password": "a", "confirm_password": "a"}) resp = view(request, code.code) validate_html(resp.render()) self.assertTrue(models.PasswordReset.objects.exists()) diff --git a/bookwyrm/tests/views/landing/test_register.py b/bookwyrm/tests/views/landing/test_register.py index 24360a646..aa1ca7fb9 100644 --- a/bookwyrm/tests/views/landing/test_register.py +++ b/bookwyrm/tests/views/landing/test_register.py @@ -122,6 +122,17 @@ class RegisterViews(TestCase): self.assertEqual(models.User.objects.count(), 1) validate_html(response.render()) + def test_register_invalid_password(self, *_): + """gotta have an email""" + view = views.Register.as_view() + self.assertEqual(models.User.objects.count(), 1) + request = self.factory.post( + "register/", {"localname": "nutria", "password": "password", "email": "aa"} + ) + response = view(request) + self.assertEqual(models.User.objects.count(), 1) + validate_html(response.render()) + def test_register_error_and_invite(self, *_): """redirect to the invite page""" view = views.Register.as_view() diff --git a/bookwyrm/tests/views/preferences/test_change_password.py b/bookwyrm/tests/views/preferences/test_change_password.py index 61837c4e1..879ffd03d 100644 --- a/bookwyrm/tests/views/preferences/test_change_password.py +++ b/bookwyrm/tests/views/preferences/test_change_password.py @@ -42,17 +42,71 @@ class ChangePasswordViews(TestCase): """change password""" view = views.ChangePassword.as_view() password_hash = self.local_user.password - request = self.factory.post("", {"password": "hi", "confirm-password": "hi"}) + request = self.factory.post( + "", + { + "current_password": "password", + "password": "longwordsecure", + "confirm_password": "longwordsecure", + }, + ) request.user = self.local_user with patch("bookwyrm.views.preferences.change_password.login"): - view(request) + result = view(request) + validate_html(result.render()) + self.local_user.refresh_from_db() self.assertNotEqual(self.local_user.password, password_hash) + def test_password_change_wrong_current(self): + """change password""" + view = views.ChangePassword.as_view() + password_hash = self.local_user.password + request = self.factory.post( + "", + { + "current_password": "not my password", + "password": "longwordsecure", + "confirm_password": "hihi", + }, + ) + request.user = self.local_user + result = view(request) + validate_html(result.render()) + self.local_user.refresh_from_db() + self.assertEqual(self.local_user.password, password_hash) + def test_password_change_mismatch(self): """change password""" view = views.ChangePassword.as_view() password_hash = self.local_user.password - request = self.factory.post("", {"password": "hi", "confirm-password": "hihi"}) + request = self.factory.post( + "", + { + "current_password": "password", + "password": "longwordsecure", + "confirm_password": "hihi", + }, + ) request.user = self.local_user - view(request) + result = view(request) + validate_html(result.render()) + self.local_user.refresh_from_db() + self.assertEqual(self.local_user.password, password_hash) + + def test_password_change_invalid(self): + """change password""" + view = views.ChangePassword.as_view() + password_hash = self.local_user.password + request = self.factory.post( + "", + { + "current_password": "password", + "password": "hi", + "confirm_password": "hi", + }, + ) + request.user = self.local_user + result = view(request) + validate_html(result.render()) + self.local_user.refresh_from_db() self.assertEqual(self.local_user.password, password_hash) diff --git a/bookwyrm/tests/views/test_export.py b/bookwyrm/tests/views/preferences/test_export.py similarity index 96% rename from bookwyrm/tests/views/test_export.py rename to bookwyrm/tests/views/preferences/test_export.py index 44c324164..7b13989f3 100644 --- a/bookwyrm/tests/views/test_export.py +++ b/bookwyrm/tests/views/preferences/test_export.py @@ -54,9 +54,9 @@ class ExportViews(TestCase): user=self.local_user, book=self.book, ) - request = self.factory.get("") + request = self.factory.post("") request.user = self.local_user - export = views.export_user_book_data(request) + export = views.Export.as_view()(request) self.assertIsInstance(export, StreamingHttpResponse) self.assertEqual(export.status_code, 200) result = list(export.streaming_content) diff --git a/bookwyrm/tests/views/shelf/test_shelf_actions.py b/bookwyrm/tests/views/shelf/test_shelf_actions.py index 93ff0a38e..290232580 100644 --- a/bookwyrm/tests/views/shelf/test_shelf_actions.py +++ b/bookwyrm/tests/views/shelf/test_shelf_actions.py @@ -32,6 +32,14 @@ class ShelfActionViews(TestCase): localname="mouse", remote_id="https://example.com/users/mouse", ) + self.another_user = models.User.objects.create_user( + "rat@local.com", + "rat@rat.com", + "ratword", + local=True, + localname="rat", + remote_id="https://example.com/users/rat", + ) self.work = models.Work.objects.create(title="Test Work") self.book = models.Edition.objects.create( title="Example Edition", @@ -66,7 +74,7 @@ class ShelfActionViews(TestCase): def test_shelve_to_read(self, *_): """special behavior for the to-read shelf""" - shelf = models.Shelf.objects.get(identifier="to-read") + shelf = models.Shelf.objects.get(user=self.local_user, identifier="to-read") request = self.factory.post( "", {"book": self.book.id, "shelf": shelf.identifier} ) @@ -79,7 +87,7 @@ class ShelfActionViews(TestCase): def test_shelve_reading(self, *_): """special behavior for the reading shelf""" - shelf = models.Shelf.objects.get(identifier="reading") + shelf = models.Shelf.objects.get(user=self.local_user, identifier="reading") request = self.factory.post( "", {"book": self.book.id, "shelf": shelf.identifier} ) @@ -92,7 +100,7 @@ class ShelfActionViews(TestCase): def test_shelve_read(self, *_): """special behavior for the read shelf""" - shelf = models.Shelf.objects.get(identifier="read") + shelf = models.Shelf.objects.get(user=self.local_user, identifier="read") request = self.factory.post( "", {"book": self.book.id, "shelf": shelf.identifier} ) @@ -105,11 +113,13 @@ class ShelfActionViews(TestCase): def test_shelve_read_with_change_shelf(self, *_): """special behavior for the read shelf""" - previous_shelf = models.Shelf.objects.get(identifier="reading") + previous_shelf = models.Shelf.objects.get( + user=self.local_user, identifier="reading" + ) models.ShelfBook.objects.create( shelf=previous_shelf, user=self.local_user, book=self.book ) - shelf = models.Shelf.objects.get(identifier="read") + shelf = models.Shelf.objects.get(user=self.local_user, identifier="read") request = self.factory.post( "", @@ -160,11 +170,24 @@ class ShelfActionViews(TestCase): views.create_shelf(request) - shelf = models.Shelf.objects.get(name="new shelf name") + shelf = models.Shelf.objects.get(user=self.local_user, name="new shelf name") self.assertEqual(shelf.privacy, "unlisted") self.assertEqual(shelf.description, "desc") self.assertEqual(shelf.user, self.local_user) + def test_create_shelf_wrong_user(self, *_): + """a brand new custom shelf""" + form = forms.ShelfForm() + form.data["user"] = self.another_user.id + form.data["name"] = "new shelf name" + form.data["description"] = "desc" + form.data["privacy"] = "unlisted" + request = self.factory.post("", form.data) + request.user = self.local_user + + with self.assertRaises(PermissionDenied): + views.create_shelf(request) + def test_delete_shelf(self, *_): """delete a brand new custom shelf""" request = self.factory.post("") @@ -177,18 +200,8 @@ class ShelfActionViews(TestCase): def test_delete_shelf_unauthorized(self, *_): """delete a brand new custom shelf""" - with patch("bookwyrm.suggested_users.rerank_suggestions_task.delay"), patch( - "bookwyrm.activitystreams.populate_stream_task.delay" - ), patch("bookwyrm.lists_stream.populate_lists_task.delay"): - rat = models.User.objects.create_user( - "rat@local.com", - "rat@mouse.mouse", - "password", - local=True, - localname="rat", - ) request = self.factory.post("") - request.user = rat + request.user = self.another_user with self.assertRaises(PermissionDenied): views.delete_shelf(request, self.shelf.id) diff --git a/bookwyrm/tests/views/test_status.py b/bookwyrm/tests/views/test_status.py index 0026c52b5..1159b3863 100644 --- a/bookwyrm/tests/views/test_status.py +++ b/bookwyrm/tests/views/test_status.py @@ -10,12 +10,13 @@ from bookwyrm.settings import DOMAIN from bookwyrm.tests.validate_html import validate_html -# pylint: disable=invalid-name @patch("bookwyrm.suggested_users.rerank_suggestions_task.delay") @patch("bookwyrm.activitystreams.populate_stream_task.delay") @patch("bookwyrm.lists_stream.populate_lists_task.delay") @patch("bookwyrm.activitystreams.remove_status_task.delay") @patch("bookwyrm.models.activitypub_mixin.broadcast_task.apply_async") +# pylint: disable=invalid-name +# pylint: disable=too-many-public-methods class StatusViews(TestCase): """viewing and creating statuses""" @@ -75,6 +76,22 @@ class StatusViews(TestCase): self.assertEqual(status.book, self.book) self.assertIsNone(status.edited_date) + def test_create_status_wrong_user(self, *_): + """You can't compose statuses for someone else""" + view = views.CreateStatus.as_view() + form = forms.CommentForm( + { + "content": "hi", + "user": self.remote_user.id, + "book": self.book.id, + "privacy": "public", + } + ) + request = self.factory.post("", form.data) + request.user = self.local_user + with self.assertRaises(PermissionDenied): + view(request, "comment") + def test_create_status_reply(self, *_): """create a status in reply to an existing status""" view = views.CreateStatus.as_view() diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py index cbb468d5a..faae7daca 100644 --- a/bookwyrm/urls.py +++ b/bookwyrm/urls.py @@ -482,11 +482,6 @@ urlpatterns = [ name="prefs-password", ), re_path(r"^preferences/export/?$", views.Export.as_view(), name="prefs-export"), - re_path( - r"^preferences/export/file/?$", - views.export_user_book_data, - name="prefs-export-file", - ), re_path(r"^preferences/delete/?$", views.DeleteUser.as_view(), name="prefs-delete"), re_path(r"^preferences/block/?$", views.Block.as_view(), name="prefs-block"), re_path(r"^block/(?P\d+)/?$", views.Block.as_view()), diff --git a/bookwyrm/views/__init__.py b/bookwyrm/views/__init__.py index 2d085b02d..f199293c0 100644 --- a/bookwyrm/views/__init__.py +++ b/bookwyrm/views/__init__.py @@ -28,7 +28,7 @@ from .admin.user_admin import UserAdmin, UserAdminList # user preferences from .preferences.change_password import ChangePassword from .preferences.edit_user import EditUser -from .preferences.export import Export, export_user_book_data +from .preferences.export import Export from .preferences.delete_user import DeleteUser from .preferences.block import Block, unblock diff --git a/bookwyrm/views/goal.py b/bookwyrm/views/goal.py index b28c04766..57ff4bd75 100644 --- a/bookwyrm/views/goal.py +++ b/bookwyrm/views/goal.py @@ -70,7 +70,7 @@ class Goal(View): privacy=goal.privacy, ) - return redirect(request.headers.get("Referer", "/")) + return redirect("user-goal", request.user.localname, year) @require_POST @@ -79,4 +79,4 @@ def hide_goal(request): """don't keep bugging people to set a goal""" request.user.show_goal = False request.user.save(broadcast=False, update_fields=["show_goal"]) - return redirect(request.headers.get("Referer", "/")) + return redirect("/") diff --git a/bookwyrm/views/interaction.py b/bookwyrm/views/interaction.py index f59271bd1..35441a2cf 100644 --- a/bookwyrm/views/interaction.py +++ b/bookwyrm/views/interaction.py @@ -28,7 +28,7 @@ class Favorite(View): if is_api_request(request): return HttpResponse() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") @method_decorator(login_required, name="dispatch") @@ -48,7 +48,7 @@ class Unfavorite(View): favorite.delete() if is_api_request(request): return HttpResponse() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") @method_decorator(login_required, name="dispatch") @@ -67,7 +67,7 @@ class Boost(View): boosted_status=status, user=request.user ).exists(): # you already boosted that. - return redirect(request.headers.get("Referer", "/")) + return redirect("/") models.Boost.objects.create( boosted_status=status, @@ -76,7 +76,7 @@ class Boost(View): ) if is_api_request(request): return HttpResponse() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") @method_decorator(login_required, name="dispatch") @@ -94,4 +94,4 @@ class Unboost(View): boost.delete() if is_api_request(request): return HttpResponse() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") diff --git a/bookwyrm/views/landing/login.py b/bookwyrm/views/landing/login.py index 7cac5ad88..0c464cb5e 100644 --- a/bookwyrm/views/landing/login.py +++ b/bookwyrm/views/landing/login.py @@ -58,7 +58,7 @@ class Login(View): user.update_active_date() if request.POST.get("first_login"): return set_language(user, redirect("get-started-profile")) - return set_language(user, redirect(request.GET.get("next", "/"))) + return set_language(user, redirect("/")) # maybe the user is pending email confirmation if models.User.objects.filter( diff --git a/bookwyrm/views/landing/password.py b/bookwyrm/views/landing/password.py index a7eb001b0..7487b9414 100644 --- a/bookwyrm/views/landing/password.py +++ b/bookwyrm/views/landing/password.py @@ -5,7 +5,7 @@ from django.shortcuts import redirect from django.template.response import TemplateResponse from django.views import View -from bookwyrm import models +from bookwyrm import forms, models from bookwyrm.emailing import password_reset_email @@ -57,7 +57,8 @@ class PasswordReset(View): except models.PasswordReset.DoesNotExist: raise PermissionDenied() - return TemplateResponse(request, "landing/password_reset.html", {"code": code}) + data = {"code": code, "form": forms.PasswordResetForm()} + return TemplateResponse(request, "landing/password_reset.html", data) def post(self, request, code): """allow a user to change their password through an emailed token""" @@ -68,14 +69,12 @@ class PasswordReset(View): return TemplateResponse(request, "landing/password_reset.html", data) user = reset_code.user - - new_password = request.POST.get("password") - confirm_password = request.POST.get("confirm-password") - - if new_password != confirm_password: - data = {"errors": ["Passwords do not match"]} + form = forms.PasswordResetForm(request.POST, instance=user) + if not form.is_valid(): + data = {"code": code, "form": form} return TemplateResponse(request, "landing/password_reset.html", data) + new_password = form.cleaned_data["password"] user.set_password(new_password) user.save(broadcast=False, update_fields=["password"]) login(request, user) diff --git a/bookwyrm/views/landing/register.py b/bookwyrm/views/landing/register.py index e8de5f809..c5fd17424 100644 --- a/bookwyrm/views/landing/register.py +++ b/bookwyrm/views/landing/register.py @@ -134,19 +134,19 @@ class ConfirmEmail(View): class ResendConfirmEmail(View): """you probably didn't get the email because celery is slow but you can try this""" - def get(self, request, error=False): + def get(self, request): """resend link landing page""" - return TemplateResponse(request, "confirm_email/resend.html", {"error": error}) + return TemplateResponse(request, "confirm_email/resend.html") def post(self, request): """resend confirmation link""" email = request.POST.get("email") try: user = models.User.objects.get(email=email) + emailing.email_confirmation_email(user) except models.User.DoesNotExist: - return self.get(request, error=True) + pass - emailing.email_confirmation_email(user) return TemplateResponse( request, "confirm_email/confirm_email.html", {"valid": True} ) diff --git a/bookwyrm/views/preferences/change_password.py b/bookwyrm/views/preferences/change_password.py index cdfc9d333..d66035560 100644 --- a/bookwyrm/views/preferences/change_password.py +++ b/bookwyrm/views/preferences/change_password.py @@ -1,10 +1,12 @@ """ class views for password management """ from django.contrib.auth import login from django.contrib.auth.decorators import login_required -from django.shortcuts import redirect from django.template.response import TemplateResponse from django.utils.decorators import method_decorator from django.views import View +from django.views.decorators.debug import sensitive_variables, sensitive_post_parameters + +from bookwyrm import forms # pylint: disable= no-self-use @@ -14,18 +16,24 @@ class ChangePassword(View): def get(self, request): """change password page""" - data = {"user": request.user} + data = {"form": forms.ChangePasswordForm()} return TemplateResponse(request, "preferences/change_password.html", data) + @method_decorator(sensitive_variables("new_password")) + @method_decorator(sensitive_post_parameters("current_password")) + @method_decorator(sensitive_post_parameters("password")) + @method_decorator(sensitive_post_parameters("confirm_password")) def post(self, request): """allow a user to change their password""" - new_password = request.POST.get("password") - confirm_password = request.POST.get("confirm-password") - - if new_password != confirm_password: - return redirect("prefs-password") + form = forms.ChangePasswordForm(request.POST, instance=request.user) + if not form.is_valid(): + data = {"form": form} + return TemplateResponse(request, "preferences/change_password.html", data) + new_password = form.cleaned_data["password"] request.user.set_password(new_password) request.user.save(broadcast=False, update_fields=["password"]) + login(request, request.user) - return redirect("user-feed", request.user.localname) + data = {"success": True, "form": forms.ChangePasswordForm()} + return TemplateResponse(request, "preferences/change_password.html", data) diff --git a/bookwyrm/views/preferences/export.py b/bookwyrm/views/preferences/export.py index c0015fb86..2582dda3c 100644 --- a/bookwyrm/views/preferences/export.py +++ b/bookwyrm/views/preferences/export.py @@ -7,7 +7,6 @@ from django.http import StreamingHttpResponse from django.template.response import TemplateResponse from django.views import View from django.utils.decorators import method_decorator -from django.views.decorators.http import require_GET from bookwyrm import models @@ -20,35 +19,34 @@ class Export(View): """Request csv file""" return TemplateResponse(request, "preferences/export.html") - -@login_required -@require_GET -def export_user_book_data(request): - """Streaming the csv file of a user's book data""" - data = ( - models.Edition.viewer_aware_objects(request.user) - .filter( - Q(shelves__user=request.user) - | Q(readthrough__user=request.user) - | Q(review__user=request.user) - | Q(comment__user=request.user) - | Q(quotation__user=request.user) + def post(self, request): + """Streaming the csv file of a user's book data""" + data = ( + models.Edition.viewer_aware_objects(request.user) + .filter( + Q(shelves__user=request.user) + | Q(readthrough__user=request.user) + | Q(review__user=request.user) + | Q(comment__user=request.user) + | Q(quotation__user=request.user) + ) + .distinct() ) - .distinct() - ) - generator = csv_row_generator(data, request.user) + generator = csv_row_generator(data, request.user) - pseudo_buffer = Echo() - writer = csv.writer(pseudo_buffer) - # for testing, if you want to see the results in the browser: - # from django.http import JsonResponse - # return JsonResponse(list(generator), safe=False) - return StreamingHttpResponse( - (writer.writerow(row) for row in generator), - content_type="text/csv", - headers={"Content-Disposition": 'attachment; filename="bookwyrm-export.csv"'}, - ) + pseudo_buffer = Echo() + writer = csv.writer(pseudo_buffer) + # for testing, if you want to see the results in the browser: + # from django.http import JsonResponse + # return JsonResponse(list(generator), safe=False) + return StreamingHttpResponse( + (writer.writerow(row) for row in generator), + content_type="text/csv", + headers={ + "Content-Disposition": 'attachment; filename="bookwyrm-export.csv"' + }, + ) def csv_row_generator(books, user): diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py index eb43e4ea4..482da3cd0 100644 --- a/bookwyrm/views/reading.py +++ b/bookwyrm/views/reading.py @@ -79,13 +79,11 @@ class ReadingStatus(View): current_status_shelfbook = shelves[0] if shelves else None # checking the referer prevents redirecting back to the modal page - referer = request.headers.get("Referer", "/") - referer = "/" if "reading-status" in referer else referer if current_status_shelfbook is not None: if current_status_shelfbook.shelf.identifier != desired_shelf.identifier: current_status_shelfbook.delete() else: # It already was on the shelf - return redirect(referer) + return redirect("/") models.ShelfBook.objects.create( book=book, shelf=desired_shelf, user=request.user @@ -123,7 +121,7 @@ class ReadingStatus(View): if is_api_request(request): return HttpResponse() - return redirect(referer) + return redirect("/") @method_decorator(login_required, name="dispatch") @@ -205,7 +203,7 @@ def delete_readthrough(request): readthrough.raise_not_deletable(request.user) readthrough.delete() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") @login_required @@ -216,4 +214,4 @@ def delete_progressupdate(request): update.raise_not_deletable(request.user) update.delete() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") diff --git a/bookwyrm/views/shelf/shelf_actions.py b/bookwyrm/views/shelf/shelf_actions.py index 5e7e6c0c9..7dbb83dea 100644 --- a/bookwyrm/views/shelf/shelf_actions.py +++ b/bookwyrm/views/shelf/shelf_actions.py @@ -13,9 +13,11 @@ def create_shelf(request): """user generated shelves""" form = forms.ShelfForm(request.POST) if not form.is_valid(): - return redirect(request.headers.get("Referer", "/")) + return redirect("user-shelves", request.user.localname) - shelf = form.save() + shelf = form.save(commit=False) + shelf.raise_not_editable(request.user) + shelf.save() return redirect(shelf.local_path) @@ -70,7 +72,7 @@ def shelve(request): ): current_read_status_shelfbook.delete() else: # It is already on the shelf - return redirect(request.headers.get("Referer", "/")) + return redirect("/") # create the new shelf-book entry models.ShelfBook.objects.create( @@ -86,7 +88,7 @@ def shelve(request): # Might be good to alert, or reject the action? except IntegrityError: pass - return redirect(request.headers.get("Referer", "/")) + return redirect("/") @login_required @@ -100,4 +102,4 @@ def unshelve(request, book_id=False): ) shelf_book.raise_not_deletable(request.user) shelf_book.delete() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") diff --git a/bookwyrm/views/status.py b/bookwyrm/views/status.py index 0dd9e0f80..c0a045f8a 100644 --- a/bookwyrm/views/status.py +++ b/bookwyrm/views/status.py @@ -82,9 +82,10 @@ class CreateStatus(View): if is_api_request(request): logger.exception(form.errors) return HttpResponseBadRequest() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") status = form.save(commit=False) + status.raise_not_editable(request.user) # save the plain, unformatted version of the status for future editing status.raw_content = status.content if hasattr(status, "quote"): @@ -146,7 +147,7 @@ class DeleteStatus(View): # perform deletion status.delete() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") @login_required @@ -195,7 +196,7 @@ def edit_readthrough(request): if is_api_request(request): return HttpResponse() - return redirect(request.headers.get("Referer", "/")) + return redirect("/") def find_mentions(content): diff --git a/bookwyrm/views/user.py b/bookwyrm/views/user.py index 2aed317f7..a46c74642 100644 --- a/bookwyrm/views/user.py +++ b/bookwyrm/views/user.py @@ -164,7 +164,7 @@ def hide_suggestions(request): """not everyone wants user suggestions""" request.user.show_suggested_users = False request.user.save(broadcast=False, update_fields=["show_suggested_users"]) - return redirect(request.headers.get("Referer", "/")) + return redirect("/") # pylint: disable=unused-argument diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index 4ce83f72b..83ef74102 100644 Binary files a/locale/de_DE/LC_MESSAGES/django.mo and b/locale/de_DE/LC_MESSAGES/django.mo differ diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 3b1fad3ba..7faa7b11f 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-12 17:43\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -48,7 +48,7 @@ msgstr "Enddatum darf nicht vor dem Startdatum liegen." #: bookwyrm/forms/forms.py:59 msgid "Reading stopped date cannot be before start date." -msgstr "" +msgstr "Das Datum für Lesen gestoppt kann nicht vor dem Lesestart sein." #: bookwyrm/forms/landing.py:32 msgid "User with this username already exists" @@ -467,7 +467,7 @@ msgstr "Rückblick auf %(year)s" #: bookwyrm/templates/annual_summary/layout.html:47 #, python-format msgid "%(display_name)s’s year of reading" -msgstr "%(display_name)ss Lesejahr" +msgstr "Lektürejahr für %(display_name)s" #: bookwyrm/templates/annual_summary/layout.html:53 msgid "Share this page" @@ -1205,7 +1205,7 @@ msgstr "Domain" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Status" @@ -1221,7 +1221,7 @@ msgstr "Aktionen" #: bookwyrm/templates/book/file_links/edit_links.html:48 #: bookwyrm/templates/settings/link_domains/link_table.html:21 msgid "Unknown user" -msgstr "" +msgstr "Unbekannter Benutzer" #: bookwyrm/templates/book/file_links/edit_links.html:57 #: bookwyrm/templates/book/file_links/verification_modal.html:22 @@ -1329,7 +1329,7 @@ msgstr "Bestätigungscode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Absenden" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Lokale Benutzer*innen" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Föderierte Gemeinschaft" @@ -1576,13 +1576,13 @@ msgstr "Erfahre mehr über %(site_name)s:" #: bookwyrm/templates/email/moderation_report/text_content.html:6 #, python-format msgid "@%(reporter)s has flagged a link domain for moderation." -msgstr "" +msgstr "@%(reporter)s hat einen Link zur Moderation markiert." #: bookwyrm/templates/email/moderation_report/html_content.html:14 #: bookwyrm/templates/email/moderation_report/text_content.html:10 #, python-format msgid "@%(reporter)s has flagged behavior by @%(reportee)s for moderation." -msgstr "" +msgstr "@%(reporter)s hat das Verhalten von @%(reportee)s zur Moderation gekennzeichnet." #: bookwyrm/templates/email/moderation_report/html_content.html:21 #: bookwyrm/templates/email/moderation_report/text_content.html:15 @@ -1746,7 +1746,7 @@ msgstr "Gelesen" #: bookwyrm/templates/get_started/book_preview.html:13 #: bookwyrm/templates/shelf/shelf.html:89 bookwyrm/templates/user/user.html:36 msgid "Stopped Reading" -msgstr "" +msgstr "Lesen gestoppt" #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "Mehr über diese Seite" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Passwort bestätigen:" @@ -2281,7 +2281,7 @@ msgstr "Passwort bestätigen:" #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." -msgstr "" +msgstr "Ein Link zum Zurücksetzen des Passworts wird an %(email)s gesendet, wenn ein Konto mit dieser E-Mail-Adresse existiert." #: bookwyrm/templates/landing/password_reset_request.html:20 msgid "A link to reset your password will be sent to your email address" @@ -2598,191 +2598,191 @@ msgstr "Gespeicherte Listen" #: bookwyrm/templates/notifications/items/accept.html:18 #, python-format msgid "%(related_user)s accepted your invitation to join group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s hat Ihre Einladung zur Gruppe akzeptiert \"%(group_name)s\"" #: bookwyrm/templates/notifications/items/accept.html:26 #, python-format msgid "%(related_user)s and %(second_user)s accepted your invitation to join group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben Ihre Einladung zur Gruppe \"%(group_name)s\" akzeptiert" #: bookwyrm/templates/notifications/items/accept.html:36 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others accepted your invitation to join group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben Ihre Einladung zur Gruppe angenommen \"%(group_name)s\"" #: bookwyrm/templates/notifications/items/add.html:33 #, python-format msgid "%(related_user)s added %(book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr "%(related_user)s hat %(book_title)s zu Ihrer Liste hinzugefügt \"%(list_name)s\"" #: bookwyrm/templates/notifications/items/add.html:39 #, python-format msgid "%(related_user)s suggested adding %(book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr "%(related_user)s schlug vor, %(book_title)s zu Ihrer Liste hinzuzufügen \"%(list_name)s\"" #: bookwyrm/templates/notifications/items/add.html:47 #, python-format msgid "%(related_user)s added %(book_title)s and %(second_book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr "%(related_user)s hat %(book_title)s und %(second_book_title)s zu Ihrer Liste hinzugefügt \"%(list_name)s\"" #: bookwyrm/templates/notifications/items/add.html:54 #, python-format msgid "%(related_user)s suggested adding %(book_title)s and %(second_book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr "%(related_user)s schlug vor, %(book_title)s und %(second_book_title)s zu Ihrer Liste hinzuzufügen \"%(list_name)s\"" #: bookwyrm/templates/notifications/items/add.html:66 #, python-format msgid "%(related_user)s added %(book_title)s, %(second_book_title)s, and %(display_count)s other book to your list \"%(list_name)s\"" msgid_plural "%(related_user)s added %(book_title)s, %(second_book_title)s, and %(display_count)s other books to your list \"%(list_name)s\"" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(related_user)s hat %(book_title)s, %(second_book_title)s und %(display_count)s andere Bücher zu Ihrer Liste \"%(list_name)s hinzugefügt\"" +msgstr[1] "%(related_user)s hat %(book_title)s, %(second_book_title)s und %(display_count)s andere Bücher zu Ihrer Liste \"%(list_name)s hinzugefügt\"" #: bookwyrm/templates/notifications/items/add.html:82 #, python-format msgid "%(related_user)s suggested adding %(book_title)s, %(second_book_title)s, and %(display_count)s other book to your list \"%(list_name)s\"" msgid_plural "%(related_user)s suggested adding %(book_title)s, %(second_book_title)s, and %(display_count)s other books to your list \"%(list_name)s\"" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(related_user)s schlug vor, %(book_title)s, %(second_book_title)s, und %(display_count)s weitere Bücher an Ihre Liste \"%(list_name)s\" hinzuzufügen" +msgstr[1] "%(related_user)s schlug vor, %(book_title)s, %(second_book_title)s, und %(display_count)s weitere Bücher an Ihre Liste \"%(list_name)s\" hinzuzufügen" #: bookwyrm/templates/notifications/items/boost.html:21 #, python-format msgid "%(related_user)s boosted your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat Ihre Rezension von %(book_title)s geteilt" #: bookwyrm/templates/notifications/items/boost.html:27 #, python-format msgid "%(related_user)s and %(second_user)s boosted your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben Ihre Rezension von %(book_title)s geteilt" #: bookwyrm/templates/notifications/items/boost.html:36 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others boosted your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben deine Rezension über %(book_title)s geteilt" #: bookwyrm/templates/notifications/items/boost.html:44 #, python-format msgid "%(related_user)s boosted your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat deinen Kommentar über %(book_title)s geteilt" #: bookwyrm/templates/notifications/items/boost.html:50 #, python-format msgid "%(related_user)s and %(second_user)s boosted your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben deinen Kommentar über %(book_title)s geteilt" #: bookwyrm/templates/notifications/items/boost.html:59 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others boosted your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben deinen Kommentar über %(book_title)s geteilt" #: bookwyrm/templates/notifications/items/boost.html:67 #, python-format msgid "%(related_user)s boosted your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat dein Zitat aus %(book_title)s geteilt" #: bookwyrm/templates/notifications/items/boost.html:73 #, python-format msgid "%(related_user)s and %(second_user)s boosted your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben dein Zitat über %(book_title)s geteilt" #: bookwyrm/templates/notifications/items/boost.html:82 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others boosted your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben dein Zitat aus %(book_title)s geteilt" #: bookwyrm/templates/notifications/items/boost.html:90 #, python-format msgid "%(related_user)s boosted your status" -msgstr "" +msgstr "%(related_user)s hat Ihren Status geteilt" #: bookwyrm/templates/notifications/items/boost.html:96 #, python-format msgid "%(related_user)s and %(second_user)s boosted your status" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben Ihren Status geteilt" #: bookwyrm/templates/notifications/items/boost.html:105 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others boosted your status" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben Ihren Status geteilt" #: bookwyrm/templates/notifications/items/fav.html:21 #, python-format msgid "%(related_user)s liked your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s gefällt Ihre Rezension von %(book_title)s" #: bookwyrm/templates/notifications/items/fav.html:27 #, python-format msgid "%(related_user)s and %(second_user)s liked your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben deine Rezension über %(book_title)s favorisiert" #: bookwyrm/templates/notifications/items/fav.html:36 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others liked your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben deine Rezension über %(book_title)s favorisiert" #: bookwyrm/templates/notifications/items/fav.html:44 #, python-format msgid "%(related_user)s liked your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat deinen Kommentar über %(book_title)s favorisiert" #: bookwyrm/templates/notifications/items/fav.html:50 #, python-format msgid "%(related_user)s and %(second_user)s liked your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben deinen Kommentar über %(book_title)s favorisiert" #: bookwyrm/templates/notifications/items/fav.html:59 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others liked your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben deinen Kommentar über %(book_title)s favorisiert" #: bookwyrm/templates/notifications/items/fav.html:67 #, python-format msgid "%(related_user)s liked your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat dein Zitat aus %(book_title)s favorisiert" #: bookwyrm/templates/notifications/items/fav.html:73 #, python-format msgid "%(related_user)s and %(second_user)s liked your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben dein Zitat über %(book_title)s favorisiert" #: bookwyrm/templates/notifications/items/fav.html:82 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others liked your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben dein Zitat aus %(book_title)s favorisiert" #: bookwyrm/templates/notifications/items/fav.html:90 #, python-format msgid "%(related_user)s liked your status" -msgstr "" +msgstr "%(related_user)s hat deinen Status favorisiert" #: bookwyrm/templates/notifications/items/fav.html:96 #, python-format msgid "%(related_user)s and %(second_user)s liked your status" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben deinen Status favorisiert" #: bookwyrm/templates/notifications/items/fav.html:105 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others liked your status" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben deinen Status favorisiert" #: bookwyrm/templates/notifications/items/follow.html:16 #, python-format msgid "%(related_user)s followed you" -msgstr "" +msgstr "%(related_user)s folgt Ihnen" #: bookwyrm/templates/notifications/items/follow.html:20 #, python-format msgid "%(related_user)s and %(second_user)s followed you" -msgstr "" +msgstr "%(related_user)s und %(second_user)s folgen Ihnen" #: bookwyrm/templates/notifications/items/follow.html:25 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others followed you" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere folgen Ihnen" #: bookwyrm/templates/notifications/items/follow_request.html:15 #, python-format msgid "%(related_user)s sent you a follow request" -msgstr "" +msgstr "%(related_user)s hat Ihnen eine Follower-Anfrage gesendet" #: bookwyrm/templates/notifications/items/import.html:14 #, python-format @@ -2792,7 +2792,7 @@ msgstr "Dein Import ist fertig." #: bookwyrm/templates/notifications/items/invite.html:16 #, python-format msgid "%(related_user)s invited you to join the group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s hat Sie eingeladen, der Gruppe \"%(group_name)s\" beizutreten" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -2802,37 +2802,37 @@ msgstr "ist deiner Gruppe „%(group_name)s“ be #: bookwyrm/templates/notifications/items/leave.html:18 #, python-format msgid "%(related_user)s has left your group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s hat Ihre Gruppe \"%(group_name)s\" verlassen" #: bookwyrm/templates/notifications/items/leave.html:26 #, python-format msgid "%(related_user)s and %(second_user)s have left your group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s und %(second_user)s haben deine Gruppe \"%(group_name)s\" verlassen" #: bookwyrm/templates/notifications/items/leave.html:36 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others have left your group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s und %(other_user_display_count)s andere haben deine Gruppe \"%(group_name)s\" verlassen" #: bookwyrm/templates/notifications/items/mention.html:20 #, python-format msgid "%(related_user)s mentioned you in a review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat dich in einer Rezension über %(book_title)s erwähnt" #: bookwyrm/templates/notifications/items/mention.html:26 #, python-format msgid "%(related_user)s mentioned you in a comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat dich in einem Kommmentar über %(book_title)s erwähnt" #: bookwyrm/templates/notifications/items/mention.html:32 #, python-format msgid "%(related_user)s mentioned you in a quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat dich in einem Zitat aus %(book_title)s erwähnt" #: bookwyrm/templates/notifications/items/mention.html:38 #, python-format msgid "%(related_user)s mentioned you in a status" -msgstr "" +msgstr "%(related_user)s hat dich in einem Status erwähnt" #: bookwyrm/templates/notifications/items/remove.html:17 #, python-format @@ -2847,29 +2847,34 @@ msgstr "Du wurdest aus der Gruppe „%(group_name)s%(related_user)s replied to your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat auf deine Rezension über %(book_title)s geantwortet" #: bookwyrm/templates/notifications/items/reply.html:27 #, python-format msgid "%(related_user)s replied to your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat auf deinen Kommentar über %(book_title)s geantwortet" #: bookwyrm/templates/notifications/items/reply.html:33 #, python-format msgid "%(related_user)s replied to your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s hat auf dein Zitat aus %(book_title)s geantwortet" #: bookwyrm/templates/notifications/items/reply.html:39 #, python-format msgid "%(related_user)s replied to your status" -msgstr "" +msgstr "%(related_user)s hat auf deinen Status geantwortet" #: bookwyrm/templates/notifications/items/report.html:15 #, python-format msgid "A new report needs moderation" msgid_plural "%(display_count)s new reports need moderation" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Ein neuer -Bericht muss moderiert werden" +msgstr[1] "%(display_count)s neue Berichte müssen moderiert werden" + +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Inhaltswarnung" #: bookwyrm/templates/notifications/items/update.html:16 #, python-format @@ -3028,12 +3033,20 @@ msgstr "Momentan keine Benutzer*innen gesperrt." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Passwort ändern" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "Passwort erfolgreich geändert" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Aktuelles Passwort:" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Neues Passwort:" @@ -3125,6 +3138,10 @@ msgstr "CSV-Export" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "Ihr Export enthält alle Bücher in Ihren Regalen, Bücher die Sie bewertet haben und Bücher mit Leseaktivität." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "Datei herunterladen" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Benutzer*inkonto" @@ -3154,7 +3171,7 @@ msgstr "„%(book_title)s“ beginnen" #: bookwyrm/templates/reading_progress/stop.html:5 #, python-format msgid "Stop Reading \"%(book_title)s\"" -msgstr "" +msgstr "Höre auf zu lesen \"%(book_title)s\"" #: bookwyrm/templates/reading_progress/want.html:5 #, python-format @@ -3205,7 +3222,7 @@ msgstr "abgeschlossen" #: bookwyrm/templates/readthrough/readthrough_list.html:16 msgid "stopped" -msgstr "" +msgstr "gestoppt" #: bookwyrm/templates/readthrough/readthrough_list.html:27 msgid "Show all updates" @@ -3353,13 +3370,13 @@ msgstr "Nein" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Startdatum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Enddatum:" @@ -3430,11 +3447,11 @@ msgstr "Farbe:" #: bookwyrm/templates/settings/automod/rules.html:11 #: bookwyrm/templates/settings/layout.html:61 msgid "Auto-moderation rules" -msgstr "" +msgstr "Regeln für automatische Moderation" #: bookwyrm/templates/settings/automod/rules.html:18 msgid "Auto-moderation rules will create reports for any local user or status with fields matching the provided string." -msgstr "" +msgstr "Auto-Moderationsregeln erstellen Berichte für jeden lokalen Benutzer oder Status mit Feldern, die der angegebenen Zeichenfolge entsprechen." #: bookwyrm/templates/settings/automod/rules.html:19 msgid "Users or statuses that have already been reported (regardless of whether the report was resolved) will not be flagged." @@ -3450,11 +3467,11 @@ msgstr "Letzte Ausführung:" #: bookwyrm/templates/settings/automod/rules.html:40 msgid "Total run count:" -msgstr "" +msgstr "Gesamtanzahl:" #: bookwyrm/templates/settings/automod/rules.html:47 msgid "Enabled:" -msgstr "" +msgstr "Aktiviert:" #: bookwyrm/templates/settings/automod/rules.html:59 msgid "Delete schedule" @@ -3466,7 +3483,7 @@ msgstr "Jetzt ausführen" #: bookwyrm/templates/settings/automod/rules.html:64 msgid "Last run date will not be updated" -msgstr "" +msgstr "Letztes Ausführungsdatum wird nicht aktualisiert" #: bookwyrm/templates/settings/automod/rules.html:69 #: bookwyrm/templates/settings/automod/rules.html:92 @@ -3484,7 +3501,7 @@ msgstr "Regel hinzufügen" #: bookwyrm/templates/settings/automod/rules.html:116 #: bookwyrm/templates/settings/automod/rules.html:160 msgid "String match" -msgstr "" +msgstr "Zeichenfolgenübereinstimmung" #: bookwyrm/templates/settings/automod/rules.html:126 #: bookwyrm/templates/settings/automod/rules.html:163 @@ -3519,7 +3536,7 @@ msgid "Dashboard" msgstr "Übersicht" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Benutzer*innen insgesamt" @@ -3537,66 +3554,31 @@ msgstr "Statusmeldungen" msgid "Works" msgstr "Werke" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s offene Meldung" -msgstr[1] "%(display_count)s offene Meldungen" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s Domain muss überprüft werden" -msgstr[1] "%(display_count)s Domains müssen überprüft werden" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s Einladungsanfrage" -msgstr[1] "%(display_count)s Einladungsanfragen" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "Ein Update ist verfügbar! Du verwendest v%(current)s, die neueste Version ist %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Instanzaktivität" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervall:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Tage" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Wochen" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Neuanmeldungen" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Statusaktivitäten" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Erstellte Werke" @@ -3612,6 +3594,49 @@ msgstr "Statusmeldungen veröffentlicht" msgid "Total" msgstr "Gesamt" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s Domain muss überprüft werden" +msgstr[1] "%(display_count)s Domains müssen überprüft werden" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "Ihre ausgehende E-Mail-Adresse %(email_sender)skönnte falsch konfiguriert sein." + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "Überprüfen Sie EMAIL_SENDER_NAME und EMAIL_SENDER_DOMAIN in Ihrer .env-Datei." + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s Einladungsanfrage" +msgstr[1] "%(display_count)s Einladungsanfragen" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "Ihrer Instanz fehlt ein Verhaltenskodex." + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "In Ihrer Instanz fehlt eine Datenschutzerklärung." + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s offene Meldung" +msgstr[1] "%(display_count)s offene Meldungen" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "Ein Update ist verfügbar! Du verwendest v%(current)s, die neueste Version ist %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4026,7 +4051,7 @@ msgstr "Zurück zu den Meldungen" #: bookwyrm/templates/settings/reports/report.html:24 msgid "Message reporter" -msgstr "" +msgstr "Nachrichtenmelder" #: bookwyrm/templates/settings/reports/report.html:28 msgid "Update on your report:" @@ -4066,7 +4091,7 @@ msgstr "Bericht #%(report_id)s: Link hinzugefügt von @%(username)s" #: bookwyrm/templates/settings/reports/report_header.html:17 #, python-format msgid "Report #%(report_id)s: Link domain" -msgstr "" +msgstr "Bericht #%(report_id)s: Link" #: bookwyrm/templates/settings/reports/report_header.html:24 #, python-format @@ -4249,15 +4274,15 @@ msgstr "Wie man ein Theme hinzufügt" #: bookwyrm/templates/settings/themes.html:29 msgid "Copy the theme file into the bookwyrm/static/css/themes directory on your server from the command line." -msgstr "" +msgstr "Kopieren Sie die Theme-Datei in das bookwyrm/static/css/themes-Verzeichnis auf Ihrem Server mittels der Kommandozeile." #: bookwyrm/templates/settings/themes.html:32 msgid "Run ./bw-dev collectstatic." -msgstr "" +msgstr "Führe ./bw-dev collectstatic aus." #: bookwyrm/templates/settings/themes.html:35 msgid "Add the file name using the form below to make it available in the application interface." -msgstr "" +msgstr "Fügen Sie den Dateinamen mit dem untenstehenden Formular hinzu, um ihn in der Anwendung verfügbar zu machen." #: bookwyrm/templates/settings/themes.html:42 #: bookwyrm/templates/settings/themes.html:83 @@ -4308,38 +4333,42 @@ msgstr "Dein Passwort:" msgid "Users: %(instance_name)s" msgstr "Benutzer*innen: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "Gelöschte Benutzer" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Benutzer*inname" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Hinzugefügt am" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Zuletzt aktiv" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Entfernte Instanz" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Aktiv" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" -msgstr "" +msgstr "Gelöscht" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inaktiv" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Nicht festgelegt" @@ -4350,7 +4379,7 @@ msgstr "Benutzer*inprofil anzeigen" #: bookwyrm/templates/settings/users/user_info.html:19 msgid "Go to user admin" -msgstr "" +msgstr "Gehe zur Benutzerverwaltung" #: bookwyrm/templates/settings/users/user_info.html:40 msgid "Local" @@ -4430,27 +4459,27 @@ msgstr "BookWyrm einrichten" #: bookwyrm/templates/setup/admin.html:7 msgid "Your account as a user and an admin" -msgstr "" +msgstr "Ihr Konto als Benutzer und Admin" #: bookwyrm/templates/setup/admin.html:13 msgid "Create your account" -msgstr "" +msgstr "Erstelle einen Account" #: bookwyrm/templates/setup/admin.html:20 msgid "Admin key:" -msgstr "" +msgstr "Adminschlüssel:" #: bookwyrm/templates/setup/admin.html:32 msgid "An admin key was created when you installed BookWyrm. You can get your admin key by running ./bw-dev admin_code from the command line on your server." -msgstr "" +msgstr "Ein Adminschlüssel wurde erstellt als Sie BookWyrm installierten. Sie können Ihren Adminschlüssel durch das Ausführen von ./bw-dev admin_code auf der Kommandozeile Ihres Servers herausfinden." #: bookwyrm/templates/setup/admin.html:45 msgid "As an admin, you'll be able to configure the instance name and information, and moderate your instance. This means you will have access to private information about your users, and are responsible for responding to reports of bad behavior or spam." -msgstr "" +msgstr "Als Administrator können Sie den Namen und die Informationen der Instanz konfigurieren und Ihre Instanz moderieren. Dies bedeutet, dass Sie Zugang zu privaten Informationen über Ihre Nutzer haben und verantwortlich für die Reaktion auf Berichte über Fehlverhalten oder Spam sind." #: bookwyrm/templates/setup/admin.html:51 msgid "Once the instance is set up, you can promote other users to moderator or admin roles from the admin panel." -msgstr "" +msgstr "Sobald die Instanz eingerichtet ist, können Sie andere Benutzer im Admin-Panel zu Moderatoren oder Administratoren befördern." #: bookwyrm/templates/setup/admin.html:55 msgid "Learn more about moderation" @@ -4462,19 +4491,19 @@ msgstr "Instanzkonfiguration" #: bookwyrm/templates/setup/config.html:7 msgid "Make sure everything looks right before proceeding" -msgstr "" +msgstr "Vergewissern Sie sich, dass alles richtig aussieht bevor Sie fortfahren" #: bookwyrm/templates/setup/config.html:18 msgid "You are running BookWyrm in debug mode. This should never be used in a production environment." -msgstr "" +msgstr "Sie verwenden BookWyrm im Debug Modus. Dies sollte nie in einer Produktionsumgebung verwendet werden." #: bookwyrm/templates/setup/config.html:30 msgid "Your domain appears to be misconfigured. It should not include protocol or slashes." -msgstr "" +msgstr "Ihre Domain scheint falsch konfiguriert zu sein. Sie sollte kein Protokoll oder Schrägstriche enthalten." #: bookwyrm/templates/setup/config.html:42 msgid "You are running BookWyrm in production mode without https. USE_HTTPS should be enabled in production." -msgstr "" +msgstr "Sie verwenden BookWyrm im Produktionsmodus ohne https. USE_HTTPS sollte in der Produktion aktiviert werden." #: bookwyrm/templates/setup/config.html:52 bookwyrm/templates/user_menu.html:45 msgid "Settings" @@ -4490,15 +4519,15 @@ msgstr "Protokoll:" #: bookwyrm/templates/setup/config.html:81 msgid "Using S3:" -msgstr "" +msgstr "S3 benutzen:" #: bookwyrm/templates/setup/config.html:95 msgid "Default interface language:" -msgstr "" +msgstr "Standardsprache der Benutzeroberfläche:" #: bookwyrm/templates/setup/config.html:102 msgid "Email sender:" -msgstr "" +msgstr "E-Mail-Absender:" #: bookwyrm/templates/setup/config.html:109 msgid "Enable preview images:" @@ -4530,7 +4559,7 @@ msgstr "Instanzeinstellungen" #: bookwyrm/templates/setup/layout.html:15 msgid "Installing BookWyrm" -msgstr "" +msgstr "Installiere BookWyrm" #: bookwyrm/templates/setup/layout.html:18 msgid "Need help?" @@ -4936,13 +4965,13 @@ msgstr "„%(book_title)s“ beginnen" #: bookwyrm/templates/snippets/reading_modals/stop_reading_modal.html:6 #, python-format msgid "Stop Reading \"%(book_title)s\"" -msgstr "" +msgstr "Lesen von \"%(book_title)s \" stoppen" #: bookwyrm/templates/snippets/reading_modals/stop_reading_modal.html:32 #: bookwyrm/templates/snippets/shelf_selector.html:54 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:21 msgid "Stopped reading" -msgstr "" +msgstr "Lesen gestoppt" #: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 #, python-format @@ -5018,16 +5047,12 @@ msgstr "Mehr Regale" #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:31 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:48 msgid "Stop reading" -msgstr "" +msgstr "Aufhören zu lesen" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:40 msgid "Finish reading" msgstr "Lesen abschließen" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Inhaltswarnung" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Status anzeigen" @@ -5118,12 +5143,12 @@ msgstr "hat %(book)s besprochen" #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:10 #, python-format msgid "stopped reading %(book)s by %(author_name)s" -msgstr "" +msgstr "hat das Lesen von %(book)s von %(author_name)s beendet" #: bookwyrm/templates/snippets/status/headers/stopped_reading.html:17 #, python-format msgid "stopped reading %(book)s" -msgstr "" +msgstr "hat das Lesen von %(book)s beendet" #: bookwyrm/templates/snippets/status/headers/to_read.html:10 #, python-format @@ -5323,7 +5348,7 @@ msgstr "Keine Follower*innen, denen du folgst" msgid "View profile and more" msgstr "Profil und mehr ansehen" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Abmelden" @@ -5344,6 +5369,14 @@ msgstr "Keine gültige CSV-Datei" msgid "Username or password are incorrect" msgstr "Benutzer*inname oder Passwort falsch" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "Falsches Passwort" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "Passwort stimmt nicht überein" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 4476585f6..8436cc4d8 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-08 22:40+0000\n" +"POT-Creation-Date: 2022-07-14 23:57+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -1352,11 +1352,7 @@ msgstr "" msgid "Email address:" msgstr "" -#: bookwyrm/templates/confirm_email/resend_modal.html:28 -msgid "No user matching this email address found." -msgstr "" - -#: bookwyrm/templates/confirm_email/resend_modal.html:38 +#: bookwyrm/templates/confirm_email/resend_modal.html:30 msgid "Resend link" msgstr "" @@ -2274,7 +2270,7 @@ msgid "More about this site" msgstr "" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "" @@ -2872,6 +2868,11 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3029,12 +3030,20 @@ msgstr "" #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "" @@ -3126,6 +3135,10 @@ msgstr "" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "" +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "" @@ -5036,10 +5049,6 @@ msgstr "" msgid "Finish reading" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "" @@ -5335,7 +5344,7 @@ msgstr "" msgid "View profile and more" msgstr "" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "" @@ -5356,6 +5365,14 @@ msgstr "" msgid "Username or password are incorrect" msgstr "" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo index 49a5f2de8..86af3d550 100644 Binary files a/locale/es_ES/LC_MESSAGES/django.mo and b/locale/es_ES/LC_MESSAGES/django.mo differ diff --git a/locale/es_ES/LC_MESSAGES/django.po b/locale/es_ES/LC_MESSAGES/django.po index 28404d726..806139558 100644 --- a/locale/es_ES/LC_MESSAGES/django.po +++ b/locale/es_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -48,7 +48,7 @@ msgstr "La fecha final de lectura no puede ser anterior a la fecha de inicio." #: bookwyrm/forms/forms.py:59 msgid "Reading stopped date cannot be before start date." -msgstr "" +msgstr "La fecha final de lectura no puede ser anterior a la fecha de inicio." #: bookwyrm/forms/landing.py:32 msgid "User with this username already exists" @@ -1205,7 +1205,7 @@ msgstr "Dominio" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Estado" @@ -1221,7 +1221,7 @@ msgstr "Acciones" #: bookwyrm/templates/book/file_links/edit_links.html:48 #: bookwyrm/templates/settings/link_domains/link_table.html:21 msgid "Unknown user" -msgstr "" +msgstr "Usuario/a desconocido/a" #: bookwyrm/templates/book/file_links/edit_links.html:57 #: bookwyrm/templates/book/file_links/verification_modal.html:22 @@ -1329,7 +1329,7 @@ msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Usuarios locales" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Comunidad federada" @@ -1746,7 +1746,7 @@ msgstr "Leído" #: bookwyrm/templates/get_started/book_preview.html:13 #: bookwyrm/templates/shelf/shelf.html:89 bookwyrm/templates/user/user.html:36 msgid "Stopped Reading" -msgstr "" +msgstr "Lectura interrumpida" #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "Más sobre este sitio" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Confirmar contraseña:" @@ -2281,7 +2281,7 @@ msgstr "Confirmar contraseña:" #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." -msgstr "" +msgstr "Se enviará un enlace para restablecer la contraseña a %(email)s si hay una cuenta usando esa dirección de correo electrónico." #: bookwyrm/templates/landing/password_reset_request.html:20 msgid "A link to reset your password will be sent to your email address" @@ -2598,7 +2598,7 @@ msgstr "Listas guardadas" #: bookwyrm/templates/notifications/items/accept.html:18 #, python-format msgid "%(related_user)s accepted your invitation to join group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s aceptó su invitación para unirse al grupo \"%(group_name)s\"" #: bookwyrm/templates/notifications/items/accept.html:26 #, python-format @@ -2871,6 +2871,11 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Advertencia de contenido" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3028,12 +3033,20 @@ msgstr "No hay ningún usuario bloqueado actualmente." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Cambiar contraseña" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Nueva contraseña:" @@ -3125,6 +3138,10 @@ msgstr "Exportar CSV" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "Se exportarán todos los libros que tengas en las estanterías, las reseñas y los libros que estés leyendo." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Cuenta" @@ -3353,13 +3370,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Fecha de inicio:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Fecha final:" @@ -3519,7 +3536,7 @@ msgid "Dashboard" msgstr "Tablero" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Número de usuarios" @@ -3537,66 +3554,31 @@ msgstr "Estados" msgid "Works" msgstr "Obras" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s informe abierto" -msgstr[1] "%(display_count)s informes abiertos" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s dominio necesita revisión" -msgstr[1] "%(display_count)s dominios necesitan revisión" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s solicitación de invitado" -msgstr[1] "%(display_count)s solicitaciones de invitado" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "Hay una actualización disponible. La versión que estás usando es la %(current)s, mientras que la actual es %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Actividad de instancia" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Actividad de inscripciones de usuarios" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Actividad de estado" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Obras creadas" @@ -3612,6 +3594,49 @@ msgstr "Estados publicados" msgid "Total" msgstr "Suma" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s dominio necesita revisión" +msgstr[1] "%(display_count)s dominios necesitan revisión" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s solicitación de invitado" +msgstr[1] "%(display_count)s solicitaciones de invitado" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s informe abierto" +msgstr[1] "%(display_count)s informes abiertos" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "Hay una actualización disponible. La versión que estás usando es la %(current)s, mientras que la actual es %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4308,38 +4333,42 @@ msgstr "Tu contraseña:" msgid "Users: %(instance_name)s" msgstr "Usuarios %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Nombre de usuario" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Fecha agregada" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Actividad reciente" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Instancia remota" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Activo" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inactivo" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "No establecido" @@ -5024,10 +5053,6 @@ msgstr "" msgid "Finish reading" msgstr "Terminar de leer" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Advertencia de contenido" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Mostrar estado" @@ -5323,7 +5348,7 @@ msgstr "No le sigue nadie que tu sigas" msgid "View profile and more" msgstr "Ver perfil y más" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Cerrar sesión" @@ -5344,6 +5369,14 @@ msgstr "No un archivo csv válido" msgid "Username or password are incorrect" msgstr "Nombre de usuario o contraseña es incorrecta" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/fi_FI/LC_MESSAGES/django.mo b/locale/fi_FI/LC_MESSAGES/django.mo index 492f9f547..f5ece7df4 100644 Binary files a/locale/fi_FI/LC_MESSAGES/django.mo and b/locale/fi_FI/LC_MESSAGES/django.mo differ diff --git a/locale/fi_FI/LC_MESSAGES/django.po b/locale/fi_FI/LC_MESSAGES/django.po index f46e70898..a05a7e631 100644 --- a/locale/fi_FI/LC_MESSAGES/django.po +++ b/locale/fi_FI/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 17:19\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Finnish\n" "Language: fi\n" @@ -1205,7 +1205,7 @@ msgstr "Verkkotunnus" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Tila" @@ -1221,7 +1221,7 @@ msgstr "Toiminnot" #: bookwyrm/templates/book/file_links/edit_links.html:48 #: bookwyrm/templates/settings/link_domains/link_table.html:21 msgid "Unknown user" -msgstr "" +msgstr "Tuntematon käyttäjä" #: bookwyrm/templates/book/file_links/edit_links.html:57 #: bookwyrm/templates/book/file_links/verification_modal.html:22 @@ -1329,7 +1329,7 @@ msgstr "Vahvistuskoodi:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Lähetä" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Paikalliset käyttäjät" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Yhteisö fediversumissa" @@ -1576,13 +1576,13 @@ msgstr "Lue lisää %(site_name)s-yhteisöstä:" #: bookwyrm/templates/email/moderation_report/text_content.html:6 #, python-format msgid "@%(reporter)s has flagged a link domain for moderation." -msgstr "" +msgstr "@%(reporter)s on merkinnyt verkkotunnuksen tarkastettavaksi." #: bookwyrm/templates/email/moderation_report/html_content.html:14 #: bookwyrm/templates/email/moderation_report/text_content.html:10 #, python-format msgid "@%(reporter)s has flagged behavior by @%(reportee)s for moderation." -msgstr "" +msgstr "@%(reporter)s on merkinnyt käyttäjän @%(reportee)s toiminnan tarkastettavaksi." #: bookwyrm/templates/email/moderation_report/html_content.html:21 #: bookwyrm/templates/email/moderation_report/text_content.html:15 @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "Tietoja sivustosta" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Vahvista salasana:" @@ -2281,7 +2281,7 @@ msgstr "Vahvista salasana:" #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." -msgstr "" +msgstr "Osoitteeseen %(email)s lähetetään linkki salasanan palauttamiseksi, mikäli osoite on yhdistetty johonkin käyttäjätiliin." #: bookwyrm/templates/landing/password_reset_request.html:20 msgid "A link to reset your password will be sent to your email address" @@ -2598,191 +2598,191 @@ msgstr "Tallennetut listat" #: bookwyrm/templates/notifications/items/accept.html:18 #, python-format msgid "%(related_user)s accepted your invitation to join group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s hyväksyi kutsusi liittyä ryhmään %(group_name)s" #: bookwyrm/templates/notifications/items/accept.html:26 #, python-format msgid "%(related_user)s and %(second_user)s accepted your invitation to join group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s hyväksyivät kutsusi liittyä ryhmään %(group_name)s" #: bookwyrm/templates/notifications/items/accept.html:36 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others accepted your invitation to join group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta hyväksyivät kutsusi liittyä ryhmään %(group_name)s" #: bookwyrm/templates/notifications/items/add.html:33 #, python-format msgid "%(related_user)s added %(book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr "%(related_user)s lisäsi teoksen %(book_title)s listaasi %(list_name)s" #: bookwyrm/templates/notifications/items/add.html:39 #, python-format msgid "%(related_user)s suggested adding %(book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr "%(related_user)s ehdotti teosta %(book_title)s lisättäväksi listaasi %(list_name)s" #: bookwyrm/templates/notifications/items/add.html:47 #, python-format msgid "%(related_user)s added %(book_title)s and %(second_book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr "%(related_user)s lisäsi teokset %(book_title)s ja %(second_book_title)s listaasi %(list_name)s" #: bookwyrm/templates/notifications/items/add.html:54 #, python-format msgid "%(related_user)s suggested adding %(book_title)s and %(second_book_title)s to your list \"%(list_name)s\"" -msgstr "" +msgstr "%(related_user)s ehdotti teoksia %(book_title)s ja %(second_book_title)s lisättäväksi listaasi %(list_name)s" #: bookwyrm/templates/notifications/items/add.html:66 #, python-format msgid "%(related_user)s added %(book_title)s, %(second_book_title)s, and %(display_count)s other book to your list \"%(list_name)s\"" msgid_plural "%(related_user)s added %(book_title)s, %(second_book_title)s, and %(display_count)s other books to your list \"%(list_name)s\"" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(related_user)s lisäsi teokset %(book_title)s ja %(second_book_title)s sekä %(display_count)s muun teoksen listaasi %(list_name)s" +msgstr[1] "%(related_user)s lisäsi teokset %(book_title)s ja %(second_book_title)s sekä %(display_count)s muuta teosta listaasi %(list_name)s" #: bookwyrm/templates/notifications/items/add.html:82 #, python-format msgid "%(related_user)s suggested adding %(book_title)s, %(second_book_title)s, and %(display_count)s other book to your list \"%(list_name)s\"" msgid_plural "%(related_user)s suggested adding %(book_title)s, %(second_book_title)s, and %(display_count)s other books to your list \"%(list_name)s\"" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(related_user)s ehdotti teoksia %(book_title)s ja %(second_book_title)s sekä %(display_count)s muuta teosta lisättäväksi listaasi %(list_name)s" +msgstr[1] "%(related_user)s ehdotti teoksia %(book_title)s ja %(second_book_title)s sekä %(display_count)s muuta teosta lisättäväksi listaasi %(list_name)s" #: bookwyrm/templates/notifications/items/boost.html:21 #, python-format msgid "%(related_user)s boosted your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s kaiutti arviotasi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/boost.html:27 #, python-format msgid "%(related_user)s and %(second_user)s boosted your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s kaiuttivat arviotasi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/boost.html:36 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others boosted your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta kaiuttivat arviotasi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/boost.html:44 #, python-format msgid "%(related_user)s boosted your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s kaiutti teosta %(book_title)s koskevaa kommenttiasi" #: bookwyrm/templates/notifications/items/boost.html:50 #, python-format msgid "%(related_user)s and %(second_user)s boosted your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s kaiuttivat teosta %(book_title)s koskevaa kommenttiasi" #: bookwyrm/templates/notifications/items/boost.html:59 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others boosted your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta kaiuttivat teosta %(book_title)s koskevaa kommenttiasi" #: bookwyrm/templates/notifications/items/boost.html:67 #, python-format msgid "%(related_user)s boosted your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s kaiuttia lainaustasi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/boost.html:73 #, python-format msgid "%(related_user)s and %(second_user)s boosted your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s kaiuttivat lainaustasi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/boost.html:82 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others boosted your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta kaiuttivat lainaustasi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/boost.html:90 #, python-format msgid "%(related_user)s boosted your status" -msgstr "" +msgstr "%(related_user)s kaiutti tilapäivitystäsi" #: bookwyrm/templates/notifications/items/boost.html:96 #, python-format msgid "%(related_user)s and %(second_user)s boosted your status" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s kaiuttivat tilapäivitystäsi" #: bookwyrm/templates/notifications/items/boost.html:105 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others boosted your status" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta kaiuttivat tilapäivitystäsi" #: bookwyrm/templates/notifications/items/fav.html:21 #, python-format msgid "%(related_user)s liked your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s tykkäsi teosta %(book_title)s koskevasta arviostasi" #: bookwyrm/templates/notifications/items/fav.html:27 #, python-format msgid "%(related_user)s and %(second_user)s liked your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s tykkäsivät teosta %(book_title)s koskevasta arviostasi" #: bookwyrm/templates/notifications/items/fav.html:36 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others liked your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta tykkäsivät teosta %(book_title)s koskevasta arviostasi" #: bookwyrm/templates/notifications/items/fav.html:44 #, python-format msgid "%(related_user)s liked your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s tykkäsi teosta %(book_title)s koskevasta kommentistasi" #: bookwyrm/templates/notifications/items/fav.html:50 #, python-format msgid "%(related_user)s and %(second_user)s liked your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s tykkäsivät teosta %(book_title)s koskevasta kommentistasi" #: bookwyrm/templates/notifications/items/fav.html:59 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others liked your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta tykkäsivät teosta %(book_title)s koskevasta kommentistasi" #: bookwyrm/templates/notifications/items/fav.html:67 #, python-format msgid "%(related_user)s liked your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s tykkäsi lainauksestasi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/fav.html:73 #, python-format msgid "%(related_user)s and %(second_user)s liked your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s tykkäsivät lainauksestasi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/fav.html:82 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others liked your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta tykkäsivät lainauksestasi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/fav.html:90 #, python-format msgid "%(related_user)s liked your status" -msgstr "" +msgstr "%(related_user)s tykkäsi tilapäivityksestäsi" #: bookwyrm/templates/notifications/items/fav.html:96 #, python-format msgid "%(related_user)s and %(second_user)s liked your status" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s tykkäsivät tilapäivityksestäsi" #: bookwyrm/templates/notifications/items/fav.html:105 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others liked your status" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta tykkäsivät tilapäivityksestäsi" #: bookwyrm/templates/notifications/items/follow.html:16 #, python-format msgid "%(related_user)s followed you" -msgstr "" +msgstr "%(related_user)s alkoi seurata sinua" #: bookwyrm/templates/notifications/items/follow.html:20 #, python-format msgid "%(related_user)s and %(second_user)s followed you" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s alkoivat seurata sinua" #: bookwyrm/templates/notifications/items/follow.html:25 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others followed you" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta alkoivat seurata sinua" #: bookwyrm/templates/notifications/items/follow_request.html:15 #, python-format msgid "%(related_user)s sent you a follow request" -msgstr "" +msgstr "%(related_user)s lähetti pyynnön saada seurata sinua" #: bookwyrm/templates/notifications/items/import.html:14 #, python-format @@ -2792,7 +2792,7 @@ msgstr "Tuonti valmis." #: bookwyrm/templates/notifications/items/invite.html:16 #, python-format msgid "%(related_user)s invited you to join the group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s kutsui sinut liittymään ryhmään ”%(group_name)s”" #: bookwyrm/templates/notifications/items/join.html:16 #, python-format @@ -2802,37 +2802,37 @@ msgstr "liittyi ryhmääsi ”%(group_name)s”" #: bookwyrm/templates/notifications/items/leave.html:18 #, python-format msgid "%(related_user)s has left your group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s poistui ryhmästäsi ”%(group_name)s”" #: bookwyrm/templates/notifications/items/leave.html:26 #, python-format msgid "%(related_user)s and %(second_user)s have left your group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s ja %(second_user)s poistuivat ryhmästäsi ”%(group_name)s”" #: bookwyrm/templates/notifications/items/leave.html:36 #, python-format msgid "%(related_user)s and %(other_user_display_count)s others have left your group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s ja %(other_user_display_count)s muuta poistuivat ryhmästäsi ”%(group_name)s”" #: bookwyrm/templates/notifications/items/mention.html:20 #, python-format msgid "%(related_user)s mentioned you in a review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s mainitsi sinut teosta %(book_title)s koskevassa arviossaan" #: bookwyrm/templates/notifications/items/mention.html:26 #, python-format msgid "%(related_user)s mentioned you in a comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s mainitsi sinut teosta %(book_title)s koskevassa kommentissaan" #: bookwyrm/templates/notifications/items/mention.html:32 #, python-format msgid "%(related_user)s mentioned you in a quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s mainitsi sinut lainauksessaan teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/mention.html:38 #, python-format msgid "%(related_user)s mentioned you in a status" -msgstr "" +msgstr "%(related_user)s mainitsi sinut tilapäivityksessään" #: bookwyrm/templates/notifications/items/remove.html:17 #, python-format @@ -2847,29 +2847,34 @@ msgstr "Sinut on poistettu ryhmästä ”%(group_name #: bookwyrm/templates/notifications/items/reply.html:21 #, python-format msgid "%(related_user)s replied to your review of %(book_title)s" -msgstr "" +msgstr "%(related_user)s vastasi teosta %(book_title)s koskevaan arvioosi" #: bookwyrm/templates/notifications/items/reply.html:27 #, python-format msgid "%(related_user)s replied to your comment on %(book_title)s" -msgstr "" +msgstr "%(related_user)s vastasi teosta %(book_title)s koskevaan kommenttiisi" #: bookwyrm/templates/notifications/items/reply.html:33 #, python-format msgid "%(related_user)s replied to your quote from %(book_title)s" -msgstr "" +msgstr "%(related_user)s vastasi lainaukseesi teoksesta %(book_title)s" #: bookwyrm/templates/notifications/items/reply.html:39 #, python-format msgid "%(related_user)s replied to your status" -msgstr "" +msgstr "%(related_user)s vastasi tilapäivitykseesi" #: bookwyrm/templates/notifications/items/report.html:15 #, python-format msgid "A new report needs moderation" msgid_plural "%(display_count)s new reports need moderation" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Uusi raportti odottaa tarkastusta" +msgstr[1] "%(display_count)s uutta raporttia odottaa tarkastusta" + +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Sisältövaroitus" #: bookwyrm/templates/notifications/items/update.html:16 #, python-format @@ -3028,12 +3033,20 @@ msgstr "Ei estettyjä käyttäjiä." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Vaihda salasana" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "Salasanan vaihto onnistui" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "Nykyinen salasana:" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Uusi salasana:" @@ -3125,6 +3138,10 @@ msgstr "CSV-vienti" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "Vienti sisältää kaikki hyllyissäsi olevat ja arvioimasi kirjat sekä kirjat, joita olet lukenut." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "Lataa tiedosto" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Käyttäjätili" @@ -3353,13 +3370,13 @@ msgstr "Epätosi" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Alkaen:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Päättyen:" @@ -3519,7 +3536,7 @@ msgid "Dashboard" msgstr "Kojelauta" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Käyttäjiä yhteensä" @@ -3537,66 +3554,31 @@ msgstr "Tilapäivityksiä" msgid "Works" msgstr "Teoksia" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s käsittelemätön raportti" -msgstr[1] "%(display_count)s käsittelemätöntä raporttia" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s verkkotunnus vaatii tarkistusta" -msgstr[1] "%(display_count)s verkkotunnusta vaatii tarkistusta" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s kutsupyyntö" -msgstr[1] "%(display_count)s kutsupyyntöä" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "Päivitys saatavilla! Käytössäsi on versio %(current)s, ja viimeisin julkaistu versio on %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Palvelimen aktiivisuus" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Aikaväli:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "päivä" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "viikko" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Rekisteröityneitä käyttäjiä" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Tilapäivityksiä" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Luotuja teoksia" @@ -3612,6 +3594,49 @@ msgstr "Tilapäivityksiä" msgid "Total" msgstr "Yhteensä" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s verkkotunnus vaatii tarkistusta" +msgstr[1] "%(display_count)s verkkotunnusta vaatii tarkistusta" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "Lähtevän sähköpostin osoitteesi %(email_sender)s saattaa olla määritelty väärin." + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "Tarkista .env-tiedostosta asetukset EMAIL_SENDER_NAME ja EMAIL_SENDER_DOMAIN." + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s kutsupyyntö" +msgstr[1] "%(display_count)s kutsupyyntöä" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "Palvelimeltasi puuttuu käyttöehdot." + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "Palvelimeltasi puuttuu tietosuojakäytäntö." + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s käsittelemätön raportti" +msgstr[1] "%(display_count)s käsittelemätöntä raporttia" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "Päivitys saatavilla! Käytössäsi on versio %(current)s, ja viimeisin julkaistu versio on %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4066,7 +4091,7 @@ msgstr "Raportti %(report_id)s: käyttäjän @%(username)s lisäämä linkki" #: bookwyrm/templates/settings/reports/report_header.html:17 #, python-format msgid "Report #%(report_id)s: Link domain" -msgstr "" +msgstr "Raportti %(report_id)s: Verkkotunnus" #: bookwyrm/templates/settings/reports/report_header.html:24 #, python-format @@ -4308,38 +4333,42 @@ msgstr "Salasana:" msgid "Users: %(instance_name)s" msgstr "Käyttäjät: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "Poistetut käyttäjät" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Käyttäjänimi" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Lisätty" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Viimeksi paikalla" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Etäpalvelin" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Aktiivinen" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" -msgstr "" +msgstr "Poistettu" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Ei aktiivinen" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Ei asetettu" @@ -5024,10 +5053,6 @@ msgstr "Keskeytä lukeminen" msgid "Finish reading" msgstr "Lopeta lukeminen" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Sisältövaroitus" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Näytä tilapäivitys" @@ -5323,7 +5348,7 @@ msgstr "Ei seuraajia, joita seuraat itse" msgid "View profile and more" msgstr "Näytä profiili ja muita tietoja" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Kirjaudu ulos" @@ -5344,6 +5369,14 @@ msgstr "Epäkelpo csv-tiedosto" msgid "Username or password are incorrect" msgstr "Käyttäjänimi tai salasana on virheellinen" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "Väärä salasana" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "Salasanat eivät täsmää" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 69fb18862..37de909b2 100644 Binary files a/locale/fr_FR/LC_MESSAGES/django.mo and b/locale/fr_FR/LC_MESSAGES/django.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 3e5bdf86f..f8e62ff27 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-08 17:00\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -1205,7 +1205,7 @@ msgstr "Domaine" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Statut" @@ -1329,7 +1329,7 @@ msgstr "Code de confirmation :" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Valider" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Comptes locaux" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Communauté fédérée" @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "En savoir plus sur ce site" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Confirmez le mot de passe :" @@ -2871,6 +2871,11 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "Un nouveau signalement a besoin d’être traité" msgstr[1] "%(display_count)s nouveaux signalements ont besoin d’être traités" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Avertissement sur le contenu" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3028,12 +3033,20 @@ msgstr "Aucun compte bloqué actuellement" #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Changer le mot de passe" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Nouveau mot de passe :" @@ -3125,6 +3138,10 @@ msgstr "Export CSV" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "Votre export comprendra tous les livres sur vos étagères, les livres que vous avez critiqués, et les livres ayant une activité de lecture." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Compte" @@ -3353,13 +3370,13 @@ msgstr "Faux" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Date de début :" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Date de fin :" @@ -3519,7 +3536,7 @@ msgid "Dashboard" msgstr "Tableau de bord" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Nombre total d'utilisateurs·rices" @@ -3537,66 +3554,31 @@ msgstr "Statuts" msgid "Works" msgstr "Œuvres" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "Votre adresse e-mail sortante, %(email_sender)s, pourrait être mal configurée." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "Vérifiez EMAIL_SENDER_NAME et EMAIL_SENDER_DOMAIN dans votre .env." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s signalement ouvert" -msgstr[1] "%(display_count)s signalements ouverts" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s domaine doit être vérifié" -msgstr[1] "%(display_count)s domaines doivent être vérifiés" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s demande d'invitation" -msgstr[1] "%(display_count)s demandes d'invitation" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "Une mise à jour est disponible ! Vous utilisez la version%(current)s et la dernière version est %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Activité de l'instance" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalle :" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Jours" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semaines" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Nouvelles inscriptions" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Nouveaux statuts" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Œuvres créées" @@ -3612,6 +3594,49 @@ msgstr "Statuts publiés" msgid "Total" msgstr "Total" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s domaine doit être vérifié" +msgstr[1] "%(display_count)s domaines doivent être vérifiés" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "Votre adresse e-mail sortante, %(email_sender)s, pourrait être mal configurée." + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "Vérifiez EMAIL_SENDER_NAME et EMAIL_SENDER_DOMAIN dans votre fichier .env." + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s demande d'invitation" +msgstr[1] "%(display_count)s demandes d'invitation" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "Il manque un code de conduite à votre instance." + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "Il manque une politique de confidentialité à votre instance." + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s signalement ouvert" +msgstr[1] "%(display_count)s signalements ouverts" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "Une mise à jour est disponible ! Vous utilisez la version%(current)s et la dernière version est %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4308,38 +4333,42 @@ msgstr "Votre mot de passe:" msgid "Users: %(instance_name)s" msgstr "Comptes : %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "Comptes supprimés" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Nom du compte" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Date d’ajout" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Dernière activité" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Instance distante" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Actif" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "Supprimé" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inactif" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Non défini" @@ -5024,10 +5053,6 @@ msgstr "Interrompre la lecture" msgid "Finish reading" msgstr "Terminer la lecture" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Avertissement sur le contenu" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Afficher le statut" @@ -5323,7 +5348,7 @@ msgstr "Aucun·e abonné·e que vous suivez" msgid "View profile and more" msgstr "Voir le profil et plus" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Se déconnecter" @@ -5344,6 +5369,14 @@ msgstr "Fichier CSV non valide" msgid "Username or password are incorrect" msgstr "Identifiant ou mot de passe incorrect" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo index ab178a376..0336edd7f 100644 Binary files a/locale/gl_ES/LC_MESSAGES/django.mo and b/locale/gl_ES/LC_MESSAGES/django.mo differ diff --git a/locale/gl_ES/LC_MESSAGES/django.po b/locale/gl_ES/LC_MESSAGES/django.po index 876afbf1e..ca3604f4c 100644 --- a/locale/gl_ES/LC_MESSAGES/django.po +++ b/locale/gl_ES/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-08 13:09\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-14 05:48\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -1205,7 +1205,7 @@ msgstr "Dominio" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Estado" @@ -1329,7 +1329,7 @@ msgstr "Código de confirmación:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Usuarias locais" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Comunidade federada" @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "Máis acerca deste sitio" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Confirma o contrasinal:" @@ -2281,7 +2281,7 @@ msgstr "Confirma o contrasinal:" #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." -msgstr "" +msgstr "Imos enviar a %(email)s unha ligazón para restablecer o contrasinal se existe unha conta que usa ese enderezo." #: bookwyrm/templates/landing/password_reset_request.html:20 msgid "A link to reset your password will be sent to your email address" @@ -2598,12 +2598,12 @@ msgstr "Listas gardadas" #: bookwyrm/templates/notifications/items/accept.html:18 #, python-format msgid "%(related_user)s accepted your invitation to join group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s aceptou o teu convite para unirte ao grupo \"%(group_name)s\"" #: bookwyrm/templates/notifications/items/accept.html:26 #, python-format msgid "%(related_user)s and %(second_user)s accepted your invitation to join group \"%(group_name)s\"" -msgstr "" +msgstr "%(related_user)s e%(second_user)s aceptaron o teu convite para unirse ao grupo \"%(group_name)s\"" #: bookwyrm/templates/notifications/items/accept.html:36 #, python-format @@ -2871,6 +2871,11 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Aviso sobre o contido" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3028,12 +3033,20 @@ msgstr "Non tes usuarias bloqueadas." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Cambiar contrasinal" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Novo contrasinal:" @@ -3125,6 +3138,10 @@ msgstr "Exportación CSV" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "A exportación incluirá tódolos libros dos estantes, libros que recensionaches e libros con actividade de lectura." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "Descargar ficheiro" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Conta" @@ -3353,13 +3370,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data de inicio:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data de fin:" @@ -3519,7 +3536,7 @@ msgid "Dashboard" msgstr "Taboleiro" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Total de usuarias" @@ -3537,66 +3554,31 @@ msgstr "Estados" msgid "Works" msgstr "Traballos" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s denuncia aberta" -msgstr[1] "%(display_count)s denuncias abertas" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "hai que revisar %(display_count)s dominio" -msgstr[1] "hai que revisar %(display_count)s dominios" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s solicitude de convite" -msgstr[1] "%(display_count)s solicitudes de convite" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "Hai unha actualización dispoñible! Estás a executar v%(current)s e a última versión é %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Actividade na instancia" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Días" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Rexistros de usuarias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Actividade do estado" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Traballos creados" @@ -3612,6 +3594,49 @@ msgstr "Estados publicados" msgid "Total" msgstr "Total" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "hai que revisar %(display_count)s dominio" +msgstr[1] "hai que revisar %(display_count)s dominios" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "O enderezo de envío de emails, %(email_sender)s, podería estar mal configurado." + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "Comproba o EMAIL_SENDER_NAME e EMAIL_SENDER_DOMAIN no teu ficheiro .env." + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s solicitude de convite" +msgstr[1] "%(display_count)s solicitudes de convite" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "A túa instancia non ten código de conduta." + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "A túa instancia non ten política de privacidade." + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s denuncia aberta" +msgstr[1] "%(display_count)s denuncias abertas" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "Hai unha actualización dispoñible! Estás a executar v%(current)s e a última versión é %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4066,7 +4091,7 @@ msgstr "Denuncia #%(report_id)s: Ligazón engadida por @%(username)s" #: bookwyrm/templates/settings/reports/report_header.html:17 #, python-format msgid "Report #%(report_id)s: Link domain" -msgstr "" +msgstr "Denuncia #%(report_id)s: Dominio na ligazón" #: bookwyrm/templates/settings/reports/report_header.html:24 #, python-format @@ -4308,38 +4333,42 @@ msgstr "Contrasinal:" msgid "Users: %(instance_name)s" msgstr "Usuarias: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "Usuarias eliminadas" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Nome de usuaria" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Data de alta" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Última vez activa" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Instancia remota" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Activa" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" -msgstr "" +msgstr "Eliminada" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inactiva" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Non establecido" @@ -5024,10 +5053,6 @@ msgstr "Deixar de ler" msgid "Finish reading" msgstr "Rematar a lectura" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Aviso sobre o contido" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Mostrar estado" @@ -5323,7 +5348,7 @@ msgstr "Sen seguidoras que ti segues" msgid "View profile and more" msgstr "Ver perfil e máis" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Desconectar" @@ -5344,6 +5369,14 @@ msgstr "Non é un ficheiro csv válido" msgid "Username or password are incorrect" msgstr "As credenciais non son correctas" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "Contrasinal incorrecto" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "O contrasinal non concorda" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/it_IT/LC_MESSAGES/django.mo b/locale/it_IT/LC_MESSAGES/django.mo index 8eca15d71..d02492a75 100644 Binary files a/locale/it_IT/LC_MESSAGES/django.mo and b/locale/it_IT/LC_MESSAGES/django.mo differ diff --git a/locale/it_IT/LC_MESSAGES/django.po b/locale/it_IT/LC_MESSAGES/django.po index 4e3115f05..83b1bc843 100644 --- a/locale/it_IT/LC_MESSAGES/django.po +++ b/locale/it_IT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:13\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Italian\n" "Language: it\n" @@ -48,7 +48,7 @@ msgstr "La data di fine lettura non può essere precedente alla data di inizio." #: bookwyrm/forms/forms.py:59 msgid "Reading stopped date cannot be before start date." -msgstr "" +msgstr "La data di fine lettura non può essere precedente alla data di inizio." #: bookwyrm/forms/landing.py:32 msgid "User with this username already exists" @@ -1205,7 +1205,7 @@ msgstr "Dominio" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Stato" @@ -1221,7 +1221,7 @@ msgstr "Azioni" #: bookwyrm/templates/book/file_links/edit_links.html:48 #: bookwyrm/templates/settings/link_domains/link_table.html:21 msgid "Unknown user" -msgstr "" +msgstr "Utente sconosciuto" #: bookwyrm/templates/book/file_links/edit_links.html:57 #: bookwyrm/templates/book/file_links/verification_modal.html:22 @@ -1329,7 +1329,7 @@ msgstr "Codice di conferma:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Invia" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Utenti Locali" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Comunità federata" @@ -1746,7 +1746,7 @@ msgstr "Letti" #: bookwyrm/templates/get_started/book_preview.html:13 #: bookwyrm/templates/shelf/shelf.html:89 bookwyrm/templates/user/user.html:36 msgid "Stopped Reading" -msgstr "" +msgstr "Lettura in pausa" #: bookwyrm/templates/get_started/books.html:6 msgid "What are you reading?" @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "Ulteriori informazioni su questo sito" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Conferma la password:" @@ -2281,7 +2281,7 @@ msgstr "Conferma la password:" #: bookwyrm/templates/landing/password_reset_request.html:14 #, python-format msgid "A password reset link will be sent to %(email)s if there is an account using that email address." -msgstr "" +msgstr "Un link di reset della password verrà mandato a \"%(email)s\" se esiste un account che usa questo indirizzo mail." #: bookwyrm/templates/landing/password_reset_request.html:20 msgid "A link to reset your password will be sent to your email address" @@ -2871,6 +2871,11 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Avviso sul contenuto" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3028,12 +3033,20 @@ msgstr "Nessun utente attualmente bloccato." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Modifica Password" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Nuova password:" @@ -3125,6 +3138,10 @@ msgstr "Esporta CSV" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "La tua esportazione includerà tutti i libri sui tuoi scaffali, quelli che hai recensito e con attività di lettura." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Profilo" @@ -3353,13 +3370,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data d'inizio:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data di fine:" @@ -3519,7 +3536,7 @@ msgid "Dashboard" msgstr "Dashboard" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Totale utenti" @@ -3537,66 +3554,31 @@ msgstr "Stati" msgid "Works" msgstr "Lavori" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s report aperto" -msgstr[1] "%(display_count)s reports aperti" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s dominio necessita di una revisione" -msgstr[1] "%(display_count)s domini necessitano di una revisione" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s richiesta d'invito" -msgstr[1] "%(display_count)s richieste d'invito" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "È disponibile un aggiornamento! Stai eseguendo v%(current)s e l'ultima versione è %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Attività di Istanza" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervallo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Giorni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Settimane" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Attività di registrazione dell'utente" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Attività di stato" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Opere create" @@ -3612,6 +3594,49 @@ msgstr "Stati pubblicati" msgid "Total" msgstr "Totale" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s dominio necessita di una revisione" +msgstr[1] "%(display_count)s domini necessitano di una revisione" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s richiesta d'invito" +msgstr[1] "%(display_count)s richieste d'invito" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s report aperto" +msgstr[1] "%(display_count)s reports aperti" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "È disponibile un aggiornamento! Stai eseguendo v%(current)s e l'ultima versione è %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4308,38 +4333,42 @@ msgstr "La tua password:" msgid "Users: %(instance_name)s" msgstr "Utenti: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Nome utente" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Aggiunto in data" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Attivo l'ultima volta" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Istanza remota" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Attivo" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inattivo" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Non impostato" @@ -5024,10 +5053,6 @@ msgstr "" msgid "Finish reading" msgstr "Finito di leggere" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Avviso sul contenuto" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Mostra stato" @@ -5323,7 +5348,7 @@ msgstr "Nessun follower che segui" msgid "View profile and more" msgstr "Visualizza profilo e altro" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Esci" @@ -5344,6 +5369,14 @@ msgstr "Non è un file di csv valido" msgid "Username or password are incorrect" msgstr "Nome utente o password errati" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo index a3fa30e43..2f37afe61 100644 Binary files a/locale/lt_LT/LC_MESSAGES/django.mo and b/locale/lt_LT/LC_MESSAGES/django.mo differ diff --git a/locale/lt_LT/LC_MESSAGES/django.po b/locale/lt_LT/LC_MESSAGES/django.po index 5efb3c922..2eca28352 100644 --- a/locale/lt_LT/LC_MESSAGES/django.po +++ b/locale/lt_LT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -1217,7 +1217,7 @@ msgstr "Domenas" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Būsena" @@ -1341,7 +1341,7 @@ msgstr "Patvirtinimo kodas:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Siųsti" @@ -1381,7 +1381,7 @@ msgid "Local users" msgstr "Vietiniai nariai" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Sujungta bendruomenė" @@ -2297,7 +2297,7 @@ msgid "More about this site" msgstr "Daugiau apie šią svetainę" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Patvirtinti slaptažodį:" @@ -2901,6 +2901,11 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Įspėjimas dėl turinio" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3058,12 +3063,20 @@ msgstr "Blokuotų narių nėra." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Keisti slaptažodį" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Naujas slaptažodis:" @@ -3155,6 +3168,10 @@ msgstr "CSV eksportas" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "Į eksportavimą įeis visos jūsų lentynose esančios knygos, peržiūrėtos knygos bei tos, kurias neseniai skaitėte." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Paskyra" @@ -3383,13 +3400,13 @@ msgstr "Netiesa" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Pradžios data:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Pabaigos data:" @@ -3549,7 +3566,7 @@ msgid "Dashboard" msgstr "Suvestinė" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Iš viso naudotojų" @@ -3567,72 +3584,31 @@ msgstr "Būsenos" msgid "Works" msgstr "Darbai" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s atvira ataskaita" -msgstr[1] "%(display_count)s atviros ataskaitos" -msgstr[2] "%(display_count)s atviros ataskaitos" -msgstr[3] "%(display_count)s atvirų ataskaitų" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s domeną reikia peržiūrėti" -msgstr[1] "%(display_count)s domenus reikia peržiūrėti" -msgstr[2] "%(display_count)s domenus reikia peržiūrėti" -msgstr[3] "%(display_count)s domenus reikia peržiūrėti" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s prašymas pakviesti" -msgstr[1] "%(display_count)s prašymai pakviesti" -msgstr[2] "%(display_count)s prašymų pakviesti" -msgstr[3] "%(display_count)s prašymai pakviesti" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "Jau yra naujinys. Jūsų versija – %(current)s, o naujausia –%(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Serverio statistika" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalas:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dienos" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Savaitės" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Naudotojo prisijungimo veikla" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Būsenos" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Darbai sukurti" @@ -3648,6 +3624,55 @@ msgstr "Būsenos publikuotos" msgid "Total" msgstr "Iš viso" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s domeną reikia peržiūrėti" +msgstr[1] "%(display_count)s domenus reikia peržiūrėti" +msgstr[2] "%(display_count)s domenus reikia peržiūrėti" +msgstr[3] "%(display_count)s domenus reikia peržiūrėti" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s prašymas pakviesti" +msgstr[1] "%(display_count)s prašymai pakviesti" +msgstr[2] "%(display_count)s prašymų pakviesti" +msgstr[3] "%(display_count)s prašymai pakviesti" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s atvira ataskaita" +msgstr[1] "%(display_count)s atviros ataskaitos" +msgstr[2] "%(display_count)s atviros ataskaitos" +msgstr[3] "%(display_count)s atvirų ataskaitų" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "Jau yra naujinys. Jūsų versija – %(current)s, o naujausia –%(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4346,38 +4371,42 @@ msgstr "Jūsų slaptažodis:" msgid "Users: %(instance_name)s" msgstr "Vartotojai: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Vartotojo vardas" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Pridėjimo data" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Paskutinį kartą aktyvus" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Nutolęs serveris" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Aktyvus" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Neaktyvus" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Nenustatytas" @@ -5076,10 +5105,6 @@ msgstr "" msgid "Finish reading" msgstr "Baigti skaityti" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Įspėjimas dėl turinio" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Rodyti būseną" @@ -5379,7 +5404,7 @@ msgstr "Jūs kartu nieko nesekate" msgid "View profile and more" msgstr "Žiūrėti paskyrą ir dar daugiau" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Atsijungti" @@ -5400,6 +5425,14 @@ msgstr "Netinkamas csv failas" msgid "Username or password are incorrect" msgstr "Naudotojo vardas arba slaptažodis neteisingi" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/no_NO/LC_MESSAGES/django.mo b/locale/no_NO/LC_MESSAGES/django.mo index e971057ad..26490831e 100644 Binary files a/locale/no_NO/LC_MESSAGES/django.mo and b/locale/no_NO/LC_MESSAGES/django.mo differ diff --git a/locale/no_NO/LC_MESSAGES/django.po b/locale/no_NO/LC_MESSAGES/django.po index 8c05461f1..3ba81df84 100644 --- a/locale/no_NO/LC_MESSAGES/django.po +++ b/locale/no_NO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Norwegian\n" "Language: no\n" @@ -1205,7 +1205,7 @@ msgstr "Domene" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Status" @@ -1329,7 +1329,7 @@ msgstr "Bekreftelseskode:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Send inn" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Lokale medlemmer" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Føderte samfunn" @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "Om dette nettstedet" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Gjenta passordet:" @@ -2871,6 +2871,11 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Varsel om følsomt innhold" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3028,12 +3033,20 @@ msgstr "Ingen brukere er for tiden blokkert." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Endre passord" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Nytt passord:" @@ -3125,6 +3138,10 @@ msgstr "" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "" +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Konto" @@ -3351,13 +3368,13 @@ msgstr "Usant" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Startdato:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Sluttdato:" @@ -3517,7 +3534,7 @@ msgid "Dashboard" msgstr "Kontrollpanel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Totalt antall brukere" @@ -3535,66 +3552,31 @@ msgstr "Statuser" msgid "Works" msgstr "Verker" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s åpen rapport" -msgstr[1] "%(display_count)s åpne rapporter" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s domene må godkjennes" -msgstr[1] "%(display_count)s domener må godkjennes" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s invitasjonsforespørsel" -msgstr[1] "%(display_count)s invitasjonsforespørsler" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Instansaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervall:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dager" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Uker" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Brukerregistreringsaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Statusaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Verker laget" @@ -3610,6 +3592,49 @@ msgstr "Statuser lagt ut" msgid "Total" msgstr "Totalt" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s domene må godkjennes" +msgstr[1] "%(display_count)s domener må godkjennes" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s invitasjonsforespørsel" +msgstr[1] "%(display_count)s invitasjonsforespørsler" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s åpen rapport" +msgstr[1] "%(display_count)s åpne rapporter" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "" + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4306,38 +4331,42 @@ msgstr "Passordet ditt:" msgid "Users: %(instance_name)s" msgstr "Medlemmer: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Brukernavn" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Lagt til dato" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Sist aktiv" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Ekstern instans" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Aktiv" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inaktiv" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Ikke angitt" @@ -5022,10 +5051,6 @@ msgstr "" msgid "Finish reading" msgstr "Fullfør lesing" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Varsel om følsomt innhold" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Vis status" @@ -5321,7 +5346,7 @@ msgstr "Ingen følgere du følger" msgid "View profile and more" msgstr "" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Logg ut" @@ -5342,6 +5367,14 @@ msgstr "Ikke en gyldig csv-fil" msgid "Username or password are incorrect" msgstr "Feil brukernavn eller passord" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo index 48000c2f2..bd053e54e 100644 Binary files a/locale/pt_BR/LC_MESSAGES/django.mo and b/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index 10e311104..280e9c896 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -1205,7 +1205,7 @@ msgstr "Domínio" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Publicação" @@ -1329,7 +1329,7 @@ msgstr "Código de confirmação:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Enviar" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Usuários locais" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Comunidade federada" @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "Mais sobre este site" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Confirmar senha:" @@ -2871,6 +2871,11 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Aviso de conteúdo" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3028,12 +3033,20 @@ msgstr "Nenhum usuário bloqueado." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Alterar senha" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Nova senha:" @@ -3125,6 +3138,10 @@ msgstr "Exportar CSV" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "Seu arquivo conterá todos os livros em suas estantes, suas resenhas e o andamento de suas leituras." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Conta" @@ -3353,13 +3370,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data de início:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data final:" @@ -3519,7 +3536,7 @@ msgid "Dashboard" msgstr "Painel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Total de usuários" @@ -3537,66 +3554,31 @@ msgstr "Publicações" msgid "Works" msgstr "Obras" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s denúncia aberta" -msgstr[1] "%(display_count)s denúncias abertas" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s domínio precisa ser analisado" -msgstr[1] "%(display_count)s domínios precisam ser analisados" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s pedido de convite" -msgstr[1] "%(display_count)s pedidos de convite" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "Há uma atualização disponível! Você está usando a v%(current)s e o último lançamento é %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Atividade da instância" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Novos usuários" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Publicações" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Obras criadas" @@ -3612,6 +3594,49 @@ msgstr "Publicações feitas" msgid "Total" msgstr "Total" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s domínio precisa ser analisado" +msgstr[1] "%(display_count)s domínios precisam ser analisados" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s pedido de convite" +msgstr[1] "%(display_count)s pedidos de convite" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s denúncia aberta" +msgstr[1] "%(display_count)s denúncias abertas" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "Há uma atualização disponível! Você está usando a v%(current)s e o último lançamento é %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4308,38 +4333,42 @@ msgstr "Sua senha:" msgid "Users: %(instance_name)s" msgstr "Usuários: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Nome de usuário" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Data de inclusão" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Última atividade" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Instância remota" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Ativo" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inativo" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Não definido" @@ -5024,10 +5053,6 @@ msgstr "" msgid "Finish reading" msgstr "Terminar de ler" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Aviso de conteúdo" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Mostrar publicação" @@ -5323,7 +5348,7 @@ msgstr "Nenhum seguidor que você segue" msgid "View profile and more" msgstr "Ver perfil e mais" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Sair" @@ -5344,6 +5369,14 @@ msgstr "Não é um arquivo csv válido" msgid "Username or password are incorrect" msgstr "Nome de usuário ou senha incorretos" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/pt_PT/LC_MESSAGES/django.mo b/locale/pt_PT/LC_MESSAGES/django.mo index 2134e8e11..0020b3296 100644 Binary files a/locale/pt_PT/LC_MESSAGES/django.mo and b/locale/pt_PT/LC_MESSAGES/django.mo differ diff --git a/locale/pt_PT/LC_MESSAGES/django.po b/locale/pt_PT/LC_MESSAGES/django.po index 2519ed976..e95cc26fd 100644 --- a/locale/pt_PT/LC_MESSAGES/django.po +++ b/locale/pt_PT/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:21\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese\n" "Language: pt\n" @@ -1205,7 +1205,7 @@ msgstr "Domínio" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Estado" @@ -1329,7 +1329,7 @@ msgstr "Código de confirmação:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Submeter" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Utilizadores locais" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Comunidade federada" @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "Mais sobre este site" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Confirmar palavra-passe:" @@ -2871,6 +2871,11 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Aviso de Conteúdo" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3028,12 +3033,20 @@ msgstr "Não há utilizadores bloqueados." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Alterar Palavra-passe" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Nova Palavra-passe:" @@ -3125,6 +3138,10 @@ msgstr "Exportar para CSV" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "A exportação incluirá todos os livros das tuas prateleiras, livros que tu já avaliaste e livros com a atividade da leitura." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Conta" @@ -3353,13 +3370,13 @@ msgstr "Falso" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data de início:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data de conclusão:" @@ -3519,7 +3536,7 @@ msgid "Dashboard" msgstr "Painel de controlo" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Total de utilizadores" @@ -3537,66 +3554,31 @@ msgstr "Estados" msgid "Works" msgstr "Obras" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s denúncia aberta" -msgstr[1] "%(display_count)s denúncias abertas" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "" -msgstr[1] "" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s pedido de convite" -msgstr[1] "%(display_count)s pedidos de convite" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "Uma atualização está disponível! Estás a correr a versão v%(current)s e a mais recente é a %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Atividade do domínio" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervalo:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dias" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Semanas" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Atividade de inscrição do utilizador" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Atividade de estado" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Obras criadas" @@ -3612,6 +3594,49 @@ msgstr "Estados publicados" msgid "Total" msgstr "Total" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s pedido de convite" +msgstr[1] "%(display_count)s pedidos de convite" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s denúncia aberta" +msgstr[1] "%(display_count)s denúncias abertas" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "Uma atualização está disponível! Estás a correr a versão v%(current)s e a mais recente é a %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4308,38 +4333,42 @@ msgstr "A tua palavra-passe:" msgid "Users: %(instance_name)s" msgstr "Utilizadores: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Nome de utilizador" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Data de Adição" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Última atividade" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Domínio remoto" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Ativo" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inativo" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Não definido" @@ -5024,10 +5053,6 @@ msgstr "" msgid "Finish reading" msgstr "Terminar leitura" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Aviso de Conteúdo" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Mostrar o estado" @@ -5323,7 +5348,7 @@ msgstr "Não há seguidores que tu segues" msgid "View profile and more" msgstr "Visualizar perfil e mais" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Terminar sessão" @@ -5344,6 +5369,14 @@ msgstr "Não é um ficheiro csv válido" msgid "Username or password are incorrect" msgstr "Nome de utilizador ou palavra-passe incorretos" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/ro_RO/LC_MESSAGES/django.mo b/locale/ro_RO/LC_MESSAGES/django.mo index b5af8e059..dd4e6c386 100644 Binary files a/locale/ro_RO/LC_MESSAGES/django.mo and b/locale/ro_RO/LC_MESSAGES/django.mo differ diff --git a/locale/ro_RO/LC_MESSAGES/django.po b/locale/ro_RO/LC_MESSAGES/django.po index 54af51b70..cf376fb56 100644 --- a/locale/ro_RO/LC_MESSAGES/django.po +++ b/locale/ro_RO/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Romanian\n" "Language: ro\n" @@ -1211,7 +1211,7 @@ msgstr "Domeniu" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Status" @@ -1335,7 +1335,7 @@ msgstr "Cod de confirmare:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Trimiteți" @@ -1375,7 +1375,7 @@ msgid "Local users" msgstr "Utilizatori locali" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Comunitate federată" @@ -2285,7 +2285,7 @@ msgid "More about this site" msgstr "Mai multe despre acest site" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Confirmați parola:" @@ -2886,6 +2886,11 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Avertisment de conținut" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3043,12 +3048,20 @@ msgstr "Niciun utilizator blocat." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Schimbați parola" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Parolă nouă:" @@ -3140,6 +3153,10 @@ msgstr "Export CSV" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "Exportul dvs. va include toate cărțile de pe etajerele dvs., cărți pe care le-ați revizuit și cărți cu activitate de lectură." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Cont" @@ -3367,13 +3384,13 @@ msgstr "Fals" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Data de început:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Data de sfârșit:" @@ -3533,7 +3550,7 @@ msgid "Dashboard" msgstr "Tablou de bord" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Număr total de utilizatori" @@ -3551,69 +3568,31 @@ msgstr "Statusuri" msgid "Works" msgstr "Opere" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s raport deschis" -msgstr[1] "" -msgstr[2] "%(display_count)s raporturi dechise" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s domeniu care necesită revizuire" -msgstr[1] "" -msgstr[2] "%(display_count)s domenii care necesită revizii" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s cerere de invitare" -msgstr[1] "" -msgstr[2] "%(display_count)s cereri de invitare" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "O actualizare este disponibilă! Rulați în prezent v%(current)s, iar cea mai nouă versiune este %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Activitatea instanței" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Interval:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Zile" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Săptămâni" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Activitate de înscriere a utilizatorilor" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Activitate stare" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Opere create" @@ -3629,6 +3608,52 @@ msgstr "Stări publicate" msgid "Total" msgstr "Total" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s domeniu care necesită revizuire" +msgstr[1] "" +msgstr[2] "%(display_count)s domenii care necesită revizii" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s cerere de invitare" +msgstr[1] "" +msgstr[2] "%(display_count)s cereri de invitare" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s raport deschis" +msgstr[1] "" +msgstr[2] "%(display_count)s raporturi dechise" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "O actualizare este disponibilă! Rulați în prezent v%(current)s, iar cea mai nouă versiune este %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4326,38 +4351,42 @@ msgstr "Parola dvs.:" msgid "Users: %(instance_name)s" msgstr "Utilizatori: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Nume de utilizator" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Data adăugării" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Ultima dată activ(ă)" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Instanță la distanță" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Activ" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inactiv" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Neconfigurat" @@ -5050,10 +5079,6 @@ msgstr "" msgid "Finish reading" msgstr "Terminați de citit" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Avertisment de conținut" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Arătați stare" @@ -5351,7 +5376,7 @@ msgstr "Niciun urmăritor pe care îl urmărești" msgid "View profile and more" msgstr "Vizualizați profil și multe altele" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Deconectați-vă" @@ -5372,6 +5397,14 @@ msgstr "Nu este un fișier csv valid" msgid "Username or password are incorrect" msgstr "Numele de utilizator sau parola greșite" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/sv_SE/LC_MESSAGES/django.mo b/locale/sv_SE/LC_MESSAGES/django.mo index 47c4f1939..61c5aabb3 100644 Binary files a/locale/sv_SE/LC_MESSAGES/django.mo and b/locale/sv_SE/LC_MESSAGES/django.mo differ diff --git a/locale/sv_SE/LC_MESSAGES/django.po b/locale/sv_SE/LC_MESSAGES/django.po index 03002a581..a881cf235 100644 --- a/locale/sv_SE/LC_MESSAGES/django.po +++ b/locale/sv_SE/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:21\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Swedish\n" "Language: sv\n" @@ -1205,7 +1205,7 @@ msgstr "Domän" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "Status" @@ -1329,7 +1329,7 @@ msgstr "Bekräftelsekod:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "Skicka in" @@ -1369,7 +1369,7 @@ msgid "Local users" msgstr "Lokala användare" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "Federerad gemenskap" @@ -2273,7 +2273,7 @@ msgid "More about this site" msgstr "Mer om den här sidan" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "Bekräfta lösenordet:" @@ -2871,6 +2871,11 @@ msgid_plural "%(display_count)s new reports need modera msgstr[0] "" msgstr[1] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "Innehållsvarning" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3028,12 +3033,20 @@ msgstr "Inga användare är för närvarande blockerade." #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "Ändra lösenord" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "Nytt lösenord:" @@ -3125,6 +3138,10 @@ msgstr "CSV-export" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "Din export inkluderar alla böcker som du har på din hylla, har recenserat och böcker med läsaktivitet." +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "Konto" @@ -3353,13 +3370,13 @@ msgstr "Falskt" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "Startdatum:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "Slutdatum:" @@ -3519,7 +3536,7 @@ msgid "Dashboard" msgstr "Översiktspanel" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "Totalt antal användare" @@ -3537,66 +3554,31 @@ msgstr "Statusar" msgid "Works" msgstr "Verk" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s öppen rapport" -msgstr[1] "%(display_count)s öppna rapporter" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s domänen behöver granskning" -msgstr[1] "%(display_count)s domänerna behöver granskning" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s inbjudningsförfrågning" -msgstr[1] "%(display_count)s inbjudningsförfrågningar" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "En uppdatering är tillgänglig! Du kör v%(current)s och den senaste versionen är %(available)s." - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "Instansaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "Intervall:" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "Dagar" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "Veckor" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "Användarens registreringsaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "Statusaktivitet" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "Skapade verk" @@ -3612,6 +3594,49 @@ msgstr "Utlagda statusar" msgid "Total" msgstr "Totalt" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s domänen behöver granskning" +msgstr[1] "%(display_count)s domänerna behöver granskning" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s inbjudningsförfrågning" +msgstr[1] "%(display_count)s inbjudningsförfrågningar" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s öppen rapport" +msgstr[1] "%(display_count)s öppna rapporter" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "En uppdatering är tillgänglig! Du kör v%(current)s och den senaste versionen är %(available)s." + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4308,38 +4333,42 @@ msgstr "Ditt lösenord:" msgid "Users: %(instance_name)s" msgstr "Användare: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "Användarnamn" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "Lades till datum" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "Senast aktiv" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "Fjärrinstans" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "Aktiv" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "Inaktiv" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "Inte inställd" @@ -5024,10 +5053,6 @@ msgstr "" msgid "Finish reading" msgstr "Sluta läs" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "Innehållsvarning" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "Visa status" @@ -5323,7 +5348,7 @@ msgstr "Inga följare som du följer" msgid "View profile and more" msgstr "" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "Logga ut" @@ -5344,6 +5369,14 @@ msgstr "Inte en giltig csv-fil" msgid "Username or password are incorrect" msgstr "Användarnamnet eller lösenordet är felaktigt" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index 1d1227f80..28ca1472f 100644 Binary files a/locale/zh_Hans/LC_MESSAGES/django.mo and b/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index effa15933..941f6807f 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -1199,7 +1199,7 @@ msgstr "域名" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "状态" @@ -1323,7 +1323,7 @@ msgstr "确认代码:" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "提交" @@ -1363,7 +1363,7 @@ msgid "Local users" msgstr "本地用户" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "跨站社区" @@ -2261,7 +2261,7 @@ msgid "More about this site" msgstr "更多关于本站点的信息" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "确认密码:" @@ -2856,6 +2856,11 @@ msgid "A new report needs moderation" msgid_plural "%(display_count)s new reports need moderation" msgstr[0] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "内容警告" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3013,12 +3018,20 @@ msgstr "当前没有被屏蔽的用户。" #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "更改密码" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "新密码:" @@ -3110,6 +3123,10 @@ msgstr "CSV导出" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "你的导出将包括你书架上的所有书籍，你评论过的书籍，以及有阅读活动的书籍。" +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "帐号" @@ -3338,13 +3355,13 @@ msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "开始日期:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "结束日期:" @@ -3504,7 +3521,7 @@ msgid "Dashboard" msgstr "仪表盘" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "用户总数" @@ -3522,63 +3539,31 @@ msgstr "状态" msgid "Works" msgstr "作品" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "%(display_count)s 条待处理报告" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "%(display_count)s 个域名需要审核" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "%(display_count)s 条邀请请求" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "有可用的更新！最新版本为：%(available)s，但你当前运行的版本为：%(current)s。" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "实例活动" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "区段：" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "天" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "周" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "用户注册活动" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "状态动态" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "创建的作品" @@ -3594,6 +3579,46 @@ msgstr "发布的状态" msgid "Total" msgstr "总数" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "%(display_count)s 个域名需要审核" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "%(display_count)s 条邀请请求" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "%(display_count)s 条待处理报告" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "有可用的更新！最新版本为：%(available)s，但你当前运行的版本为：%(current)s。" + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4289,38 +4314,42 @@ msgstr "你的密码：" msgid "Users: %(instance_name)s" msgstr "用户: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "用户名" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "添加日期:" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "最后或缺" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "移除服务器" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "活跃" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "停用" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "未设置" @@ -4998,10 +5027,6 @@ msgstr "" msgid "Finish reading" msgstr "完成阅读" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "内容警告" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "显示状态" @@ -5295,7 +5320,7 @@ msgstr "没有你关注的关注者" msgid "View profile and more" msgstr "查看档案和其他" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "登出" @@ -5316,6 +5341,14 @@ msgstr "不是有效的 csv 文件" msgid "Username or password are incorrect" msgstr "用户名或密码不正确" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}" diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo index f9ca27be9..5f8f5aa41 100644 Binary files a/locale/zh_Hant/LC_MESSAGES/django.mo and b/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index cb0c7244a..2774d7184 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-07-07 17:47+0000\n" -"PO-Revision-Date: 2022-07-07 18:12\n" +"POT-Creation-Date: 2022-07-11 15:53+0000\n" +"PO-Revision-Date: 2022-07-11 16:22\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -1199,7 +1199,7 @@ msgstr "" #: bookwyrm/templates/settings/announcements/announcements.html:37 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:47 #: bookwyrm/templates/settings/invites/status_filter.html:5 -#: bookwyrm/templates/settings/users/user_admin.html:52 +#: bookwyrm/templates/settings/users/user_admin.html:56 #: bookwyrm/templates/settings/users/user_info.html:24 msgid "Status" msgstr "狀態" @@ -1323,7 +1323,7 @@ msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:25 #: bookwyrm/templates/landing/layout.html:81 -#: bookwyrm/templates/settings/dashboard/dashboard.html:127 +#: bookwyrm/templates/settings/dashboard/dashboard.html:106 #: bookwyrm/templates/snippets/report_modal.html:53 msgid "Submit" msgstr "提交" @@ -1363,7 +1363,7 @@ msgid "Local users" msgstr "本地使用者" #: bookwyrm/templates/directory/community_filter.html:12 -#: bookwyrm/templates/settings/users/user_admin.html:29 +#: bookwyrm/templates/settings/users/user_admin.html:33 msgid "Federated community" msgstr "跨站社群" @@ -1994,7 +1994,7 @@ msgstr "納入書評" #: bookwyrm/templates/import/import.html:60 msgid "Privacy setting for imported reviews:" -msgstr "匯入書評的隱私設定" +msgstr "匯入書評的私隱設定" #: bookwyrm/templates/import/import.html:66 #: bookwyrm/templates/preferences/layout.html:31 @@ -2261,7 +2261,7 @@ msgid "More about this site" msgstr "關於本網站的更多" #: bookwyrm/templates/landing/password_reset.html:34 -#: bookwyrm/templates/preferences/change_password.html:18 +#: bookwyrm/templates/preferences/change_password.html:40 #: bookwyrm/templates/preferences/delete_user.html:20 msgid "Confirm password:" msgstr "確認密碼:" @@ -2856,6 +2856,11 @@ msgid "A new report needs moderation" msgid_plural "%(display_count)s new reports need moderation" msgstr[0] "" +#: bookwyrm/templates/notifications/items/status_preview.html:4 +#: bookwyrm/templates/snippets/status/content_status.html:73 +msgid "Content warning" +msgstr "" + #: bookwyrm/templates/notifications/items/update.html:16 #, python-format msgid "has changed the privacy level for %(group_name)s" @@ -3013,12 +3018,20 @@ msgstr "當前沒有被封鎖的使用者。" #: bookwyrm/templates/preferences/change_password.html:4 #: bookwyrm/templates/preferences/change_password.html:7 -#: bookwyrm/templates/preferences/change_password.html:21 +#: bookwyrm/templates/preferences/change_password.html:52 #: bookwyrm/templates/preferences/layout.html:20 msgid "Change Password" msgstr "更改密碼" -#: bookwyrm/templates/preferences/change_password.html:14 +#: bookwyrm/templates/preferences/change_password.html:15 +msgid "Successfully changed password" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:22 +msgid "Current password:" +msgstr "" + +#: bookwyrm/templates/preferences/change_password.html:36 msgid "New password:" msgstr "新密碼:" @@ -3110,6 +3123,10 @@ msgstr "" msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity." msgstr "" +#: bookwyrm/templates/preferences/export.html:20 +msgid "Download file" +msgstr "" + #: bookwyrm/templates/preferences/layout.html:11 msgid "Account" msgstr "帳號" @@ -3336,13 +3353,13 @@ msgstr "否" #: bookwyrm/templates/settings/announcements/announcement.html:57 #: bookwyrm/templates/settings/announcements/edit_announcement.html:79 -#: bookwyrm/templates/settings/dashboard/dashboard.html:105 +#: bookwyrm/templates/settings/dashboard/dashboard.html:84 msgid "Start date:" msgstr "開始日期:" #: bookwyrm/templates/settings/announcements/announcement.html:62 #: bookwyrm/templates/settings/announcements/edit_announcement.html:89 -#: bookwyrm/templates/settings/dashboard/dashboard.html:111 +#: bookwyrm/templates/settings/dashboard/dashboard.html:90 msgid "End date:" msgstr "結束日期:" @@ -3502,7 +3519,7 @@ msgid "Dashboard" msgstr "" #: bookwyrm/templates/settings/dashboard/dashboard.html:15 -#: bookwyrm/templates/settings/dashboard/dashboard.html:134 +#: bookwyrm/templates/settings/dashboard/dashboard.html:113 msgid "Total users" msgstr "" @@ -3520,63 +3537,31 @@ msgstr "" msgid "Works" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:43 -#, python-format -msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:46 -msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:54 -#, python-format -msgid "%(display_count)s open report" -msgid_plural "%(display_count)s open reports" -msgstr[0] "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:66 -#, python-format -msgid "%(display_count)s domain needs review" -msgid_plural "%(display_count)s domains need review" -msgstr[0] "" - #: bookwyrm/templates/settings/dashboard/dashboard.html:78 -#, python-format -msgid "%(display_count)s invite request" -msgid_plural "%(display_count)s invite requests" -msgstr[0] "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:90 -#, python-format -msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." -msgstr "" - -#: bookwyrm/templates/settings/dashboard/dashboard.html:99 msgid "Instance Activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:117 +#: bookwyrm/templates/settings/dashboard/dashboard.html:96 msgid "Interval:" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:121 +#: bookwyrm/templates/settings/dashboard/dashboard.html:100 msgid "Days" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:122 +#: bookwyrm/templates/settings/dashboard/dashboard.html:101 msgid "Weeks" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:140 +#: bookwyrm/templates/settings/dashboard/dashboard.html:119 msgid "User signup activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:146 +#: bookwyrm/templates/settings/dashboard/dashboard.html:125 msgid "Status activity" msgstr "" -#: bookwyrm/templates/settings/dashboard/dashboard.html:152 +#: bookwyrm/templates/settings/dashboard/dashboard.html:131 msgid "Works created" msgstr "" @@ -3592,6 +3577,46 @@ msgstr "" msgid "Total" msgstr "" +#: bookwyrm/templates/settings/dashboard/warnings/domain_review.html:9 +#, python-format +msgid "%(display_count)s domain needs review" +msgid_plural "%(display_count)s domains need review" +msgstr[0] "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:8 +#, python-format +msgid "Your outgoing email address, %(email_sender)s, may be misconfigured." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/email_config.html:11 +msgid "Check the EMAIL_SENDER_NAME and EMAIL_SENDER_DOMAIN in your .env file." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/invites.html:9 +#, python-format +msgid "%(display_count)s invite request" +msgid_plural "%(display_count)s invite requests" +msgstr[0] "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_conduct.html:8 +msgid "Your instance is missing a code of conduct." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/missing_privacy.html:8 +msgid "Your instance is missing a privacy policy." +msgstr "" + +#: bookwyrm/templates/settings/dashboard/warnings/reports.html:9 +#, python-format +msgid "%(display_count)s open report" +msgid_plural "%(display_count)s open reports" +msgstr[0] "" + +#: bookwyrm/templates/settings/dashboard/warnings/update_version.html:8 +#, python-format +msgid "An update is available! You're running v%(current)s and the latest release is %(available)s." +msgstr "" + #: bookwyrm/templates/settings/email_blocklist/domain_form.html:5 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:10 msgid "Add domain" @@ -4287,38 +4312,42 @@ msgstr "" msgid "Users: %(instance_name)s" msgstr "使用者: %(instance_name)s" -#: bookwyrm/templates/settings/users/user_admin.html:40 +#: bookwyrm/templates/settings/users/user_admin.html:29 +msgid "Deleted users" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:44 #: bookwyrm/templates/settings/users/username_filter.html:5 msgid "Username" msgstr "使用者名稱" -#: bookwyrm/templates/settings/users/user_admin.html:44 +#: bookwyrm/templates/settings/users/user_admin.html:48 msgid "Date Added" msgstr "新增日期:" -#: bookwyrm/templates/settings/users/user_admin.html:48 +#: bookwyrm/templates/settings/users/user_admin.html:52 msgid "Last Active" msgstr "最後活躍" -#: bookwyrm/templates/settings/users/user_admin.html:57 +#: bookwyrm/templates/settings/users/user_admin.html:61 msgid "Remote instance" msgstr "移除伺服器" -#: bookwyrm/templates/settings/users/user_admin.html:74 +#: bookwyrm/templates/settings/users/user_admin.html:81 #: bookwyrm/templates/settings/users/user_info.html:28 msgid "Active" msgstr "活躍" -#: bookwyrm/templates/settings/users/user_admin.html:79 +#: bookwyrm/templates/settings/users/user_admin.html:86 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:85 +#: bookwyrm/templates/settings/users/user_admin.html:92 #: bookwyrm/templates/settings/users/user_info.html:32 msgid "Inactive" msgstr "停用" -#: bookwyrm/templates/settings/users/user_admin.html:94 +#: bookwyrm/templates/settings/users/user_admin.html:101 #: bookwyrm/templates/settings/users/user_info.html:127 msgid "Not set" msgstr "未設定" @@ -4996,10 +5025,6 @@ msgstr "" msgid "Finish reading" msgstr "完成閱讀" -#: bookwyrm/templates/snippets/status/content_status.html:73 -msgid "Content warning" -msgstr "" - #: bookwyrm/templates/snippets/status/content_status.html:80 msgid "Show status" msgstr "" @@ -5293,7 +5318,7 @@ msgstr "" msgid "View profile and more" msgstr "" -#: bookwyrm/templates/user_menu.html:72 +#: bookwyrm/templates/user_menu.html:78 msgid "Log out" msgstr "登出" @@ -5314,6 +5339,14 @@ msgstr "不是有效的 csv 檔案" msgid "Username or password are incorrect" msgstr "" +#: bookwyrm/views/preferences/change_password.py:35 +msgid "Incorrect password" +msgstr "" + +#: bookwyrm/views/preferences/change_password.py:42 +msgid "Password does not match" +msgstr "" + #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}"