diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index ba2fcc8ca..b920fc9c0 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -6,6 +6,7 @@ from django import forms
from django.forms import ModelForm, PasswordInput, widgets
from django.forms.widgets import Textarea
from django.utils import timezone
+from django.utils.translation import gettext as _
from bookwyrm import models
@@ -181,13 +182,14 @@ class CreateInviteForm(CustomForm):
exclude = ['code', 'user', 'times_used']
widgets = {
'expiry': ExpiryWidget(choices=[
- ('day', 'One Day'),
- ('week', 'One Week'),
- ('month', 'One Month'),
- ('forever', 'Does Not Expire')]),
+ ('day', _('One Day')),
+ ('week', _('One Week')),
+ ('month', _('One Month')),
+ ('forever', _('Does Not Expire'))]),
'use_limit': widgets.Select(
- choices=[(i, "%d uses" % (i,)) for i in [1, 5, 10, 25, 50, 100]]
- + [(None, 'Unlimited')])
+ choices=[(i, _("%(count)d uses" % {'count': i})) \
+ for i in [1, 5, 10, 25, 50, 100]]
+ + [(None, _('Unlimited'))])
}
class ShelfForm(CustomForm):
diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py
index 8cdf87ff3..6c3bb7d20 100644
--- a/bookwyrm/settings.py
+++ b/bookwyrm/settings.py
@@ -141,6 +141,7 @@ LANGUAGE_CODE = 'en-us'
LANGUAGES = [
('en-us', _('English')),
('fr-fr', _('French')),
+ ('zh-cn', _('Simplified Chinese')),
]
diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html
index 10682347a..d80daca24 100644
--- a/bookwyrm/templates/book.html
+++ b/bookwyrm/templates/book.html
@@ -18,7 +18,7 @@
{% if book.authors %}
- by {% include 'snippets/authors.html' with book=book %}
+ {% trans "by" %} {% include 'snippets/authors.html' with book=book %}
{% endif %}
@@ -78,8 +78,13 @@
- {% if book.physical_format %}{{ book.physical_format | title }}{% if book.pages %}, {% endif %}{% endif %}
- {% if book.pages %}{{ book.pages }} pages{% endif %}
+ {% if book.physical_format and not book.pages %}
+ {{ book.physical_format | title }}
+ {% elif book.physical_format and book.pages %}
+ {% blocktrans with format=book.physical_format|title pages=book.pages %}{{ format }}, {{ pages }} pages{% endblocktrans %}
+ {% elif book.pages %}
+ {% blocktrans with pages=book.pages %}{{ pages }} pages{% endblocktrans %}
+ {% endif %}
{% if book.openlibrary_key %}
@@ -90,7 +95,10 @@
-
{% include 'snippets/stars.html' with rating=rating %} ({{ review_count }} review{{ review_count|pluralize }})
+
+ {% include 'snippets/stars.html' with rating=rating %}
+ {% blocktrans count counter=review_count %}({{ review_count }} review){% plural %}({{ review_count }} reviews){% endblocktrans %}
+
{% include 'snippets/trimmed_text.html' with full=book|book_description %}
@@ -116,7 +124,7 @@
{% if book.parent_work.editions.count > 1 %}
-
{{ book.parent_work.editions.count }} editions
+
{% blocktrans with path=book.parent_work.local_path count=book.parent_work.editions.count %}{{ count }} editions {% endblocktrans %}
{% endif %}
@@ -124,13 +132,13 @@
{% for shelf in user_shelves %}
- This edition is on your {{ shelf.shelf.name }} shelf.
+ {% blocktrans with path=shelf.shelf.local_path shelf_name=shelf.shelf.name %}This edition is on your {{ shelf_name }} shelf.{% endblocktrans %}
{% include 'snippets/shelf_selector.html' with current=shelf.shelf %}
{% endfor %}
{% for shelf in other_edition_shelves %}
- A different edition of this book is on your {{ shelf.shelf.name }} shelf.
+ {% blocktrans with book_path=shelf.book.local_path shelf_path=shelf.shelf.local_path shelf_name=shelf.shelf.name %}A different edition of this book is on your {{ shelf_name }} shelf.{% endblocktrans %}
{% include 'snippets/switch_edition_button.html' with edition=book %}
{% endfor %}
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index 71b59cc14..1eae24d4e 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -3,7 +3,7 @@
{% load bookwyrm_tags %}
{% block panel %}
-
{% blocktrans with tab_title=tab|title %}{{ tab_title }} Timeline{% endblocktrans %}
+
{% blocktrans %}{{ tab_title }} Timeline{% endblocktrans %}
diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html
index 7f35d2f30..04826a64d 100644
--- a/bookwyrm/templates/feed/feed_layout.html
+++ b/bookwyrm/templates/feed/feed_layout.html
@@ -20,7 +20,10 @@
{% with shelf_counter=forloop.counter %}
- {{ shelf.name }}
+ {% if shelf.identifier == 'to-read' %}{% trans "To Read" %}
+ {% elif shelf.identifier == 'reading' %}{% trans "Currently Reading" %}
+ {% elif shelf.identifier == 'read' %}{% trans "Read" %}
+ {% else %}{{ shelf.name }}{% endif %}
diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html
index ddfaad0af..ddac04f3b 100644
--- a/bookwyrm/templates/lists/list.html
+++ b/bookwyrm/templates/lists/list.html
@@ -32,7 +32,7 @@
- {% trans "Create shelf" %}
+ {% trans "Create Shelf" %}
diff --git a/bookwyrm/templates/user/edit_shelf_form.html b/bookwyrm/templates/user/edit_shelf_form.html
index a9f86da4c..753d06816 100644
--- a/bookwyrm/templates/user/edit_shelf_form.html
+++ b/bookwyrm/templates/user/edit_shelf_form.html
@@ -29,4 +29,3 @@
{% endblock %}
-
diff --git a/bookwyrm/templates/user/lists.html b/bookwyrm/templates/user/lists.html
index 8e47041f4..85c7cc8c6 100644
--- a/bookwyrm/templates/user/lists.html
+++ b/bookwyrm/templates/user/lists.html
@@ -14,7 +14,7 @@
{% if is_self %}
- {% trans "Create new list" as button_text %}
+ {% trans "Create list" as button_text %}
{% include 'snippets/toggle/open_button.html' with controls_text="create-list" icon="plus" text=button_text %}
{% endif %}
diff --git a/bookwyrm/templates/user/shelf.html b/bookwyrm/templates/user/shelf.html
index c7c833886..189d28568 100644
--- a/bookwyrm/templates/user/shelf.html
+++ b/bookwyrm/templates/user/shelf.html
@@ -21,7 +21,7 @@
diff --git a/bookwyrm/views/feed.py b/bookwyrm/views/feed.py
index 5300c762a..f7e93e9a3 100644
--- a/bookwyrm/views/feed.py
+++ b/bookwyrm/views/feed.py
@@ -6,6 +6,7 @@ from django.http import HttpResponseNotFound
from django.template.response import TemplateResponse
from django.utils import timezone
from django.utils.decorators import method_decorator
+from django.utils.translation import gettext as _
from django.views import View
from bookwyrm import forms, models
@@ -29,18 +30,22 @@ class Feed(View):
if tab == 'home':
activities = get_activity_feed(
request.user, following_only=True)
+ tab_title = _('Home')
elif tab == 'local':
activities = get_activity_feed(
request.user, privacy=['public', 'followers'], local_only=True)
+ tab_title = _('Local')
else:
activities = get_activity_feed(
request.user, privacy=['public', 'followers'])
+ tab_title = _('Federated')
paginated = Paginator(activities, PAGE_LENGTH)
data = {**feed_page_data(request.user), **{
'user': request.user,
'activities': paginated.page(page),
'tab': tab,
+ 'tab_title': tab_title,
'goal_form': forms.GoalForm(),
'path': '/%s' % tab,
}}
@@ -161,6 +166,7 @@ def get_suggested_books(user, max_books=5):
continue
shelf_preview = {
'name': shelf.name,
+ 'identifier': shelf.identifier,
'books': [s.book for s in shelf_books]
}
suggested_books.append(shelf_preview)
diff --git a/bw-dev b/bw-dev
index 7a003d018..b411751d7 100755
--- a/bw-dev
+++ b/bw-dev
@@ -91,7 +91,7 @@ case "$CMD" in
execweb python manage.py collectstatic --no-input
;;
makemessages)
- execweb django-admin makemessages --extension html --ignore=venv3 $@
+ execweb django-admin makemessages --no-wrap --ignore=venv3 $@
;;
compilemessages)
execweb django-admin compilemessages --ignore venv3 $@
diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo
index c0a5dd979..e07529141 100644
Binary files a/locale/en_US/LC_MESSAGES/django.mo and b/locale/en_US/LC_MESSAGES/django.mo differ
diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po
index 851758132..25d38437a 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-03-01 09:32-0800\n"
+"POT-Creation-Date: 2021-03-02 19:51+0000\n"
"PO-Revision-Date: 2021-02-28 17:19-0800\n"
"Last-Translator: Mouse Reeve
\n"
"Language-Team: English \n"
@@ -18,6 +18,61 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: bookwyrm/forms.py:185
+msgid "One Day"
+msgstr ""
+
+#: bookwyrm/forms.py:186
+msgid "One Week"
+msgstr ""
+
+#: bookwyrm/forms.py:187
+msgid "One Month"
+msgstr ""
+
+#: bookwyrm/forms.py:188
+msgid "Does Not Expire"
+msgstr ""
+
+#: bookwyrm/forms.py:190
+#, python-format
+msgid "%(count)d uses"
+msgstr ""
+
+#: bookwyrm/forms.py:192
+msgid "Unlimited"
+msgstr ""
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+msgid "username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:144
+msgid "Simplified Chinese"
+msgstr ""
+
#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
#: bookwyrm/templates/edit_author.html:5
msgid "Edit Author"
@@ -32,6 +87,10 @@ msgstr ""
msgid "Books by %(name)s"
msgstr ""
+#: bookwyrm/templates/book.html:21
+msgid "by"
+msgstr ""
+
#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
#: bookwyrm/templates/edit_book.html:5
msgid "Edit Book"
@@ -57,20 +116,37 @@ msgstr ""
msgid "ASIN:"
msgstr ""
+#: bookwyrm/templates/book.html:84
+#, python-format
+msgid "%(format)s, %(pages)s pages"
+msgstr ""
+
#: bookwyrm/templates/book.html:86
+#, python-format
+msgid "%(pages)s pages"
+msgstr ""
+
+#: bookwyrm/templates/book.html:91
msgid "View on OpenLibrary"
msgstr ""
-#: bookwyrm/templates/book.html:98
+#: bookwyrm/templates/book.html:100
+#, python-format
+msgid "(%(review_count)s review)"
+msgid_plural "(%(review_count)s reviews)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/book.html:106
msgid "Add Description"
msgstr ""
-#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
#: bookwyrm/templates/lists/form.html:12
msgid "Description:"
msgstr ""
-#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:50
#: bookwyrm/templates/settings/site.html:89
@@ -81,7 +157,7 @@ msgstr ""
msgid "Save"
msgstr ""
-#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
#: bookwyrm/templates/snippets/goal_form.html:32
@@ -92,51 +168,66 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: bookwyrm/templates/book.html:142
+#: bookwyrm/templates/book.html:127
+#, python-format
+msgid "%(count)s editions "
+msgstr ""
+
+#: bookwyrm/templates/book.html:135
+#, python-format
+msgid "This edition is on your %(shelf_name)s shelf."
+msgstr ""
+
+#: bookwyrm/templates/book.html:141
+#, python-format
+msgid "A different edition of this book is on your %(shelf_name)s shelf."
+msgstr ""
+
+#: bookwyrm/templates/book.html:150
msgid "Your reading activity"
msgstr ""
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:152
msgid "Add read dates"
msgstr ""
-#: bookwyrm/templates/book.html:149
+#: bookwyrm/templates/book.html:157
msgid "You don't have any reading activity for this book."
msgstr ""
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:164
msgid "Create"
msgstr ""
-#: bookwyrm/templates/book.html:178
+#: bookwyrm/templates/book.html:186
msgid "Tags"
msgstr ""
-#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
msgid "Add tag"
msgstr ""
-#: bookwyrm/templates/book.html:199
+#: bookwyrm/templates/book.html:207
msgid "Subjects"
msgstr ""
-#: bookwyrm/templates/book.html:210
+#: bookwyrm/templates/book.html:218
msgid "Places"
msgstr ""
-#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
#: bookwyrm/templates/search_results.html:90
#: bookwyrm/templates/user/user_layout.html:62
msgid "Lists"
msgstr ""
-#: bookwyrm/templates/book.html:250
+#: bookwyrm/templates/book.html:258
msgid "rated it"
msgstr ""
#: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:51
+#: bookwyrm/templates/feed/feed_layout.html:54
msgid "Close"
msgstr ""
@@ -341,15 +432,15 @@ msgstr ""
msgid "%(tab_title)s Timeline"
msgstr ""
-#: bookwyrm/templates/feed/feed.html:10
+#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
msgid "Home"
msgstr ""
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
msgid "Local"
msgstr ""
-#: bookwyrm/templates/feed/feed.html:16
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
msgid "Federated"
msgstr ""
@@ -358,8 +449,7 @@ msgid "Announcements"
msgstr ""
#: bookwyrm/templates/feed/feed.html:32
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
msgstr ""
#: bookwyrm/templates/feed/feed_layout.html:5
@@ -371,11 +461,26 @@ msgid "Your books"
msgstr ""
#: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
msgstr ""
-#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf.html:24
+msgid "To Read"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Currently Reading"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Read"
+msgstr ""
+
+#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
#: bookwyrm/templates/snippets/goal_card.html:6
#, python-format
msgid "%(year)s Reading Goal"
@@ -397,9 +502,7 @@ msgstr ""
#: bookwyrm/templates/goal.html:30
#: bookwyrm/templates/snippets/goal_card.html:13
#, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
msgstr ""
#: bookwyrm/templates/goal.html:39
@@ -590,9 +693,7 @@ msgid "Contact site admin"
msgstr ""
#: bookwyrm/templates/layout.html:198
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on GitHub ."
+msgid "BookWyrm is open source software. You can contribute or report issues on GitHub ."
msgstr ""
#: bookwyrm/templates/lists/create_form.html:5
@@ -662,7 +763,8 @@ msgid "This list is currently empty"
msgstr ""
#: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
+#, python-format
+msgid "Added by %(username)s "
msgstr ""
#: bookwyrm/templates/lists/list.html:41
@@ -716,6 +818,11 @@ msgstr ""
msgid "Your lists"
msgstr ""
+#: bookwyrm/templates/lists/lists.html:32
+#, python-format
+msgid "See all %(size)s lists"
+msgstr ""
+
#: bookwyrm/templates/lists/lists.html:40
msgid "Recent Lists"
msgstr ""
@@ -755,23 +862,17 @@ msgstr ""
#: bookwyrm/templates/notifications.html:49
#, python-format
-msgid ""
-"favorited your review of %(book_title)s"
-"em> "
+msgid "favorited your review of %(book_title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:51
#, python-format
-msgid ""
-"favorited your comment on %(book_title)s"
-"em> "
+msgid "favorited your comment on %(book_title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:53
#, python-format
-msgid ""
-"favorited your quote from %(book_title)s"
-"em> "
+msgid "favorited your quote from %(book_title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:55
@@ -781,23 +882,17 @@ msgstr ""
#: bookwyrm/templates/notifications.html:60
#, python-format
-msgid ""
-"mentioned you in a review of "
-"%(book_title)s "
+msgid "mentioned you in a review of %(book_title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:62
#, python-format
-msgid ""
-"mentioned you in a comment on "
-"%(book_title)s "
+msgid "mentioned you in a comment on %(book_title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:64
#, python-format
-msgid ""
-"mentioned you in a quote from "
-"%(book_title)s "
+msgid "mentioned you in a quote from %(book_title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:66
@@ -807,30 +902,22 @@ msgstr ""
#: bookwyrm/templates/notifications.html:71
#, python-format
-msgid ""
-"replied to your review of %(book_title)s "
+msgid "replied to your review of %(book_title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:73
#, python-format
-msgid ""
-"replied to your comment on %(book_title)s "
+msgid "replied to your comment on %(book_title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:75
#, python-format
-msgid ""
-"replied to your quote from %(book_title)s "
+msgid "replied to your quote from %(book_title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:77
#, python-format
-msgid ""
-"replied to your status "
+msgid "replied to your status "
msgstr ""
#: bookwyrm/templates/notifications.html:81
@@ -843,23 +930,17 @@ msgstr ""
#: bookwyrm/templates/notifications.html:90
#, python-format
-msgid ""
-"boosted your review of %(book.title)s "
-"a>"
+msgid "boosted your review of %(book.title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:92
#, python-format
-msgid ""
-"boosted your comment on%(book.title)s "
-"a>"
+msgid "boosted your comment on%(book.title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:94
#, python-format
-msgid ""
-"boosted your quote from %(book.title)s"
-"em> "
+msgid "boosted your quote from %(book.title)s "
msgstr ""
#: bookwyrm/templates/notifications.html:96
@@ -869,16 +950,12 @@ msgstr ""
#: bookwyrm/templates/notifications.html:100
#, python-format
-msgid ""
-" added %(book_title)s to your list "
-"\"%(list_name)s \""
+msgid " added %(book_title)s to your list \"%(list_name)s \""
msgstr ""
#: bookwyrm/templates/notifications.html:102
#, python-format
-msgid ""
-" suggested adding %(book_title)s to "
-"your list \"%(list_name)s \""
+msgid " suggested adding %(book_title)s to your list \"%(list_name)s \""
msgstr ""
#: bookwyrm/templates/notifications.html:106
@@ -1239,9 +1316,7 @@ msgstr ""
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
#, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
msgstr ""
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1294,9 +1369,7 @@ msgstr ""
#: bookwyrm/templates/snippets/goal_card.html:22
#, python-format
-msgid ""
-"You can set or change your reading goal any time from your profile page "
+msgid "You can set or change your reading goal any time from your profile page "
msgstr ""
#: bookwyrm/templates/snippets/goal_form.html:9
@@ -1333,15 +1406,12 @@ msgstr ""
#: bookwyrm/templates/snippets/goal_progress.html:10
#, python-format
-msgid ""
-"You've read %(read_count)s of %(goal_count)s books ."
+msgid "You've read %(read_count)s of %(goal_count)s books ."
msgstr ""
#: bookwyrm/templates/snippets/goal_progress.html:12
#, python-format
-msgid ""
-"%(username)s has read %(read_count)s of %(goal_count)s "
-"books ."
+msgid "%(username)s has read %(read_count)s of %(goal_count)s books ."
msgstr ""
#: bookwyrm/templates/snippets/pagination.html:7
@@ -1530,10 +1600,6 @@ msgstr ""
msgid "Start reading"
msgstr ""
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-msgid "Read"
-msgstr ""
-
#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
msgid "Finish reading"
msgstr ""
@@ -1583,7 +1649,7 @@ msgid "More options"
msgstr ""
#: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
+msgid "Delete status"
msgstr ""
#: bookwyrm/templates/snippets/status/status_options.html:23
@@ -1605,12 +1671,8 @@ msgid "Books tagged \"%(tag.name)s\""
msgstr ""
#: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr ""
-
#: bookwyrm/templates/user/create_shelf_form.html:22
-#: bookwyrm/templates/user/shelf.html:33
-msgid "Create shelf"
+msgid "Create Shelf"
msgstr ""
#: bookwyrm/templates/user/edit_shelf_form.html:5
@@ -1649,11 +1711,7 @@ msgstr ""
msgid "Lists: %(username)s"
msgstr ""
-#: bookwyrm/templates/user/lists.html:17
-msgid "Create new list"
-msgstr ""
-
-#: bookwyrm/templates/user/lists.html:29
+#: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
msgid "Create list"
msgstr ""
@@ -1666,6 +1724,10 @@ msgstr ""
msgid "%(username)s: Shelves"
msgstr ""
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr ""
+
#: bookwyrm/templates/user/shelf.html:54
msgid "Edit shelf"
msgstr ""
diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo
index 8b845aa78..a8d8ff0d4 100644
Binary files a/locale/fr_FR/LC_MESSAGES/django.mo and b/locale/fr_FR/LC_MESSAGES/django.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po
index 3956fc921..263de6d13 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-03-02 11:38+0000\n"
+"POT-Creation-Date: 2021-03-02 19:51+0000\n"
"PO-Revision-Date: 2021-03-02 12:37+0100\n"
"Last-Translator: Fabien Basmaison \n"
"Language-Team: Mouse Reeve \n"
@@ -18,6 +18,65 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: bookwyrm/forms.py:185
+msgid "One Day"
+msgstr ""
+
+#: bookwyrm/forms.py:186
+msgid "One Week"
+msgstr ""
+
+#: bookwyrm/forms.py:187
+msgid "One Month"
+msgstr ""
+
+#: bookwyrm/forms.py:188
+msgid "Does Not Expire"
+msgstr ""
+
+#: bookwyrm/forms.py:190
+#, python-format
+msgid "%(count)d uses"
+msgstr ""
+
+#: bookwyrm/forms.py:192
+#, fuzzy
+#| msgid "Unlisted"
+msgid "Unlimited"
+msgstr "Non listé"
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+#, fuzzy
+#| msgid "Username:"
+msgid "username"
+msgstr "Nom d’utilisateur :"
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:144
+msgid "Simplified Chinese"
+msgstr ""
+
#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
#: bookwyrm/templates/edit_author.html:5
msgid "Edit Author"
@@ -32,6 +91,10 @@ msgstr "Wikipedia"
msgid "Books by %(name)s"
msgstr "Livres par %(name)s"
+#: bookwyrm/templates/book.html:21
+msgid "by"
+msgstr ""
+
#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
#: bookwyrm/templates/edit_book.html:5
msgid "Edit Book"
@@ -57,22 +120,41 @@ msgstr "Numéro OCLC :"
msgid "ASIN:"
msgstr "ASIN :"
+#: bookwyrm/templates/book.html:84
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(format)s, %(pages)s pages"
+msgstr "sur %(book.pages)s pages"
+
#: bookwyrm/templates/book.html:86
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(pages)s pages"
+msgstr "sur %(book.pages)s pages"
+
+#: bookwyrm/templates/book.html:91
msgid "View on OpenLibrary"
msgstr "Voir sur OpenLibrary"
-#: bookwyrm/templates/book.html:98
+#: bookwyrm/templates/book.html:100
+#, python-format
+msgid "(%(review_count)s review)"
+msgid_plural "(%(review_count)s reviews)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bookwyrm/templates/book.html:106
#, fuzzy
#| msgid "Description:"
msgid "Add Description"
msgstr "Ajouter une description"
-#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
#: bookwyrm/templates/lists/form.html:12
msgid "Description:"
msgstr "Description :"
-#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:50
#: bookwyrm/templates/settings/site.html:89
@@ -83,7 +165,7 @@ msgstr "Description :"
msgid "Save"
msgstr "Enregistrer"
-#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
#: bookwyrm/templates/snippets/goal_form.html:32
@@ -94,53 +176,71 @@ msgstr "Enregistrer"
msgid "Cancel"
msgstr "Annuler"
-#: bookwyrm/templates/book.html:142
+#: bookwyrm/templates/book.html:127
+#, fuzzy, python-format
+#| msgid "Editions of \"%(work_title)s\" "
+msgid "%(count)s editions "
+msgstr "%(title)s par "
+
+#: bookwyrm/templates/book.html:135
+#, fuzzy, python-format
+#| msgid "favorited your %(preview_name)s "
+msgid "This edition is on your %(shelf_name)s shelf."
+msgstr "Messages directs avec %(username)s "
+
+#: bookwyrm/templates/book.html:141
+#, fuzzy, python-format
+#| msgid "replied to your %(preview_name)s "
+msgid "A different edition of this book is on your %(shelf_name)s shelf."
+msgstr " a ajouté %(book_title)s à votre liste « %(list_name)s »"
+
+#: bookwyrm/templates/book.html:150
msgid "Your reading activity"
msgstr "Votre activité de lecture"
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:152
#, fuzzy
#| msgid "Edit read dates"
msgid "Add read dates"
msgstr "Ajouter des dates de lecture"
-#: bookwyrm/templates/book.html:149
+#: bookwyrm/templates/book.html:157
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.html:156
+#: bookwyrm/templates/book.html:164
msgid "Create"
msgstr "Créer"
-#: bookwyrm/templates/book.html:178
+#: bookwyrm/templates/book.html:186
msgid "Tags"
msgstr "Tags"
-#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
msgid "Add tag"
msgstr "Ajouter un tag"
-#: bookwyrm/templates/book.html:199
+#: bookwyrm/templates/book.html:207
msgid "Subjects"
msgstr "Sujets"
-#: bookwyrm/templates/book.html:210
+#: bookwyrm/templates/book.html:218
msgid "Places"
msgstr "Lieux"
-#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
#: bookwyrm/templates/search_results.html:90
#: bookwyrm/templates/user/user_layout.html:62
msgid "Lists"
msgstr "Listes"
-#: bookwyrm/templates/book.html:250
+#: bookwyrm/templates/book.html:258
msgid "rated it"
msgstr "l’a noté"
#: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:51
+#: bookwyrm/templates/feed/feed_layout.html:54
#, fuzzy
#| msgid "Closed"
msgid "Close"
@@ -352,15 +452,15 @@ msgstr "Vous n’avez aucun message pour l’instant."
msgid "%(tab_title)s Timeline"
msgstr "%(tab_title)s — Fil d’actualité"
-#: bookwyrm/templates/feed/feed.html:10
+#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
msgid "Home"
msgstr "Accueil"
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
msgid "Local"
msgstr "Local"
-#: bookwyrm/templates/feed/feed.html:16
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
msgid "Federated"
msgstr "Fédéré"
@@ -369,10 +469,8 @@ msgid "Announcements"
msgstr "Annonces"
#: bookwyrm/templates/feed/feed.html:32
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
-msgstr ""
-"Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
+msgid "There aren't any activities right now! Try following a user to get started"
+msgstr "Aucune activité pour l’instant ! Abonnez‑vous à quelqu’un pour commencer"
#: bookwyrm/templates/feed/feed_layout.html:5
#, fuzzy
@@ -385,11 +483,30 @@ msgid "Your books"
msgstr "Vos livres"
#: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
msgstr "Aucun livre ici pour l’instant ! Cherchez un livre pour commencer"
-#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Read"
+msgid "To Read"
+msgstr "Lu"
+
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Started reading"
+msgid "Currently Reading"
+msgstr "Commencer la lecture"
+
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Read"
+msgstr "Lu"
+
+#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
#: bookwyrm/templates/snippets/goal_card.html:6
#, python-format
msgid "%(year)s Reading Goal"
@@ -413,12 +530,8 @@ msgstr "Modifier le défi"
#: bookwyrm/templates/goal.html:30
#: bookwyrm/templates/snippets/goal_card.html:13
#, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
-msgstr ""
-"Définissez un nombre de livre à lire comme objectif pour %(year)s, et "
-"suivezvotre progression au fil de l’année."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
+msgstr "Définissez un nombre de livre à lire comme objectif pour %(year)s, et suivezvotre progression au fil de l’année."
#: bookwyrm/templates/goal.html:39
#, python-format
@@ -616,12 +729,8 @@ msgid "Contact site admin"
msgstr "Contacter l’administrateur du site"
#: bookwyrm/templates/layout.html:198
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on GitHub ."
-msgstr ""
-"Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports "
-"de bogues via GitHub ."
+msgid "BookWyrm is open source software. You can contribute or report issues on GitHub ."
+msgstr "Bookwyrm est un logiciel libre. Vous pouvez contribuer ou faire des rapports de bogues via GitHub ."
#: bookwyrm/templates/lists/create_form.html:5
#: bookwyrm/templates/lists/lists.html:17
@@ -690,8 +799,10 @@ msgid "This list is currently empty"
msgstr "Cette liste est vide actuellement"
#: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
-msgstr "Ajouté par"
+#, fuzzy, python-format
+#| msgid "favorited your %(preview_name)s "
+msgid "Added by %(username)s "
+msgstr "Messages directs avec %(username)s "
#: bookwyrm/templates/lists/list.html:41
msgid "Remove"
@@ -744,6 +855,12 @@ msgstr "Créée par"
msgid "Your lists"
msgstr "Vos listes"
+#: bookwyrm/templates/lists/lists.html:32
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "See all %(size)s lists"
+msgstr "Voir les %(size)s"
+
#: bookwyrm/templates/lists/lists.html:40
msgid "Recent Lists"
msgstr "Listes récentes"
@@ -784,32 +901,20 @@ msgstr "Supprimer les notifications"
#: bookwyrm/templates/notifications.html:49
#, fuzzy, python-format
#| msgid "favorited your %(preview_name)s "
-msgid ""
-"favorited your review of %(book_title)s"
-"em> "
-msgstr ""
-"a ajouté votre critique de %(book_title)s"
-"em> à ses favoris"
+msgid "favorited your review of %(book_title)s "
+msgstr "a ajouté votre critique de %(book_title)s à ses favoris"
#: bookwyrm/templates/notifications.html:51
#, fuzzy, python-format
#| msgid "favorited your %(preview_name)s "
-msgid ""
-"favorited your comment on %(book_title)s"
-"em> "
-msgstr ""
-"a ajouté votre commentaire sur "
-"%(book_title)s à ses favoris"
+msgid "favorited your comment on %(book_title)s "
+msgstr "a ajouté votre commentaire sur %(book_title)s à ses favoris"
#: bookwyrm/templates/notifications.html:53
#, fuzzy, python-format
#| msgid "favorited your %(preview_name)s "
-msgid ""
-"favorited your quote from %(book_title)s"
-"em> "
-msgstr ""
-"a ajouté votre citation de %(book_title)s"
-"em> à ses favoris"
+msgid "favorited your quote from %(book_title)s "
+msgstr "a ajouté votre citation de %(book_title)s à ses favoris"
#: bookwyrm/templates/notifications.html:55
#, fuzzy, python-format
@@ -820,32 +925,20 @@ msgstr "a ajouté votre statut à ses favoris"
#: bookwyrm/templates/notifications.html:60
#, fuzzy, python-format
#| msgid "mentioned you in a %(preview_name)s "
-msgid ""
-"mentioned you in a review of "
-"%(book_title)s "
-msgstr ""
-"vous a mentionné dans sa critique de "
-"%(book_title)s "
+msgid "mentioned you in a review of %(book_title)s "
+msgstr "vous a mentionné dans sa critique de %(book_title)s "
#: bookwyrm/templates/notifications.html:62
#, fuzzy, python-format
#| msgid "mentioned you in a %(preview_name)s "
-msgid ""
-"mentioned you in a comment on "
-"%(book_title)s "
-msgstr ""
-"vous a mentionné dans son commentaire sur "
-"%(book_title)s "
+msgid "mentioned you in a comment on %(book_title)s "
+msgstr "vous a mentionné dans son commentaire sur %(book_title)s "
#: bookwyrm/templates/notifications.html:64
#, fuzzy, python-format
#| msgid "mentioned you in a %(preview_name)s "
-msgid ""
-"mentioned you in a quote from "
-"%(book_title)s "
-msgstr ""
-"vous a mentionné dans sa citation de "
-"%(book_title)s "
+msgid "mentioned you in a quote from %(book_title)s "
+msgstr "vous a mentionné dans sa citation de %(book_title)s "
#: bookwyrm/templates/notifications.html:66
#, fuzzy, python-format
@@ -855,51 +948,27 @@ msgstr "vous a mentionné dans son statut "
#: bookwyrm/templates/notifications.html:71
#, fuzzy, python-format
-#| msgid ""
-#| "replied to your %(preview_name)s "
-msgid ""
-"replied to your review of %(book_title)s "
-msgstr ""
-"a répondu à votre critique de %(book_title)s "
+#| msgid "replied to your %(preview_name)s "
+msgid "replied to your review of %(book_title)s "
+msgstr "a répondu à votre critique de %(book_title)s "
#: bookwyrm/templates/notifications.html:73
#, fuzzy, python-format
-#| msgid ""
-#| "replied to your %(preview_name)s "
-msgid ""
-"replied to your comment on %(book_title)s "
-msgstr ""
-"a répondu à votre commentaire sur %(book_title)s "
+#| msgid "replied to your %(preview_name)s "
+msgid "replied to your comment on %(book_title)s "
+msgstr "a répondu à votre commentaire sur %(book_title)s "
#: bookwyrm/templates/notifications.html:75
#, fuzzy, python-format
-#| msgid ""
-#| "replied to your %(preview_name)s "
-msgid ""
-"replied to your quote from %(book_title)s "
-msgstr ""
-"a répondu à votre citation de %(book_title)s "
+#| msgid "replied to your %(preview_name)s "
+msgid "replied to your quote from %(book_title)s "
+msgstr "a répondu à votre citation de %(book_title)s "
#: bookwyrm/templates/notifications.html:77
#, fuzzy, python-format
-#| msgid ""
-#| "replied to your %(preview_name)s "
-msgid ""
-"replied to your status "
-msgstr ""
-"a répondu à votre statut "
+#| msgid "replied to your %(preview_name)s "
+msgid "replied to your status "
+msgstr "a répondu à votre statut "
#: bookwyrm/templates/notifications.html:81
msgid "followed you"
@@ -912,32 +981,20 @@ msgstr "vous a envoyé une demande d’abonnement"
#: bookwyrm/templates/notifications.html:90
#, fuzzy, python-format
#| msgid "boosted your %(preview_name)s "
-msgid ""
-"boosted your review of %(book.title)s "
-"a>"
-msgstr ""
-"a partagé votre critique de %(book_title)s"
-"em> "
+msgid "boosted your review of %(book.title)s "
+msgstr "a partagé votre critique de %(book_title)s "
#: bookwyrm/templates/notifications.html:92
#, fuzzy, python-format
#| msgid "boosted your %(preview_name)s "
-msgid ""
-"boosted your comment on%(book.title)s "
-"a>"
-msgstr ""
-"a partagé votre commentaire sur "
-"%(book_title)s "
+msgid "boosted your comment on%(book.title)s "
+msgstr "a partagé votre commentaire sur %(book_title)s "
#: bookwyrm/templates/notifications.html:94
#, fuzzy, python-format
#| msgid "boosted your %(preview_name)s "
-msgid ""
-"boosted your quote from %(book.title)s"
-"em> "
-msgstr ""
-"a partagé votre citation de %(book_title)s"
-"em> "
+msgid "boosted your quote from %(book.title)s "
+msgstr "a partagé votre citation de %(book_title)s "
#: bookwyrm/templates/notifications.html:96
#, fuzzy, python-format
@@ -947,33 +1004,20 @@ msgstr "a partagé votre statut "
#: bookwyrm/templates/notifications.html:100
#, fuzzy, python-format
-#| msgid ""
-#| "replied to your %(preview_name)s "
-msgid ""
-" added %(book_title)s to your list "
-"\"%(list_name)s \""
-msgstr ""
-" a ajouté %(book_title)s à votre "
-"liste « %(list_name)s »"
+#| msgid "replied to your %(preview_name)s "
+msgid " added %(book_title)s to your list \"%(list_name)s \""
+msgstr " a ajouté %(book_title)s à votre liste « %(list_name)s »"
#: bookwyrm/templates/notifications.html:102
#, fuzzy, python-format
-#| msgid ""
-#| "replied to your %(preview_name)s "
-msgid ""
-" suggested adding %(book_title)s to "
-"your list \"%(list_name)s \""
-msgstr ""
-" a suggégré l’ajout de %(book_title)s "
-"à votre liste « %(list_name)s »"
+#| msgid "replied to your %(preview_name)s "
+msgid " suggested adding %(book_title)s to your list \"%(list_name)s \""
+msgstr " a suggégré l’ajout de %(book_title)s à votre liste « %(list_name)s »"
#: bookwyrm/templates/notifications.html:106
#, python-format
msgid " your import completed."
-msgstr ""
-" votre importation est terminée."
+msgstr " votre importation est terminée."
#: bookwyrm/templates/notifications.html:138
msgid "You're all caught up!"
@@ -997,8 +1041,7 @@ msgstr "Confirmer"
#: bookwyrm/templates/password_reset_request.html:12
msgid "A link to reset your password will be sent to your email address"
-msgstr ""
-"Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
+msgstr "Un lien pour changer votre mot de passe sera envoyé à votre addresse email"
#: bookwyrm/templates/password_reset_request.html:16
#: bookwyrm/templates/preferences/edit_user.html:38
@@ -1338,9 +1381,7 @@ msgstr "Supprimer ces dates de lecture ?"
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
#, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
msgstr "Vous avez supprimé ce résumé et ses %(count)s progressions associées."
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1393,12 +1434,8 @@ msgstr "Rejeter le message"
#: bookwyrm/templates/snippets/goal_card.html:22
#, python-format
-msgid ""
-"You can set or change your reading goal any time from your profile page "
-msgstr ""
-"Vous pouvez définir ou changer vore défi lecture à n’importe quel moment "
-"depuis votre profil "
+msgid "You can set or change your reading goal any time from your profile page "
+msgstr "Vous pouvez définir ou changer vore défi lecture à n’importe quel moment depuis votre profil "
#: bookwyrm/templates/snippets/goal_form.html:9
msgid "Reading goal:"
@@ -1434,20 +1471,13 @@ msgstr "%(percent)s%% terminé !"
#: bookwyrm/templates/snippets/goal_progress.html:10
#, python-format
-msgid ""
-"You've read %(read_count)s of %(goal_count)s books ."
-msgstr ""
-"Vous avez lu %(read_count)s sur %(goal_count)s livres"
-"a>."
+msgid "You've read %(read_count)s of %(goal_count)s books ."
+msgstr "Vous avez lu %(read_count)s sur %(goal_count)s livres ."
#: bookwyrm/templates/snippets/goal_progress.html:12
#, python-format
-msgid ""
-"%(username)s has read %(read_count)s of %(goal_count)s "
-"books ."
-msgstr ""
-"%(username)s a lu %(read_count)s sur %(goal_count)s "
-"livres ."
+msgid "%(username)s has read %(read_count)s of %(goal_count)s books ."
+msgstr "%(username)s a lu %(read_count)s sur %(goal_count)s livres ."
#: bookwyrm/templates/snippets/pagination.html:7
msgid "Previous"
@@ -1639,10 +1669,6 @@ msgstr "Plus d’étagères"
msgid "Start reading"
msgstr "Commencer la lecture"
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-msgid "Read"
-msgstr "Lu"
-
#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
#, fuzzy
#| msgid "Finished reading"
@@ -1694,7 +1720,9 @@ msgid "More options"
msgstr "Plus d’options"
#: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
+#, fuzzy
+#| msgid "Delete post"
+msgid "Delete status"
msgstr "Supprimer le statut"
#: bookwyrm/templates/snippets/status/status_options.html:23
@@ -1716,12 +1744,10 @@ msgid "Books tagged \"%(tag.name)s\""
msgstr "Livres tagués « %(tag.name)s »"
#: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr "Créer une nouvelle étagère"
-
#: bookwyrm/templates/user/create_shelf_form.html:22
-#: bookwyrm/templates/user/shelf.html:33
-msgid "Create shelf"
+#, fuzzy
+#| msgid "Create shelf"
+msgid "Create Shelf"
msgstr "Créer l’étagère"
#: bookwyrm/templates/user/edit_shelf_form.html:5
@@ -1765,13 +1791,7 @@ msgstr "Vos listes"
msgid "Lists: %(username)s"
msgstr "Listes : %(username)s"
-#: bookwyrm/templates/user/lists.html:17
-#, fuzzy
-#| msgid "Create list"
-msgid "Create new list"
-msgstr "Créer une nouvelle liste"
-
-#: bookwyrm/templates/user/lists.html:29
+#: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
msgid "Create list"
msgstr "Créer une liste"
@@ -1787,6 +1807,10 @@ msgstr "Vos étagères"
msgid "%(username)s: Shelves"
msgstr "%(username)s : Étagères"
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr "Créer l’étagère"
+
#: bookwyrm/templates/user/shelf.html:54
#, fuzzy
#| msgid "Edit Shelf"
@@ -1859,6 +1883,17 @@ msgstr[1] "%(username)s n’a pas d’abonné(e)s"
msgid "%(counter)s following"
msgstr "%(counter)s abonnements"
+#~ msgid "Create New Shelf"
+#~ msgstr "Créer une nouvelle étagère"
+
+#, fuzzy
+#~| msgid "Create list"
+#~ msgid "Create new list"
+#~ msgstr "Créer une nouvelle liste"
+
+#~ msgid "Added by"
+#~ msgstr "Ajouté par"
+
#~ msgid "added"
#~ msgstr "a ajouté"
diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo
index 818dd2a10..dbdd1daa8 100644
Binary files a/locale/zh_CN/LC_MESSAGES/django.mo and b/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po
index 9159c1ce4..0f51c6c33 100644
--- a/locale/zh_CN/LC_MESSAGES/django.po
+++ b/locale/zh_CN/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-03-02 10:32+0000\n"
+"POT-Creation-Date: 2021-03-02 19:51+0000\n"
"PO-Revision-Date: 2021-03-02 10:35+0000\n"
"Last-Translator: Kana \n"
"Language-Team: Mouse Reeve \n"
@@ -18,6 +18,65 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#: bookwyrm/forms.py:185
+msgid "One Day"
+msgstr ""
+
+#: bookwyrm/forms.py:186
+msgid "One Week"
+msgstr ""
+
+#: bookwyrm/forms.py:187
+msgid "One Month"
+msgstr ""
+
+#: bookwyrm/forms.py:188
+msgid "Does Not Expire"
+msgstr ""
+
+#: bookwyrm/forms.py:190
+#, python-format
+msgid "%(count)d uses"
+msgstr ""
+
+#: bookwyrm/forms.py:192
+#, fuzzy
+#| msgid "Unlisted"
+msgid "Unlimited"
+msgstr "不公开"
+
+#: bookwyrm/models/fields.py:24
+#, python-format
+msgid "%(value)s is not a valid remote_id"
+msgstr ""
+
+#: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
+#, python-format
+msgid "%(value)s is not a valid username"
+msgstr ""
+
+#: bookwyrm/models/fields.py:164
+#, fuzzy
+#| msgid "Username:"
+msgid "username"
+msgstr "用户名:"
+
+#: bookwyrm/models/fields.py:169
+msgid "A user with that username already exists."
+msgstr ""
+
+#: bookwyrm/settings.py:142
+msgid "English"
+msgstr ""
+
+#: bookwyrm/settings.py:143
+msgid "French"
+msgstr ""
+
+#: bookwyrm/settings.py:144
+msgid "Simplified Chinese"
+msgstr ""
+
#: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
#: bookwyrm/templates/edit_author.html:5
msgid "Edit Author"
@@ -32,6 +91,10 @@ msgstr "维基百科"
msgid "Books by %(name)s"
msgstr "%(name)s 所著的书"
+#: bookwyrm/templates/book.html:21
+msgid "by"
+msgstr ""
+
#: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
#: bookwyrm/templates/edit_book.html:5
msgid "Edit Book"
@@ -57,20 +120,38 @@ msgstr "OCLC 号:"
msgid "ASIN:"
msgstr "ASIN:"
+#: bookwyrm/templates/book.html:84
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(format)s, %(pages)s pages"
+msgstr "全书 %(book.pages)s 页"
+
#: bookwyrm/templates/book.html:86
+#, fuzzy, python-format
+#| msgid "of %(book.pages)s pages"
+msgid "%(pages)s pages"
+msgstr "全书 %(book.pages)s 页"
+
+#: bookwyrm/templates/book.html:91
msgid "View on OpenLibrary"
msgstr "在 OpenLibrary 查看"
-#: bookwyrm/templates/book.html:98
+#: bookwyrm/templates/book.html:100
+#, python-format
+msgid "(%(review_count)s review)"
+msgid_plural "(%(review_count)s reviews)"
+msgstr[0] ""
+
+#: bookwyrm/templates/book.html:106
msgid "Add Description"
msgstr "添加描述"
-#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39
+#: bookwyrm/templates/book.html:113 bookwyrm/templates/edit_book.html:39
#: bookwyrm/templates/lists/form.html:12
msgid "Description:"
msgstr "描述:"
-#: bookwyrm/templates/book.html:109 bookwyrm/templates/edit_author.html:78
+#: bookwyrm/templates/book.html:117 bookwyrm/templates/edit_author.html:78
#: bookwyrm/templates/edit_book.html:120 bookwyrm/templates/lists/form.html:42
#: bookwyrm/templates/preferences/edit_user.html:50
#: bookwyrm/templates/settings/site.html:89
@@ -81,7 +162,7 @@ msgstr "描述:"
msgid "Save"
msgstr "保存"
-#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159
+#: bookwyrm/templates/book.html:118 bookwyrm/templates/book.html:167
#: bookwyrm/templates/edit_author.html:79 bookwyrm/templates/edit_book.html:121
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:17
#: bookwyrm/templates/snippets/goal_form.html:32
@@ -92,51 +173,69 @@ msgstr "保存"
msgid "Cancel"
msgstr "取消"
-#: bookwyrm/templates/book.html:142
+#: bookwyrm/templates/book.html:127
+#, fuzzy, python-format
+#| msgid "%(title)s by "
+msgid "%(count)s editions "
+msgstr "%(title)s 来自"
+
+#: bookwyrm/templates/book.html:135
+#, fuzzy, python-format
+#| msgid "Direct Messages with %(username)s "
+msgid "This edition is on your %(shelf_name)s shelf."
+msgstr "与 %(username)s 私信"
+
+#: bookwyrm/templates/book.html:141
+#, 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 " 添加了 %(book_title)s 到你的列表 \"%(list_name)s \""
+
+#: bookwyrm/templates/book.html:150
msgid "Your reading activity"
msgstr "你的阅读活动"
-#: bookwyrm/templates/book.html:144
+#: bookwyrm/templates/book.html:152
msgid "Add read dates"
msgstr "添加阅读日期"
-#: bookwyrm/templates/book.html:149
+#: bookwyrm/templates/book.html:157
msgid "You don't have any reading activity for this book."
msgstr "你还没有任何这本书的阅读活动。"
-#: bookwyrm/templates/book.html:156
+#: bookwyrm/templates/book.html:164
msgid "Create"
msgstr "创建"
-#: bookwyrm/templates/book.html:178
+#: bookwyrm/templates/book.html:186
msgid "Tags"
msgstr "标签"
-#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18
+#: bookwyrm/templates/book.html:190 bookwyrm/templates/snippets/tag.html:18
msgid "Add tag"
msgstr "添加标签"
-#: bookwyrm/templates/book.html:199
+#: bookwyrm/templates/book.html:207
msgid "Subjects"
msgstr "主题"
-#: bookwyrm/templates/book.html:210
+#: bookwyrm/templates/book.html:218
msgid "Places"
msgstr "地点"
-#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64
+#: bookwyrm/templates/book.html:229 bookwyrm/templates/layout.html:64
#: bookwyrm/templates/lists/lists.html:4 bookwyrm/templates/lists/lists.html:9
#: bookwyrm/templates/search_results.html:90
#: bookwyrm/templates/user/user_layout.html:62
msgid "Lists"
msgstr "列表"
-#: bookwyrm/templates/book.html:250
+#: bookwyrm/templates/book.html:258
msgid "rated it"
msgstr "评价了"
#: bookwyrm/templates/components/inline_form.html:8
-#: bookwyrm/templates/feed/feed_layout.html:51
+#: bookwyrm/templates/feed/feed_layout.html:54
msgid "Close"
msgstr "关闭"
@@ -341,15 +440,15 @@ msgstr "你现在没有消息。"
msgid "%(tab_title)s Timeline"
msgstr "%(tab_title)s 时间线"
-#: bookwyrm/templates/feed/feed.html:10
+#: bookwyrm/templates/feed/feed.html:10 bookwyrm/views/feed.py:33
msgid "Home"
msgstr "主页"
-#: bookwyrm/templates/feed/feed.html:13
+#: bookwyrm/templates/feed/feed.html:13 bookwyrm/views/feed.py:37
msgid "Local"
msgstr "本站"
-#: bookwyrm/templates/feed/feed.html:16
+#: bookwyrm/templates/feed/feed.html:16 bookwyrm/views/feed.py:41
msgid "Federated"
msgstr "跨站"
@@ -358,8 +457,7 @@ msgid "Announcements"
msgstr "公告"
#: bookwyrm/templates/feed/feed.html:32
-msgid ""
-"There aren't any activities right now! Try following a user to get started"
+msgid "There aren't any activities right now! Try following a user to get started"
msgstr "现在还没有任何活动!尝试着从关注一个用户开始吧"
#: bookwyrm/templates/feed/feed_layout.html:5
@@ -371,11 +469,30 @@ msgid "Your books"
msgstr "你的书目"
#: bookwyrm/templates/feed/feed_layout.html:13
-msgid ""
-"There are no books here right now! Try searching for a book to get started"
+msgid "There are no books here right now! Try searching for a book to get started"
msgstr "现在这里还没有任何书目!尝试着从搜索某本书开始吧"
-#: bookwyrm/templates/feed/feed_layout.html:73 bookwyrm/templates/goal.html:26
+#: bookwyrm/templates/feed/feed_layout.html:23
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Read"
+msgid "To Read"
+msgstr "阅读"
+
+#: bookwyrm/templates/feed/feed_layout.html:24
+#: bookwyrm/templates/user/shelf.html:24
+#, fuzzy
+#| msgid "Start reading"
+msgid "Currently Reading"
+msgstr "开始阅读"
+
+#: bookwyrm/templates/feed/feed_layout.html:25
+#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
+#: bookwyrm/templates/user/shelf.html:24
+msgid "Read"
+msgstr "阅读"
+
+#: bookwyrm/templates/feed/feed_layout.html:76 bookwyrm/templates/goal.html:26
#: bookwyrm/templates/snippets/goal_card.html:6
#, python-format
msgid "%(year)s Reading Goal"
@@ -397,9 +514,7 @@ msgstr "编辑目标"
#: bookwyrm/templates/goal.html:30
#: bookwyrm/templates/snippets/goal_card.html:13
#, python-format
-msgid ""
-"Set a goal for how many books you'll finish reading in %(year)s, and track "
-"your progress throughout the year."
+msgid "Set a goal for how many books you'll finish reading in %(year)s, and track your progress throughout the year."
msgstr "设定一个 %(year)s 内要读多少书的目标,并记录你全年的进度。"
#: bookwyrm/templates/goal.html:39
@@ -590,12 +705,8 @@ msgid "Contact site admin"
msgstr "联系站点管理员"
#: bookwyrm/templates/layout.html:198
-msgid ""
-"BookWyrm is open source software. You can contribute or report issues on GitHub ."
-msgstr ""
-"BookWyrm 是开源软件。你可以在GitHub 贡献或报告问题。"
+msgid "BookWyrm is open source software. You can contribute or report issues on GitHub ."
+msgstr "BookWyrm 是开源软件。你可以在GitHub 贡献或报告问题。"
#: bookwyrm/templates/lists/create_form.html:5
#: bookwyrm/templates/lists/lists.html:17
@@ -664,8 +775,10 @@ msgid "This list is currently empty"
msgstr "此列表当前是空的"
#: bookwyrm/templates/lists/list.html:35
-msgid "Added by"
-msgstr "添加来自"
+#, fuzzy, python-format
+#| msgid "Direct Messages with %(username)s "
+msgid "Added by %(username)s "
+msgstr "与 %(username)s 私信"
#: bookwyrm/templates/lists/list.html:41
msgid "Remove"
@@ -718,6 +831,12 @@ msgstr "创建者为"
msgid "Your lists"
msgstr "你的列表"
+#: bookwyrm/templates/lists/lists.html:32
+#, fuzzy, python-format
+#| msgid "See all %(size)s"
+msgid "See all %(size)s lists"
+msgstr "查看所有 %(size)s"
+
#: bookwyrm/templates/lists/lists.html:40
msgid "Recent Lists"
msgstr "最近的列表"
@@ -757,27 +876,18 @@ msgstr "删除通知"
#: bookwyrm/templates/notifications.html:49
#, python-format
-msgid ""
-"favorited your review of %(book_title)s"
-"em> "
-msgstr ""
-"喜欢了你 对 %(book_title)s 的书评 "
+msgid "favorited your review of %(book_title)s "
+msgstr "喜欢了你 对 %(book_title)s 的书评 "
#: bookwyrm/templates/notifications.html:51
#, python-format
-msgid ""
-"favorited your comment on %(book_title)s"
-"em> "
-msgstr ""
-"喜欢了你 对 %(book_title)s 的评论 "
+msgid "favorited your comment on %(book_title)s "
+msgstr "喜欢了你 对 %(book_title)s 的评论 "
#: bookwyrm/templates/notifications.html:53
#, python-format
-msgid ""
-"favorited your quote from %(book_title)s"
-"em> "
-msgstr ""
-"喜欢了你 来自 %(book_title)s 的引用 "
+msgid "favorited your quote from %(book_title)s "
+msgstr "喜欢了你 来自 %(book_title)s 的引用 "
#: bookwyrm/templates/notifications.html:55
#, python-format
@@ -786,30 +896,18 @@ msgstr "喜欢了你的 状态 "
#: bookwyrm/templates/notifications.html:60
#, python-format
-msgid ""
-"mentioned you in a review of "
-"%(book_title)s "
-msgstr ""
-"在 对 %(book_title)s 的书评 里提到"
-"了你"
+msgid "mentioned you in a review of %(book_title)s "
+msgstr "在 对 %(book_title)s 的书评 里提到了你"
#: bookwyrm/templates/notifications.html:62
#, python-format
-msgid ""
-"mentioned you in a comment on "
-"%(book_title)s "
-msgstr ""
-"在 对 %(book_title)s 的评论 里提到"
-"了你"
+msgid "mentioned you in a comment on %(book_title)s "
+msgstr "在 对 %(book_title)s 的评论 里提到了你"
#: bookwyrm/templates/notifications.html:64
#, python-format
-msgid ""
-"mentioned you in a quote from "
-"%(book_title)s "
-msgstr ""
-"在 对 %(book_title)s 的引用 中提到"
-"了你"
+msgid "mentioned you in a quote from %(book_title)s "
+msgstr "在 对 %(book_title)s 的引用 中提到了你"
#: bookwyrm/templates/notifications.html:66
#, python-format
@@ -818,39 +916,23 @@ msgstr "在 状态 中提到了你"
#: bookwyrm/templates/notifications.html:71
#, python-format
-msgid ""
-"replied to your review of %(book_title)s "
-msgstr ""
-"回复 了你的 对 "
-"%(book_title)s 的书评 "
+msgid "replied to your review of %(book_title)s "
+msgstr "回复 了你的 对 %(book_title)s 的书评 "
#: bookwyrm/templates/notifications.html:73
#, python-format
-msgid ""
-"replied to your comment on %(book_title)s "
-msgstr ""
-"回复 了你的 对 "
-"%(book_title)s 的评论 "
+msgid "replied to your comment on %(book_title)s "
+msgstr "回复 了你的 对 %(book_title)s 的评论 "
#: bookwyrm/templates/notifications.html:75
#, python-format
-msgid ""
-"replied to your quote from %(book_title)s "
-msgstr ""
-"回复 了你 对 "
-"%(book_title)s 中的引用 "
+msgid "replied to your quote from %(book_title)s "
+msgstr "回复 了你 对 %(book_title)s 中的引用 "
#: bookwyrm/templates/notifications.html:77
#, python-format
-msgid ""
-"replied to your status "
-msgstr ""
-"回复 了你的 状态"
-" "
+msgid "replied to your status "
+msgstr "回复 了你的 状态 "
#: bookwyrm/templates/notifications.html:81
msgid "followed you"
@@ -862,27 +944,18 @@ msgstr "向你发送了关注请求"
#: bookwyrm/templates/notifications.html:90
#, python-format
-msgid ""
-"boosted your review of %(book.title)s "
-"a>"
-msgstr ""
-"转发了你的 对 %(book.title)s 的书评 "
+msgid "boosted your review of %(book.title)s "
+msgstr "转发了你的 对 %(book.title)s 的书评 "
#: bookwyrm/templates/notifications.html:92
#, python-format
-msgid ""
-"boosted your comment on%(book.title)s "
-"a>"
-msgstr ""
-"转发了你的 对 %(book.title)s 的评论 "
+msgid "boosted your comment on%(book.title)s "
+msgstr "转发了你的 对 %(book.title)s 的评论 "
#: bookwyrm/templates/notifications.html:94
#, python-format
-msgid ""
-"boosted your quote from %(book.title)s"
-"em> "
-msgstr ""
-"转发了你的 对 %(book.title)s 的引用 "
+msgid "boosted your quote from %(book.title)s "
+msgstr "转发了你的 对 %(book.title)s 的引用 "
#: bookwyrm/templates/notifications.html:96
#, python-format
@@ -891,21 +964,13 @@ msgstr "转发了你的 状态 "
#: bookwyrm/templates/notifications.html:100
#, python-format
-msgid ""
-" added %(book_title)s to your list "
-"\"%(list_name)s \""
-msgstr ""
-" 添加了 %(book_title)s 到你的列表 "
-"\"%(list_name)s \""
+msgid " added %(book_title)s to your list \"%(list_name)s \""
+msgstr " 添加了 %(book_title)s 到你的列表 \"%(list_name)s \""
#: bookwyrm/templates/notifications.html:102
#, python-format
-msgid ""
-" suggested adding %(book_title)s to "
-"your list \"%(list_name)s \""
-msgstr ""
-" 推荐添加 %(book_title)s 到你的列表 "
-"\"%(list_name)s \""
+msgid " suggested adding %(book_title)s to your list \"%(list_name)s \""
+msgstr " 推荐添加 %(book_title)s 到你的列表 \"%(list_name)s \""
#: bookwyrm/templates/notifications.html:106
#, python-format
@@ -1266,9 +1331,7 @@ msgstr "删除这些阅读日期吗?"
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
#, python-format
-msgid ""
-"You are deleting this readthrough and its %(count)s associated progress "
-"updates."
+msgid "You are deleting this readthrough and its %(count)s associated progress updates."
msgstr "你正要删除这篇阅读经过以及与之相关的 %(count)s 次进度更新。"
#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
@@ -1320,12 +1383,8 @@ msgstr "遣散消息"
#: bookwyrm/templates/snippets/goal_card.html:22
#, python-format
-msgid ""
-"You can set or change your reading goal any time from your profile page "
-msgstr ""
-"你可以在任何时候从你的个人资料页面 中设置或改变你的"
-"阅读目标"
+msgid "You can set or change your reading goal any time from your profile page "
+msgstr "你可以在任何时候从你的个人资料页面 中设置或改变你的阅读目标"
#: bookwyrm/templates/snippets/goal_form.html:9
msgid "Reading goal:"
@@ -1361,20 +1420,13 @@ msgstr "完成了 %(percent)s%% !"
#: bookwyrm/templates/snippets/goal_progress.html:10
#, python-format
-msgid ""
-"You've read %(read_count)s of %(goal_count)s books ."
-msgstr ""
-"你已经阅读了 %(goal_count)s 本书中的 %(read_count)s 本"
-"a>。"
+msgid "You've read %(read_count)s of %(goal_count)s books ."
+msgstr "你已经阅读了 %(goal_count)s 本书中的 %(read_count)s 本 。"
#: bookwyrm/templates/snippets/goal_progress.html:12
#, python-format
-msgid ""
-"%(username)s has read %(read_count)s of %(goal_count)s "
-"books ."
-msgstr ""
-"%(username)s 已经阅读了 %(goal_count)s 本书中的 "
-"%(read_count)s 本 。"
+msgid "%(username)s has read %(read_count)s of %(goal_count)s books ."
+msgstr "%(username)s 已经阅读了 %(goal_count)s 本书中的 %(read_count)s 本 。"
#: bookwyrm/templates/snippets/pagination.html:7
msgid "Previous"
@@ -1562,10 +1614,6 @@ msgstr "更多书架"
msgid "Start reading"
msgstr "开始阅读"
-#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
-msgid "Read"
-msgstr "阅读"
-
#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:13
msgid "Finish reading"
msgstr "完成阅读"
@@ -1615,7 +1663,9 @@ msgid "More options"
msgstr "更多选项"
#: bookwyrm/templates/snippets/status/status_options.html:17
-msgid "Delete post"
+#, fuzzy
+#| msgid "Delete post"
+msgid "Delete status"
msgstr "删除发文"
#: bookwyrm/templates/snippets/status/status_options.html:23
@@ -1637,12 +1687,10 @@ msgid "Books tagged \"%(tag.name)s\""
msgstr "标有 \"%(tag.name)s\" 标签的书"
#: bookwyrm/templates/user/create_shelf_form.html:5
-msgid "Create New Shelf"
-msgstr "新建书架"
-
#: bookwyrm/templates/user/create_shelf_form.html:22
-#: bookwyrm/templates/user/shelf.html:33
-msgid "Create shelf"
+#, fuzzy
+#| msgid "Create shelf"
+msgid "Create Shelf"
msgstr "创建书架"
#: bookwyrm/templates/user/edit_shelf_form.html:5
@@ -1681,11 +1729,7 @@ msgstr "你的列表"
msgid "Lists: %(username)s"
msgstr "列表: %(username)s"
-#: bookwyrm/templates/user/lists.html:17
-msgid "Create new list"
-msgstr "新建列表"
-
-#: bookwyrm/templates/user/lists.html:29
+#: bookwyrm/templates/user/lists.html:17 bookwyrm/templates/user/lists.html:29
msgid "Create list"
msgstr "创建列表"
@@ -1698,6 +1742,10 @@ msgstr "你的书架"
msgid "%(username)s: Shelves"
msgstr "%(username)s: 书架"
+#: bookwyrm/templates/user/shelf.html:33
+msgid "Create shelf"
+msgstr "创建书架"
+
#: bookwyrm/templates/user/shelf.html:54
msgid "Edit shelf"
msgstr "编辑书架"
@@ -1765,3 +1813,12 @@ msgstr[0] "%(counter)s 个关注者"
#, python-format
msgid "%(counter)s following"
msgstr "关注着 %(counter)s 人"
+
+#~ msgid "Create New Shelf"
+#~ msgstr "新建书架"
+
+#~ msgid "Create new list"
+#~ msgstr "新建列表"
+
+#~ msgid "Added by"
+#~ msgstr "添加来自"