diff --git a/bookwyrm/activitypub/note.py b/bookwyrm/activitypub/note.py index aca62d7c5..d61471fe0 100644 --- a/bookwyrm/activitypub/note.py +++ b/bookwyrm/activitypub/note.py @@ -70,6 +70,8 @@ class Quotation(Comment): """a quote and commentary on a book""" quote: str + position: int = None + positionMode: str = None type: str = "Quotation" diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py index e88124702..690526050 100644 --- a/bookwyrm/forms.py +++ b/bookwyrm/forms.py @@ -101,6 +101,8 @@ class QuotationForm(CustomForm): "content_warning", "sensitive", "privacy", + "position", + "position_mode", ] diff --git a/bookwyrm/migrations/0088_auto_20210905_2233.py b/bookwyrm/migrations/0088_auto_20210905_2233.py new file mode 100644 index 000000000..028cf7bf7 --- /dev/null +++ b/bookwyrm/migrations/0088_auto_20210905_2233.py @@ -0,0 +1,34 @@ +# Generated by Django 3.2.4 on 2021-09-05 22:33 + +import django.core.validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bookwyrm", "0087_merge_0086_auto_20210827_1727_0086_auto_20210828_1724"), + ] + + operations = [ + migrations.AddField( + model_name="quotation", + name="position", + field=models.IntegerField( + blank=True, + null=True, + validators=[django.core.validators.MinValueValidator(0)], + ), + ), + migrations.AddField( + model_name="quotation", + name="position_mode", + field=models.CharField( + blank=True, + choices=[("PG", "page"), ("PCT", "percent")], + default="PG", + max_length=3, + null=True, + ), + ), + ] diff --git a/bookwyrm/models/status.py b/bookwyrm/models/status.py index 9274a5813..d0f094d22 100644 --- a/bookwyrm/models/status.py +++ b/bookwyrm/models/status.py @@ -290,6 +290,16 @@ class Quotation(BookStatus): """like a review but without a rating and transient""" quote = fields.HtmlField() + position = models.IntegerField( + validators=[MinValueValidator(0)], null=True, blank=True + ) + position_mode = models.CharField( + max_length=3, + choices=ProgressMode.choices, + default=ProgressMode.PAGE, + null=True, + blank=True, + ) @property def pure_content(self): diff --git a/bookwyrm/templates/components/modal.html b/bookwyrm/templates/components/modal.html index d8c1a4683..2eabd2e2b 100644 --- a/bookwyrm/templates/components/modal.html +++ b/bookwyrm/templates/components/modal.html @@ -14,7 +14,11 @@

{% block modal-title %}{% endblock %}

