Merge branch 'main' into production

bookwyrm/templates/user_menu.html

@@ -21,7 +21,7 @@
             role="menu"
         >
             <li role="menuitem">
-                <a href="{% url 'user-feed' user|username %}" class="navbar-item">
+                <a href="{% url 'user-feed' request.user.localname %}" class="navbar-item">
                     {% trans "Profile" %}
                 </a>
             </li>

locale/en_US/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-26 14:35+0000\n"
+"POT-Creation-Date: 2022-04-29 22:43+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"

locale/es_ES/LC_MESSAGES/django.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-08 21:00+0000\n"
-"PO-Revision-Date: 2022-04-26 11:37\n"
+"PO-Revision-Date: 2022-04-26 17:25\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Spanish\n"
 "Language: es\n"
@@ -1381,7 +1381,7 @@ msgstr "Unirse al directorio"
 #: bookwyrm/templates/directory/directory.html:24
 #, python-format
 msgid "You can opt-out at any time in your <a href=\"%(path)s\">profile settings.</a>"
-msgstr "Puedes optar por no en cualquier hora en tus <a href=\"%(path)s\">configuraciones de perfil.</a>"
+msgstr "Puedes negarte en cualquier momento desde <a href=\"%(path)s\">Configuración</a>."
 
 #: bookwyrm/templates/directory/directory.html:29
 #: bookwyrm/templates/directory/directory.html:31
@@ -2837,7 +2837,7 @@ msgstr "Seguir desde %(sitename)s"
 
 #: bookwyrm/templates/ostatus/subscribe.html:18
 msgid "Uh oh..."
-msgstr "Oh-oh..."
+msgstr "Oh, oh..."
 
 #: bookwyrm/templates/ostatus/subscribe.html:20
 msgid "Let's log in first..."
@@ -3790,13 +3790,13 @@ msgstr "Dominios de enlaces"
 
 #: bookwyrm/templates/settings/layout.html:78
 msgid "Instance Settings"
-msgstr "Configuración de instancia"
+msgstr "Configurar instancia"
 
 #: bookwyrm/templates/settings/layout.html:86
 #: bookwyrm/templates/settings/site.html:4
 #: bookwyrm/templates/settings/site.html:6
 msgid "Site Settings"
-msgstr "Configuración de sitio"
+msgstr "Configurar sitio"
 
 #: bookwyrm/templates/settings/layout.html:91
 #: bookwyrm/templates/settings/site.html:95

locale/zh_Hans/LC_MESSAGES/django.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: bookwyrm\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-04-08 21:00+0000\n"
-"PO-Revision-Date: 2022-04-10 05:48\n"
+"PO-Revision-Date: 2022-04-29 14:20\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh\n"
@@ -44,7 +44,7 @@ msgstr "不受限"
 
 #: bookwyrm/forms/forms.py:54
 msgid "Reading finish date cannot be before start date."
-msgstr "阅读完成日期不能早于开始日期。"
+msgstr "读完日期不得早于开始日期。"
 
 #: bookwyrm/forms/landing.py:32
 msgid "User with this username already exists"
@@ -1066,7 +1066,7 @@ msgstr "张三"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:210
 msgid "Add Another Author"
-msgstr "添加另一作者"
+msgstr "添加其他作者"
 
 #: bookwyrm/templates/book/edit/edit_book_form.html:220
 #: bookwyrm/templates/shelf/shelf.html:146
@@ -1118,7 +1118,7 @@ msgstr "<a href=\"%(work_path)s\">《%(work_title)s》</a> 的各版本"
 
 #: bookwyrm/templates/book/editions/editions.html:55
 msgid "Can't find the edition you're looking for?"
-msgstr "找不到你想找的版次？"
+msgstr "找不到对应的版本？"
 
 #: bookwyrm/templates/book/editions/editions.html:75
 msgid "Add another edition"
@@ -1859,7 +1859,7 @@ msgstr "删除该群组？"
 #: bookwyrm/templates/lists/delete_list_modal.html:7
 #: bookwyrm/templates/readthrough/delete_readthrough_modal.html:12
 msgid "This action cannot be un-done"
-msgstr "此操作无法被撤销"
+msgstr "此操作无法撤销"
 
 #: bookwyrm/templates/groups/delete_group_modal.html:17
 #: bookwyrm/templates/lists/delete_list_modal.html:19