diff --git a/bookwyrm/connectors/abstract_connector.py b/bookwyrm/connectors/abstract_connector.py index 5ed57df1..0ab135b8 100644 --- a/bookwyrm/connectors/abstract_connector.py +++ b/bookwyrm/connectors/abstract_connector.py @@ -1,7 +1,9 @@ """ functionality outline for a book data connector """ from abc import ABC, abstractmethod +import imghdr import logging +from django.core.files.base import ContentFile from django.db import transaction import requests from requests.exceptions import RequestException @@ -290,10 +292,18 @@ def get_image(url, timeout=10): ) except RequestException as err: logger.exception(err) - return None + return None, None + if not resp.ok: - return None - return resp + return None, None + + image_content = ContentFile(resp.content) + extension = imghdr.what(None, image_content.read()) + if not extension: + logger.exception("File requested was not an image: %s", url) + return None, None + + return image_content, extension class Mapping: diff --git a/bookwyrm/migrations/0132_alter_user_preferred_language.py b/bookwyrm/migrations/0132_alter_user_preferred_language.py new file mode 100644 index 00000000..a2f0aa6a --- /dev/null +++ b/bookwyrm/migrations/0132_alter_user_preferred_language.py @@ -0,0 +1,37 @@ +# Generated by Django 3.2.10 on 2022-02-02 20:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0131_merge_20220125_1644"), + ] + + operations = [ + migrations.AlterField( + model_name="user", + name="preferred_language", + field=models.CharField( + blank=True, + choices=[ + ("en-us", "English"), + ("de-de", "Deutsch (German)"), + ("es-es", "Español (Spanish)"), + ("gl-es", "Galego (Galician)"), + ("it-it", "Italiano (Italian)"), + ("fr-fr", "Français (French)"), + ("lt-lt", "Lietuvių (Lithuanian)"), + ("no-no", "Norsk (Norwegian)"), + ("pt-br", "Português do Brasil (Brazilian Portuguese)"), + ("pt-pt", "Português Europeu (European Portuguese)"), + ("sv-se", "Svenska (Swedish)"), + ("zh-hans", "简体中文 (Simplified Chinese)"), + ("zh-hant", "繁體中文 (Traditional Chinese)"), + ], + max_length=255, + null=True, + ), + ), + ] diff --git a/bookwyrm/models/fields.py b/bookwyrm/models/fields.py index e61f912e..b506c11c 100644 --- a/bookwyrm/models/fields.py +++ b/bookwyrm/models/fields.py @@ -1,6 +1,5 @@ """ activitypub-aware django model fields """ from dataclasses import MISSING -import imghdr import re from uuid import uuid4 from urllib.parse import urljoin @@ -9,7 +8,6 @@ import dateutil.parser from dateutil.parser import ParserError from django.contrib.postgres.fields import ArrayField as DjangoArrayField from django.core.exceptions import ValidationError -from django.core.files.base import ContentFile from django.db import models from django.forms import ClearableFileInput, ImageField as DjangoImageField from django.utils import timezone @@ -443,12 +441,10 @@ class ImageField(ActivitypubFieldMixin, models.ImageField): except ValidationError: return None - response = get_image(url) - if not response: + image_content, extension = get_image(url) + if not image_content: return None - image_content = ContentFile(response.content) - extension = imghdr.what(None, image_content.read()) or "" image_name = f"{uuid4()}.{extension}" return [image_name, image_content] diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 8c4e8a7e..72af0804 100644 --- a/bookwyrm/settings.py +++ b/bookwyrm/settings.py @@ -9,7 +9,7 @@ from django.utils.translation import gettext_lazy as _ env = Env() env.read_env() DOMAIN = env("DOMAIN") -VERSION = "0.2.0" +VERSION = "0.2.1" PAGE_LENGTH = env("PAGE_LENGTH", 15) DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English") @@ -255,7 +255,7 @@ LANGUAGES = [ ("no-no", _("Norsk (Norwegian)")), ("pt-br", _("Português do Brasil (Brazilian Portuguese)")), ("pt-pt", _("Português Europeu (European Portuguese)")), - ("sv-se", _("Swedish (Svenska)")), + ("sv-se", _("Svenska (Swedish)")), ("zh-hans", _("简体中文 (Simplified Chinese)")), ("zh-hant", _("繁體中文 (Traditional Chinese)")), ] diff --git a/bookwyrm/templates/book/book.html b/bookwyrm/templates/book/book.html index 43f2171c..e15b656c 100644 --- a/bookwyrm/templates/book/book.html +++ b/bookwyrm/templates/book/book.html @@ -356,10 +356,11 @@
{% csrf_token %} +
- {% for list in user.list_set.all %} {% endfor %} diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index 8e35416f..a4c12f46 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -97,7 +97,7 @@ - {% include "lists/edit_item_form.html" %} + {% include "lists/edit_item_form.html" with book=item.book %}
{% endif %} @@ -112,7 +112,7 @@ - {% include "lists/edit_item_form.html" %} + {% include "lists/edit_item_form.html" with book=item.book %}
{% endif %} diff --git a/bookwyrm/templates/shelf/shelf.html b/bookwyrm/templates/shelf/shelf.html index 3a565221..cc4bb143 100644 --- a/bookwyrm/templates/shelf/shelf.html +++ b/bookwyrm/templates/shelf/shelf.html @@ -45,7 +45,7 @@ href="{{ shelf_tab.local_path }}" {% if shelf_tab.identifier == shelf.identifier %} aria-current="page"{% endif %} > - {% include 'user/books_header.html' with shelf=shelf_tab %} + {% include "snippets/translated_shelf_name.html" with shelf=shelf_tab %} {% endfor %} diff --git a/bookwyrm/tests/models/test_fields.py b/bookwyrm/tests/models/test_fields.py index 5bb7fecc..f7386c2e 100644 --- a/bookwyrm/tests/models/test_fields.py +++ b/bookwyrm/tests/models/test_fields.py @@ -443,18 +443,17 @@ class ModelFields(TestCase): image_file = pathlib.Path(__file__).parent.joinpath( "../../static/images/default_avi.jpg" ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) - instance = fields.ImageField() - responses.add( - responses.GET, - "http://www.example.com/image.jpg", - body=image.tobytes(), - status=200, - ) + with open(image_file, "rb") as image_data: + responses.add( + responses.GET, + "http://www.example.com/image.jpg", + body=image_data.read(), + status=200, + content_type="image/jpeg", + stream=True, + ) loaded_image = instance.field_from_activity("http://www.example.com/image.jpg") self.assertIsInstance(loaded_image, list) self.assertIsInstance(loaded_image[1], ContentFile) @@ -465,18 +464,18 @@ class ModelFields(TestCase): image_file = pathlib.Path(__file__).parent.joinpath( "../../static/images/default_avi.jpg" ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) instance = fields.ImageField(activitypub_field="cover", name="cover") - responses.add( - responses.GET, - "http://www.example.com/image.jpg", - body=image.tobytes(), - status=200, - ) + with open(image_file, "rb") as image_data: + responses.add( + responses.GET, + "http://www.example.com/image.jpg", + body=image_data.read(), + content_type="image/jpeg", + status=200, + stream=True, + ) book = Edition.objects.create(title="hello") MockActivity = namedtuple("MockActivity", ("cover")) @@ -491,18 +490,18 @@ class ModelFields(TestCase): image_file = pathlib.Path(__file__).parent.joinpath( "../../static/images/default_avi.jpg" ) - image = Image.open(image_file) - output = BytesIO() - image.save(output, format=image.format) instance = fields.ImageField(activitypub_field="cover", name="cover") - responses.add( - responses.GET, - "http://www.example.com/image.jpg", - body=image.tobytes(), - status=200, - ) + with open(image_file, "rb") as image_data: + responses.add( + responses.GET, + "http://www.example.com/image.jpg", + body=image_data.read(), + status=200, + content_type="image/jpeg", + stream=True, + ) book = Edition.objects.create(title="hello") MockActivity = namedtuple("MockActivity", ("cover")) @@ -565,18 +564,18 @@ class ModelFields(TestCase): another_image_file = pathlib.Path(__file__).parent.joinpath( "../../static/images/logo.png" ) - another_image = Image.open(another_image_file) - another_output = BytesIO() - another_image.save(another_output, format=another_image.format) instance = fields.ImageField(activitypub_field="cover", name="cover") - responses.add( - responses.GET, - "http://www.example.com/image.jpg", - body=another_image.tobytes(), - status=200, - ) + with open(another_image_file, "rb") as another_image: + responses.add( + responses.GET, + "http://www.example.com/image.jpg", + body=another_image.read(), + status=200, + content_type="image/jpeg", + stream=True, + ) MockActivity = namedtuple("MockActivity", ("cover")) mock_activity = MockActivity("http://www.example.com/image.jpg") diff --git a/bookwyrm/views/books/books.py b/bookwyrm/views/books/books.py index 7de2d0d2..e04230ba 100644 --- a/bookwyrm/views/books/books.py +++ b/bookwyrm/views/books/books.py @@ -2,7 +2,6 @@ from uuid import uuid4 from django.contrib.auth.decorators import login_required, permission_required -from django.core.files.base import ContentFile from django.core.paginator import Paginator from django.db.models import Avg, Q from django.http import Http404 @@ -144,13 +143,12 @@ def upload_cover(request, book_id): def set_cover_from_url(url): """load it from a url""" try: - image_file = get_image(url) + image_content, extension = get_image(url) except: # pylint: disable=bare-except return None - if not image_file: + if not image_content: return None - image_name = str(uuid4()) + "." + url.split(".")[-1] - image_content = ContentFile(image_file.content) + image_name = str(uuid4()) + "." + extension return [image_name, image_content] diff --git a/bookwyrm/views/list/list_item.py b/bookwyrm/views/list/list_item.py index 29cfbee8..5fd65938 100644 --- a/bookwyrm/views/list/list_item.py +++ b/bookwyrm/views/list/list_item.py @@ -19,4 +19,6 @@ class ListItem(View): form = forms.ListItemForm(request.POST, instance=list_item) if form.is_valid(): form.save() + else: + raise Exception(form.errors) return redirect("list", list_item.book_list.id) diff --git a/bw-dev b/bw-dev index 5248c887..11977ad0 100755 --- a/bw-dev +++ b/bw-dev @@ -209,6 +209,7 @@ case "$CMD" in echo " build" echo " clean" echo " black" + echo " prettier" echo " populate_streams [--stream=]" echo " populate_suggestions" echo " generate_thumbnails" diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 34fecd22..1ed9ee62 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-02-02 18:03+0000\n" -"PO-Revision-Date: 2022-01-24 18:55\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 19:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: German\n" "Language: de\n" @@ -3582,23 +3582,31 @@ msgstr "Keine Links für diese Domain vorhanden." msgid "Back to reports" msgstr "Zurück zu den Meldungen" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Gemeldete Statusmeldungen" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "Statusmeldung gelöscht" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "Gemeldete Links" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Moderator*innenkommentare" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Kommentieren" @@ -4023,14 +4031,14 @@ msgstr "Prozent" msgid "of %(pages)s pages" msgstr "von %(pages)s Seiten" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Antworten" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Inhalt" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index a923e43e..2b8ffaf5 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-02-02 18:03+0000\n" +"POT-Creation-Date: 2022-02-02 20:09+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -149,26 +149,26 @@ msgstr "" msgid "Blocked" msgstr "" -#: bookwyrm/models/fields.py:29 +#: bookwyrm/models/fields.py:27 #, python-format msgid "%(value)s is not a valid remote_id" msgstr "" -#: bookwyrm/models/fields.py:38 bookwyrm/models/fields.py:47 +#: bookwyrm/models/fields.py:36 bookwyrm/models/fields.py:45 #, python-format msgid "%(value)s is not a valid username" msgstr "" -#: bookwyrm/models/fields.py:183 bookwyrm/templates/layout.html:170 +#: bookwyrm/models/fields.py:181 bookwyrm/templates/layout.html:170 #: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "" -#: bookwyrm/models/fields.py:188 +#: bookwyrm/models/fields.py:186 msgid "A user with that username already exists." msgstr "" -#: bookwyrm/models/fields.py:207 +#: bookwyrm/models/fields.py:205 #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 #: bookwyrm/templates/snippets/privacy_select.html:11 @@ -176,7 +176,7 @@ msgstr "" msgid "Public" msgstr "" -#: bookwyrm/models/fields.py:208 +#: bookwyrm/models/fields.py:206 #: bookwyrm/templates/snippets/privacy-icons.html:7 #: bookwyrm/templates/snippets/privacy-icons.html:8 #: bookwyrm/templates/snippets/privacy_select.html:14 @@ -184,14 +184,14 @@ msgstr "" msgid "Unlisted" msgstr "" -#: bookwyrm/models/fields.py:209 +#: bookwyrm/models/fields.py:207 #: bookwyrm/templates/snippets/privacy_select.html:17 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/layout.html:11 msgid "Followers" msgstr "" -#: bookwyrm/models/fields.py:210 +#: bookwyrm/models/fields.py:208 #: bookwyrm/templates/snippets/create_status/post_options_block.html:8 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 @@ -292,7 +292,7 @@ msgid "Português Europeu (European Portuguese)" msgstr "" #: bookwyrm/settings.py:258 -msgid "Swedish (Svenska)" +msgid "Svenska (Swedish)" msgstr "" #: bookwyrm/settings.py:259 @@ -378,7 +378,7 @@ msgstr "" #: bookwyrm/templates/about/about.html:131 #: bookwyrm/templates/settings/users/user_moderation_actions.html:14 #: bookwyrm/templates/snippets/status/status_options.html:35 -#: bookwyrm/templates/snippets/user_options.html:13 +#: bookwyrm/templates/snippets/user_options.html:14 msgid "Send direct message" msgstr "" @@ -1026,7 +1026,7 @@ msgid "Physical Properties" msgstr "" #: bookwyrm/templates/book/edit/edit_book_form.html:199 -#: bookwyrm/templates/book/editions/format_filter.html:5 +#: bookwyrm/templates/book/editions/format_filter.html:6 msgid "Format:" msgstr "" @@ -1064,17 +1064,17 @@ msgstr "" msgid "Editions of \"%(work_title)s\"" msgstr "" -#: bookwyrm/templates/book/editions/format_filter.html:8 -#: bookwyrm/templates/book/editions/language_filter.html:8 +#: bookwyrm/templates/book/editions/format_filter.html:9 +#: bookwyrm/templates/book/editions/language_filter.html:9 msgid "Any" msgstr "" -#: bookwyrm/templates/book/editions/language_filter.html:5 +#: bookwyrm/templates/book/editions/language_filter.html:6 #: bookwyrm/templates/preferences/edit_user.html:95 msgid "Language:" msgstr "" -#: bookwyrm/templates/book/editions/search_filter.html:5 +#: bookwyrm/templates/book/editions/search_filter.html:6 msgid "Search editions" msgstr "" @@ -4116,7 +4116,7 @@ msgstr "" msgid "Clear filters" msgstr "" -#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:42 +#: bookwyrm/templates/snippets/filters_panel/filters_panel.html:43 msgid "Apply filters" msgstr "" diff --git a/locale/es_ES/LC_MESSAGES/django.mo b/locale/es_ES/LC_MESSAGES/django.mo index 84f15f73..faae97ed 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 75acdad9..6d0cf2d7 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-28 08:06\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 19:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Spanish\n" "Language: es\n" @@ -3574,23 +3574,31 @@ msgstr "Ningún enlace disponible para este dominio." msgid "Back to reports" msgstr "Volver a los informes" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Estados reportados" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "El estado ha sido eliminado" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "Enlaces denunciados" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Comentarios de moderador" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Comentario" @@ -4015,14 +4023,14 @@ msgstr "por ciento" msgid "of %(pages)s pages" msgstr "de %(pages)s páginas" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Responder" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Contenido" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index cf872cf6..4300f005 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-28 11:29\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 19:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: French\n" "Language: fr\n" @@ -3574,23 +3574,31 @@ msgstr "Aucun lien n’est disponible pour ce domaine." msgid "Back to reports" msgstr "Retour aux signalements" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Statuts signalés" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "Le statut a été supprimé" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "Liens signalés" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Commentaires de l’équipe de modération" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Commentaire" @@ -4015,14 +4023,14 @@ msgstr "pourcent" msgid "of %(pages)s pages" msgstr "sur %(pages)s pages" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Répondre" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Contenu" diff --git a/locale/gl_ES/LC_MESSAGES/django.mo b/locale/gl_ES/LC_MESSAGES/django.mo index 78192e67..563a5e98 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 731b56ec..5ae9619c 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-28 05:04\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-31 07:59\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Galician\n" "Language: gl\n" @@ -3574,23 +3574,31 @@ msgstr "Non hai ligazóns dispoñibles para este dominio." msgid "Back to reports" msgstr "Volver a denuncias" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "Denunciante" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "Actualiza a denuncia:" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Estados dununciados" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "O estado foi eliminado" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "Ligazóns denunciadas" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Comentarios da moderación" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Comentario" @@ -4015,14 +4023,14 @@ msgstr "porcentaxe" msgid "of %(pages)s pages" msgstr "de %(pages)s páxinas" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Responder" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Contido" diff --git a/locale/it_IT/LC_MESSAGES/django.mo b/locale/it_IT/LC_MESSAGES/django.mo index 1b0b6d28..a8f4c5de 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 24c44980..fa00f1f4 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-28 19:04\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 20:36\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Italian\n" "Language: it\n" @@ -3574,23 +3574,31 @@ msgstr "Nessun collegamento disponibile per questo libro." msgid "Back to reports" msgstr "Tornare all'elenco dei report" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "Messaggio segnalato" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "Aggiornamento sul tuo rapporto:" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Stati segnalati" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "Lo stato è stato eliminato" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "Collegamenti segnalati" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Commenti del moderatore" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Commenta" @@ -4015,14 +4023,14 @@ msgstr "percentuale" msgid "of %(pages)s pages" msgstr "di %(pages)s pagine" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Rispondi" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Contenuto" diff --git a/locale/lt_LT/LC_MESSAGES/django.mo b/locale/lt_LT/LC_MESSAGES/django.mo index 7d8a201a..7c4e5413 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 db8813f1..b9e24e72 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-30 17:27\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-31 15:31\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Lithuanian\n" "Language: lt\n" @@ -3603,23 +3603,31 @@ msgstr "" msgid "Back to reports" msgstr "Atgal į pranešimus" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Praneštos būsenos" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "Būsena ištrinta" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "Raportuotos nuorodos" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Moderatoriaus komentarai" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Komentuoti" @@ -4048,14 +4056,14 @@ msgstr "procentai" msgid "of %(pages)s pages" msgstr "iš %(pages)s psl." -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Atsakyti" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Turinys" @@ -4420,7 +4428,7 @@ msgstr "redaguota %(date)s" #: bookwyrm/templates/snippets/status/headers/comment.html:8 #, python-format msgid "commented on %(book)s by %(author_name)s" -msgstr "" +msgstr "pakomentavo autoriaus %(author_name)s knygą %(book)s" #: bookwyrm/templates/snippets/status/headers/comment.html:15 #, python-format @@ -4714,8 +4722,8 @@ msgstr "Būsenos atnaujinimai iš {obj.display_name}" #, python-format msgid "Load %(count)d unread status" msgid_plural "Load %(count)d unread statuses" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Įkelti %(count)d neperskaitytą statusą" +msgstr[1] "Įkelti %(count)d neperskaitytus statusus" +msgstr[2] "Įkelti %(count)d neperskaitytą statusą" +msgstr[3] "Įkelti %(count)d neperskaitytą statusą" diff --git a/locale/no_NO/LC_MESSAGES/django.mo b/locale/no_NO/LC_MESSAGES/django.mo index 3d71d6dd..3d3d4263 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 ae88985c..a4677434 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-28 04:03\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 21:36\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Norwegian\n" "Language: no\n" @@ -193,20 +193,20 @@ msgstr "Privat" #: bookwyrm/models/link.py:51 msgid "Free" -msgstr "" +msgstr "Gratis" #: bookwyrm/models/link.py:52 msgid "Purchasable" -msgstr "" +msgstr "Tilgjengelig for kjøp" #: bookwyrm/models/link.py:53 msgid "Available for loan" -msgstr "" +msgstr "Tilgjengelig for utlån" #: bookwyrm/models/link.py:70 #: bookwyrm/templates/settings/link_domains/link_domains.html:23 msgid "Approved" -msgstr "" +msgstr "Godkjent" #: bookwyrm/models/user.py:32 bookwyrm/templates/book/book.html:272 msgid "Reviews" @@ -284,7 +284,7 @@ msgstr "Português Europeu (Europeisk Portugisisk)" #: bookwyrm/settings.py:258 msgid "Swedish (Svenska)" -msgstr "" +msgstr "Svensk (Svenska)" #: bookwyrm/settings.py:259 msgid "简体中文 (Simplified Chinese)" @@ -328,7 +328,7 @@ msgstr "Velkommen til %(site_name)s!" #: bookwyrm/templates/about/about.html:23 #, python-format msgid "%(site_name)s is part of BookWyrm, a network of independent, self-directed communities for readers. While you can interact seamlessly with users anywhere in the BookWyrm network, this community is unique." -msgstr "" +msgstr "%(site_name)s er en del av BookWyrm, et nettverk av selvstendige, selvstyrte samfunn for lesere. Du kan kommunisere sømløst med brukere hvor som helst i BookWyrm nettverket, men hvert samfunn er unikt." #: bookwyrm/templates/about/about.html:40 #, python-format @@ -356,7 +356,7 @@ msgstr "Møt administratorene" #: bookwyrm/templates/about/about.html:99 #, python-format msgid "%(site_name)s's moderators and administrators keep the site up and running, enforce the code of conduct, and respond when users report spam and bad behavior." -msgstr "" +msgstr "%(site_name)s sine moderatorer og administratorer holder nettsida oppe og tilgjengelig, håndhever adferdskoden, og svarer på brukernes rapporterer om spam og dårlig atferd." #: bookwyrm/templates/about/about.html:113 msgid "Moderator" @@ -1071,51 +1071,53 @@ msgstr "Søk etter utgaver" #: bookwyrm/templates/book/file_links/add_link_modal.html:6 msgid "Add file link" -msgstr "" +msgstr "Legg til fillenke" #: bookwyrm/templates/book/file_links/add_link_modal.html:19 msgid "Links from unknown domains will need to be approved by a moderator before they are added." -msgstr "" +msgstr "Lenker fra ukjente domener må være godkjent av en moderator før de kan legges til." #: bookwyrm/templates/book/file_links/add_link_modal.html:24 msgid "URL:" -msgstr "" +msgstr "URL:" #: bookwyrm/templates/book/file_links/add_link_modal.html:29 msgid "File type:" -msgstr "" +msgstr "Filtype:" #: bookwyrm/templates/book/file_links/add_link_modal.html:48 msgid "Availability:" -msgstr "" +msgstr "Tilgjengelighet:" #: bookwyrm/templates/book/file_links/edit_links.html:5 #: bookwyrm/templates/book/file_links/edit_links.html:22 #: bookwyrm/templates/book/file_links/links.html:53 msgid "Edit links" -msgstr "" +msgstr "Rediger lenker" #: bookwyrm/templates/book/file_links/edit_links.html:11 #, python-format msgid "\n" " Links for \"%(title)s\"\n" " " -msgstr "" +msgstr "\n" +" Lenker for \"%(title)s\"\n" +" " #: bookwyrm/templates/book/file_links/edit_links.html:32 #: bookwyrm/templates/settings/link_domains/link_table.html:6 msgid "URL" -msgstr "" +msgstr "URL" #: bookwyrm/templates/book/file_links/edit_links.html:33 #: bookwyrm/templates/settings/link_domains/link_table.html:7 msgid "Added by" -msgstr "" +msgstr "Lagt til av" #: bookwyrm/templates/book/file_links/edit_links.html:34 #: bookwyrm/templates/settings/link_domains/link_table.html:8 msgid "Filetype" -msgstr "" +msgstr "Filtype" #: bookwyrm/templates/book/file_links/edit_links.html:35 #: bookwyrm/templates/settings/email_blocklist/email_blocklist.html:25 @@ -1143,41 +1145,41 @@ msgstr "Handlinger" #: bookwyrm/templates/book/file_links/edit_links.html:53 #: bookwyrm/templates/book/file_links/verification_modal.html:25 msgid "Report spam" -msgstr "" +msgstr "Rapporter spam" #: bookwyrm/templates/book/file_links/edit_links.html:97 msgid "No links available for this book." -msgstr "" +msgstr "Ingen lenker er tilgjengelig for denne boka." #: bookwyrm/templates/book/file_links/edit_links.html:108 #: bookwyrm/templates/book/file_links/links.html:18 msgid "Add link to file" -msgstr "" +msgstr "Legg til lenke til fil" #: bookwyrm/templates/book/file_links/file_link_page.html:6 msgid "File Links" -msgstr "" +msgstr "Fillenker" #: bookwyrm/templates/book/file_links/links.html:9 msgid "Get a copy" -msgstr "" +msgstr "Få en kopi" #: bookwyrm/templates/book/file_links/links.html:47 msgid "No links available" -msgstr "" +msgstr "Ingen tilgjengelige lenker" #: bookwyrm/templates/book/file_links/verification_modal.html:5 msgid "Leaving BookWyrm" -msgstr "" +msgstr "Forlater BookWyrm" #: bookwyrm/templates/book/file_links/verification_modal.html:11 #, python-format msgid "This link is taking you to: %(link_url)s.
Is that where you'd like to go?" -msgstr "" +msgstr "Denne lenka sender deg til: %(link_url)s.
Er det dit du vil dra?" #: bookwyrm/templates/book/file_links/verification_modal.html:20 msgid "Continue" -msgstr "" +msgstr "Fortsett" #: bookwyrm/templates/book/publisher_info.html:23 #, python-format @@ -2045,7 +2047,7 @@ msgstr "Avslå" #: bookwyrm/templates/import/tooltip.html:6 msgid "You can download your Goodreads data from the Import/Export page of your Goodreads account." -msgstr "" +msgstr "Du kan laste ned Goodread-dataene dine fra Import/Export sida på Goodread-kontoen din." #: bookwyrm/templates/import/troubleshoot.html:7 msgid "Failed items" @@ -2248,12 +2250,12 @@ msgstr "BookWyrms kildekode er fritt tilgjengelig. Du kan bidra eller rapportere #: bookwyrm/templates/lists/add_item_modal.html:8 #, python-format msgid "Add \"%(title)s\" to this list" -msgstr "" +msgstr "Legg til \"%(title)s\" på denne lista" #: bookwyrm/templates/lists/add_item_modal.html:12 #, python-format msgid "Suggest \"%(title)s\" for this list" -msgstr "" +msgstr "Foreslå \"%(title)s\" for denne lista" #: bookwyrm/templates/lists/add_item_modal.html:39 #: bookwyrm/templates/lists/list.html:249 @@ -2295,7 +2297,7 @@ msgstr "Nå er du klar!" #: bookwyrm/templates/lists/list.html:83 #, python-format msgid "%(username)s says:" -msgstr "" +msgstr "%(username)s sier:" #: bookwyrm/templates/lists/curate.html:55 msgid "Suggested by" @@ -2393,7 +2395,7 @@ msgstr "Notater:" #: bookwyrm/templates/lists/item_notes_field.html:19 msgid "An optional note that will be displayed with the book." -msgstr "" +msgstr "En valgfri merknad som vil vises sammen med boken." #: bookwyrm/templates/lists/list.html:36 msgid "You successfully suggested a book for this list!" @@ -2405,11 +2407,11 @@ msgstr "Du har nå lagt til ei bok i denne lista!" #: bookwyrm/templates/lists/list.html:96 msgid "Edit notes" -msgstr "" +msgstr "Rediger merknader" #: bookwyrm/templates/lists/list.html:111 msgid "Add notes" -msgstr "" +msgstr "Legg til merknader" #: bookwyrm/templates/lists/list.html:123 #, python-format @@ -3129,8 +3131,8 @@ msgstr[1] "%(display_count)s åpne rapporter" #, python-format msgid "%(display_count)s domain needs review" msgid_plural "%(display_count)s domains need review" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%(display_count)s domene må godkjennes" +msgstr[1] "%(display_count)s domener må godkjennes" #: bookwyrm/templates/settings/dashboard/dashboard.html:65 #, python-format @@ -3523,7 +3525,7 @@ msgstr "Rapporter" #: bookwyrm/templates/settings/link_domains/link_domains.html:5 #: bookwyrm/templates/settings/link_domains/link_domains.html:7 msgid "Link Domains" -msgstr "" +msgstr "Lenkedomener" #: bookwyrm/templates/settings/layout.html:72 msgid "Instance Settings" @@ -3538,57 +3540,65 @@ msgstr "Sideinnstillinger" #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:5 #, python-format msgid "Set display name for %(url)s" -msgstr "" +msgstr "Angi visningsnavn for %(url)s" #: bookwyrm/templates/settings/link_domains/link_domains.html:11 msgid "Link domains must be approved before they are shown on book pages. Please make sure that the domains are not hosting spam, malicious code, or deceptive links before approving." -msgstr "" +msgstr "Nettstedsdomener må godkjennes før de kan vises på boksidene. Vennligst sjekk at domenene ikke fører spam, ondsinnet kode eller lurelenker før du godkjenner." #: bookwyrm/templates/settings/link_domains/link_domains.html:45 msgid "Set display name" -msgstr "" +msgstr "Angi visningsnavn" #: bookwyrm/templates/settings/link_domains/link_domains.html:53 msgid "View links" -msgstr "" +msgstr "Vis lenker" #: bookwyrm/templates/settings/link_domains/link_domains.html:96 msgid "No domains currently approved" -msgstr "" +msgstr "Ingen domener er hittil godkjent" #: bookwyrm/templates/settings/link_domains/link_domains.html:98 msgid "No domains currently pending" -msgstr "" +msgstr "Ingen domener venter for tiden på godkjenning" #: bookwyrm/templates/settings/link_domains/link_domains.html:100 msgid "No domains currently blocked" -msgstr "" +msgstr "Ingen domener er for øyeblikket blokkert" #: bookwyrm/templates/settings/link_domains/link_table.html:39 msgid "No links available for this domain." -msgstr "" +msgstr "Ingen lenker tilgjengelig til dette domenet." #: bookwyrm/templates/settings/reports/report.html:11 msgid "Back to reports" msgstr "Tilbake til rapporter" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "Send melding til rapportør" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "Oppdatering på din rapport:" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Rapporterte statuser" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "Status er slettet" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" -msgstr "" +msgstr "Rapporterte lenker" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Moderatorkommentarer" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Kommentar" @@ -3596,21 +3606,21 @@ msgstr "Kommentar" #: bookwyrm/templates/settings/reports/report_header.html:6 #, python-format msgid "Report #%(report_id)s: Status posted by @%(username)s" -msgstr "" +msgstr "Rapportér #%(report_id)s: Status postet av @%(username)s" #: bookwyrm/templates/settings/reports/report_header.html:12 #, python-format msgid "Report #%(report_id)s: Link added by @%(username)s" -msgstr "" +msgstr "Rapportér #%(report_id)s: Lenke lagt til av @%(username)s" #: bookwyrm/templates/settings/reports/report_header.html:18 #, python-format msgid "Report #%(report_id)s: User @%(username)s" -msgstr "" +msgstr "Rapportér #%(report_id)s: bruker @%(username)s" #: bookwyrm/templates/settings/reports/report_links_table.html:17 msgid "Block domain" -msgstr "" +msgstr "Blokkér domene" #: bookwyrm/templates/settings/reports/report_preview.html:17 msgid "No notes provided" @@ -3619,7 +3629,7 @@ msgstr "Ingen merknader finnes" #: bookwyrm/templates/settings/reports/report_preview.html:24 #, python-format msgid "Reported by @%(username)s" -msgstr "" +msgstr "Rapportert av %(username)s" #: bookwyrm/templates/settings/reports/report_preview.html:34 msgid "Re-open" @@ -3865,7 +3875,7 @@ msgstr "Slettet for godt" #: bookwyrm/templates/settings/users/user_moderation_actions.html:8 msgid "User Actions" -msgstr "" +msgstr "Brukerhandlinger" #: bookwyrm/templates/settings/users/user_moderation_actions.html:21 msgid "Suspend user" @@ -4013,14 +4023,14 @@ msgstr "prosent" msgid "of %(pages)s pages" msgstr "av %(pages)s sider" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Svar" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Innhold" @@ -4167,13 +4177,13 @@ msgstr[1] "vurderte %(title)s til: %(display_r #, python-format msgid "Review of \"%(book_title)s\" (%(display_rating)s star): %(review_title)s" msgid_plural "Review of \"%(book_title)s\" (%(display_rating)s stars): %(review_title)s" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Anmeldelse av \"%(book_title)s\" (%(display_rating)s stjerne): %(review_title)s" +msgstr[1] "Anmeldelse av \"%(book_title)s\" (%(display_rating)s stjerner): %(review_title)s" #: bookwyrm/templates/snippets/generated_status/review_pure_name.html:12 #, python-format msgid "Review of \"%(book_title)s\": %(review_title)s" -msgstr "" +msgstr "Anmeldelse av \"%(book_title)s\": %(review_title)s" #: bookwyrm/templates/snippets/goal_form.html:4 #, python-format @@ -4282,12 +4292,12 @@ msgstr "Registrer deg" #: bookwyrm/templates/snippets/report_modal.html:8 #, python-format msgid "Report @%(username)s's status" -msgstr "" +msgstr "Rapportér @%(username)s sin status" #: bookwyrm/templates/snippets/report_modal.html:10 #, python-format msgid "Report %(domain)s link" -msgstr "" +msgstr "Rapportér %(domain)s lenke" #: bookwyrm/templates/snippets/report_modal.html:12 #, python-format @@ -4301,7 +4311,7 @@ msgstr "Denne rapporten vil bli sendt til %(site_name)s sine moderatorer for gje #: bookwyrm/templates/snippets/report_modal.html:36 msgid "Links from this domain will be removed until your report has been reviewed." -msgstr "" +msgstr "Lenker fra dette domenet vil fjernes fram til rapporten din er ferbigbehandlet." #: bookwyrm/templates/snippets/report_modal.html:41 msgid "More info about this report:" @@ -4665,6 +4675,6 @@ msgstr "Statusoppdateringer fra {obj.display_name}" #, python-format msgid "Load %(count)d unread status" msgid_plural "Load %(count)d unread statuses" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Last inn %(count)d ulest status" +msgstr[1] "Last inn %(count)d uleste statuser" diff --git a/locale/pt_BR/LC_MESSAGES/django.mo b/locale/pt_BR/LC_MESSAGES/django.mo index ec3d556d..2522c804 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 f8e1ff35..4845ae1b 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-29 14:28\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 19:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese, Brazilian\n" "Language: pt\n" @@ -3574,23 +3574,31 @@ msgstr "Nenhum link disponível para este domínio." msgid "Back to reports" msgstr "Voltar às denúncias" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "Enviar mensagem a quem denunciou" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "Atualização sobre sua denúncia:" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Publicações denunciadas" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "A publicação foi excluída" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "Links denunciados" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Comentários da moderação" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Comentar" @@ -4015,14 +4023,14 @@ msgstr "porcentagem" msgid "of %(pages)s pages" msgstr "de %(pages)s páginas" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Responder" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Conteúdo" diff --git a/locale/pt_PT/LC_MESSAGES/django.mo b/locale/pt_PT/LC_MESSAGES/django.mo index 45eadd19..1ffe4140 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 363f096f..b241c4d5 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-28 04:03\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 19:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Portuguese\n" "Language: pt\n" @@ -3572,23 +3572,31 @@ msgstr "" msgid "Back to reports" msgstr "Voltar para denúncias" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Estados denunciados" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "O estado foi eliminado" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Comentários do Moderador" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Comentar" @@ -4013,14 +4021,14 @@ msgstr "porcento" msgid "of %(pages)s pages" msgstr "%(pages)s páginas" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Responder" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Conteúdo" diff --git a/locale/sv_SE/LC_MESSAGES/django.mo b/locale/sv_SE/LC_MESSAGES/django.mo index bff1e3e3..87a0038a 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 7f2fbd85..33fc8682 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-28 04:03\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 19:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Swedish\n" "Language: sv\n" @@ -3574,23 +3574,31 @@ msgstr "Inga länkar tillgängliga för den här domänen." msgid "Back to reports" msgstr "Tillbaka till rapporter" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "Rapporterade statusar" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "Statusen har tagits bort" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "Rapporterade länkar" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "Moderatorns kommentarer" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "Kommentar" @@ -4015,14 +4023,14 @@ msgstr "procent" msgid "of %(pages)s pages" msgstr "av %(pages)s sidor" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "Svara" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "Innehåll" diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 250d030b..6b51efb8 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-28 04:03\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 19:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Simplified\n" "Language: zh\n" @@ -3557,23 +3557,31 @@ msgstr "" msgid "Back to reports" msgstr "回到报告" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "被报告的状态" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "状态已被删除" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "监察员评论" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "评论" @@ -3996,14 +4004,14 @@ msgstr "百分比" msgid "of %(pages)s pages" msgstr "全书 %(pages)s 页" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "回复" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "内容" diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index 220a6268..daebda62 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-01-28 02:50+0000\n" -"PO-Revision-Date: 2022-01-28 04:03\n" +"POT-Creation-Date: 2022-01-30 18:17+0000\n" +"PO-Revision-Date: 2022-01-30 19:38\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Chinese Traditional\n" "Language: zh\n" @@ -3557,23 +3557,31 @@ msgstr "" msgid "Back to reports" msgstr "回到舉報" -#: bookwyrm/templates/settings/reports/report.html:22 +#: bookwyrm/templates/settings/reports/report.html:23 +msgid "Message reporter" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:27 +msgid "Update on your report:" +msgstr "" + +#: bookwyrm/templates/settings/reports/report.html:35 msgid "Reported statuses" msgstr "被舉報的狀態" -#: bookwyrm/templates/settings/reports/report.html:27 +#: bookwyrm/templates/settings/reports/report.html:40 msgid "Status has been deleted" msgstr "狀態已被刪除" -#: bookwyrm/templates/settings/reports/report.html:39 +#: bookwyrm/templates/settings/reports/report.html:52 msgid "Reported links" msgstr "" -#: bookwyrm/templates/settings/reports/report.html:55 +#: bookwyrm/templates/settings/reports/report.html:68 msgid "Moderator Comments" msgstr "監察員評論" -#: bookwyrm/templates/settings/reports/report.html:73 +#: bookwyrm/templates/settings/reports/report.html:89 #: bookwyrm/templates/snippets/create_status.html:28 msgid "Comment" msgstr "評論" @@ -3996,14 +4004,14 @@ msgstr "百分比" msgid "of %(pages)s pages" msgstr "全書 %(pages)s 頁" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 #: bookwyrm/templates/snippets/status/layout.html:34 #: bookwyrm/templates/snippets/status/layout.html:53 #: bookwyrm/templates/snippets/status/layout.html:54 msgid "Reply" msgstr "回覆" -#: bookwyrm/templates/snippets/create_status/content_field.html:17 +#: bookwyrm/templates/snippets/create_status/content_field.html:18 msgid "Content" msgstr "內容"