- {% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %} + {% if static %} + {{ label }} + {% else %} + {% include 'snippets/toggle/toggle_button.html' with label=label class="delete" nonbutton=True %} + {% endif %} {% block modal-form-open %}{% endblock %} {% if not no_body %} @@ -27,6 +31,10 @@ {% block modal-form-close %}{% endblock %} - {% include 'snippets/toggle/toggle_button.html' with label=label class="modal-close is-large" nonbutton=True %} + {% if static %} + {{ label }} + {% else %} + {% include 'snippets/toggle/toggle_button.html' with label=label class="modal-close is-large" nonbutton=True %} + {% endif %} diff --git a/bookwyrm/templates/reading_progress/finish.html b/bookwyrm/templates/reading_progress/finish.html index ca69128ec..501fb3c47 100644 --- a/bookwyrm/templates/reading_progress/finish.html +++ b/bookwyrm/templates/reading_progress/finish.html @@ -9,6 +9,6 @@ Finish "{{ book_title }}" {% block content %} -{% include "snippets/reading_modals/finish_reading_modal.html" with book=book active=True %} +{% include "snippets/reading_modals/finish_reading_modal.html" with book=book active=True static=True %} {% endblock %} diff --git a/bookwyrm/templates/reading_progress/start.html b/bookwyrm/templates/reading_progress/start.html index e24a0e05b..df8f698a6 100644 --- a/bookwyrm/templates/reading_progress/start.html +++ b/bookwyrm/templates/reading_progress/start.html @@ -9,6 +9,6 @@ Start "{{ book_title }}" {% block content %} -{% include "snippets/reading_modals/start_reading_modal.html" with book=book active=True %} +{% include "snippets/reading_modals/start_reading_modal.html" with book=book active=True static=True %} {% endblock %} diff --git a/bookwyrm/templates/reading_progress/want.html b/bookwyrm/templates/reading_progress/want.html index 6122ade3a..31f047cf8 100644 --- a/bookwyrm/templates/reading_progress/want.html +++ b/bookwyrm/templates/reading_progress/want.html @@ -9,6 +9,6 @@ Want to Read "{{ book_title }}" {% block content %} -{% include "snippets/reading_modals/want_to_read_modal.html" with book=book active=True %} +{% include "snippets/reading_modals/want_to_read_modal.html" with book=book active=True static=True %} {% endblock %} diff --git a/bookwyrm/templates/snippets/about.html b/bookwyrm/templates/snippets/about.html index b94777d1c..c9a9db80e 100644 --- a/bookwyrm/templates/snippets/about.html +++ b/bookwyrm/templates/snippets/about.html @@ -3,7 +3,7 @@
- BookWyrm logo + BookWyrm logo
diff --git a/bookwyrm/templates/snippets/create_status/comment.html b/bookwyrm/templates/snippets/create_status/comment.html index d830ddcbf..8f3f5c2b6 100644 --- a/bookwyrm/templates/snippets/create_status/comment.html +++ b/bookwyrm/templates/snippets/create_status/comment.html @@ -26,13 +26,32 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j
- +
diff --git a/bookwyrm/templates/snippets/create_status/content_field.html b/bookwyrm/templates/snippets/create_status/content_field.html index 903372003..907467362 100644 --- a/bookwyrm/templates/snippets/create_status/content_field.html +++ b/bookwyrm/templates/snippets/create_status/content_field.html @@ -14,6 +14,6 @@ draft: an existing Status object that is providing default values for input fiel id="id_content_{{ type }}_{{ book.id }}{{ reply_parent.id }}" placeholder="{{ placeholder }}" aria-label="{% if reply_parent %}{% trans 'Reply' %}{% else %}{% trans 'Content' %}{% endif %}" - {% if not optional and type != "quotation" %}required{% endif %} + {% if not optional and type != "quotation" and type != "review" %}required{% endif %} >{% if reply_parent %}{{ reply_parent|mentions:request.user }}{% endif %}{% if mention %}@{{ mention|username }} {% endif %}{{ draft.content|default:'' }} diff --git a/bookwyrm/templates/snippets/create_status/quotation.html b/bookwyrm/templates/snippets/create_status/quotation.html index 03e9c25b3..c6f1f85fc 100644 --- a/bookwyrm/templates/snippets/create_status/quotation.html +++ b/bookwyrm/templates/snippets/create_status/quotation.html @@ -11,8 +11,6 @@ draft: the content of an existing Status object to be edited (used in delete and uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls {% endcomment %} -{% with type="quotation" %} - {% block pre_content_additions %}
+
+ +
+
+
+ +
+
+
+ +
+
+
{% endblock %} - -{% endwith %} diff --git a/bookwyrm/templates/snippets/create_status/review.html b/bookwyrm/templates/snippets/create_status/review.html index be17b7f2e..714055a1c 100644 --- a/bookwyrm/templates/snippets/create_status/review.html +++ b/bookwyrm/templates/snippets/create_status/review.html @@ -11,8 +11,6 @@ draft: the content of an existing Status object to be edited (used in delete and uuid: a unique identifier used to make html "id" attributes unique and clarify javascript controls {% endcomment %} -{% with type="review" %} - {% block pre_content_additions %}
@@ -31,5 +29,3 @@ uuid: a unique identifier used to make html "id" attributes unique and clarify j {% block content_label %} {% trans "Review:" %} {% endblock %} - -{% endwith %} diff --git a/bookwyrm/templates/snippets/status/content_status.html b/bookwyrm/templates/snippets/status/content_status.html index 781af2793..788ea3950 100644 --- a/bookwyrm/templates/snippets/status/content_status.html +++ b/bookwyrm/templates/snippets/status/content_status.html @@ -2,6 +2,7 @@ {% load markdown %} {% load i18n %} {% load static %} +{% load humanize %} {% with status_type=status.status_type %}
{{ status.quote|safe }}
-

— {% include 'snippets/book_titleby.html' with book=status.book %}

+

+ — {% include 'snippets/book_titleby.html' with book=status.book %} + {% if status.position %} + {% if status.position_mode == 'PG' %} + {% blocktrans with page=status.position|intcomma %}(Page {{ page }}){% endblocktrans %} + {% else %} + {% blocktrans with percent=status.position %}({{ percent }}%){% endblocktrans %} + {% endif %} + {% endif %} +

{% endif %} diff --git a/bookwyrm/templates/user/shelf/shelf.html b/bookwyrm/templates/user/shelf/shelf.html index 61458fcc9..06507d3ed 100644 --- a/bookwyrm/templates/user/shelf/shelf.html +++ b/bookwyrm/templates/user/shelf/shelf.html @@ -24,11 +24,26 @@
@@ -55,6 +70,23 @@ {% include 'snippets/privacy-icons.html' with item=shelf %} + {% with count=books.paginator.count %} + {% if count %} +

+ {% blocktrans trimmed count counter=count with formatted_count=count|intcomma %} + {{ formatted_count }} book + {% plural %} + {{ formatted_count }} books + {% endblocktrans %} + + {% if books.has_other_pages %} + {% blocktrans trimmed with start=books.start_index end=books.end_index %} + (showing {{ start }}-{{ end }}) + {% endblocktrans %} + {% endif %} +

+ {% endif %} + {% endwith %}
{% if is_self and shelf.id %} diff --git a/bookwyrm/views/reading.py b/bookwyrm/views/reading.py index 9100e1d43..70dc21479 100644 --- a/bookwyrm/views/reading.py +++ b/bookwyrm/views/reading.py @@ -31,6 +31,7 @@ class ReadingStatus(View): }.get(status) if not template: return HttpResponseNotFound() + # redirect if we're already on this shelf return TemplateResponse(request, f"reading_progress/{template}", {"book": book}) def post(self, request, status, book_id): @@ -58,11 +59,15 @@ class ReadingStatus(View): ) .first() ) + + referer = request.headers.get("Referer", "/") + if "reading-status" in referer: + 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(request.headers.get("Referer", "/")) + return redirect(referer) models.ShelfBook.objects.create( book=book, shelf=desired_shelf, user=request.user @@ -87,8 +92,7 @@ class ReadingStatus(View): else: privacy = request.POST.get("privacy") handle_reading_status(request.user, desired_shelf, book, privacy) - - return redirect(request.headers.get("Referer", "/")) + return redirect(referer) @login_required diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 397e18c28..b3623765d 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-27 19:11+0000\n" +"POT-Creation-Date: 2021-09-05 23:09+0000\n" "PO-Revision-Date: 2021-03-02 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,67 +18,67 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:233 +#: bookwyrm/forms.py:235 #, fuzzy #| msgid "A user with that username already exists." msgid "A user with this email already exists." msgstr "Dieser Benutzename ist bereits vergeben." -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "Ein Tag" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "Eine Woche" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "Ein Monat" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "Läuft nicht aus" -#: bookwyrm/forms.py:255 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d Benutzungen" -#: bookwyrm/forms.py:258 +#: bookwyrm/forms.py:260 #, fuzzy #| msgid "Unlisted" msgid "Unlimited" msgstr "Ungelistet" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:311 #, fuzzy #| msgid "Title" msgid "Book Title" msgstr "Titel" -#: bookwyrm/forms.py:310 -#: bookwyrm/templates/snippets/create_status/review.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:85 -#: bookwyrm/templates/user/shelf/shelf.html:116 +#: bookwyrm/forms.py:312 +#: bookwyrm/templates/snippets/create_status/review.html:23 +#: bookwyrm/templates/user/shelf/shelf.html:117 +#: bookwyrm/templates/user/shelf/shelf.html:148 msgid "Rating" msgstr "" -#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:318 #, fuzzy #| msgid "Started reading" msgid "Ascending" msgstr "Zu lesen angefangen" -#: bookwyrm/forms.py:317 +#: bookwyrm/forms.py:319 #, fuzzy #| msgid "Started reading" msgid "Descending" @@ -191,12 +191,12 @@ msgid "Wikipedia" msgstr "" #: bookwyrm/templates/author/author.html:69 -#: bookwyrm/templates/book/book.html:95 +#: bookwyrm/templates/book/book.html:94 msgid "View on OpenLibrary" msgstr "In OpenLibrary ansehen" #: bookwyrm/templates/author/author.html:77 -#: bookwyrm/templates/book/book.html:98 +#: bookwyrm/templates/book/book.html:97 #, fuzzy #| msgid "View on OpenLibrary" msgid "View on Inventaire" @@ -299,7 +299,7 @@ msgid "Goodreads key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:116 -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 @@ -316,7 +316,7 @@ msgid "Save" msgstr "Speichern" #: bookwyrm/templates/author/edit_author.html:117 -#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 @@ -328,112 +328,112 @@ msgstr "Speichern" msgid "Cancel" msgstr "Abbrechen" -#: bookwyrm/templates/book/book.html:48 +#: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 #: bookwyrm/templates/landing/small-book.html:18 msgid "by" msgstr "von" -#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56 msgid "Edit Book" msgstr "Buch editieren" -#: bookwyrm/templates/book/book.html:74 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "Cover hinzufügen" -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/book/book.html:77 #, fuzzy #| msgid "Failed to load" msgid "Failed to load cover" msgstr "Laden fehlgeschlagen" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:117 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s Bewertung)" msgstr[1] "(%(review_count)s Bewertungen)" -#: bookwyrm/templates/book/book.html:130 +#: bookwyrm/templates/book/book.html:129 msgid "Add Description" msgstr "Beschreibung hinzufügen" -#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/book.html:136 #: bookwyrm/templates/book/edit_book.html:143 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Beschreibung:" -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:150 #, fuzzy, python-format #| msgid "%(title)s by " msgid "%(count)s editions" msgstr "%(title)s von" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:158 #, fuzzy, python-format #| msgid "Direct Messages with %(username)s" msgid "This edition is on your %(shelf_name)s shelf." msgstr "Direktnachrichten mit %(username)s" -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:164 #, fuzzy, python-format #| msgid " added %(book_title)s to your list \"%(list_name)s\"" msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "hat %(book_title)s zu deiner Liste \"%(list_name)s\" Hinzugefügt" -#: bookwyrm/templates/book/book.html:176 +#: bookwyrm/templates/book/book.html:175 msgid "Your reading activity" msgstr "Deine Leseaktivität" -#: bookwyrm/templates/book/book.html:179 +#: bookwyrm/templates/book/book.html:178 msgid "Add read dates" msgstr "Lesedaten hinzufügen" -#: bookwyrm/templates/book/book.html:188 +#: bookwyrm/templates/book/book.html:187 msgid "Create" msgstr "Erstellen" -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:197 msgid "You don't have any reading activity for this book." msgstr "Du hast keine Leseaktivität für dieses Buch." -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:216 #, fuzzy #| msgid "Review" msgid "Reviews" msgstr "Bewerten" -#: bookwyrm/templates/book/book.html:222 +#: bookwyrm/templates/book/book.html:221 #, fuzzy #| msgid "Your shelves" msgid "Your reviews" msgstr "Deine Regale" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:227 #, fuzzy #| msgid "Your Account" msgid "Your comments" msgstr "Dein Account" -#: bookwyrm/templates/book/book.html:234 +#: bookwyrm/templates/book/book.html:233 #, fuzzy #| msgid "Your books" msgid "Your quotes" msgstr "Deine Bücher" -#: bookwyrm/templates/book/book.html:270 +#: bookwyrm/templates/book/book.html:269 msgid "Subjects" msgstr "Themen" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:281 msgid "Places" msgstr "Orte" -#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 +#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -441,13 +441,13 @@ msgstr "Orte" msgid "Lists" msgstr "Listen" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:303 #, fuzzy #| msgid "Go to list" msgid "Add to list" msgstr "Zur Liste" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:313 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -536,7 +536,7 @@ msgid "Back" msgstr "Zurück" #: bookwyrm/templates/book/edit_book.html:127 -#: bookwyrm/templates/snippets/create_status/review.html:18 +#: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "Titel:" @@ -601,7 +601,7 @@ msgid "John Doe, Jane Smith" msgstr "" #: bookwyrm/templates/book/edit_book.html:227 -#: bookwyrm/templates/user/shelf/shelf.html:78 +#: bookwyrm/templates/user/shelf/shelf.html:110 msgid "Cover" msgstr "" @@ -1071,14 +1071,14 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "Hier sind noch keine Bücher! Versuche nach Büchern zu suchen um loszulegen" #: bookwyrm/templates/feed/layout.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:38 #, fuzzy #| msgid "Read" msgid "To Read" msgstr "Auf der Leseliste" #: bookwyrm/templates/feed/layout.html:26 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:40 #, fuzzy #| msgid "Start reading" msgid "Currently Reading" @@ -1086,7 +1086,7 @@ msgstr "Gerade lesend" #: bookwyrm/templates/feed/layout.html:27 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:42 msgid "Read" msgstr "Gelesen" @@ -1284,7 +1284,7 @@ msgid "%(username)s's %(year)s Books" msgstr "%(username)ss %(year)s Bücher" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 -#: bookwyrm/templates/user/shelf/shelf.html:42 +#: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "Bücher importieren" @@ -1387,14 +1387,14 @@ msgid "Book" msgstr "Buch" #: bookwyrm/templates/import_status.html:122 -#: bookwyrm/templates/user/shelf/shelf.html:79 -#: bookwyrm/templates/user/shelf/shelf.html:99 +#: bookwyrm/templates/user/shelf/shelf.html:111 +#: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "Titel" #: bookwyrm/templates/import_status.html:125 -#: bookwyrm/templates/user/shelf/shelf.html:80 -#: bookwyrm/templates/user/shelf/shelf.html:102 +#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "Autor*in" @@ -1491,7 +1491,7 @@ msgid "Settings" msgstr "Einstellungen" #: bookwyrm/templates/layout.html:118 -#: bookwyrm/templates/settings/admin_layout.html:31 +#: bookwyrm/templates/settings/admin_layout.html:33 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 #: bookwyrm/templates/settings/manage_invites.html:15 @@ -1838,7 +1838,7 @@ msgstr "Listen: %(username)s" #: bookwyrm/templates/moderation/reports.html:8 #: bookwyrm/templates/moderation/reports.html:17 -#: bookwyrm/templates/settings/admin_layout.html:35 +#: bookwyrm/templates/settings/admin_layout.html:38 #, fuzzy #| msgid "Recent Imports" msgid "Reports" @@ -2123,7 +2123,7 @@ msgstr "Suche" #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 -#: bookwyrm/templates/settings/admin_layout.html:26 +#: bookwyrm/templates/settings/admin_layout.html:27 #: bookwyrm/templates/user_admin/user_admin.html:3 #: bookwyrm/templates/user_admin/user_admin.html:10 msgid "Users" @@ -2143,7 +2143,7 @@ msgstr "" msgid "Manage Users" msgstr "Nutzer*innen verwalten" -#: bookwyrm/templates/settings/admin_layout.html:39 +#: bookwyrm/templates/settings/admin_layout.html:44 #: bookwyrm/templates/settings/federation.html:3 #: bookwyrm/templates/settings/federation.html:5 #, fuzzy @@ -2151,38 +2151,38 @@ msgstr "Nutzer*innen verwalten" msgid "Federated Instances" msgstr "Föderierende Server" -#: bookwyrm/templates/settings/admin_layout.html:44 +#: bookwyrm/templates/settings/admin_layout.html:50 msgid "Instance Settings" msgstr "Instanzeinstellungen" -#: bookwyrm/templates/settings/admin_layout.html:48 +#: bookwyrm/templates/settings/admin_layout.html:54 #: bookwyrm/templates/settings/announcements.html:3 #: bookwyrm/templates/settings/announcements.html:5 msgid "Announcements" msgstr "Ankündigungen" -#: bookwyrm/templates/settings/admin_layout.html:52 +#: bookwyrm/templates/settings/admin_layout.html:58 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Seiteneinstellungen" -#: bookwyrm/templates/settings/admin_layout.html:55 +#: bookwyrm/templates/settings/admin_layout.html:61 #: bookwyrm/templates/settings/site.html:13 msgid "Instance Info" msgstr "Instanzinformationen" -#: bookwyrm/templates/settings/admin_layout.html:56 +#: bookwyrm/templates/settings/admin_layout.html:62 #: bookwyrm/templates/settings/site.html:39 msgid "Images" msgstr "Bilder" -#: bookwyrm/templates/settings/admin_layout.html:57 +#: bookwyrm/templates/settings/admin_layout.html:63 #: bookwyrm/templates/settings/site.html:59 msgid "Footer Content" msgstr "Inhalt des Footers" -#: bookwyrm/templates/settings/admin_layout.html:58 +#: bookwyrm/templates/settings/admin_layout.html:64 #: bookwyrm/templates/settings/site.html:81 msgid "Registration" msgstr "Registrierung" @@ -2728,19 +2728,19 @@ msgstr "" msgid "Progress:" msgstr "Fortschritt:" -#: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/create_status/comment.html:47 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 msgid "pages" msgstr "Seiten" -#: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/create_status/comment.html:53 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 msgid "percent" msgstr "Prozent" -#: bookwyrm/templates/snippets/create_status/comment.html:41 +#: bookwyrm/templates/snippets/create_status/comment.html:60 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" @@ -2789,25 +2789,43 @@ msgstr "Privat" msgid "Post" msgstr "Absenden" -#: bookwyrm/templates/snippets/create_status/quotation.html:19 +#: bookwyrm/templates/snippets/create_status/quotation.html:17 #, fuzzy #| msgid "Quote" msgid "Quote:" msgstr "Zitieren" -#: bookwyrm/templates/snippets/create_status/quotation.html:27 +#: bookwyrm/templates/snippets/create_status/quotation.html:25 #, fuzzy, python-format #| msgid "Editions of %(book_title)s" msgid "An excerpt from '%(book_title)s'" msgstr "Editionen von %(book_title)s" -#: bookwyrm/templates/snippets/create_status/review.html:20 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +#, fuzzy +#| msgid "Description:" +msgid "Position:" +msgstr "Beschreibung:" + +#: bookwyrm/templates/snippets/create_status/quotation.html:40 +#, fuzzy +#| msgid "pages" +msgid "On page:" +msgstr "Seiten" + +#: bookwyrm/templates/snippets/create_status/quotation.html:46 +#, fuzzy +#| msgid "percent" +msgid "At percent:" +msgstr "Prozent" + +#: bookwyrm/templates/snippets/create_status/review.html:18 #, fuzzy, python-format #| msgid "Editions of %(book_title)s" msgid "Your review of '%(book_title)s'" msgstr "Editionen von %(book_title)s" -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:30 #, fuzzy #| msgid "Review" msgid "Review:" @@ -3102,17 +3120,29 @@ msgstr "Auf Leseliste setzen" msgid "Remove from %(name)s" msgstr "Listen: %(username)s" -#: bookwyrm/templates/snippets/status/content_status.html:72 +#: bookwyrm/templates/snippets/status/content_status.html:73 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" msgstr "Mehr anzeigen" -#: bookwyrm/templates/snippets/status/content_status.html:87 +#: bookwyrm/templates/snippets/status/content_status.html:88 #: bookwyrm/templates/snippets/trimmed_text.html:34 msgid "Show less" msgstr "Weniger anzeigen" -#: bookwyrm/templates/snippets/status/content_status.html:117 +#: bookwyrm/templates/snippets/status/content_status.html:103 +#, fuzzy, python-format +#| msgid "%(pages)s pages" +msgid "(Page %(page)s)" +msgstr "%(pages)s Seiten" + +#: bookwyrm/templates/snippets/status/content_status.html:105 +#, fuzzy, python-format +#| msgid "%(percent)s%% complete!" +msgid "(%(percent)s%%)" +msgstr "%(percent)s%% komplett!" + +#: bookwyrm/templates/snippets/status/content_status.html:127 msgid "Open image in new window" msgstr "Bild in neuem Fenster öffnen" @@ -3292,40 +3322,52 @@ msgstr "Regal bearbeiten" msgid "Update shelf" msgstr "Regal aktualisieren" -#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56 +#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56 #, fuzzy #| msgid "books" msgid "All books" msgstr "Bücher" -#: bookwyrm/templates/user/shelf/shelf.html:40 +#: bookwyrm/templates/user/shelf/shelf.html:55 msgid "Create shelf" msgstr "Regal erstellen" -#: bookwyrm/templates/user/shelf/shelf.html:62 +#: bookwyrm/templates/user/shelf/shelf.html:76 +#, python-format +msgid "%(formatted_count)s book" +msgid_plural "%(formatted_count)s books" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/user/shelf/shelf.html:83 +#, python-format +msgid "(showing %(start)s-%(end)s)" +msgstr "" + +#: bookwyrm/templates/user/shelf/shelf.html:94 msgid "Edit shelf" msgstr "Regal bearbeiten" -#: bookwyrm/templates/user/shelf/shelf.html:81 -#: bookwyrm/templates/user/shelf/shelf.html:105 +#: bookwyrm/templates/user/shelf/shelf.html:113 +#: bookwyrm/templates/user/shelf/shelf.html:137 msgid "Shelved" msgstr "Ins Regal gestellt" -#: bookwyrm/templates/user/shelf/shelf.html:82 -#: bookwyrm/templates/user/shelf/shelf.html:109 +#: bookwyrm/templates/user/shelf/shelf.html:114 +#: bookwyrm/templates/user/shelf/shelf.html:141 msgid "Started" msgstr "Gestartet" -#: bookwyrm/templates/user/shelf/shelf.html:83 -#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:115 +#: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Finished" msgstr "Abgeschlossen" -#: bookwyrm/templates/user/shelf/shelf.html:138 +#: bookwyrm/templates/user/shelf/shelf.html:170 msgid "This shelf is empty." msgstr "Dieses Regal ist leer." -#: bookwyrm/templates/user/shelf/shelf.html:144 +#: bookwyrm/templates/user/shelf/shelf.html:176 msgid "Delete shelf" msgstr "Regal löschen" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 65c402b1f..5fb906116 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-27 19:11+0000\n" +"POT-Creation-Date: 2021-09-05 23:09+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:233 +#: bookwyrm/forms.py:235 msgid "A user with this email already exists." msgstr "" -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "" -#: bookwyrm/forms.py:255 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "" -#: bookwyrm/forms.py:258 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "" -#: bookwyrm/forms.py:310 -#: bookwyrm/templates/snippets/create_status/review.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:85 -#: bookwyrm/templates/user/shelf/shelf.html:116 +#: bookwyrm/forms.py:312 +#: bookwyrm/templates/snippets/create_status/review.html:23 +#: bookwyrm/templates/user/shelf/shelf.html:117 +#: bookwyrm/templates/user/shelf/shelf.html:148 msgid "Rating" msgstr "" -#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "" -#: bookwyrm/forms.py:317 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "" @@ -177,12 +177,12 @@ msgid "Wikipedia" msgstr "" #: bookwyrm/templates/author/author.html:69 -#: bookwyrm/templates/book/book.html:95 +#: bookwyrm/templates/book/book.html:94 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:77 -#: bookwyrm/templates/book/book.html:98 +#: bookwyrm/templates/book/book.html:97 msgid "View on Inventaire" msgstr "" @@ -275,7 +275,7 @@ msgid "Goodreads key:" msgstr "" #: bookwyrm/templates/author/edit_author.html:116 -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 @@ -292,7 +292,7 @@ msgid "Save" msgstr "" #: bookwyrm/templates/author/edit_author.html:117 -#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 @@ -304,99 +304,99 @@ msgstr "" msgid "Cancel" msgstr "" -#: bookwyrm/templates/book/book.html:48 +#: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 #: bookwyrm/templates/landing/small-book.html:18 msgid "by" msgstr "" -#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:74 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "" -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/book/book.html:77 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:117 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book/book.html:130 +#: bookwyrm/templates/book/book.html:129 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/book.html:136 #: bookwyrm/templates/book/edit_book.html:143 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "" -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:150 #, python-format msgid "%(count)s editions" msgstr "" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:158 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:164 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book/book.html:176 +#: bookwyrm/templates/book/book.html:175 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book/book.html:179 +#: bookwyrm/templates/book/book.html:178 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book/book.html:188 +#: bookwyrm/templates/book/book.html:187 msgid "Create" msgstr "" -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:197 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:216 msgid "Reviews" msgstr "" -#: bookwyrm/templates/book/book.html:222 +#: bookwyrm/templates/book/book.html:221 msgid "Your reviews" msgstr "" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:227 msgid "Your comments" msgstr "" -#: bookwyrm/templates/book/book.html:234 +#: bookwyrm/templates/book/book.html:233 msgid "Your quotes" msgstr "" -#: bookwyrm/templates/book/book.html:270 +#: bookwyrm/templates/book/book.html:269 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:281 msgid "Places" msgstr "" -#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 +#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -404,11 +404,11 @@ msgstr "" msgid "Lists" msgstr "" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:303 msgid "Add to list" msgstr "" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:313 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -491,7 +491,7 @@ msgid "Back" msgstr "" #: bookwyrm/templates/book/edit_book.html:127 -#: bookwyrm/templates/snippets/create_status/review.html:18 +#: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "" @@ -546,7 +546,7 @@ msgid "John Doe, Jane Smith" msgstr "" #: bookwyrm/templates/book/edit_book.html:227 -#: bookwyrm/templates/user/shelf/shelf.html:78 +#: bookwyrm/templates/user/shelf/shelf.html:110 msgid "Cover" msgstr "" @@ -977,18 +977,18 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "" #: bookwyrm/templates/feed/layout.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:38 msgid "To Read" msgstr "" #: bookwyrm/templates/feed/layout.html:26 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:40 msgid "Currently Reading" msgstr "" #: bookwyrm/templates/feed/layout.html:27 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:42 msgid "Read" msgstr "" @@ -1169,7 +1169,7 @@ msgid "%(username)s's %(year)s Books" msgstr "" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 -#: bookwyrm/templates/user/shelf/shelf.html:42 +#: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "" @@ -1266,14 +1266,14 @@ msgid "Book" msgstr "" #: bookwyrm/templates/import_status.html:122 -#: bookwyrm/templates/user/shelf/shelf.html:79 -#: bookwyrm/templates/user/shelf/shelf.html:99 +#: bookwyrm/templates/user/shelf/shelf.html:111 +#: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "" #: bookwyrm/templates/import_status.html:125 -#: bookwyrm/templates/user/shelf/shelf.html:80 -#: bookwyrm/templates/user/shelf/shelf.html:102 +#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "" @@ -1368,7 +1368,7 @@ msgid "Settings" msgstr "" #: bookwyrm/templates/layout.html:118 -#: bookwyrm/templates/settings/admin_layout.html:31 +#: bookwyrm/templates/settings/admin_layout.html:33 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 #: bookwyrm/templates/settings/manage_invites.html:15 @@ -1683,7 +1683,7 @@ msgstr "" #: bookwyrm/templates/moderation/reports.html:8 #: bookwyrm/templates/moderation/reports.html:17 -#: bookwyrm/templates/settings/admin_layout.html:35 +#: bookwyrm/templates/settings/admin_layout.html:38 msgid "Reports" msgstr "" @@ -1945,7 +1945,7 @@ msgstr "" #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 -#: bookwyrm/templates/settings/admin_layout.html:26 +#: bookwyrm/templates/settings/admin_layout.html:27 #: bookwyrm/templates/user_admin/user_admin.html:3 #: bookwyrm/templates/user_admin/user_admin.html:10 msgid "Users" @@ -1964,44 +1964,44 @@ msgstr "" msgid "Manage Users" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:39 +#: bookwyrm/templates/settings/admin_layout.html:44 #: bookwyrm/templates/settings/federation.html:3 #: bookwyrm/templates/settings/federation.html:5 msgid "Federated Instances" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:44 +#: bookwyrm/templates/settings/admin_layout.html:50 msgid "Instance Settings" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:48 +#: bookwyrm/templates/settings/admin_layout.html:54 #: bookwyrm/templates/settings/announcements.html:3 #: bookwyrm/templates/settings/announcements.html:5 msgid "Announcements" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:52 +#: bookwyrm/templates/settings/admin_layout.html:58 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:55 +#: bookwyrm/templates/settings/admin_layout.html:61 #: bookwyrm/templates/settings/site.html:13 msgid "Instance Info" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:56 +#: bookwyrm/templates/settings/admin_layout.html:62 #: bookwyrm/templates/settings/site.html:39 msgid "Images" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:57 +#: bookwyrm/templates/settings/admin_layout.html:63 #: bookwyrm/templates/settings/site.html:59 msgid "Footer Content" msgstr "" -#: bookwyrm/templates/settings/admin_layout.html:58 +#: bookwyrm/templates/settings/admin_layout.html:64 #: bookwyrm/templates/settings/site.html:81 msgid "Registration" msgstr "" @@ -2461,19 +2461,19 @@ msgstr "" msgid "Progress:" msgstr "" -#: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/create_status/comment.html:47 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 msgid "pages" msgstr "" -#: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/create_status/comment.html:53 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 msgid "percent" msgstr "" -#: bookwyrm/templates/snippets/create_status/comment.html:41 +#: bookwyrm/templates/snippets/create_status/comment.html:60 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" @@ -2518,21 +2518,33 @@ msgstr "" msgid "Post" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:19 +#: bookwyrm/templates/snippets/create_status/quotation.html:17 msgid "Quote:" msgstr "" -#: bookwyrm/templates/snippets/create_status/quotation.html:27 +#: bookwyrm/templates/snippets/create_status/quotation.html:25 #, python-format msgid "An excerpt from '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:20 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +msgid "Position:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/quotation.html:40 +msgid "On page:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/quotation.html:46 +msgid "At percent:" +msgstr "" + +#: bookwyrm/templates/snippets/create_status/review.html:18 #, python-format msgid "Your review of '%(book_title)s'" msgstr "" -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:30 msgid "Review:" msgstr "" @@ -2805,17 +2817,27 @@ msgstr "" msgid "Remove from %(name)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:72 +#: bookwyrm/templates/snippets/status/content_status.html:73 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:87 +#: bookwyrm/templates/snippets/status/content_status.html:88 #: bookwyrm/templates/snippets/trimmed_text.html:34 msgid "Show less" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:117 +#: bookwyrm/templates/snippets/status/content_status.html:103 +#, python-format +msgid "(Page %(page)s)" +msgstr "" + +#: bookwyrm/templates/snippets/status/content_status.html:105 +#, python-format +msgid "(%(percent)s%%)" +msgstr "" + +#: bookwyrm/templates/snippets/status/content_status.html:127 msgid "Open image in new window" msgstr "" @@ -2978,38 +3000,50 @@ msgstr "" msgid "Update shelf" msgstr "" -#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56 +#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56 msgid "All books" msgstr "" -#: bookwyrm/templates/user/shelf/shelf.html:40 +#: bookwyrm/templates/user/shelf/shelf.html:55 msgid "Create shelf" msgstr "" -#: bookwyrm/templates/user/shelf/shelf.html:62 +#: bookwyrm/templates/user/shelf/shelf.html:76 +#, python-format +msgid "%(formatted_count)s book" +msgid_plural "%(formatted_count)s books" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/user/shelf/shelf.html:83 +#, python-format +msgid "(showing %(start)s-%(end)s)" +msgstr "" + +#: bookwyrm/templates/user/shelf/shelf.html:94 msgid "Edit shelf" msgstr "" -#: bookwyrm/templates/user/shelf/shelf.html:81 -#: bookwyrm/templates/user/shelf/shelf.html:105 +#: bookwyrm/templates/user/shelf/shelf.html:113 +#: bookwyrm/templates/user/shelf/shelf.html:137 msgid "Shelved" msgstr "" -#: bookwyrm/templates/user/shelf/shelf.html:82 -#: bookwyrm/templates/user/shelf/shelf.html:109 +#: bookwyrm/templates/user/shelf/shelf.html:114 +#: bookwyrm/templates/user/shelf/shelf.html:141 msgid "Started" msgstr "" -#: bookwyrm/templates/user/shelf/shelf.html:83 -#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:115 +#: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Finished" msgstr "" -#: bookwyrm/templates/user/shelf/shelf.html:138 +#: bookwyrm/templates/user/shelf/shelf.html:170 msgid "This shelf is empty." msgstr "" -#: bookwyrm/templates/user/shelf/shelf.html:144 +#: bookwyrm/templates/user/shelf/shelf.html:176 msgid "Delete shelf" msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 117102781..48e8e8cef 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-29 18:01+0000\n" +"POT-Creation-Date: 2021-09-05 23:09+0000\n" "PO-Revision-Date: 2021-03-19 11:49+0800\n" "Last-Translator: Reese Porter \n" "Language-Team: LANGUAGE \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:233 +#: bookwyrm/forms.py:235 msgid "A user with this email already exists." msgstr "Ya existe un usuario con ese correo electrónico." -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "Una semana" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "Nunca se vence" -#: bookwyrm/forms.py:255 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d usos" -#: bookwyrm/forms.py:258 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "Sin límite" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "Orden de la lista" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "Título" -#: bookwyrm/forms.py:310 -#: bookwyrm/templates/snippets/create_status/review.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:85 -#: bookwyrm/templates/user/shelf/shelf.html:116 +#: bookwyrm/forms.py:312 +#: bookwyrm/templates/snippets/create_status/review.html:23 +#: bookwyrm/templates/user/shelf/shelf.html:117 +#: bookwyrm/templates/user/shelf/shelf.html:148 msgid "Rating" msgstr "Calificación" -#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Ordenar por" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "Ascendente" -#: bookwyrm/forms.py:317 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "Descendente" @@ -177,12 +177,12 @@ msgid "Wikipedia" msgstr "Wikipedia" #: bookwyrm/templates/author/author.html:69 -#: bookwyrm/templates/book/book.html:95 +#: bookwyrm/templates/book/book.html:94 msgid "View on OpenLibrary" msgstr "Ver en OpenLibrary" #: bookwyrm/templates/author/author.html:77 -#: bookwyrm/templates/book/book.html:98 +#: bookwyrm/templates/book/book.html:97 msgid "View on Inventaire" msgstr "Ver en Inventaire" @@ -275,7 +275,7 @@ msgid "Goodreads key:" msgstr "Clave Goodreads:" #: bookwyrm/templates/author/edit_author.html:116 -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 @@ -292,7 +292,7 @@ msgid "Save" msgstr "Guardar" #: bookwyrm/templates/author/edit_author.html:117 -#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 @@ -304,99 +304,99 @@ msgstr "Guardar" msgid "Cancel" msgstr "Cancelar" -#: bookwyrm/templates/book/book.html:48 +#: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 #: bookwyrm/templates/landing/small-book.html:18 msgid "by" msgstr "por" -#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56 msgid "Edit Book" msgstr "Editar Libro" -#: bookwyrm/templates/book/book.html:74 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "Agregar portada" -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/book/book.html:77 msgid "Failed to load cover" msgstr "No se pudo cargar la portada" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:117 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s reseña)" msgstr[1] "(%(review_count)s reseñas)" -#: bookwyrm/templates/book/book.html:130 +#: bookwyrm/templates/book/book.html:129 msgid "Add Description" msgstr "Agregar descripción" -#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/book.html:136 #: bookwyrm/templates/book/edit_book.html:143 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Descripción:" -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:150 #, python-format msgid "%(count)s editions" msgstr "%(count)s ediciones" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:158 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "Esta edición está en tu %(shelf_name)s estante." -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:164 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Una edición diferente de este libro está en tu %(shelf_name)s estante." -#: bookwyrm/templates/book/book.html:176 +#: bookwyrm/templates/book/book.html:175 msgid "Your reading activity" msgstr "Tu actividad de lectura" -#: bookwyrm/templates/book/book.html:179 +#: bookwyrm/templates/book/book.html:178 msgid "Add read dates" msgstr "Agregar fechas de lectura" -#: bookwyrm/templates/book/book.html:188 +#: bookwyrm/templates/book/book.html:187 msgid "Create" msgstr "Crear" -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:197 msgid "You don't have any reading activity for this book." msgstr "No tienes ninguna actividad de lectura para este libro." -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:216 msgid "Reviews" msgstr "Reseñas" -#: bookwyrm/templates/book/book.html:222 +#: bookwyrm/templates/book/book.html:221 msgid "Your reviews" msgstr "Tus reseñas" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:227 msgid "Your comments" msgstr "Tus comentarios" -#: bookwyrm/templates/book/book.html:234 +#: bookwyrm/templates/book/book.html:233 msgid "Your quotes" msgstr "Tus citas" -#: bookwyrm/templates/book/book.html:270 +#: bookwyrm/templates/book/book.html:269 msgid "Subjects" msgstr "Sujetos" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:281 msgid "Places" msgstr "Lugares" -#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 +#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -404,11 +404,11 @@ msgstr "Lugares" msgid "Lists" msgstr "Listas" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:303 msgid "Add to list" msgstr "Agregar a lista" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:313 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -491,7 +491,7 @@ msgid "Back" msgstr "Volver" #: bookwyrm/templates/book/edit_book.html:127 -#: bookwyrm/templates/snippets/create_status/review.html:18 +#: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "Título:" @@ -546,7 +546,7 @@ msgid "John Doe, Jane Smith" msgstr "Juan Nadie, Natalia Natalia" #: bookwyrm/templates/book/edit_book.html:227 -#: bookwyrm/templates/user/shelf/shelf.html:78 +#: bookwyrm/templates/user/shelf/shelf.html:110 msgid "Cover" msgstr "Portada:" @@ -955,6 +955,7 @@ msgid "You have no messages right now." msgstr "No tienes ningún mensaje en este momento." #: bookwyrm/templates/feed/feed.html:22 +#, python-format msgid "load 0 unread status(es)" msgstr "cargar 0 status(es) no leído(s)" @@ -976,18 +977,18 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "¡No hay ningún libro aqui ahorita! Busca a un libro para empezar" #: bookwyrm/templates/feed/layout.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:38 msgid "To Read" msgstr "Para leer" #: bookwyrm/templates/feed/layout.html:26 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:40 msgid "Currently Reading" msgstr "Leyendo actualmente" #: bookwyrm/templates/feed/layout.html:27 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:42 msgid "Read" msgstr "Leido" @@ -1168,7 +1169,7 @@ msgid "%(username)s's %(year)s Books" msgstr "Los libros de %(username)s para %(year)s" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 -#: bookwyrm/templates/user/shelf/shelf.html:42 +#: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "Importar libros" @@ -1265,14 +1266,14 @@ msgid "Book" msgstr "Libro" #: bookwyrm/templates/import_status.html:122 -#: bookwyrm/templates/user/shelf/shelf.html:79 -#: bookwyrm/templates/user/shelf/shelf.html:99 +#: bookwyrm/templates/user/shelf/shelf.html:111 +#: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "Título" #: bookwyrm/templates/import_status.html:125 -#: bookwyrm/templates/user/shelf/shelf.html:80 -#: bookwyrm/templates/user/shelf/shelf.html:102 +#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "Autor/Autora" @@ -1367,7 +1368,7 @@ msgid "Settings" msgstr "Configuración" #: bookwyrm/templates/layout.html:118 -#: bookwyrm/templates/settings/admin_layout.html:31 +#: bookwyrm/templates/settings/admin_layout.html:33 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 #: bookwyrm/templates/settings/manage_invites.html:15 @@ -1682,7 +1683,7 @@ msgstr "Informes: %(instance_name)s" #: bookwyrm/templates/moderation/reports.html:8 #: bookwyrm/templates/moderation/reports.html:17 -#: bookwyrm/templates/settings/admin_layout.html:35 +#: bookwyrm/templates/settings/admin_layout.html:38 msgid "Reports" msgstr "Informes" @@ -1944,7 +1945,7 @@ msgstr "Tipo de búsqueda" #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 -#: bookwyrm/templates/settings/admin_layout.html:26 +#: bookwyrm/templates/settings/admin_layout.html:27 #: bookwyrm/templates/user_admin/user_admin.html:3 #: bookwyrm/templates/user_admin/user_admin.html:10 msgid "Users" @@ -1963,44 +1964,44 @@ msgstr "Adminstración" msgid "Manage Users" msgstr "Administrar usuarios" -#: bookwyrm/templates/settings/admin_layout.html:39 +#: bookwyrm/templates/settings/admin_layout.html:44 #: bookwyrm/templates/settings/federation.html:3 #: bookwyrm/templates/settings/federation.html:5 msgid "Federated Instances" msgstr "Instancias federalizadas" -#: bookwyrm/templates/settings/admin_layout.html:44 +#: bookwyrm/templates/settings/admin_layout.html:50 msgid "Instance Settings" msgstr "Configuración de instancia" -#: bookwyrm/templates/settings/admin_layout.html:48 +#: bookwyrm/templates/settings/admin_layout.html:54 #: bookwyrm/templates/settings/announcements.html:3 #: bookwyrm/templates/settings/announcements.html:5 msgid "Announcements" msgstr "Anuncios" -#: bookwyrm/templates/settings/admin_layout.html:52 +#: bookwyrm/templates/settings/admin_layout.html:58 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Configuración de sitio" -#: bookwyrm/templates/settings/admin_layout.html:55 +#: bookwyrm/templates/settings/admin_layout.html:61 #: bookwyrm/templates/settings/site.html:13 msgid "Instance Info" msgstr "Información de instancia" -#: bookwyrm/templates/settings/admin_layout.html:56 +#: bookwyrm/templates/settings/admin_layout.html:62 #: bookwyrm/templates/settings/site.html:39 msgid "Images" msgstr "Imagenes" -#: bookwyrm/templates/settings/admin_layout.html:57 +#: bookwyrm/templates/settings/admin_layout.html:63 #: bookwyrm/templates/settings/site.html:59 msgid "Footer Content" msgstr "Contenido del pie de página" -#: bookwyrm/templates/settings/admin_layout.html:58 +#: bookwyrm/templates/settings/admin_layout.html:64 #: bookwyrm/templates/settings/site.html:81 msgid "Registration" msgstr "Registración" @@ -2460,19 +2461,19 @@ msgstr "Algunos pensamientos sobre el libro" msgid "Progress:" msgstr "Progreso:" -#: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/create_status/comment.html:47 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 msgid "pages" msgstr "páginas" -#: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/create_status/comment.html:53 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 msgid "percent" msgstr "por ciento" -#: bookwyrm/templates/snippets/create_status/comment.html:41 +#: bookwyrm/templates/snippets/create_status/comment.html:60 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" @@ -2517,21 +2518,39 @@ msgstr "Privada" msgid "Post" msgstr "Compartir" -#: bookwyrm/templates/snippets/create_status/quotation.html:19 +#: bookwyrm/templates/snippets/create_status/quotation.html:17 msgid "Quote:" msgstr "Cita:" -#: bookwyrm/templates/snippets/create_status/quotation.html:27 +#: bookwyrm/templates/snippets/create_status/quotation.html:25 #, python-format msgid "An excerpt from '%(book_title)s'" msgstr "Un extracto de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:20 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +#, fuzzy +#| msgid "Description:" +msgid "Position:" +msgstr "Descripción:" + +#: bookwyrm/templates/snippets/create_status/quotation.html:40 +#, fuzzy +#| msgid "pages" +msgid "On page:" +msgstr "páginas" + +#: bookwyrm/templates/snippets/create_status/quotation.html:46 +#, fuzzy +#| msgid "percent" +msgid "At percent:" +msgstr "por ciento" + +#: bookwyrm/templates/snippets/create_status/review.html:18 #, python-format msgid "Your review of '%(book_title)s'" msgstr "Tu reseña de '%(book_title)s'" -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:30 msgid "Review:" msgstr "Reseña:" @@ -2682,6 +2701,7 @@ msgid "page %(page)s of %(total_pages)s" msgstr "página %(page)s de %(total_pages)s" #: bookwyrm/templates/snippets/page_text.html:6 +#, python-format msgid "page %(page)s" msgstr "página %(page)s" @@ -2803,17 +2823,29 @@ msgstr "Quiero leer" msgid "Remove from %(name)s" msgstr "Quitar de %(name)s" -#: bookwyrm/templates/snippets/status/content_status.html:72 +#: bookwyrm/templates/snippets/status/content_status.html:73 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" msgstr "Mostrar más" -#: bookwyrm/templates/snippets/status/content_status.html:87 +#: bookwyrm/templates/snippets/status/content_status.html:88 #: bookwyrm/templates/snippets/trimmed_text.html:34 msgid "Show less" msgstr "Mostrar menos" -#: bookwyrm/templates/snippets/status/content_status.html:117 +#: bookwyrm/templates/snippets/status/content_status.html:103 +#, fuzzy, python-format +#| msgid "page %(page)s" +msgid "(Page %(page)s)" +msgstr "página %(page)s" + +#: bookwyrm/templates/snippets/status/content_status.html:105 +#, fuzzy, python-format +#| msgid "%(percent)s%% complete!" +msgid "(%(percent)s%%)" +msgstr "%(percent)s%% terminado!" + +#: bookwyrm/templates/snippets/status/content_status.html:127 msgid "Open image in new window" msgstr "Abrir imagen en una nueva ventana" @@ -2976,38 +3008,50 @@ msgstr "Editar estante" msgid "Update shelf" msgstr "Actualizar estante" -#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56 +#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56 msgid "All books" msgstr "Todos los libros" -#: bookwyrm/templates/user/shelf/shelf.html:40 +#: bookwyrm/templates/user/shelf/shelf.html:55 msgid "Create shelf" msgstr "Crear estante" -#: bookwyrm/templates/user/shelf/shelf.html:62 +#: bookwyrm/templates/user/shelf/shelf.html:76 +#, python-format +msgid "%(formatted_count)s book" +msgid_plural "%(formatted_count)s books" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/user/shelf/shelf.html:83 +#, python-format +msgid "(showing %(start)s-%(end)s)" +msgstr "" + +#: bookwyrm/templates/user/shelf/shelf.html:94 msgid "Edit shelf" msgstr "Editar estante" -#: bookwyrm/templates/user/shelf/shelf.html:81 -#: bookwyrm/templates/user/shelf/shelf.html:105 +#: bookwyrm/templates/user/shelf/shelf.html:113 +#: bookwyrm/templates/user/shelf/shelf.html:137 msgid "Shelved" msgstr "Archivado" -#: bookwyrm/templates/user/shelf/shelf.html:82 -#: bookwyrm/templates/user/shelf/shelf.html:109 +#: bookwyrm/templates/user/shelf/shelf.html:114 +#: bookwyrm/templates/user/shelf/shelf.html:141 msgid "Started" msgstr "Empezado" -#: bookwyrm/templates/user/shelf/shelf.html:83 -#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:115 +#: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Finished" msgstr "Terminado" -#: bookwyrm/templates/user/shelf/shelf.html:138 +#: bookwyrm/templates/user/shelf/shelf.html:170 msgid "This shelf is empty." msgstr "Este estante está vacio." -#: bookwyrm/templates/user/shelf/shelf.html:144 +#: bookwyrm/templates/user/shelf/shelf.html:176 msgid "Delete shelf" msgstr "Eliminar estante" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 81130aa34..647d18ece 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-27 19:11+0000\n" +"POT-Creation-Date: 2021-09-05 23:09+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:233 +#: bookwyrm/forms.py:235 msgid "A user with this email already exists." msgstr "Cet email est déjà associé à un compte." -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "Un jour" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "Une semaine" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "Un mois" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "Sans expiration" -#: bookwyrm/forms.py:255 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d utilisations" -#: bookwyrm/forms.py:258 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "Sans limite" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "Ordre de la liste" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "Titre du livre" -#: bookwyrm/forms.py:310 -#: bookwyrm/templates/snippets/create_status/review.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:85 -#: bookwyrm/templates/user/shelf/shelf.html:116 +#: bookwyrm/forms.py:312 +#: bookwyrm/templates/snippets/create_status/review.html:23 +#: bookwyrm/templates/user/shelf/shelf.html:117 +#: bookwyrm/templates/user/shelf/shelf.html:148 msgid "Rating" msgstr "Note" -#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Trier par" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "Ordre croissant" -#: bookwyrm/forms.py:317 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "Ordre décroissant" @@ -181,12 +181,12 @@ msgid "Wikipedia" msgstr "Wikipedia" #: bookwyrm/templates/author/author.html:69 -#: bookwyrm/templates/book/book.html:95 +#: bookwyrm/templates/book/book.html:94 msgid "View on OpenLibrary" msgstr "Voir sur OpenLibrary" #: bookwyrm/templates/author/author.html:77 -#: bookwyrm/templates/book/book.html:98 +#: bookwyrm/templates/book/book.html:97 msgid "View on Inventaire" msgstr "Voir sur Inventaire" @@ -279,7 +279,7 @@ msgid "Goodreads key:" msgstr "Clé Goodreads :" #: bookwyrm/templates/author/edit_author.html:116 -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 @@ -296,7 +296,7 @@ msgid "Save" msgstr "Enregistrer" #: bookwyrm/templates/author/edit_author.html:117 -#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 @@ -308,99 +308,99 @@ msgstr "Enregistrer" msgid "Cancel" msgstr "Annuler" -#: bookwyrm/templates/book/book.html:48 +#: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 #: bookwyrm/templates/landing/small-book.html:18 msgid "by" msgstr "par" -#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56 msgid "Edit Book" msgstr "Modifier le livre" -#: bookwyrm/templates/book/book.html:74 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "Ajouter une couverture" -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/book/book.html:77 msgid "Failed to load cover" msgstr "La couverture n’a pu être chargée" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:117 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s critique)" msgstr[1] "(%(review_count)s critiques)" -#: bookwyrm/templates/book/book.html:130 +#: bookwyrm/templates/book/book.html:129 msgid "Add Description" msgstr "Ajouter une description" -#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/book.html:136 #: bookwyrm/templates/book/edit_book.html:143 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "Description :" -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:150 #, python-format msgid "%(count)s editions" msgstr "%(count)s éditions" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:158 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "Cette édition est sur votre étagère %(shelf_name)s." -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:164 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "Une édition différente de ce livre existe sur votre étagère %(shelf_name)s." -#: bookwyrm/templates/book/book.html:176 +#: bookwyrm/templates/book/book.html:175 msgid "Your reading activity" msgstr "Votre activité de lecture" -#: bookwyrm/templates/book/book.html:179 +#: bookwyrm/templates/book/book.html:178 msgid "Add read dates" msgstr "Ajouter des dates de lecture" -#: bookwyrm/templates/book/book.html:188 +#: bookwyrm/templates/book/book.html:187 msgid "Create" msgstr "Créer" -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:197 msgid "You don't have any reading activity for this book." msgstr "Vous n’avez aucune activité de lecture pour ce livre" -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:216 msgid "Reviews" msgstr "Critiques" -#: bookwyrm/templates/book/book.html:222 +#: bookwyrm/templates/book/book.html:221 msgid "Your reviews" msgstr "Vos critiques" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:227 msgid "Your comments" msgstr "Vos commentaires" -#: bookwyrm/templates/book/book.html:234 +#: bookwyrm/templates/book/book.html:233 msgid "Your quotes" msgstr "Vos citations" -#: bookwyrm/templates/book/book.html:270 +#: bookwyrm/templates/book/book.html:269 msgid "Subjects" msgstr "Sujets" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:281 msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 +#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -408,11 +408,11 @@ msgstr "Lieux" msgid "Lists" msgstr "Listes" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:303 msgid "Add to list" msgstr "Ajouter à la liste" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:313 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -495,7 +495,7 @@ msgid "Back" msgstr "Retour" #: bookwyrm/templates/book/edit_book.html:127 -#: bookwyrm/templates/snippets/create_status/review.html:18 +#: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "Titre :" @@ -550,7 +550,7 @@ msgid "John Doe, Jane Smith" msgstr "Claude Dupont, Dominique Durand" #: bookwyrm/templates/book/edit_book.html:227 -#: bookwyrm/templates/user/shelf/shelf.html:78 +#: bookwyrm/templates/user/shelf/shelf.html:110 msgid "Cover" msgstr "Couverture" @@ -990,18 +990,18 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer" #: bookwyrm/templates/feed/layout.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:38 msgid "To Read" msgstr "À lire" #: bookwyrm/templates/feed/layout.html:26 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:40 msgid "Currently Reading" msgstr "Lectures en cours" #: bookwyrm/templates/feed/layout.html:27 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:42 msgid "Read" msgstr "Lu" @@ -1184,7 +1184,7 @@ msgid "%(username)s's %(year)s Books" msgstr "Livres de %(username)s en %(year)s" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 -#: bookwyrm/templates/user/shelf/shelf.html:42 +#: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "Importer des livres" @@ -1285,14 +1285,14 @@ msgid "Book" msgstr "Livre" #: bookwyrm/templates/import_status.html:122 -#: bookwyrm/templates/user/shelf/shelf.html:79 -#: bookwyrm/templates/user/shelf/shelf.html:99 +#: bookwyrm/templates/user/shelf/shelf.html:111 +#: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "Titre" #: bookwyrm/templates/import_status.html:125 -#: bookwyrm/templates/user/shelf/shelf.html:80 -#: bookwyrm/templates/user/shelf/shelf.html:102 +#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "Auteur/autrice" @@ -1387,7 +1387,7 @@ msgid "Settings" msgstr "Paramètres" #: bookwyrm/templates/layout.html:118 -#: bookwyrm/templates/settings/admin_layout.html:31 +#: bookwyrm/templates/settings/admin_layout.html:33 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 #: bookwyrm/templates/settings/manage_invites.html:15 @@ -1708,7 +1708,7 @@ msgstr "Signalements : %(instance_name)s" #: bookwyrm/templates/moderation/reports.html:8 #: bookwyrm/templates/moderation/reports.html:17 -#: bookwyrm/templates/settings/admin_layout.html:35 +#: bookwyrm/templates/settings/admin_layout.html:38 msgid "Reports" msgstr "Signalements" @@ -1977,7 +1977,7 @@ msgstr "Type de recherche" #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 -#: bookwyrm/templates/settings/admin_layout.html:26 +#: bookwyrm/templates/settings/admin_layout.html:27 #: bookwyrm/templates/user_admin/user_admin.html:3 #: bookwyrm/templates/user_admin/user_admin.html:10 msgid "Users" @@ -1996,44 +1996,44 @@ msgstr "Administration" msgid "Manage Users" msgstr "Gérer les comptes" -#: bookwyrm/templates/settings/admin_layout.html:39 +#: bookwyrm/templates/settings/admin_layout.html:44 #: bookwyrm/templates/settings/federation.html:3 #: bookwyrm/templates/settings/federation.html:5 msgid "Federated Instances" msgstr "Instances fédérées" -#: bookwyrm/templates/settings/admin_layout.html:44 +#: bookwyrm/templates/settings/admin_layout.html:50 msgid "Instance Settings" msgstr "Paramètres de l’instance" -#: bookwyrm/templates/settings/admin_layout.html:48 +#: bookwyrm/templates/settings/admin_layout.html:54 #: bookwyrm/templates/settings/announcements.html:3 #: bookwyrm/templates/settings/announcements.html:5 msgid "Announcements" msgstr "Annonces" -#: bookwyrm/templates/settings/admin_layout.html:52 +#: bookwyrm/templates/settings/admin_layout.html:58 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "Paramètres du site" -#: bookwyrm/templates/settings/admin_layout.html:55 +#: bookwyrm/templates/settings/admin_layout.html:61 #: bookwyrm/templates/settings/site.html:13 msgid "Instance Info" msgstr "Information sur l’instance" -#: bookwyrm/templates/settings/admin_layout.html:56 +#: bookwyrm/templates/settings/admin_layout.html:62 #: bookwyrm/templates/settings/site.html:39 msgid "Images" msgstr "Images" -#: bookwyrm/templates/settings/admin_layout.html:57 +#: bookwyrm/templates/settings/admin_layout.html:63 #: bookwyrm/templates/settings/site.html:59 msgid "Footer Content" msgstr "Contenu du pied de page" -#: bookwyrm/templates/settings/admin_layout.html:58 +#: bookwyrm/templates/settings/admin_layout.html:64 #: bookwyrm/templates/settings/site.html:81 msgid "Registration" msgstr "Inscription" @@ -2494,19 +2494,19 @@ msgstr "" msgid "Progress:" msgstr "Progression :" -#: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/create_status/comment.html:47 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 msgid "pages" msgstr "pages" -#: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/create_status/comment.html:53 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 msgid "percent" msgstr "pourcent" -#: bookwyrm/templates/snippets/create_status/comment.html:41 +#: bookwyrm/templates/snippets/create_status/comment.html:60 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" @@ -2551,23 +2551,41 @@ msgstr "Privé" msgid "Post" msgstr "Publier" -#: bookwyrm/templates/snippets/create_status/quotation.html:19 +#: bookwyrm/templates/snippets/create_status/quotation.html:17 msgid "Quote:" msgstr "Citation :" -#: bookwyrm/templates/snippets/create_status/quotation.html:27 +#: bookwyrm/templates/snippets/create_status/quotation.html:25 #, fuzzy, python-format #| msgid "Edit \"%(book_title)s\"" msgid "An excerpt from '%(book_title)s'" msgstr "Modifier « %(book_title)s »" -#: bookwyrm/templates/snippets/create_status/review.html:20 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +#, fuzzy +#| msgid "Description:" +msgid "Position:" +msgstr "Description :" + +#: bookwyrm/templates/snippets/create_status/quotation.html:40 +#, fuzzy +#| msgid "pages" +msgid "On page:" +msgstr "pages" + +#: bookwyrm/templates/snippets/create_status/quotation.html:46 +#, fuzzy +#| msgid "percent" +msgid "At percent:" +msgstr "pourcent" + +#: bookwyrm/templates/snippets/create_status/review.html:18 #, fuzzy, python-format #| msgid "Editions of %(book_title)s" msgid "Your review of '%(book_title)s'" msgstr "Éditions de %(book_title)s" -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:30 msgid "Review:" msgstr "Critique :" @@ -2844,17 +2862,29 @@ msgstr "Je veux le lire" msgid "Remove from %(name)s" msgstr "Retirer de %(name)s" -#: bookwyrm/templates/snippets/status/content_status.html:72 +#: bookwyrm/templates/snippets/status/content_status.html:73 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" msgstr "Déplier" -#: bookwyrm/templates/snippets/status/content_status.html:87 +#: bookwyrm/templates/snippets/status/content_status.html:88 #: bookwyrm/templates/snippets/trimmed_text.html:34 msgid "Show less" msgstr "Replier" -#: bookwyrm/templates/snippets/status/content_status.html:117 +#: bookwyrm/templates/snippets/status/content_status.html:103 +#, fuzzy, python-format +#| msgid "page %(page)s" +msgid "(Page %(page)s)" +msgstr "page %(page)s" + +#: bookwyrm/templates/snippets/status/content_status.html:105 +#, fuzzy, python-format +#| msgid "%(percent)s%% complete!" +msgid "(%(percent)s%%)" +msgstr "%(percent)s%% terminé !" + +#: bookwyrm/templates/snippets/status/content_status.html:127 msgid "Open image in new window" msgstr "Ouvrir l’image dans une nouvelle fenêtre" @@ -3026,38 +3056,50 @@ msgstr "Modifier l’étagère" msgid "Update shelf" msgstr "Mettre l’étagère à jour" -#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56 +#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56 msgid "All books" msgstr "Tous les livres" -#: bookwyrm/templates/user/shelf/shelf.html:40 +#: bookwyrm/templates/user/shelf/shelf.html:55 msgid "Create shelf" msgstr "Créer une étagère" -#: bookwyrm/templates/user/shelf/shelf.html:62 +#: bookwyrm/templates/user/shelf/shelf.html:76 +#, python-format +msgid "%(formatted_count)s book" +msgid_plural "%(formatted_count)s books" +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/user/shelf/shelf.html:83 +#, python-format +msgid "(showing %(start)s-%(end)s)" +msgstr "" + +#: bookwyrm/templates/user/shelf/shelf.html:94 msgid "Edit shelf" msgstr "Modifier l’étagère" -#: bookwyrm/templates/user/shelf/shelf.html:81 -#: bookwyrm/templates/user/shelf/shelf.html:105 +#: bookwyrm/templates/user/shelf/shelf.html:113 +#: bookwyrm/templates/user/shelf/shelf.html:137 msgid "Shelved" msgstr "Date d’ajout" -#: bookwyrm/templates/user/shelf/shelf.html:82 -#: bookwyrm/templates/user/shelf/shelf.html:109 +#: bookwyrm/templates/user/shelf/shelf.html:114 +#: bookwyrm/templates/user/shelf/shelf.html:141 msgid "Started" msgstr "Commencé" -#: bookwyrm/templates/user/shelf/shelf.html:83 -#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:115 +#: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Finished" msgstr "Terminé" -#: bookwyrm/templates/user/shelf/shelf.html:138 +#: bookwyrm/templates/user/shelf/shelf.html:170 msgid "This shelf is empty." msgstr "Cette étagère est vide" -#: bookwyrm/templates/user/shelf/shelf.html:144 +#: bookwyrm/templates/user/shelf/shelf.html:176 msgid "Delete shelf" msgstr "Supprimer l’étagère" diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index df3ee019e..3adb5aef5 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-27 19:11+0000\n" +"POT-Creation-Date: 2021-09-05 23:09+0000\n" "PO-Revision-Date: 2021-03-20 00:56+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:233 +#: bookwyrm/forms.py:235 msgid "A user with this email already exists." msgstr "已经存在使用该邮箱的用户。" -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "一周" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "一个月" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:255 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:258 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "列表顺序" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "书名" -#: bookwyrm/forms.py:310 -#: bookwyrm/templates/snippets/create_status/review.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:85 -#: bookwyrm/templates/user/shelf/shelf.html:116 +#: bookwyrm/forms.py:312 +#: bookwyrm/templates/snippets/create_status/review.html:23 +#: bookwyrm/templates/user/shelf/shelf.html:117 +#: bookwyrm/templates/user/shelf/shelf.html:148 msgid "Rating" msgstr "评价" -#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:317 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "降序" @@ -177,12 +177,12 @@ msgid "Wikipedia" msgstr "维基百科" #: bookwyrm/templates/author/author.html:69 -#: bookwyrm/templates/book/book.html:95 +#: bookwyrm/templates/book/book.html:94 msgid "View on OpenLibrary" msgstr "在 OpenLibrary 查看" #: bookwyrm/templates/author/author.html:77 -#: bookwyrm/templates/book/book.html:98 +#: bookwyrm/templates/book/book.html:97 msgid "View on Inventaire" msgstr "在 Inventaire 查看" @@ -275,7 +275,7 @@ msgid "Goodreads key:" msgstr "Goodreads key:" #: bookwyrm/templates/author/edit_author.html:116 -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 @@ -292,7 +292,7 @@ msgid "Save" msgstr "保存" #: bookwyrm/templates/author/edit_author.html:117 -#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 @@ -304,98 +304,98 @@ msgstr "保存" msgid "Cancel" msgstr "取消" -#: bookwyrm/templates/book/book.html:48 +#: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 #: bookwyrm/templates/landing/small-book.html:18 msgid "by" msgstr "作者" -#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56 msgid "Edit Book" msgstr "编辑书目" -#: bookwyrm/templates/book/book.html:74 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "添加封面" -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/book/book.html:77 msgid "Failed to load cover" msgstr "加载封面失败" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:117 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 则书评)" -#: bookwyrm/templates/book/book.html:130 +#: bookwyrm/templates/book/book.html:129 msgid "Add Description" msgstr "添加描述" -#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/book.html:136 #: bookwyrm/templates/book/edit_book.html:143 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:150 #, python-format msgid "%(count)s editions" msgstr "%(count)s 个版本" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:158 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "此版本在你的 %(shelf_name)s 书架上。" -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:164 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "本书的 另一个版本 在你的 %(shelf_name)s 书架上。" -#: bookwyrm/templates/book/book.html:176 +#: bookwyrm/templates/book/book.html:175 msgid "Your reading activity" msgstr "你的阅读活动" -#: bookwyrm/templates/book/book.html:179 +#: bookwyrm/templates/book/book.html:178 msgid "Add read dates" msgstr "添加阅读日期" -#: bookwyrm/templates/book/book.html:188 +#: bookwyrm/templates/book/book.html:187 msgid "Create" msgstr "创建" -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:197 msgid "You don't have any reading activity for this book." msgstr "你还没有任何这本书的阅读活动。" -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:216 msgid "Reviews" msgstr "书评" -#: bookwyrm/templates/book/book.html:222 +#: bookwyrm/templates/book/book.html:221 msgid "Your reviews" msgstr "你的书评" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:227 msgid "Your comments" msgstr "你的评论" -#: bookwyrm/templates/book/book.html:234 +#: bookwyrm/templates/book/book.html:233 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:270 +#: bookwyrm/templates/book/book.html:269 msgid "Subjects" msgstr "主题" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:281 msgid "Places" msgstr "地点" -#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 +#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -403,11 +403,11 @@ msgstr "地点" msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:303 msgid "Add to list" msgstr "添加到列表" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:313 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -490,7 +490,7 @@ msgid "Back" msgstr "返回" #: bookwyrm/templates/book/edit_book.html:127 -#: bookwyrm/templates/snippets/create_status/review.html:18 +#: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "标题:" @@ -545,7 +545,7 @@ msgid "John Doe, Jane Smith" msgstr "张三, 李四" #: bookwyrm/templates/book/edit_book.html:227 -#: bookwyrm/templates/user/shelf/shelf.html:78 +#: bookwyrm/templates/user/shelf/shelf.html:110 msgid "Cover" msgstr "封面" @@ -976,18 +976,18 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "现在这里还没有任何书目！尝试着从搜索某本书开始吧" #: bookwyrm/templates/feed/layout.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:38 msgid "To Read" msgstr "想读" #: bookwyrm/templates/feed/layout.html:26 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:40 msgid "Currently Reading" msgstr "在读" #: bookwyrm/templates/feed/layout.html:27 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:42 msgid "Read" msgstr "读过" @@ -1170,7 +1170,7 @@ msgid "%(username)s's %(year)s Books" msgstr "%(username)s 在 %(year)s 的书目" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 -#: bookwyrm/templates/user/shelf/shelf.html:42 +#: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "导入书目" @@ -1267,14 +1267,14 @@ msgid "Book" msgstr "书目" #: bookwyrm/templates/import_status.html:122 -#: bookwyrm/templates/user/shelf/shelf.html:79 -#: bookwyrm/templates/user/shelf/shelf.html:99 +#: bookwyrm/templates/user/shelf/shelf.html:111 +#: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "标题" #: bookwyrm/templates/import_status.html:125 -#: bookwyrm/templates/user/shelf/shelf.html:80 -#: bookwyrm/templates/user/shelf/shelf.html:102 +#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "作者" @@ -1369,7 +1369,7 @@ msgid "Settings" msgstr "设置" #: bookwyrm/templates/layout.html:118 -#: bookwyrm/templates/settings/admin_layout.html:31 +#: bookwyrm/templates/settings/admin_layout.html:33 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 #: bookwyrm/templates/settings/manage_invites.html:15 @@ -1690,7 +1690,7 @@ msgstr "报告: %(instance_name)s" #: bookwyrm/templates/moderation/reports.html:8 #: bookwyrm/templates/moderation/reports.html:17 -#: bookwyrm/templates/settings/admin_layout.html:35 +#: bookwyrm/templates/settings/admin_layout.html:38 msgid "Reports" msgstr "报告" @@ -1953,7 +1953,7 @@ msgstr "搜索类型" #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 -#: bookwyrm/templates/settings/admin_layout.html:26 +#: bookwyrm/templates/settings/admin_layout.html:27 #: bookwyrm/templates/user_admin/user_admin.html:3 #: bookwyrm/templates/user_admin/user_admin.html:10 msgid "Users" @@ -1972,44 +1972,44 @@ msgstr "管理" msgid "Manage Users" msgstr "管理用户" -#: bookwyrm/templates/settings/admin_layout.html:39 +#: bookwyrm/templates/settings/admin_layout.html:44 #: bookwyrm/templates/settings/federation.html:3 #: bookwyrm/templates/settings/federation.html:5 msgid "Federated Instances" msgstr "互联实例" -#: bookwyrm/templates/settings/admin_layout.html:44 +#: bookwyrm/templates/settings/admin_layout.html:50 msgid "Instance Settings" msgstr "实例设置" -#: bookwyrm/templates/settings/admin_layout.html:48 +#: bookwyrm/templates/settings/admin_layout.html:54 #: bookwyrm/templates/settings/announcements.html:3 #: bookwyrm/templates/settings/announcements.html:5 msgid "Announcements" msgstr "公告" -#: bookwyrm/templates/settings/admin_layout.html:52 +#: bookwyrm/templates/settings/admin_layout.html:58 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "站点设置" -#: bookwyrm/templates/settings/admin_layout.html:55 +#: bookwyrm/templates/settings/admin_layout.html:61 #: bookwyrm/templates/settings/site.html:13 msgid "Instance Info" msgstr "实例信息" -#: bookwyrm/templates/settings/admin_layout.html:56 +#: bookwyrm/templates/settings/admin_layout.html:62 #: bookwyrm/templates/settings/site.html:39 msgid "Images" msgstr "图像" -#: bookwyrm/templates/settings/admin_layout.html:57 +#: bookwyrm/templates/settings/admin_layout.html:63 #: bookwyrm/templates/settings/site.html:59 msgid "Footer Content" msgstr "页脚内容" -#: bookwyrm/templates/settings/admin_layout.html:58 +#: bookwyrm/templates/settings/admin_layout.html:64 #: bookwyrm/templates/settings/site.html:81 msgid "Registration" msgstr "注册" @@ -2468,19 +2468,19 @@ msgstr "对书的一些看法" msgid "Progress:" msgstr "进度:" -#: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/create_status/comment.html:47 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 msgid "pages" msgstr "页数" -#: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/create_status/comment.html:53 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 msgid "percent" msgstr "百分比" -#: bookwyrm/templates/snippets/create_status/comment.html:41 +#: bookwyrm/templates/snippets/create_status/comment.html:60 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" @@ -2525,21 +2525,39 @@ msgstr "私密" msgid "Post" msgstr "发布" -#: bookwyrm/templates/snippets/create_status/quotation.html:19 +#: bookwyrm/templates/snippets/create_status/quotation.html:17 msgid "Quote:" msgstr "引用:" -#: bookwyrm/templates/snippets/create_status/quotation.html:27 +#: bookwyrm/templates/snippets/create_status/quotation.html:25 #, python-format msgid "An excerpt from '%(book_title)s'" msgstr "摘自《%(book_title)s》的节录" -#: bookwyrm/templates/snippets/create_status/review.html:20 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +#, fuzzy +#| msgid "Description:" +msgid "Position:" +msgstr "描述:" + +#: bookwyrm/templates/snippets/create_status/quotation.html:40 +#, fuzzy +#| msgid "pages" +msgid "On page:" +msgstr "页数" + +#: bookwyrm/templates/snippets/create_status/quotation.html:46 +#, fuzzy +#| msgid "percent" +msgid "At percent:" +msgstr "百分比" + +#: bookwyrm/templates/snippets/create_status/review.html:18 #, python-format msgid "Your review of '%(book_title)s'" msgstr "你对《%(book_title)s》的书评" -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:30 msgid "Review:" msgstr "书评:" @@ -2808,17 +2826,29 @@ msgstr "想要阅读" msgid "Remove from %(name)s" msgstr "从 %(name)s 移除" -#: bookwyrm/templates/snippets/status/content_status.html:72 +#: bookwyrm/templates/snippets/status/content_status.html:73 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" msgstr "显示更多" -#: bookwyrm/templates/snippets/status/content_status.html:87 +#: bookwyrm/templates/snippets/status/content_status.html:88 #: bookwyrm/templates/snippets/trimmed_text.html:34 msgid "Show less" msgstr "显示更少" -#: bookwyrm/templates/snippets/status/content_status.html:117 +#: bookwyrm/templates/snippets/status/content_status.html:103 +#, fuzzy, python-format +#| msgid "page %(page)s" +msgid "(Page %(page)s)" +msgstr "第 %(page)s 页" + +#: bookwyrm/templates/snippets/status/content_status.html:105 +#, fuzzy, python-format +#| msgid "%(percent)s%% complete!" +msgid "(%(percent)s%%)" +msgstr "完成了 %(percent)s%% ！" + +#: bookwyrm/templates/snippets/status/content_status.html:127 msgid "Open image in new window" msgstr "在新窗口中打开图像" @@ -2979,38 +3009,49 @@ msgstr "编辑书架" msgid "Update shelf" msgstr "更新书架" -#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56 +#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56 msgid "All books" msgstr "所有书目" -#: bookwyrm/templates/user/shelf/shelf.html:40 +#: bookwyrm/templates/user/shelf/shelf.html:55 msgid "Create shelf" msgstr "创建书架" -#: bookwyrm/templates/user/shelf/shelf.html:62 +#: bookwyrm/templates/user/shelf/shelf.html:76 +#, python-format +msgid "%(formatted_count)s book" +msgid_plural "%(formatted_count)s books" +msgstr[0] "" + +#: bookwyrm/templates/user/shelf/shelf.html:83 +#, python-format +msgid "(showing %(start)s-%(end)s)" +msgstr "" + +#: bookwyrm/templates/user/shelf/shelf.html:94 msgid "Edit shelf" msgstr "编辑书架" -#: bookwyrm/templates/user/shelf/shelf.html:81 -#: bookwyrm/templates/user/shelf/shelf.html:105 +#: bookwyrm/templates/user/shelf/shelf.html:113 +#: bookwyrm/templates/user/shelf/shelf.html:137 msgid "Shelved" msgstr "上架时间" -#: bookwyrm/templates/user/shelf/shelf.html:82 -#: bookwyrm/templates/user/shelf/shelf.html:109 +#: bookwyrm/templates/user/shelf/shelf.html:114 +#: bookwyrm/templates/user/shelf/shelf.html:141 msgid "Started" msgstr "开始时间" -#: bookwyrm/templates/user/shelf/shelf.html:83 -#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:115 +#: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Finished" msgstr "完成时间" -#: bookwyrm/templates/user/shelf/shelf.html:138 +#: bookwyrm/templates/user/shelf/shelf.html:170 msgid "This shelf is empty." msgstr "此书架是空的。" -#: bookwyrm/templates/user/shelf/shelf.html:144 +#: bookwyrm/templates/user/shelf/shelf.html:176 msgid "Delete shelf" msgstr "删除书架" diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index c8224be61..2149c9131 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-27 19:11+0000\n" +"POT-Creation-Date: 2021-09-05 23:09+0000\n" "PO-Revision-Date: 2021-06-30 10:36+0000\n" "Last-Translator: Grace Cheng \n" "Language-Team: LANGUAGE \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:233 +#: bookwyrm/forms.py:235 msgid "A user with this email already exists." msgstr "已經存在使用該郵箱的使用者。" -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:249 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:250 msgid "One Week" msgstr "一週" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:251 msgid "One Month" msgstr "一個月" -#: bookwyrm/forms.py:250 +#: bookwyrm/forms.py:252 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:255 +#: bookwyrm/forms.py:257 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:258 +#: bookwyrm/forms.py:260 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:310 msgid "List Order" msgstr "列表順序" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:311 msgid "Book Title" msgstr "書名" -#: bookwyrm/forms.py:310 -#: bookwyrm/templates/snippets/create_status/review.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:85 -#: bookwyrm/templates/user/shelf/shelf.html:116 +#: bookwyrm/forms.py:312 +#: bookwyrm/templates/snippets/create_status/review.html:23 +#: bookwyrm/templates/user/shelf/shelf.html:117 +#: bookwyrm/templates/user/shelf/shelf.html:148 msgid "Rating" msgstr "評價" -#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:314 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:318 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:317 +#: bookwyrm/forms.py:319 msgid "Descending" msgstr "降序" @@ -181,12 +181,12 @@ msgid "Wikipedia" msgstr "維基百科" #: bookwyrm/templates/author/author.html:69 -#: bookwyrm/templates/book/book.html:95 +#: bookwyrm/templates/book/book.html:94 msgid "View on OpenLibrary" msgstr "在 OpenLibrary 檢視" #: bookwyrm/templates/author/author.html:77 -#: bookwyrm/templates/book/book.html:98 +#: bookwyrm/templates/book/book.html:97 msgid "View on Inventaire" msgstr "在 Inventaire 檢視" @@ -281,7 +281,7 @@ msgid "Goodreads key:" msgstr "Goodreads key:" #: bookwyrm/templates/author/edit_author.html:116 -#: bookwyrm/templates/book/book.html:141 +#: bookwyrm/templates/book/book.html:140 #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 @@ -298,7 +298,7 @@ msgid "Save" msgstr "儲存" #: bookwyrm/templates/author/edit_author.html:117 -#: bookwyrm/templates/book/book.html:142 bookwyrm/templates/book/book.html:191 +#: bookwyrm/templates/book/book.html:141 bookwyrm/templates/book/book.html:190 #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 @@ -310,98 +310,98 @@ msgstr "儲存" msgid "Cancel" msgstr "取消" -#: bookwyrm/templates/book/book.html:48 +#: bookwyrm/templates/book/book.html:47 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:25 #: bookwyrm/templates/landing/small-book.html:18 msgid "by" msgstr "作者" -#: bookwyrm/templates/book/book.html:56 bookwyrm/templates/book/book.html:57 +#: bookwyrm/templates/book/book.html:55 bookwyrm/templates/book/book.html:56 msgid "Edit Book" msgstr "編輯書目" -#: bookwyrm/templates/book/book.html:74 +#: bookwyrm/templates/book/book.html:73 #: bookwyrm/templates/book/cover_modal.html:5 msgid "Add cover" msgstr "新增封面" -#: bookwyrm/templates/book/book.html:78 +#: bookwyrm/templates/book/book.html:77 msgid "Failed to load cover" msgstr "載入封面失敗" -#: bookwyrm/templates/book/book.html:118 +#: bookwyrm/templates/book/book.html:117 #, python-format msgid "(%(review_count)s review)" msgid_plural "(%(review_count)s reviews)" msgstr[0] "(%(review_count)s 則書評)" -#: bookwyrm/templates/book/book.html:130 +#: bookwyrm/templates/book/book.html:129 msgid "Add Description" msgstr "新增描述" -#: bookwyrm/templates/book/book.html:137 +#: bookwyrm/templates/book/book.html:136 #: bookwyrm/templates/book/edit_book.html:143 #: bookwyrm/templates/lists/form.html:12 msgid "Description:" msgstr "描述:" -#: bookwyrm/templates/book/book.html:151 +#: bookwyrm/templates/book/book.html:150 #, python-format msgid "%(count)s editions" msgstr "%(count)s 個版本" -#: bookwyrm/templates/book/book.html:159 +#: bookwyrm/templates/book/book.html:158 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "此版本在你的 %(shelf_name)s 書架上。" -#: bookwyrm/templates/book/book.html:165 +#: bookwyrm/templates/book/book.html:164 #, python-format msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "本書的 另一個版本 在你的 %(shelf_name)s 書架上。" -#: bookwyrm/templates/book/book.html:176 +#: bookwyrm/templates/book/book.html:175 msgid "Your reading activity" msgstr "你的閱讀活動" -#: bookwyrm/templates/book/book.html:179 +#: bookwyrm/templates/book/book.html:178 msgid "Add read dates" msgstr "新增閱讀日期" -#: bookwyrm/templates/book/book.html:188 +#: bookwyrm/templates/book/book.html:187 msgid "Create" msgstr "建立" -#: bookwyrm/templates/book/book.html:198 +#: bookwyrm/templates/book/book.html:197 msgid "You don't have any reading activity for this book." msgstr "你還未閱讀這本書。" -#: bookwyrm/templates/book/book.html:217 +#: bookwyrm/templates/book/book.html:216 msgid "Reviews" msgstr "書評" -#: bookwyrm/templates/book/book.html:222 +#: bookwyrm/templates/book/book.html:221 msgid "Your reviews" msgstr "你的書評" -#: bookwyrm/templates/book/book.html:228 +#: bookwyrm/templates/book/book.html:227 msgid "Your comments" msgstr "你的評論" -#: bookwyrm/templates/book/book.html:234 +#: bookwyrm/templates/book/book.html:233 msgid "Your quotes" msgstr "你的引用" -#: bookwyrm/templates/book/book.html:270 +#: bookwyrm/templates/book/book.html:269 msgid "Subjects" msgstr "主題" -#: bookwyrm/templates/book/book.html:282 +#: bookwyrm/templates/book/book.html:281 msgid "Places" msgstr "地點" -#: bookwyrm/templates/book/book.html:293 bookwyrm/templates/layout.html:68 +#: bookwyrm/templates/book/book.html:292 bookwyrm/templates/layout.html:68 #: bookwyrm/templates/lists/lists.html:5 bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:25 #: bookwyrm/templates/search/layout.html:50 @@ -409,11 +409,11 @@ msgstr "地點" msgid "Lists" msgstr "列表" -#: bookwyrm/templates/book/book.html:304 +#: bookwyrm/templates/book/book.html:303 msgid "Add to list" msgstr "新增到列表" -#: bookwyrm/templates/book/book.html:314 +#: bookwyrm/templates/book/book.html:313 #: bookwyrm/templates/book/cover_modal.html:31 #: bookwyrm/templates/lists/list.html:179 msgid "Add" @@ -496,7 +496,7 @@ msgid "Back" msgstr "返回" #: bookwyrm/templates/book/edit_book.html:127 -#: bookwyrm/templates/snippets/create_status/review.html:18 +#: bookwyrm/templates/snippets/create_status/review.html:16 msgid "Title:" msgstr "標題:" @@ -553,7 +553,7 @@ msgid "John Doe, Jane Smith" msgstr "John Doe, Jane Smith" #: bookwyrm/templates/book/edit_book.html:227 -#: bookwyrm/templates/user/shelf/shelf.html:78 +#: bookwyrm/templates/user/shelf/shelf.html:110 msgid "Cover" msgstr "封面" @@ -1001,18 +1001,18 @@ msgid "There are no books here right now! Try searching for a book to get starte msgstr "現在這裡還沒有任何書目！嘗試著從搜尋某本書開始吧" #: bookwyrm/templates/feed/layout.html:25 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:38 msgid "To Read" msgstr "想讀" #: bookwyrm/templates/feed/layout.html:26 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:40 msgid "Currently Reading" msgstr "在讀" #: bookwyrm/templates/feed/layout.html:27 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:17 -#: bookwyrm/templates/user/shelf/shelf.html:31 +#: bookwyrm/templates/user/shelf/shelf.html:42 msgid "Read" msgstr "讀過" @@ -1195,7 +1195,7 @@ msgid "%(username)s's %(year)s Books" msgstr "%(username)s 在 %(year)s 的書目" #: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 -#: bookwyrm/templates/user/shelf/shelf.html:42 +#: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "匯入書目" @@ -1296,14 +1296,14 @@ msgid "Book" msgstr "書目" #: bookwyrm/templates/import_status.html:122 -#: bookwyrm/templates/user/shelf/shelf.html:79 -#: bookwyrm/templates/user/shelf/shelf.html:99 +#: bookwyrm/templates/user/shelf/shelf.html:111 +#: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "標題" #: bookwyrm/templates/import_status.html:125 -#: bookwyrm/templates/user/shelf/shelf.html:80 -#: bookwyrm/templates/user/shelf/shelf.html:102 +#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "作者" @@ -1398,7 +1398,7 @@ msgid "Settings" msgstr "設定" #: bookwyrm/templates/layout.html:118 -#: bookwyrm/templates/settings/admin_layout.html:31 +#: bookwyrm/templates/settings/admin_layout.html:33 #: bookwyrm/templates/settings/manage_invite_requests.html:15 #: bookwyrm/templates/settings/manage_invites.html:3 #: bookwyrm/templates/settings/manage_invites.html:15 @@ -1719,7 +1719,7 @@ msgstr "舉報: %(instance_name)s" #: bookwyrm/templates/moderation/reports.html:8 #: bookwyrm/templates/moderation/reports.html:17 -#: bookwyrm/templates/settings/admin_layout.html:35 +#: bookwyrm/templates/settings/admin_layout.html:38 msgid "Reports" msgstr "舉報" @@ -1988,7 +1988,7 @@ msgstr "搜尋類別" #: bookwyrm/templates/search/layout.html:23 #: bookwyrm/templates/search/layout.html:46 -#: bookwyrm/templates/settings/admin_layout.html:26 +#: bookwyrm/templates/settings/admin_layout.html:27 #: bookwyrm/templates/user_admin/user_admin.html:3 #: bookwyrm/templates/user_admin/user_admin.html:10 msgid "Users" @@ -2007,44 +2007,44 @@ msgstr "管理" msgid "Manage Users" msgstr "管理使用者" -#: bookwyrm/templates/settings/admin_layout.html:39 +#: bookwyrm/templates/settings/admin_layout.html:44 #: bookwyrm/templates/settings/federation.html:3 #: bookwyrm/templates/settings/federation.html:5 msgid "Federated Instances" msgstr "聯合實例" -#: bookwyrm/templates/settings/admin_layout.html:44 +#: bookwyrm/templates/settings/admin_layout.html:50 msgid "Instance Settings" msgstr "實例設定" -#: bookwyrm/templates/settings/admin_layout.html:48 +#: bookwyrm/templates/settings/admin_layout.html:54 #: bookwyrm/templates/settings/announcements.html:3 #: bookwyrm/templates/settings/announcements.html:5 msgid "Announcements" msgstr "公告" -#: bookwyrm/templates/settings/admin_layout.html:52 +#: bookwyrm/templates/settings/admin_layout.html:58 #: bookwyrm/templates/settings/site.html:4 #: bookwyrm/templates/settings/site.html:6 msgid "Site Settings" msgstr "網站設定" -#: bookwyrm/templates/settings/admin_layout.html:55 +#: bookwyrm/templates/settings/admin_layout.html:61 #: bookwyrm/templates/settings/site.html:13 msgid "Instance Info" msgstr "實例資訊" -#: bookwyrm/templates/settings/admin_layout.html:56 +#: bookwyrm/templates/settings/admin_layout.html:62 #: bookwyrm/templates/settings/site.html:39 msgid "Images" msgstr "圖片" -#: bookwyrm/templates/settings/admin_layout.html:57 +#: bookwyrm/templates/settings/admin_layout.html:63 #: bookwyrm/templates/settings/site.html:59 msgid "Footer Content" msgstr "頁尾內容" -#: bookwyrm/templates/settings/admin_layout.html:58 +#: bookwyrm/templates/settings/admin_layout.html:64 #: bookwyrm/templates/settings/site.html:81 msgid "Registration" msgstr "註冊" @@ -2508,19 +2508,19 @@ msgstr "" msgid "Progress:" msgstr "進度:" -#: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/create_status/comment.html:47 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 msgid "pages" msgstr "頁數" -#: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/create_status/comment.html:53 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 msgid "percent" msgstr "百分比" -#: bookwyrm/templates/snippets/create_status/comment.html:41 +#: bookwyrm/templates/snippets/create_status/comment.html:60 #: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" @@ -2565,23 +2565,41 @@ msgstr "私密" msgid "Post" msgstr "釋出" -#: bookwyrm/templates/snippets/create_status/quotation.html:19 +#: bookwyrm/templates/snippets/create_status/quotation.html:17 msgid "Quote:" msgstr "引用:" -#: bookwyrm/templates/snippets/create_status/quotation.html:27 +#: bookwyrm/templates/snippets/create_status/quotation.html:25 #, fuzzy, python-format #| msgid "Edit \"%(book_title)s\"" msgid "An excerpt from '%(book_title)s'" msgstr "編輯 \"%(book_title)s\"" -#: bookwyrm/templates/snippets/create_status/review.html:20 +#: bookwyrm/templates/snippets/create_status/quotation.html:31 +#, fuzzy +#| msgid "Description:" +msgid "Position:" +msgstr "描述:" + +#: bookwyrm/templates/snippets/create_status/quotation.html:40 +#, fuzzy +#| msgid "pages" +msgid "On page:" +msgstr "頁數" + +#: bookwyrm/templates/snippets/create_status/quotation.html:46 +#, fuzzy +#| msgid "percent" +msgid "At percent:" +msgstr "百分比" + +#: bookwyrm/templates/snippets/create_status/review.html:18 #, fuzzy, python-format #| msgid "Editions of %(book_title)s" msgid "Your review of '%(book_title)s'" msgstr "%(book_title)s 的各版本" -#: bookwyrm/templates/snippets/create_status/review.html:32 +#: bookwyrm/templates/snippets/create_status/review.html:30 msgid "Review:" msgstr "書評:" @@ -2854,17 +2872,29 @@ msgstr "想要閱讀" msgid "Remove from %(name)s" msgstr "從 %(name)s 移除" -#: bookwyrm/templates/snippets/status/content_status.html:72 +#: bookwyrm/templates/snippets/status/content_status.html:73 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" msgstr "顯示更多" -#: bookwyrm/templates/snippets/status/content_status.html:87 +#: bookwyrm/templates/snippets/status/content_status.html:88 #: bookwyrm/templates/snippets/trimmed_text.html:34 msgid "Show less" msgstr "顯示更少" -#: bookwyrm/templates/snippets/status/content_status.html:117 +#: bookwyrm/templates/snippets/status/content_status.html:103 +#, fuzzy, python-format +#| msgid "page %(page)s" +msgid "(Page %(page)s)" +msgstr "第 %(page)s 頁" + +#: bookwyrm/templates/snippets/status/content_status.html:105 +#, fuzzy, python-format +#| msgid "%(percent)s%% complete!" +msgid "(%(percent)s%%)" +msgstr "完成了 %(percent)s%% ！" + +#: bookwyrm/templates/snippets/status/content_status.html:127 msgid "Open image in new window" msgstr "在新視窗中開啟圖片" @@ -3034,38 +3064,49 @@ msgstr "編輯書架" msgid "Update shelf" msgstr "更新書架" -#: bookwyrm/templates/user/shelf/shelf.html:27 bookwyrm/views/shelf.py:56 +#: bookwyrm/templates/user/shelf/shelf.html:28 bookwyrm/views/shelf.py:56 msgid "All books" msgstr "所有書目" -#: bookwyrm/templates/user/shelf/shelf.html:40 +#: bookwyrm/templates/user/shelf/shelf.html:55 msgid "Create shelf" msgstr "建立書架" -#: bookwyrm/templates/user/shelf/shelf.html:62 +#: bookwyrm/templates/user/shelf/shelf.html:76 +#, python-format +msgid "%(formatted_count)s book" +msgid_plural "%(formatted_count)s books" +msgstr[0] "" + +#: bookwyrm/templates/user/shelf/shelf.html:83 +#, python-format +msgid "(showing %(start)s-%(end)s)" +msgstr "" + +#: bookwyrm/templates/user/shelf/shelf.html:94 msgid "Edit shelf" msgstr "編輯書架" -#: bookwyrm/templates/user/shelf/shelf.html:81 -#: bookwyrm/templates/user/shelf/shelf.html:105 +#: bookwyrm/templates/user/shelf/shelf.html:113 +#: bookwyrm/templates/user/shelf/shelf.html:137 msgid "Shelved" msgstr "上架時間" -#: bookwyrm/templates/user/shelf/shelf.html:82 -#: bookwyrm/templates/user/shelf/shelf.html:109 +#: bookwyrm/templates/user/shelf/shelf.html:114 +#: bookwyrm/templates/user/shelf/shelf.html:141 msgid "Started" msgstr "開始時間" -#: bookwyrm/templates/user/shelf/shelf.html:83 -#: bookwyrm/templates/user/shelf/shelf.html:112 +#: bookwyrm/templates/user/shelf/shelf.html:115 +#: bookwyrm/templates/user/shelf/shelf.html:144 msgid "Finished" msgstr "完成時間" -#: bookwyrm/templates/user/shelf/shelf.html:138 +#: bookwyrm/templates/user/shelf/shelf.html:170 msgid "This shelf is empty." msgstr "此書架是空的。" -#: bookwyrm/templates/user/shelf/shelf.html:144 +#: bookwyrm/templates/user/shelf/shelf.html:176 msgid "Delete shelf" msgstr "刪除書架" diff --git a/nginx/production b/nginx/production index 54c84af45..76f18f32f 100644 --- a/nginx/production +++ b/nginx/production @@ -24,6 +24,10 @@ server { # listen 443 ssl http2; # # server_name your-domain.com; + +# if ($host != "you-domain.com") { +# return 301 $scheme://your-domain.com$request_uri; +# } # # # SSL code # ssl_certificate /etc/nginx/ssl/live/your-domain.com/fullchain.pem;