From 01df4ad3216493eb5d65b7a1cc6e08e1ca122016 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Mar 2021 09:25:45 -0800 Subject: [PATCH 1/9] Small fixes for translation --- bookwyrm/templates/lists/list.html | 2 +- bookwyrm/templates/snippets/status/status_options.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/lists/list.html b/bookwyrm/templates/lists/list.html index ddfaad0a..ddac04f3 100644 --- a/bookwyrm/templates/lists/list.html +++ b/bookwyrm/templates/lists/list.html @@ -32,7 +32,7 @@
-

{% trans "Added by" %} {% include 'snippets/username.html' with user=item.user %}

+

{% blocktrans with username=item.user.display_name user_path=user.local_path %}Added by {{ username }}{% endblocktrans %}

{% if list.user == request.user or list.curation == 'open' and item.user == request.user %}
diff --git a/bookwyrm/templates/snippets/status/status_options.html b/bookwyrm/templates/snippets/status/status_options.html index 735ff51c..babd8296 100644 --- a/bookwyrm/templates/snippets/status/status_options.html +++ b/bookwyrm/templates/snippets/status/status_options.html @@ -14,7 +14,7 @@ {% csrf_token %}
From bb6a82fdffd08b7ce78033cdfe0feb1093569ffc Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Mar 2021 09:26:21 -0800 Subject: [PATCH 2/9] Adds simplified chinese language code to settings --- bookwyrm/settings.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/settings.py b/bookwyrm/settings.py index 8cdf87ff..6c3bb7d2 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')), ] From 8bb7d5bba0e1cefa29cfe5b2886d8e394ef5d4dd Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Mar 2021 09:55:28 -0800 Subject: [PATCH 3/9] Translates invite form values --- bookwyrm/forms.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py index ba2fcc8c..b920fc9c 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): From 5938c438e2621d9dfd70e91fc6973c48764b0b21 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Mar 2021 09:59:15 -0800 Subject: [PATCH 4/9] Translate table titles in header --- bookwyrm/templates/feed/feed.html | 2 +- bookwyrm/views/feed.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html index 71b59cc1..1eae24d4 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/views/feed.py b/bookwyrm/views/feed.py index 5300c762..f9cb9d59 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, }} From 27914d07b9b1203412d49faea63a76281c3d2e80 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Mar 2021 10:23:11 -0800 Subject: [PATCH 5/9] Missing translation strings on book and list pages --- bookwyrm/templates/book.html | 26 +++++++++++++++++++------- bookwyrm/templates/lists/lists.html | 2 +- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html index 10682347..aabfb37b 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,14 @@
-

