Combine a couple very similar translation strings

plus a whitespace fix
This commit is contained in:
Mouse Reeve 2021-03-02 10:46:08 -08:00
parent 9f2e255f50
commit 549d8768a6
9 changed files with 100 additions and 119 deletions

View file

@ -97,11 +97,7 @@
<div class="block">
<h3 class="field is-grouped">
{% 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 %}
</h3>
{% include 'snippets/trimmed_text.html' with full=book|book_description %}

View file

@ -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' %}
</div>
<div class="control">
<button class="button is-primary" type="submit">{% trans "Create shelf" %}</button>
<button class="button is-primary" type="submit">{% trans "Create Shelf" %}</button>
</div>
</div>
</form>

View file

@ -29,4 +29,3 @@
</form>
{% endblock %}

View file

@ -14,7 +14,7 @@
</div>
{% if is_self %}
<div class="column is-narrow">
{% 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 %}
</div>
{% endif %}

View file

@ -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 <mousereeve@riseup.net>\n"
"Language-Team: English <LL@li.org>\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 "<a href=\"%(path)s/editions\">%(count)s editions</a>"
msgstr ""
#: bookwyrm/templates/book.html:139
#: bookwyrm/templates/book.html:135
#, python-format
msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
msgstr ""
#: bookwyrm/templates/book.html:145
#: bookwyrm/templates/book.html:141
#, python-format
msgid ""
"A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a "
"href=\"%(shelf_path)s\">%(shelf_name)s</a> 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 ""

Binary file not shown.

View file

@ -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 <contact@arkhi.org>\n"
"Language-Team: Mouse Reeve <LL@li.org>\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 <a href=\"%(work_path)s\">\"%(work_title)s\"</a>"
msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
msgstr "<a href=\"%(path)s\">%(title)s</a> par "
#: bookwyrm/templates/book.html:139
#: bookwyrm/templates/book.html:135
#, fuzzy, python-format
#| msgid "favorited your <a href=\"%(related_path)s\">%(preview_name)s</a>"
msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
msgstr "Messages directs avec <a href=\"%(path)s\">%(username)s</a>"
#: bookwyrm/templates/book.html:145
#: bookwyrm/templates/book.html:141
#, fuzzy, python-format
#| msgid ""
#| "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s"
@ -147,48 +141,48 @@ msgstr ""
" a ajouté <em><a href=\"%(book_path)s\">%(book_title)s</a></em> à votre "
"liste « <a href=\"%(list_path)s\">%(list_name)s</a> »"
#: 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 navez 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 "la 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 na pas dabonné(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"

Binary file not shown.

View file

@ -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 <gudzpoz@live.com>\n"
"Language-Team: Mouse Reeve <LL@li.org>\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 "<a href=\"%(path)s\">%(title)s</a> by "
msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
msgstr "<a href=\"%(path)s\">%(title)s</a> 来自"
#: bookwyrm/templates/book.html:139
#: bookwyrm/templates/book.html:135
#, fuzzy, python-format
#| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
msgstr "与 <a href=\"%(path)s\">%(username)s</a> 私信"
#: bookwyrm/templates/book.html:145
#: bookwyrm/templates/book.html:141
#, fuzzy, python-format
#| msgid ""
#| " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list "
@ -144,46 +138,46 @@ msgstr ""
" 添加了 <em><a href=\"%(book_path)s\">%(book_title)s</a></em> 到你的列表 "
"\"<a href=\"%(list_path)s\">%(list_name)s</a>\""
#: 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 "添加来自"