{% 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 +128,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 +136,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/lists/lists.html b/bookwyrm/templates/lists/lists.html index 795db6fb..f7ab020a 100644 --- a/bookwyrm/templates/lists/lists.html +++ b/bookwyrm/templates/lists/lists.html @@ -29,7 +29,7 @@ {% endif %} {% if request.user.list_set.count > 4 %} - See all {{ request.user.list_set.count}} lists + {% blocktrans with size=request.user.list_set.count %}See all {{ size }} lists{% endblocktrans %} {% endif %} {% endif %} From 2c3789379099c76d430bb50817b996870f6e115b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Mar 2021 10:32:46 -0800 Subject: [PATCH 6/9] Adds default shelf names translations --- bookwyrm/templates/feed/feed_layout.html | 5 ++++- bookwyrm/templates/user/shelf.html | 2 +- bookwyrm/views/feed.py | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bookwyrm/templates/feed/feed_layout.html b/bookwyrm/templates/feed/feed_layout.html index 7f35d2f3..04826a64 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/user/shelf.html b/bookwyrm/templates/user/shelf.html index c7c83388..189d2856 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 f9cb9d59..f7e93e9a 100644 --- a/bookwyrm/views/feed.py +++ b/bookwyrm/views/feed.py @@ -166,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) From 9f2e255f501428de1ad524fff679dfc26537023b Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Mar 2021 10:33:48 -0800 Subject: [PATCH 7/9] Re-compile messages for new strings --- locale/en_US/LC_MESSAGES/django.mo | Bin 390 -> 386 bytes locale/en_US/LC_MESSAGES/django.po | 108 +++++++++++++++++++----- locale/fr_FR/LC_MESSAGES/django.mo | Bin 20801 -> 20692 bytes locale/fr_FR/LC_MESSAGES/django.po | 130 +++++++++++++++++++++++------ locale/zh_CN/LC_MESSAGES/django.mo | Bin 23973 -> 23894 bytes locale/zh_CN/LC_MESSAGES/django.po | 129 ++++++++++++++++++++++------ 6 files changed, 296 insertions(+), 71 deletions(-) diff --git a/locale/en_US/LC_MESSAGES/django.mo b/locale/en_US/LC_MESSAGES/django.mo index c0a5dd97922819649185a3a8135344140fa5f096..e07529141a2dbe01f4f40179065965e72cb674c3 100644 GIT binary patch delta 46 zcmZo;ZepIG!sszkRg2MJVt^@+g@U2Em7%4sfrWv=#0jqKu6gM>nZ+3sAIMGo-wps8 C4i0qy delta 51 zcmZo-ZeyOH!ss(mRg2MZVt^^Pxq_jwm8pStKyb*!iLTtf`K86F3PGu\n" "Language-Team: English \n" @@ -32,6 +32,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 +61,43 @@ 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 "" +"\n" +" (%(review_count)s review)\n" +" " +msgid_plural "" +"\n" +" (%(review_count)s reviews)\n" +" " +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/book.html:110 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39 +#: bookwyrm/templates/book.html:117 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:121 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 +108,7 @@ msgstr "" msgid "Save" msgstr "" -#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159 +#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171 #: 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 +119,68 @@ msgstr "" msgid "Cancel" msgstr "" -#: bookwyrm/templates/book.html:142 +#: bookwyrm/templates/book.html:131 +#, python-format +msgid "%(count)s editions" +msgstr "" + +#: bookwyrm/templates/book.html:139 +#, python-format +msgid "This edition is on your %(shelf_name)s shelf." +msgstr "" + +#: bookwyrm/templates/book.html:145 +#, python-format +msgid "" +"A different edition of this book is on your %(shelf_name)s shelf." +msgstr "" + +#: bookwyrm/templates/book.html:154 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book.html:144 +#: bookwyrm/templates/book.html:156 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book.html:149 +#: bookwyrm/templates/book.html:161 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book.html:156 +#: bookwyrm/templates/book.html:168 msgid "Create" msgstr "" -#: bookwyrm/templates/book.html:178 +#: bookwyrm/templates/book.html:190 msgid "Tags" msgstr "" -#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18 +#: bookwyrm/templates/book.html:194 bookwyrm/templates/snippets/tag.html:18 msgid "Add tag" msgstr "" -#: bookwyrm/templates/book.html:199 +#: bookwyrm/templates/book.html:211 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book.html:210 +#: bookwyrm/templates/book.html:222 msgid "Places" msgstr "" -#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book.html:233 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:262 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 "" @@ -375,7 +419,23 @@ 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" @@ -662,7 +722,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 +777,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 "" @@ -1530,10 +1596,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 +1645,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 diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index 8b845aa782e4dddbeaef185c9447f67e8c99eeb3..9f8cca0a8c197b367ab948e30475b8a861aa1fc9 100644 GIT binary patch delta 7043 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 diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 3956fc92..f0a25f6b 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 18:33+0000\n" "PO-Revision-Date: 2021-03-02 12:37+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -32,6 +32,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 +61,47 @@ 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 "" +"\n" +" (%(review_count)s review)\n" +" " +msgid_plural "" +"\n" +" (%(review_count)s reviews)\n" +" " +msgstr[0] "" +msgstr[1] "" + +#: bookwyrm/templates/book.html:110 #, 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:117 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:121 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 +112,7 @@ msgstr "Description :" msgid "Save" msgstr "Enregistrer" -#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159 +#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171 #: 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 +123,77 @@ msgstr "Enregistrer" msgid "Cancel" msgstr "Annuler" -#: bookwyrm/templates/book.html:142 +#: bookwyrm/templates/book.html:131 +#, fuzzy, python-format +#| msgid "Editions of \"%(work_title)s\"" +msgid "%(count)s editions" +msgstr "%(title)s par " + +#: bookwyrm/templates/book.html:139 +#, 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:145 +#, 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:154 msgid "Your reading activity" msgstr "Votre activité de lecture" -#: bookwyrm/templates/book.html:144 +#: bookwyrm/templates/book.html:156 #, fuzzy #| msgid "Edit read dates" msgid "Add read dates" msgstr "Ajouter des dates de lecture" -#: bookwyrm/templates/book.html:149 +#: bookwyrm/templates/book.html:161 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:168 msgid "Create" msgstr "Créer" -#: bookwyrm/templates/book.html:178 +#: bookwyrm/templates/book.html:190 msgid "Tags" msgstr "Tags" -#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18 +#: bookwyrm/templates/book.html:194 bookwyrm/templates/snippets/tag.html:18 msgid "Add tag" msgstr "Ajouter un tag" -#: bookwyrm/templates/book.html:199 +#: bookwyrm/templates/book.html:211 msgid "Subjects" msgstr "Sujets" -#: bookwyrm/templates/book.html:210 +#: bookwyrm/templates/book.html:222 msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book.html:233 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:262 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" @@ -389,7 +442,27 @@ 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" @@ -690,8 +763,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 +819,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" @@ -1639,10 +1720,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 +1771,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 @@ -1859,6 +1938,9 @@ msgstr[1] "%(username)s n’a pas d’abonné(e)s" msgid "%(counter)s following" msgstr "%(counter)s abonnements" +#~ 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 818dd2a106bc0d908fae88238bb4d2157c8c0708..1114628341af6f1ca8e4f07e6dadb2932b1b0b91 100644 GIT binary patch delta 8038 zcmYk>3w+P@9>?+T*u@yLjk#uX*@ZE43nTZrGYrw@GOU)E+$y*Jp%l60lH8Jr+(L7U zopMWbL{U^nqoR&lP8V{|dA;}hcs%?bkB{f~^Zk8qzwhtzU+28D&+p7$KVN>h|6<26 z&d<5Zm{-ENzbI#vQ>}CHQO=FUn)ni~#O7E%+PPXd7|Y_Tn1riQT~A>o{(=voUsdON zV-&{XIHca^mQ&CGADAbx0{JD>K=-f)maFF6C~R(S#vJm>)tyVjSFshI#{i6`Qv}9h z7$##NcEun}!(zSHVhF~93iK?7!DIA-evPC|d2ZoY!t9XAI9a4BknRj77bur$7pGw=}V z$~(t8R|zvv3w{m*@g?->N@v@N73KyEpnewyVjim9A=Ct?Q473i7N91&iZwAX&byE# z)HrQ15Idn3+yiwX1LN3#4LF<%4KT@0%t1}K6t&_FsE2767RS#p2){-Rbiph@O>hG> zVPL#-Ww0b_oNB0NsxFqt4)N^2wq~$3n2cP6n~7S$Hf)0XF$iy3y&spUiNa6|h{9k@ zFdLaIQ4@DUExfPgnW*t|e0Jh_tVqR7)P!qM58ZdDi3`lDR)5DV!8=%t^A#}|tD|o*s*WouC@+l2Za>_ZLwHEMt#EdRsu+o=A<6TF2+ zqb7()y#@8KIHq9Xy+@5R5P5@rZX^Y*bUv!%V)ISZ!?PZ>ur1~e)Ryi;4R{nw;2G4F z|A4xHtElgYe{FBvDyaH6)PfshNxlEwC}>6Lr~!ssgUP6^Ux1ou8ESxc%{{1oM^XLG zq84%)bwStc{4Lal1lRF)Bovib$3VURH7RJKBsKMfKJ!&D_Q0;eGo`+i40Urfj$qB1Chg#WX%Ws$g^}MG!9M!%y zYQSXF>(v@HaaUCTUZ@?+M70}ImwSXZw5_3@FokQ)+9Z&9m1FvH#GZHmn71UPOHJc(I4A&Ml z(c>77Ij9|(iW+zx#^D>7fcsGkEI{3&+o*+nc>dN0j_1j|gyHE=_jQSBfjoO)Cuo&~ZzbWY6+`~llZ^UmlHZY$@ z{c0UUeUiV&GWZYbmP9=4-TNx2h1WnWAOUqj4N(hdXZ2}j2Kv-6i-K03V<#q|uIxqB z1hY|BxCGVi9n_Azj}e%MvG}>2zmDqf-`Hyxf?7x<_P|&ih|e}=|9KAF87g#7g8Aty zi#1UlTB3F$6*bW^)B@f^Eo`6VM=U>W=A*{BZ0GNx-j0x_-onDM8+pa1?0|V^R|2z{TZol$6K3I2jKRd#{BmJ$)I<0jYOCj%Yp@3S2N;L>I2Hrj zcuq90AUou9L)vnmX|Nl$6W37#-$lLO;qAODjxlSS4a{WJmbW&$o9U?j*_Ka2Ju|PM zzApk1^ujku;ovn#vNt# zQ&120i^`ebEwYN`IGKDCYD?qWdtba3s4L7wJsUZek2j~8^DvO}D^LqxWA$553)qW+ zc+@?C-YqPtVZf2X~Q4iZR%a>yy`MZ{H?ZEzP zWqDTdsWmujdA|88YM>jag@$$X7Mg@X;`#kd)79&67qo9W8 zQ4{`T`Av)_*XK_it70%Fq8^?msEInF`u9b(8-QBSa8&ylRzKfdX>LT#=i5y|EBq8S z&?!6d4Qjvw)I>K?KO#Y0ya^&v?dzkiq^a2k1IWAB`JQG!)Odr;5uQFbfr2KOVJ}}K)>_m0^$m)+rFZ=%Kt?CLG73~Hw;p~g!w*j-qz-3~B-S7=l+Y5^r05csI`L{jWwrE3A*Y;uO@=o{H+2 zZH`9`JPnKEEYyM*qx!Efx0(mB8uedcJl?RpD!+Idw;eW8$DS0b;xJT)8K{M9KuwTq z`Cil)@bJR0@CctCv*1+kZ=GH?kv5naoHA64dlv(B&)W|+_hSkqOeSwx){Wh!L zjU}l+jGFgUDtAr;T(Jh%PG)d7m2#^>Xx_k zQP5U(#aJ9-`ApP8R-rnsL*0U0)D;{-UGbNwg`YDEuow9qjKWkB^&f>AZ!&5Jr(5ou zLm`}sMW}}B%^j$f9zb>c&gw6ke^~uL7{~d5G|xJy1@=KLY$!(KSk(B7PzzY?o%gv- z6g0s;^C0TIIEHHYC2F92JAVZ=&^5CNe}8BvLQxZ!Gh;BEyaB3xd(=E>=3}V;<;rDJ z;0MCZM1Hf~Dby_~-^Y7_6H$2w)ItWJ1{#T)cpPei$*2iunk%e+E9ye>EI(qN#^U;N zT%e!(>?i$nPH)DTGp?=jlIInQtaN&@hKO z?QlgOl_Q7)BniYYLI;1P79LIc_a-rz7-j?fi?WW2L=UU`f$}AyJ^5hbE@d52l>NP; zt3$c8m0MDNjPS+sj~Wb&RF4UaRkjhLm?=D)A|C|KKrjhlzol*Rh&-g0ers zLtc11YtF|kq8@RbI7+M|yrY>%IvvMToMqKt<2K?=;z`ckKQ36|V=T6CbcG1t&y?EG zVjylHz9HTsW)sg4PjOB!Z}|sCi6gH|J{GSMr-(u1^>H$x<9(tvb$=p%6S=C^|2N7J zl(UGD+P`H~tRQsgQSHPDy*q^m{fM`lyN%xPBMd3^MKh#l)KS3S(lwH>IGff%C{=$FxdYG@9V{EW~_^{Q9)(@2HTbt!pr~mqn zr(A)EC2CmxeJXSQ7ZTqg{uxQ^wljaDA1C`+9*w2QqlxpB&sx3cLtQCcV0E?0zolFp z?_nq6hMj9~euR%$If?lTiwCVDn2tKO64Qx5@_qOahGQ-4Xl;69D6zcel zXhPj-d|4G7dp+FKn9aFv#CpyDFoi8tzDUd=nv-|NE5tQI#~9*EB93!G#8ApDa0lub zO*t7S5L1akL?!CNiRUTbKNeGHOI;McN}TYn-~01*I~A3Qe-k=-5SheqB^+sVtVRS7 zqlh%G+Pz?wqfW>79_}1gAzBd)h<}KpL?dDb5kdG?@{f*RiT@G-#1TSARpL0&LWv!X z&64IGjJJtvQ;s1@l6SyIt^Og(?+`jB65R?*e0OyJQ>{@3l^@!P=ddfG|2z2p(cj8n zSVawTef>J%=T^50{~`uh+o9$i>V{J;Li8evTKzHI|C*faL+E(h!__s#6yg!EqOZ-SQR8E_+MA!puv#H-jG@$Nx)X|G*OZ-9Tzs}qMLPr>}k$9KTbJ3e9twC`T xQJok<=*S~Fb1sAUit>}hd$}o5(*tt9s4=x@?!fr0%DJDn8(K8CRmZHd{|D6yE0F*I delta 8093 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\n" "Language-Team: Mouse Reeve \n" @@ -32,6 +32,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 +61,44 @@ 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 "" +"\n" +" (%(review_count)s review)\n" +" " +msgid_plural "" +"\n" +" (%(review_count)s reviews)\n" +" " +msgstr[0] "" + +#: bookwyrm/templates/book.html:110 msgid "Add Description" msgstr "添加描述" -#: bookwyrm/templates/book.html:105 bookwyrm/templates/edit_book.html:39 +#: bookwyrm/templates/book.html:117 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:121 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 +109,7 @@ msgstr "描述:" msgid "Save" msgstr "保存" -#: bookwyrm/templates/book.html:110 bookwyrm/templates/book.html:159 +#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171 #: 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 +120,75 @@ msgstr "保存" msgid "Cancel" msgstr "取消" -#: bookwyrm/templates/book.html:142 +#: bookwyrm/templates/book.html:131 +#, fuzzy, python-format +#| msgid "%(title)s by " +msgid "%(count)s editions" +msgstr "%(title)s 来自" + +#: bookwyrm/templates/book.html:139 +#, 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:145 +#, 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:154 msgid "Your reading activity" msgstr "你的阅读活动" -#: bookwyrm/templates/book.html:144 +#: bookwyrm/templates/book.html:156 msgid "Add read dates" msgstr "添加阅读日期" -#: bookwyrm/templates/book.html:149 +#: bookwyrm/templates/book.html:161 msgid "You don't have any reading activity for this book." msgstr "你还没有任何这本书的阅读活动。" -#: bookwyrm/templates/book.html:156 +#: bookwyrm/templates/book.html:168 msgid "Create" msgstr "创建" -#: bookwyrm/templates/book.html:178 +#: bookwyrm/templates/book.html:190 msgid "Tags" msgstr "标签" -#: bookwyrm/templates/book.html:182 bookwyrm/templates/snippets/tag.html:18 +#: bookwyrm/templates/book.html:194 bookwyrm/templates/snippets/tag.html:18 msgid "Add tag" msgstr "添加标签" -#: bookwyrm/templates/book.html:199 +#: bookwyrm/templates/book.html:211 msgid "Subjects" msgstr "主题" -#: bookwyrm/templates/book.html:210 +#: bookwyrm/templates/book.html:222 msgid "Places" msgstr "地点" -#: bookwyrm/templates/book.html:221 bookwyrm/templates/layout.html:64 +#: bookwyrm/templates/book.html:233 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:262 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 "关闭" @@ -375,7 +427,27 @@ 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" @@ -664,8 +736,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 +792,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 "最近的列表" @@ -1562,10 +1642,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 +1691,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 @@ -1765,3 +1843,6 @@ msgstr[0] "%(counter)s 个关注者" #, python-format msgid "%(counter)s following" msgstr "关注着 %(counter)s 人" + +#~ msgid "Added by" +#~ msgstr "添加来自" From 549d8768a6786b9bff67674ca308038523277de8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Mar 2021 10:46:08 -0800 Subject: [PATCH 8/9] Combine a couple very similar translation strings plus a whitespace fix --- bookwyrm/templates/book.html | 6 +- .../templates/user/create_shelf_form.html | 4 +- bookwyrm/templates/user/edit_shelf_form.html | 1 - bookwyrm/templates/user/lists.html | 2 +- locale/en_US/LC_MESSAGES/django.po | 62 ++++++--------- locale/fr_FR/LC_MESSAGES/django.mo | Bin 20692 -> 20629 bytes locale/fr_FR/LC_MESSAGES/django.po | 74 +++++++++--------- locale/zh_CN/LC_MESSAGES/django.mo | Bin 23894 -> 23803 bytes locale/zh_CN/LC_MESSAGES/django.po | 70 ++++++++--------- 9 files changed, 100 insertions(+), 119 deletions(-) diff --git a/bookwyrm/templates/book.html b/bookwyrm/templates/book.html index aabfb37b..d80daca2 100644 --- a/bookwyrm/templates/book.html +++ b/bookwyrm/templates/book.html @@ -97,11 +97,7 @@

      {% include 'snippets/stars.html' with rating=rating %} - {% blocktrans count counter=review_count %} - ({{ review_count }} review) - {% plural %} - ({{ review_count }} reviews) - {% endblocktrans %} + {% blocktrans count counter=review_count %}({{ review_count }} review){% plural %}({{ review_count }} reviews){% endblocktrans %}

      {% include 'snippets/trimmed_text.html' with full=book|book_description %} diff --git a/bookwyrm/templates/user/create_shelf_form.html b/bookwyrm/templates/user/create_shelf_form.html index 785c8d06..b7ea27de 100644 --- a/bookwyrm/templates/user/create_shelf_form.html +++ b/bookwyrm/templates/user/create_shelf_form.html @@ -2,7 +2,7 @@ {% load i18n %} {% block header %} -{% trans "Create New Shelf" %} +{% trans "Create Shelf" %} {% endblock %} {% block form %} @@ -19,7 +19,7 @@ {% include 'snippets/privacy_select.html' %}
      - +
    diff --git a/bookwyrm/templates/user/edit_shelf_form.html b/bookwyrm/templates/user/edit_shelf_form.html index a9f86da4..753d0681 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 8e47041f..85c7cc8c 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/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 486494b0..8aae6c92 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-02 18:33+0000\n" +"POT-Creation-Date: 2021-03-02 18:44+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -77,27 +77,21 @@ msgstr "" #: bookwyrm/templates/book.html:100 #, python-format -msgid "" -"\n" -" (%(review_count)s review)\n" -" " -msgid_plural "" -"\n" -" (%(review_count)s reviews)\n" -" " +msgid "(%(review_count)s review)" +msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book.html:110 +#: bookwyrm/templates/book.html:106 msgid "Add Description" msgstr "" -#: bookwyrm/templates/book.html:117 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:121 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 @@ -108,7 +102,7 @@ msgstr "" msgid "Save" msgstr "" -#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171 +#: 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 @@ -119,63 +113,63 @@ msgstr "" msgid "Cancel" msgstr "" -#: bookwyrm/templates/book.html:131 +#: bookwyrm/templates/book.html:127 #, python-format msgid "%(count)s editions" msgstr "" -#: bookwyrm/templates/book.html:139 +#: bookwyrm/templates/book.html:135 #, python-format msgid "This edition is on your %(shelf_name)s shelf." msgstr "" -#: bookwyrm/templates/book.html:145 +#: 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:154 +#: bookwyrm/templates/book.html:150 msgid "Your reading activity" msgstr "" -#: bookwyrm/templates/book.html:156 +#: bookwyrm/templates/book.html:152 msgid "Add read dates" msgstr "" -#: bookwyrm/templates/book.html:161 +#: bookwyrm/templates/book.html:157 msgid "You don't have any reading activity for this book." msgstr "" -#: bookwyrm/templates/book.html:168 +#: bookwyrm/templates/book.html:164 msgid "Create" msgstr "" -#: bookwyrm/templates/book.html:190 +#: bookwyrm/templates/book.html:186 msgid "Tags" msgstr "" -#: bookwyrm/templates/book.html:194 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:211 +#: bookwyrm/templates/book.html:207 msgid "Subjects" msgstr "" -#: bookwyrm/templates/book.html:222 +#: bookwyrm/templates/book.html:218 msgid "Places" msgstr "" -#: bookwyrm/templates/book.html:233 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:262 +#: bookwyrm/templates/book.html:258 msgid "rated it" msgstr "" @@ -1667,12 +1661,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 @@ -1711,11 +1701,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 "" @@ -1728,6 +1714,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 9f8cca0a8c197b367ab948e30475b8a861aa1fc9..a8d8ff0d4ff95439cf2ae37ec5b802c5110f58c8 100644 GIT binary patch delta 6960 zcmZA530PHS9>?)Rg0cw;2`B=WMFdeq1(#enXW;RaLWG*dg7S;E6&);X}ne#mV`+48@yyxA|y*$)Z2CS$I za6gXa|*e%p?sz{HyR;7;Pi>C~eu?d!74$i<>+<-Co1}0z)-hkg@Iu_EX zo-4(s_%Q0Zwb;{fT<2vHK@?oV##o2-F_P9AUbXJ;$06ou zj3$2$hG?g z*ob@~K7ylA6FiA5j&lLS>ECIX{#4LKH0S5$}nQ1ynG#i$0yqdJ&@ zIzDBni7dr9d>S?Lmr>q;dMW}(@Z23D- zD>xN9<2=+}??SbI&^&DApC-Frg|8{lA-ja?$Vu^5Bowvh&C!R+sCoscEf|D4-D6NQ zpN1O1eaJa>%2DlYL=9w{<@Z?rpi4px97B!pEUJTxs8jnpYKGCNwj!v8S|hiduBZW) zpq{(koQT@t{k<(?vo_6#LuG6z&6wj-bB5xM^Fu)vGSi#4+f=q1BpgG zmx7u|E@~nJQT2wS+8b+5K~3O6d>7*%`l*aci19O?X@zypeEGcFZ(}?gdQwLJviB%i$UbeQ8TH)KztfC<8`RlYbUCM z{m3ir9K|;HljT!6;W`5asOO4MZ$Swr(!VpuDy&9zv>r8(D$K^+7=+)U2Ji#wb-IjN zfyOPp!P+2=sy7{7H8_WaI&{s&s3lsBn%O$k9#$cfa`s^Z ztToS}>R&>2Wi1Bd6=YYOdRYt}v-r?}ZbEH^JD!9(o`q`QNxQKYwRBrh4ZVcw zc(>&bpx*bxsOM@?OMVVD!#dP+p{>30XjI3^sNa+v4Ac8xNJ14ypq6|LX5(!*5SN;Ggxp5Amz9O$+8ph=E{f%9*2*;xawgc5cwdHG26F7m|g43vhoy91;h&p^BdEQy@ z<+1*pLZ>YSdJDRu-tW=q!%3))9=Gz9m`VP5)C@mHb=0h*_gorkLLE_CHU>4I38;aT zViTNY`Nb}YMieYZE%^qk@B*$PzYn9axRcj#DQYImQ4KzavA7l0@P5<;PN43eL$!Yi zuf<^gEYgG%Py=@}N$>}*(*ddD3_~q>Icf%5P&0T9)xlm=gGbF;^D?S~kS^YjQzELP zPNq4$4=RhW<3^CcLI&!fKC_M!fiI*pMSa2A71nPkqzIP!~7Gkg{`!)>UU z?Lu{Q2z6*rq0UfvH*bZSU^4ku7^e5Xh=gW53e$0lZs1B(N9$4Vb2X~oyH@@sYJk6> z&QAUAUc=$2nP;Q6wkK*pCDD#`v3mlNJ1TMM~!qhYR~su{t#+rpI}q`7S%ye z4{w06W)AA~4?wju8MV~2u{l@)WEAzEAkfV8}uM*i;kk&`2sb-3;C|s&=m@_L~%X6JYp$2*xwe%tVz2{O;hqetiz`+=dH=@p5 z3A$REMI_Y08VtrNRE1rbhqb7;BVmBIggL0gRES!!>8R)L$NIR;dW@D1voJ&Vkt)t! z49AG;y@AG?>8LZ+4kNG#wN>tD62T4W{(wU2m`$mF5>u@Rx`B=J3wMEOmafx<9pw7%AL{GwhQT{lI<3vl+bG=gM2!2R(d65WP2&Hr(-dS7KNIf}w-W7W zL+?%vHM&c`C8gcbnWQhhmn@>6zTU$GKlFzaG^D#Mqp>HM8feIhv^~6--RpMX7 z9O6qt*D>N9f9k&{O3WiB6YZ%m0S^?+TW>?I{*v8EMbD3StW~L3>3|nH1O0A?tT5cOPmz2w|i{fOZ%o1_5 zoE#L97SXA5kR+E}QmrFQPEyAu6>{jj-v8g%>G3$fhtL1{{eFMH@Adcn{`Y^VuJJis z0cMq({S;9iWuZ*eI4(pWqe zqw3AVmbegAZyn|tzjK?7Cj14dogR!Tz0QKBpRJ~$sj3w6b z7*2i~hF~Q&!6g_+|7JCbbP7I2HFO=-P(T}Fnqdg4+=G6YU`@eB}@Tw_wTXy??*LUfg0FT)_JH7sxT2> zM@?WqYJl~qeomtXdJY}U;2H@v80>KyXoV{8gc?W|>Kzv#+rtb;bvzpN+(heiRKs&n z9aW>Y(Na`98!!q#K&`+R9@bwsE>aMWyby209Z@ThifXVIs-r=ucYn8a6smqXYG9Aq z{L`rV3or{`L%s8_Q3F3?{VC3IZ~SH-2yW|cwkT9bai}FtM!owS^k5&0!Wko|4epxXNwHIM@~f84PJXHX4XL5(o9o!dbqYWI3jGt5Bmil7=Agj6xZ zQ3G^P1DkDq4)yL|LJe%Gbp>kWoHZoW;3m`(e}tOx0n`jmqR#C_RKp?d-SP-jy?E3> zGEnvUq9$?&Y9ixN&rL$L_k{IDq@H7HNT}j^)Bv`jAMQgndZZn_ZE4BMhMTPmu(LhCRL()l0jO>mr0yLCFM;tSSg=udtPY9{N^4?jQ+d^_rx zeU9qjG;+kvB}~BxcDC~Qs68+WRj(YQ>EAf^fmiGUTTmVCKn>&|cE)4qk4-wd189yq zPAyR@kdE4nxfp+LWRvgiW=A~)J*2t z{9@F=R@!{6bsK8a?ngcUJ*vG+s8e(u)o*a3J^!JJZbNNQOPPYI&>c0PJew~-y~}~9 z8IH$ToQYccWvC9;p_ceP>t57APoP%pJZeIh9TMu$KZ#jmQ&fWv2H|p4g;mz|sE#&c zFn(e^g!&#hihAB8yPGly)lM{a#P-NPGmsAr$eBh$?_v(B<3*?jHretIQ7f?@)zA@C z$H#2`d(?UV2~{tsle^?$s2R3F)l0VJ8K{o?Ab(RFb1R8P6pTSVI2pC%GqE#1i34zh z^*^W|5dBizuh#oe$94ub#1~QTb}4G$uc6vqjhg7&r~z#Amh=7(*azyYC$TXP{Alx6 zP!0Psnh*>@tw1#D9e2QZ?2f880<{w5sOP4jI(Bdf&c_lwj_LGodZoHcUx8Z61*i(E zP&40*YPdm~JCHDIH0t?y)ctJK%=@DTFc>x9Vtc<7wGtIJKOG${iaTE%_SM4ECdDP>1T^1ggPHsCq%&-F&Ko4VaL;`^)G5hBwuu>nn(1uR z%2c8TxE%GBy&kn9`>iLi8U34!BqF#G(9^9LgZj;uhP`nRs^WaqO4OhR`lfX&YKFT} zGdzi!;W^aAuAl}KlI?C@4{9$JVsoAUp(NsPEUJNds2MN9czny2A3=3gk2=>^QO^bE zxaD!E0ro)cp#oI9g{TRXV+=Z|0WCwP6N&XCv~)*N12|>9fEwvF)VmMJb@L&pnMGhr zOhR>#j~d{e)`_T7Fc;O%I@C&U!q&Jim-W{SexM*48}xFIUo2`My-*`9L_Jr6ZEz~; z-BzPE<4TOd_fda4>QL<+Lk;{YYDIkW+;7St)GKO{=eP~UQlJs0p&IIr>bMw_a2%?m zYSawgz*yXddKLB93eTek)`*Rx6>5!I*)-J3WTE=G)#iseB(y}6P!$%VUddX_!aC&d zgbDBCu1Fu$%!)7$$6*Rq+WT8j1KNoi$YIRKQ>c!U`nm(^ipk`io+Px?qfzH|5^8DY zq8eC$9$bN1fgPw7s6#F31=I{Lp;q8`)WBNNtM`u*YUce>@BDt$fF0!3IA*PzFz=uS zvK4i%Kem2h?|+Bt=qze4{EC`UlLFUB)POwbhwC6Lg&APgl0Mg zb*`U5Eqyg=CH7grL_Jq;^A}MAxn^x~Gy8^o3Tj}ZQ4@N|=4W6U`KM6>c^BK!zu9FA zenf4$>!@SZw4eKpmyBB4BGmaFi+UB4Q3HM!r{H4jh@rQ*1I!xSOyQ>Yb&cHc<|?#R1qJ%TcFb0jmBwY>3-Y?|vV$JmI4_#&~75s2;)%=r=fOlPt+3Lgs6BHPHSlm}ko%J;0aalbs^f9i$rwU@7P3gD5~tx2%*4S(?s1xf9`d!A zp!>)p=67t2g9f`38D=d-t%UOsi6$iGq2ARJ)H|=SjWx=#RhI z`}&Ei%@u5IimKld^?V0Z`?;8?^WTreT@*Zwn)z<@!Bjq;LuDpIClzwN;^O@;H8tGC zmLDK}$=>?}^>^YX?sX)hiER7aUnu`Kp%bJ2y`#F{oB88o8_7jP5|w6Qn7wrzFA^Tg zHRyKuGwNFIVghVOIvEk9IW#8Jmg$lI=!2`XKIq^4gZPTLO0?#|4fqqGi+y4)5NDL( zYGxbK68_m+;(mM&V{N`Gw&c0zkpp1n5WNXqK9tYLe-a6#`_EJ<*CFCF;%VYFq5)A# zBokpgsA~c7I&qnJl=wSwjnMT)RY*jnv%<}I|2Nqtz4W1lk)$3bs)#;>cHL@XJMsV5 zDGCyZ--tcL2qK*}bat*2El77J+7spEW3b-cnC^M{fWmpik*eB=*n7Kky8{tSiLRqA z-p{^#`Vzkq{zN>XOWz;5id@WajHHcNLf5@SHgR`Vm&kDEcT)Q1(WPUQO6dIExO$MN zA<77y#|*-cmh?TJMdG;{D9wp+ZuDwxJoM`w`=aTM1py5`QJWBPJ0yu1cE-qHZ4PU`(;?JV-vx-k*(a zeH?zMlgQwK!#ISfAl@UsC8iT630=9wPH*auk1o_}M5NgcbZ0cNlxRv>48B0LASM#J z*0^~8($vxa|E>m9h$p_Jq&v}r^w;<@(TcP`v4r$T#17&Fv5-h4z9D`jLW!Y7IM3>8 zgXy@N*hHwmbwnoRdzIhJM=zq5c$IjPc!=oA17q+Yk#8F#X;$fjYpsj-GlkEoM2RgM zg^v*)n=imOiSf#N9-TO)!jnDHGp3^S!JLh$(Fgp3i%K8y+&-qX?7@wfV=qUAmwF~l boHDhvtgO_tef8v#qqncB*mx>yedK=u4&uDv diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index f0a25f6b..76b70615 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 18:33+0000\n" +"POT-Creation-Date: 2021-03-02 18:44+0000\n" "PO-Revision-Date: 2021-03-02 12:37+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -79,29 +79,23 @@ msgstr "Voir sur OpenLibrary" #: bookwyrm/templates/book.html:100 #, python-format -msgid "" -"\n" -" (%(review_count)s review)\n" -" " -msgid_plural "" -"\n" -" (%(review_count)s reviews)\n" -" " +msgid "(%(review_count)s review)" +msgid_plural "(%(review_count)s reviews)" msgstr[0] "" msgstr[1] "" -#: bookwyrm/templates/book.html:110 +#: bookwyrm/templates/book.html:106 #, fuzzy #| msgid "Description:" msgid "Add Description" msgstr "Ajouter une description" -#: bookwyrm/templates/book.html:117 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:121 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 @@ -112,7 +106,7 @@ msgstr "Description :" msgid "Save" msgstr "Enregistrer" -#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171 +#: 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 @@ -123,19 +117,19 @@ msgstr "Enregistrer" msgid "Cancel" msgstr "Annuler" -#: bookwyrm/templates/book.html:131 +#: 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:139 +#: 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:145 +#: bookwyrm/templates/book.html:141 #, fuzzy, python-format #| msgid "" #| "replied to your %(book_title)s à votre " "liste « %(list_name)s »" -#: bookwyrm/templates/book.html:154 +#: bookwyrm/templates/book.html:150 msgid "Your reading activity" msgstr "Votre activité de lecture" -#: bookwyrm/templates/book.html:156 +#: bookwyrm/templates/book.html:152 #, fuzzy #| msgid "Edit read dates" msgid "Add read dates" msgstr "Ajouter des dates de lecture" -#: bookwyrm/templates/book.html:161 +#: 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:168 +#: bookwyrm/templates/book.html:164 msgid "Create" msgstr "Créer" -#: bookwyrm/templates/book.html:190 +#: bookwyrm/templates/book.html:186 msgid "Tags" msgstr "Tags" -#: bookwyrm/templates/book.html:194 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:211 +#: bookwyrm/templates/book.html:207 msgid "Subjects" msgstr "Sujets" -#: bookwyrm/templates/book.html:222 +#: bookwyrm/templates/book.html:218 msgid "Places" msgstr "Lieux" -#: bookwyrm/templates/book.html:233 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:262 +#: bookwyrm/templates/book.html:258 msgid "rated it" msgstr "l’a noté" @@ -1795,12 +1789,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 @@ -1844,13 +1836,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" @@ -1866,6 +1852,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" @@ -1938,6 +1928,14 @@ 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" diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index 1114628341af6f1ca8e4f07e6dadb2932b1b0b91..dbdd1daa82d0c6bbb300cab32443cddfb7fdd201 100644 GIT binary patch delta 7934 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 diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index fc53bf05..1feaad2e 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 18:33+0000\n" +"POT-Creation-Date: 2021-03-02 18:44+0000\n" "PO-Revision-Date: 2021-03-02 10:35+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -79,26 +79,20 @@ msgstr "在 OpenLibrary 查看" #: bookwyrm/templates/book.html:100 #, python-format -msgid "" -"\n" -" (%(review_count)s review)\n" -" " -msgid_plural "" -"\n" -" (%(review_count)s reviews)\n" -" " +msgid "(%(review_count)s review)" +msgid_plural "(%(review_count)s reviews)" msgstr[0] "" -#: bookwyrm/templates/book.html:110 +#: bookwyrm/templates/book.html:106 msgid "Add Description" msgstr "添加描述" -#: bookwyrm/templates/book.html:117 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:121 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 @@ -109,7 +103,7 @@ msgstr "描述:" msgid "Save" msgstr "保存" -#: bookwyrm/templates/book.html:122 bookwyrm/templates/book.html:171 +#: 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 @@ -120,19 +114,19 @@ msgstr "保存" msgid "Cancel" msgstr "取消" -#: bookwyrm/templates/book.html:131 +#: bookwyrm/templates/book.html:127 #, fuzzy, python-format #| msgid "%(title)s by " msgid "%(count)s editions" msgstr "%(title)s 来自" -#: bookwyrm/templates/book.html:139 +#: 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:145 +#: bookwyrm/templates/book.html:141 #, fuzzy, python-format #| msgid "" #| " added %(book_title)s to your list " @@ -144,46 +138,46 @@ msgstr "" " 添加了 %(book_title)s 到你的列表 " "\"%(list_name)s\"" -#: bookwyrm/templates/book.html:154 +#: bookwyrm/templates/book.html:150 msgid "Your reading activity" msgstr "你的阅读活动" -#: bookwyrm/templates/book.html:156 +#: bookwyrm/templates/book.html:152 msgid "Add read dates" msgstr "添加阅读日期" -#: bookwyrm/templates/book.html:161 +#: bookwyrm/templates/book.html:157 msgid "You don't have any reading activity for this book." msgstr "你还没有任何这本书的阅读活动。" -#: bookwyrm/templates/book.html:168 +#: bookwyrm/templates/book.html:164 msgid "Create" msgstr "创建" -#: bookwyrm/templates/book.html:190 +#: bookwyrm/templates/book.html:186 msgid "Tags" msgstr "标签" -#: bookwyrm/templates/book.html:194 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:211 +#: bookwyrm/templates/book.html:207 msgid "Subjects" msgstr "主题" -#: bookwyrm/templates/book.html:222 +#: bookwyrm/templates/book.html:218 msgid "Places" msgstr "地点" -#: bookwyrm/templates/book.html:233 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:262 +#: bookwyrm/templates/book.html:258 msgid "rated it" msgstr "评价了" @@ -1715,12 +1709,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 @@ -1759,11 +1751,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 "创建列表" @@ -1776,6 +1764,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 "编辑书架" @@ -1844,5 +1836,11 @@ msgstr[0] "%(counter)s 个关注者" msgid "%(counter)s following" msgstr "关注着 %(counter)s 人" +#~ msgid "Create New Shelf" +#~ msgstr "新建书架" + +#~ msgid "Create new list" +#~ msgstr "新建列表" + #~ msgid "Added by" #~ msgstr "添加来自" From 821862a8919e11c9e9e410cce4997367397f3882 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 2 Mar 2021 11:51:49 -0800 Subject: [PATCH 9/9] Updates bw-dev makemessages default flags --- bw-dev | 2 +- locale/en_US/LC_MESSAGES/django.po | 156 ++++++++-------- locale/fr_FR/LC_MESSAGES/django.po | 281 ++++++++++++----------------- locale/zh_CN/LC_MESSAGES/django.po | 238 +++++++++++------------- 4 files changed, 310 insertions(+), 367 deletions(-) diff --git a/bw-dev b/bw-dev index 7a003d01..b411751d 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.po b/locale/en_US/LC_MESSAGES/django.po index 8aae6c92..25d38437 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-02 18:44+0000\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" @@ -125,9 +180,7 @@ msgstr "" #: bookwyrm/templates/book.html:141 #, python-format -msgid "" -"A different edition of this book is on your %(shelf_name)s shelf." +msgid "A different edition of this book is on your %(shelf_name)s shelf." msgstr "" #: bookwyrm/templates/book.html:150 @@ -379,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 "" @@ -396,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 @@ -409,8 +461,7 @@ 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:23 @@ -451,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 @@ -644,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 @@ -815,23 +862,17 @@ msgstr "" #: bookwyrm/templates/notifications.html:49 #, python-format -msgid "" -"favorited your review of %(book_title)s" +msgid "favorited your review of %(book_title)s" msgstr "" #: bookwyrm/templates/notifications.html:51 #, python-format -msgid "" -"favorited your comment on %(book_title)s" +msgid "favorited your comment on %(book_title)s" msgstr "" #: bookwyrm/templates/notifications.html:53 #, python-format -msgid "" -"favorited your quote from %(book_title)s" +msgid "favorited your quote from %(book_title)s" msgstr "" #: bookwyrm/templates/notifications.html:55 @@ -841,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 @@ -867,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 @@ -903,23 +930,17 @@ msgstr "" #: bookwyrm/templates/notifications.html:90 #, python-format -msgid "" -"boosted your review of %(book.title)s" +msgid "boosted your review of %(book.title)s" msgstr "" #: bookwyrm/templates/notifications.html:92 #, python-format -msgid "" -"boosted your comment on%(book.title)s" +msgid "boosted your comment on%(book.title)s" msgstr "" #: bookwyrm/templates/notifications.html:94 #, python-format -msgid "" -"boosted your quote from %(book.title)s" +msgid "boosted your quote from %(book.title)s" msgstr "" #: bookwyrm/templates/notifications.html:96 @@ -929,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 @@ -1299,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 @@ -1354,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 @@ -1393,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 diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 76b70615..263de6d1 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 18:44+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" @@ -131,15 +190,9 @@ 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 »" +#| 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" @@ -399,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é" @@ -416,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 @@ -432,8 +483,7 @@ 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:23 @@ -480,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 @@ -683,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 @@ -859,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" -msgstr "" -"a ajouté votre critique de %(book_title)s à 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" -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" -msgstr "" -"a ajouté votre citation de %(book_title)s à 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 @@ -895,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 @@ -930,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" @@ -987,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" -msgstr "" -"a partagé votre critique de %(book_title)s" +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" -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" -msgstr "" -"a partagé votre citation de %(book_title)s" +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 @@ -1022,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!" @@ -1072,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 @@ -1413,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 @@ -1468,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:" @@ -1509,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." +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" diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 1feaad2e..0f51c6c3 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 18:44+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" @@ -128,15 +187,9 @@ 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\"" +#| 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" @@ -387,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 "跨站" @@ -404,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 @@ -417,8 +469,7 @@ 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:23 @@ -463,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 @@ -656,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 @@ -831,27 +876,18 @@ msgstr "删除通知" #: bookwyrm/templates/notifications.html:49 #, python-format -msgid "" -"favorited your review of %(book_title)s" -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" -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" -msgstr "" -"喜欢了你 来自 %(book_title)s 的引用" +msgid "favorited your quote from %(book_title)s" +msgstr "喜欢了你 来自 %(book_title)s 的引用" #: bookwyrm/templates/notifications.html:55 #, python-format @@ -860,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 @@ -892,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" @@ -936,27 +944,18 @@ msgstr "向你发送了关注请求" #: bookwyrm/templates/notifications.html:90 #, python-format -msgid "" -"boosted your review of %(book.title)s" -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" -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" -msgstr "" -"转发了你的 对 %(book.title)s 的引用" +msgid "boosted your quote from %(book.title)s" +msgstr "转发了你的 对 %(book.title)s 的引用" #: bookwyrm/templates/notifications.html:96 #, python-format @@ -965,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 @@ -1340,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 @@ -1394,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:" @@ -1435,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 本。" +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"