From 899f91a81107762883e99b27da63f3e68df9c197 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Mon, 16 Aug 2021 14:27:43 -0700 Subject: [PATCH] Adds locales --- locale/de_DE/LC_MESSAGES/django.po | 125 +++++++++++++------------- locale/en_US/LC_MESSAGES/django.po | 121 ++++++++++++------------- locale/es/LC_MESSAGES/django.po | 121 ++++++++++++------------- locale/fr_FR/LC_MESSAGES/django.po | 121 ++++++++++++------------- locale/zh_Hans/LC_MESSAGES/django.mo | Bin 45867 -> 45604 bytes locale/zh_Hans/LC_MESSAGES/django.po | 127 ++++++++++++++------------- locale/zh_Hant/LC_MESSAGES/django.po | 121 ++++++++++++------------- 7 files changed, 377 insertions(+), 359 deletions(-) diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index 6d6588843..00fbd0e8b 100644 --- a/locale/de_DE/LC_MESSAGES/django.po +++ b/locale/de_DE/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-13 02:21+0000\n" +"POT-Creation-Date: 2021-08-16 21:26+0000\n" "PO-Revision-Date: 2021-03-02 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,67 +18,67 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:232 +#: bookwyrm/forms.py:233 #, fuzzy #| msgid "A user with that username already exists." msgid "A user with this email already exists." msgstr "Dieser Benutzename ist bereits vergeben." -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:247 msgid "One Day" msgstr "Ein Tag" -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:248 msgid "One Week" msgstr "Eine Woche" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:249 msgid "One Month" msgstr "Ein Monat" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:250 msgid "Does Not Expire" msgstr "Läuft nicht aus" -#: bookwyrm/forms.py:254 +#: bookwyrm/forms.py:255 #, python-format msgid "%(count)d uses" msgstr "%(count)d Benutzungen" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:258 #, fuzzy #| msgid "Unlisted" msgid "Unlimited" msgstr "Ungelistet" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:308 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:309 #, fuzzy #| msgid "Title" msgid "Book Title" msgstr "Titel" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:310 #: bookwyrm/templates/snippets/create_status/review.html:25 #: bookwyrm/templates/user/shelf/shelf.html:85 #: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" msgstr "" -#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:315 +#: bookwyrm/forms.py:316 #, fuzzy #| msgid "Started reading" msgid "Ascending" msgstr "Zu lesen angefangen" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:317 #, fuzzy #| msgid "Started reading" msgid "Descending" @@ -308,9 +308,8 @@ msgstr "" #: bookwyrm/templates/settings/edit_server.html:68 #: bookwyrm/templates/settings/federated_server.html:98 #: bookwyrm/templates/settings/site.html:108 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/layout.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "Speichern" @@ -324,10 +323,7 @@ msgstr "Speichern" #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 #: bookwyrm/templates/snippets/goal_form.html:32 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43 msgid "Cancel" msgstr "Abbrechen" @@ -2709,24 +2705,24 @@ msgid "Some thoughts on the book" msgstr "" #: bookwyrm/templates/snippets/create_status/comment.html:26 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16 msgid "Progress:" msgstr "Fortschritt:" #: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30 msgid "pages" msgstr "Seiten" #: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31 msgid "percent" msgstr "Prozent" #: bookwyrm/templates/snippets/create_status/comment.html:41 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" msgstr "von %(pages)s Seiten" @@ -2757,6 +2753,7 @@ msgid "Include spoiler alert" msgstr "Spoileralarm aktivieren" #: bookwyrm/templates/snippets/create_status/layout.html:38 +#: bookwyrm/templates/snippets/reading_modals/form.html:7 #, fuzzy #| msgid "Comment" msgid "Comment:" @@ -2926,9 +2923,7 @@ msgid "Goal privacy:" msgstr "Sichtbarkeit des Ziels" #: bookwyrm/templates/snippets/goal_form.html:26 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/layout.html:13 msgid "Post to feed" msgstr "Posten" @@ -3005,21 +3000,47 @@ msgstr "Raten" msgid "Rate" msgstr "" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "\"%(book_title)s\" abschließen" + +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 #: bookwyrm/templates/snippets/readthrough_form.html:7 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "Zu lesen angefangen" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30 +#: bookwyrm/templates/snippets/readthrough_form.html:30 +msgid "Finished reading" +msgstr "Lesen abgeschlossen" + +#: bookwyrm/templates/snippets/reading_modals/form.html:8 +msgid "(Optional)" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 +#, fuzzy +#| msgid "Progress" +msgid "Update progress" +msgstr "Fortschritt" + +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "\"%(book_title)s\" beginnen" + +#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "\"%(book_title)s\" auf Leseliste setzen" + #: bookwyrm/templates/snippets/readthrough_form.html:14 msgid "Progress" msgstr "Fortschritt" -#: bookwyrm/templates/snippets/readthrough_form.html:30 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25 -msgid "Finished reading" -msgstr "Lesen abgeschlossen" - #: bookwyrm/templates/snippets/register_form.html:32 msgid "Sign Up" msgstr "Registrieren" @@ -3040,18 +3061,6 @@ msgstr "Buch importieren" msgid "Move book" msgstr "Deine Bücher" -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 -#, python-format -msgid "Finish \"%(book_title)s\"" -msgstr "\"%(book_title)s\" abschließen" - -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 -#, fuzzy -#| msgid "Progress" -msgid "Update progress" -msgstr "Fortschritt" - #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 msgid "More shelves" msgstr "Mehr Regale" @@ -3065,7 +3074,6 @@ msgid "Finish reading" msgstr "Lesen abschließen" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26 msgid "Want to read" msgstr "Auf Leseliste setzen" @@ -3075,16 +3083,6 @@ msgstr "Auf Leseliste setzen" msgid "Remove from %(name)s" msgstr "Listen: %(username)s" -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 -#, python-format -msgid "Start \"%(book_title)s\"" -msgstr "\"%(book_title)s\" beginnen" - -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 -#, python-format -msgid "Want to Read \"%(book_title)s\"" -msgstr "\"%(book_title)s\" auf Leseliste setzen" - #: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" @@ -3123,13 +3121,13 @@ msgstr "Direktnachrichten mit %(username)s" msgid "rated %(book)s:" msgstr "Direktnachrichten mit %(username)s" -#: bookwyrm/templates/snippets/status/headers/read.html:5 +#: bookwyrm/templates/snippets/status/headers/read.html:7 #, fuzzy, python-format #| msgid "Editions of \"%(work_title)s\"" msgid "finished reading %(book)s" msgstr "Editionen von \"%(work_title)s\"" -#: bookwyrm/templates/snippets/status/headers/reading.html:6 +#: bookwyrm/templates/snippets/status/headers/reading.html:7 #, fuzzy, python-format #| msgid "Direct Messages with %(username)s" msgid "started reading %(book)s" @@ -3141,7 +3139,7 @@ msgstr "Direktnachrichten mit %(username)s" msgid "reviewed %(book)s" msgstr "Direktnachrichten mit %(username)s" -#: bookwyrm/templates/snippets/status/headers/to_read.html:6 +#: bookwyrm/templates/snippets/status/headers/to_read.html:7 #, fuzzy, python-format #| msgid "replied to your status" msgid "%(username)s wants to read %(book)s" @@ -3485,6 +3483,11 @@ msgstr "Dieser Benutzename ist bereits vergeben." msgid "A password reset link sent to %s" msgstr "" +#: bookwyrm/views/rss_feed.py:34 +#, python-brace-format +msgid "Status updates from {obj.display_name}" +msgstr "" + #, fuzzy #~| msgid "Federated Servers" #~ msgid "Federated Timeline" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index ba475e53a..ac2acf350 100644 --- a/locale/en_US/LC_MESSAGES/django.po +++ b/locale/en_US/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-13 02:21+0000\n" +"POT-Creation-Date: 2021-08-16 21:26+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:232 +#: bookwyrm/forms.py:233 msgid "A user with this email already exists." msgstr "" -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:247 msgid "One Day" msgstr "" -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:248 msgid "One Week" msgstr "" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:249 msgid "One Month" msgstr "" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:250 msgid "Does Not Expire" msgstr "" -#: bookwyrm/forms.py:254 +#: bookwyrm/forms.py:255 #, python-format msgid "%(count)d uses" msgstr "" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:258 msgid "Unlimited" msgstr "" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:308 msgid "List Order" msgstr "" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:309 msgid "Book Title" msgstr "" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:310 #: bookwyrm/templates/snippets/create_status/review.html:25 #: bookwyrm/templates/user/shelf/shelf.html:85 #: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" msgstr "" -#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "" -#: bookwyrm/forms.py:315 +#: bookwyrm/forms.py:316 msgid "Ascending" msgstr "" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:317 msgid "Descending" msgstr "" @@ -284,9 +284,8 @@ msgstr "" #: bookwyrm/templates/settings/edit_server.html:68 #: bookwyrm/templates/settings/federated_server.html:98 #: bookwyrm/templates/settings/site.html:108 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/layout.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "" @@ -300,10 +299,7 @@ msgstr "" #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 #: bookwyrm/templates/snippets/goal_form.html:32 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43 msgid "Cancel" msgstr "" @@ -2450,24 +2446,24 @@ msgid "Some thoughts on the book" msgstr "" #: bookwyrm/templates/snippets/create_status/comment.html:26 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16 msgid "Progress:" msgstr "" #: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30 msgid "pages" msgstr "" #: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31 msgid "percent" msgstr "" #: bookwyrm/templates/snippets/create_status/comment.html:41 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" msgstr "" @@ -2496,6 +2492,7 @@ msgid "Include spoiler alert" msgstr "" #: bookwyrm/templates/snippets/create_status/layout.html:38 +#: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "" @@ -2646,9 +2643,7 @@ msgid "Goal privacy:" msgstr "" #: bookwyrm/templates/snippets/goal_form.html:26 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/layout.html:13 msgid "Post to feed" msgstr "" @@ -2723,21 +2718,45 @@ msgstr "" msgid "Rate" msgstr "" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 #: bookwyrm/templates/snippets/readthrough_form.html:7 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30 +#: bookwyrm/templates/snippets/readthrough_form.html:30 +msgid "Finished reading" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/form.html:8 +msgid "(Optional)" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 +msgid "Update progress" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "" + #: bookwyrm/templates/snippets/readthrough_form.html:14 msgid "Progress" msgstr "" -#: bookwyrm/templates/snippets/readthrough_form.html:30 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25 -msgid "Finished reading" -msgstr "" - #: bookwyrm/templates/snippets/register_form.html:32 msgid "Sign Up" msgstr "" @@ -2754,16 +2773,6 @@ msgstr "" msgid "Move book" msgstr "" -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 -#, python-format -msgid "Finish \"%(book_title)s\"" -msgstr "" - -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 -msgid "Update progress" -msgstr "" - #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 msgid "More shelves" msgstr "" @@ -2777,7 +2786,6 @@ msgid "Finish reading" msgstr "" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26 msgid "Want to read" msgstr "" @@ -2786,16 +2794,6 @@ msgstr "" msgid "Remove from %(name)s" msgstr "" -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 -#, python-format -msgid "Start \"%(book_title)s\"" -msgstr "" - -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 -#, python-format -msgid "Want to Read \"%(book_title)s\"" -msgstr "" - #: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" @@ -2830,12 +2828,12 @@ msgstr "" msgid "rated %(book)s:" msgstr "" -#: bookwyrm/templates/snippets/status/headers/read.html:5 +#: bookwyrm/templates/snippets/status/headers/read.html:7 #, python-format msgid "finished reading %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/reading.html:6 +#: bookwyrm/templates/snippets/status/headers/reading.html:7 #, python-format msgid "started reading %(book)s" msgstr "" @@ -2845,7 +2843,7 @@ msgstr "" msgid "reviewed %(book)s" msgstr "" -#: bookwyrm/templates/snippets/status/headers/to_read.html:6 +#: bookwyrm/templates/snippets/status/headers/to_read.html:7 #, python-format msgid "%(username)s wants to read %(book)s" msgstr "" @@ -3153,3 +3151,8 @@ msgstr "" #, python-format msgid "A password reset link sent to %s" msgstr "" + +#: bookwyrm/views/rss_feed.py:34 +#, python-brace-format +msgid "Status updates from {obj.display_name}" +msgstr "" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index d073a36c7..04497a2a1 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-13 02:21+0000\n" +"POT-Creation-Date: 2021-08-16 21:26+0000\n" "PO-Revision-Date: 2021-03-19 11:49+0800\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:232 +#: bookwyrm/forms.py:233 msgid "A user with this email already exists." msgstr "Ya existe un usuario con ese correo electrónico." -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:247 msgid "One Day" msgstr "Un día" -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:248 msgid "One Week" msgstr "Una semana" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:249 msgid "One Month" msgstr "Un mes" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:250 msgid "Does Not Expire" msgstr "Nunca se vence" -#: bookwyrm/forms.py:254 +#: bookwyrm/forms.py:255 #, python-format msgid "%(count)d uses" msgstr "%(count)d usos" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:258 msgid "Unlimited" msgstr "Sin límite" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:308 msgid "List Order" msgstr "Orden de la lista" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:309 msgid "Book Title" msgstr "Título" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:310 #: bookwyrm/templates/snippets/create_status/review.html:25 #: bookwyrm/templates/user/shelf/shelf.html:85 #: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" msgstr "Calificación" -#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Ordenar por" -#: bookwyrm/forms.py:315 +#: bookwyrm/forms.py:316 msgid "Ascending" msgstr "Ascendente" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:317 msgid "Descending" msgstr "Descendente" @@ -284,9 +284,8 @@ msgstr "Clave Goodreads:" #: bookwyrm/templates/settings/edit_server.html:68 #: bookwyrm/templates/settings/federated_server.html:98 #: bookwyrm/templates/settings/site.html:108 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/layout.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "Guardar" @@ -300,10 +299,7 @@ msgstr "Guardar" #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 #: bookwyrm/templates/snippets/goal_form.html:32 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43 msgid "Cancel" msgstr "Cancelar" @@ -2451,24 +2447,24 @@ msgid "Some thoughts on the book" msgstr "Algunos pensamientos sobre el libro" #: bookwyrm/templates/snippets/create_status/comment.html:26 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16 msgid "Progress:" msgstr "Progreso:" #: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30 msgid "pages" msgstr "páginas" #: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31 msgid "percent" msgstr "por ciento" #: bookwyrm/templates/snippets/create_status/comment.html:41 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" msgstr "de %(pages)s páginas" @@ -2497,6 +2493,7 @@ msgid "Include spoiler alert" msgstr "Incluir alerta de spoiler" #: bookwyrm/templates/snippets/create_status/layout.html:38 +#: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Comentario:" @@ -2647,9 +2644,7 @@ msgid "Goal privacy:" msgstr "Privacidad de meta:" #: bookwyrm/templates/snippets/goal_form.html:26 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/layout.html:13 msgid "Post to feed" msgstr "Compartir con tu feed" @@ -2725,21 +2720,45 @@ msgstr "Da una calificación" msgid "Rate" msgstr "Calificar" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "Terminar \"%(book_title)s\"" + +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 #: bookwyrm/templates/snippets/readthrough_form.html:7 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "Lectura se empezó" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30 +#: bookwyrm/templates/snippets/readthrough_form.html:30 +msgid "Finished reading" +msgstr "Lectura se terminó" + +#: bookwyrm/templates/snippets/reading_modals/form.html:8 +msgid "(Optional)" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 +msgid "Update progress" +msgstr "Progreso de actualización" + +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "Empezar \"%(book_title)s\"" + +#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "Quiero leer \"%(book_title)s\"" + #: bookwyrm/templates/snippets/readthrough_form.html:14 msgid "Progress" msgstr "Progreso" -#: bookwyrm/templates/snippets/readthrough_form.html:30 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25 -msgid "Finished reading" -msgstr "Lectura se terminó" - #: bookwyrm/templates/snippets/register_form.html:32 msgid "Sign Up" msgstr "Inscribirse" @@ -2756,16 +2775,6 @@ msgstr "Importar libro" msgid "Move book" msgstr "Mover libro" -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 -#, python-format -msgid "Finish \"%(book_title)s\"" -msgstr "Terminar \"%(book_title)s\"" - -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 -msgid "Update progress" -msgstr "Progreso de actualización" - #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 msgid "More shelves" msgstr "Más estantes" @@ -2779,7 +2788,6 @@ msgid "Finish reading" msgstr "Terminar de leer" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26 msgid "Want to read" msgstr "Quiero leer" @@ -2788,16 +2796,6 @@ msgstr "Quiero leer" msgid "Remove from %(name)s" msgstr "Quitar de %(name)s" -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 -#, python-format -msgid "Start \"%(book_title)s\"" -msgstr "Empezar \"%(book_title)s\"" - -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 -#, python-format -msgid "Want to Read \"%(book_title)s\"" -msgstr "Quiero leer \"%(book_title)s\"" - #: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" @@ -2832,12 +2830,12 @@ msgstr "citó a %(book)s" msgid "rated %(book)s:" msgstr "calificó %(book)s:" -#: bookwyrm/templates/snippets/status/headers/read.html:5 +#: bookwyrm/templates/snippets/status/headers/read.html:7 #, python-format msgid "finished reading %(book)s" msgstr "terminó de leer %(book)s" -#: bookwyrm/templates/snippets/status/headers/reading.html:6 +#: bookwyrm/templates/snippets/status/headers/reading.html:7 #, python-format msgid "started reading %(book)s" msgstr "empezó a leer %(book)s" @@ -2847,7 +2845,7 @@ msgstr "empezó a leer %(book)s" msgid "reviewed %(book)s" msgstr "reseñó a %(book)s" -#: bookwyrm/templates/snippets/status/headers/to_read.html:6 +#: bookwyrm/templates/snippets/status/headers/to_read.html:7 #, python-format msgid "%(username)s wants to read %(book)s" msgstr "%(username)s quiere leer %(book)s" @@ -3156,6 +3154,11 @@ msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónic msgid "A password reset link sent to %s" msgstr "Un enlace para reestablecer tu contraseña se enviará a %s" +#: bookwyrm/views/rss_feed.py:34 +#, python-brace-format +msgid "Status updates from {obj.display_name}" +msgstr "" + #~ msgid "Local Timeline" #~ msgstr "Línea temporal local" diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 1ab9157bd..46416931e 100644 --- a/locale/fr_FR/LC_MESSAGES/django.po +++ b/locale/fr_FR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-13 02:21+0000\n" +"POT-Creation-Date: 2021-08-16 21:26+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: bookwyrm/forms.py:232 +#: bookwyrm/forms.py:233 msgid "A user with this email already exists." msgstr "Cet email est déjà associé à un compte." -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:247 msgid "One Day" msgstr "Un jour" -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:248 msgid "One Week" msgstr "Une semaine" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:249 msgid "One Month" msgstr "Un mois" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:250 msgid "Does Not Expire" msgstr "Sans expiration" -#: bookwyrm/forms.py:254 +#: bookwyrm/forms.py:255 #, python-format msgid "%(count)d uses" msgstr "%(count)d utilisations" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:258 msgid "Unlimited" msgstr "Sans limite" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:308 msgid "List Order" msgstr "Ordre de la liste" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:309 msgid "Book Title" msgstr "Titre du livre" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:310 #: bookwyrm/templates/snippets/create_status/review.html:25 #: bookwyrm/templates/user/shelf/shelf.html:85 #: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" msgstr "Note" -#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "Trier par" -#: bookwyrm/forms.py:315 +#: bookwyrm/forms.py:316 msgid "Ascending" msgstr "Ordre croissant" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:317 msgid "Descending" msgstr "Ordre décroissant" @@ -288,9 +288,8 @@ msgstr "Clé Goodreads :" #: bookwyrm/templates/settings/edit_server.html:68 #: bookwyrm/templates/settings/federated_server.html:98 #: bookwyrm/templates/settings/site.html:108 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/layout.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "Enregistrer" @@ -304,10 +303,7 @@ msgstr "Enregistrer" #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 #: bookwyrm/templates/snippets/goal_form.html:32 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43 msgid "Cancel" msgstr "Annuler" @@ -2473,24 +2469,24 @@ msgid "Some thoughts on the book" msgstr "" #: bookwyrm/templates/snippets/create_status/comment.html:26 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16 msgid "Progress:" msgstr "Progression :" #: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30 msgid "pages" msgstr "pages" #: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31 msgid "percent" msgstr "pourcent" #: bookwyrm/templates/snippets/create_status/comment.html:41 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" msgstr "sur %(pages)s pages" @@ -2519,6 +2515,7 @@ msgid "Include spoiler alert" msgstr "Afficher une alerte spoiler" #: bookwyrm/templates/snippets/create_status/layout.html:38 +#: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "Commentaire :" @@ -2675,9 +2672,7 @@ msgid "Goal privacy:" msgstr "Confidentialité du défi :" #: bookwyrm/templates/snippets/goal_form.html:26 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/layout.html:13 msgid "Post to feed" msgstr "Publier sur le fil d’actualité" @@ -2752,21 +2747,45 @@ msgstr "Laisser une note" msgid "Rate" msgstr "Noter" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "Terminer « %(book_title)s »" + +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 #: bookwyrm/templates/snippets/readthrough_form.html:7 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "Lecture commencée le" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30 +#: bookwyrm/templates/snippets/readthrough_form.html:30 +msgid "Finished reading" +msgstr "Lecture terminée le" + +#: bookwyrm/templates/snippets/reading_modals/form.html:8 +msgid "(Optional)" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 +msgid "Update progress" +msgstr "Progression de la mise à jour" + +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "Commencer « %(book_title)s »" + +#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "Ajouter « %(book_title)s » aux envies de lecture" + #: bookwyrm/templates/snippets/readthrough_form.html:14 msgid "Progress" msgstr "Progression" -#: bookwyrm/templates/snippets/readthrough_form.html:30 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25 -msgid "Finished reading" -msgstr "Lecture terminée le" - #: bookwyrm/templates/snippets/register_form.html:32 msgid "Sign Up" msgstr "S’enregistrer" @@ -2783,16 +2802,6 @@ msgstr "Importer le livre" msgid "Move book" msgstr "Déplacer le livre" -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 -#, python-format -msgid "Finish \"%(book_title)s\"" -msgstr "Terminer « %(book_title)s »" - -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 -msgid "Update progress" -msgstr "Progression de la mise à jour" - #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 msgid "More shelves" msgstr "Plus d’étagères" @@ -2806,7 +2815,6 @@ msgid "Finish reading" msgstr "Terminer la lecture" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26 msgid "Want to read" msgstr "Je veux le lire" @@ -2815,16 +2823,6 @@ msgstr "Je veux le lire" msgid "Remove from %(name)s" msgstr "Retirer de %(name)s" -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 -#, python-format -msgid "Start \"%(book_title)s\"" -msgstr "Commencer « %(book_title)s »" - -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 -#, python-format -msgid "Want to Read \"%(book_title)s\"" -msgstr "Ajouter « %(book_title)s » aux envies de lecture" - #: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" @@ -2862,13 +2860,13 @@ msgstr "Signalé par %(username)s" msgid "rated %(book)s:" msgstr "Créée par %(username)s" -#: bookwyrm/templates/snippets/status/headers/read.html:5 +#: bookwyrm/templates/snippets/status/headers/read.html:7 #, fuzzy, python-format #| msgid "Editions of \"%(work_title)s\"" msgid "finished reading %(book)s" msgstr "Éditions de « %(work_title)s »" -#: bookwyrm/templates/snippets/status/headers/reading.html:6 +#: bookwyrm/templates/snippets/status/headers/reading.html:7 #, fuzzy, python-format #| msgid "Created by %(username)s" msgid "started reading %(book)s" @@ -2880,7 +2878,7 @@ msgstr "Créée par %(username)s" msgid "reviewed %(book)s" msgstr "Créée par %(username)s" -#: bookwyrm/templates/snippets/status/headers/to_read.html:6 +#: bookwyrm/templates/snippets/status/headers/to_read.html:7 #, fuzzy, python-format #| msgid "replied to %(username)s's quote" msgid "%(username)s wants to read %(book)s" @@ -3195,6 +3193,11 @@ msgstr "Aucun compte avec cette adresse email n’a été trouvé." msgid "A password reset link sent to %s" msgstr "Un lien de réinitialisation a été envoyé à %s." +#: bookwyrm/views/rss_feed.py:34 +#, python-brace-format +msgid "Status updates from {obj.display_name}" +msgstr "" + #~ msgid "Local Timeline" #~ msgstr "Fil d’actualité local" diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index dbe69686f8f0510405b134346451d40a2258abcc..6739399271062a1ccaacee0d377727c4a396f406 100644 GIT binary patch delta 14585 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 TwKm+hC+1}Jz4b@kedGTC8%*qH delta 14657 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 QT@nYC^EX!*^jo?A0|3bp3;+NC diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 547126495..75def3735 100644 --- a/locale/zh_Hans/LC_MESSAGES/django.po +++ b/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-13 02:21+0000\n" +"POT-Creation-Date: 2021-08-16 21:26+0000\n" "PO-Revision-Date: 2021-03-20 00:56+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:232 +#: bookwyrm/forms.py:233 msgid "A user with this email already exists." msgstr "已经存在使用该邮箱的用户。" -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:247 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:248 msgid "One Week" msgstr "一周" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:249 msgid "One Month" msgstr "一个月" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:250 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:254 +#: bookwyrm/forms.py:255 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:258 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:308 msgid "List Order" msgstr "列表顺序" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:309 msgid "Book Title" msgstr "书名" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:310 #: bookwyrm/templates/snippets/create_status/review.html:25 #: bookwyrm/templates/user/shelf/shelf.html:85 #: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" msgstr "评价" -#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:315 +#: bookwyrm/forms.py:316 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:317 msgid "Descending" msgstr "降序" @@ -284,9 +284,8 @@ msgstr "Goodreads key:" #: bookwyrm/templates/settings/edit_server.html:68 #: bookwyrm/templates/settings/federated_server.html:98 #: bookwyrm/templates/settings/site.html:108 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/layout.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "保存" @@ -300,10 +299,7 @@ msgstr "保存" #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 #: bookwyrm/templates/snippets/goal_form.html:32 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43 msgid "Cancel" msgstr "取消" @@ -1791,8 +1787,9 @@ msgid "boosted your status" msgstr "转发了你的 状态" #: bookwyrm/templates/notifications.html:121 -#, python-format -msgid " added %(book_title)s to your list “%(list_name)s”" +#, fuzzy, 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 " 添加了 %(book_title)s 到你的列表 “%(list_name)s”" #: bookwyrm/templates/notifications.html:123 @@ -2446,24 +2443,24 @@ msgid "Some thoughts on the book" msgstr "对书的一些看法" #: bookwyrm/templates/snippets/create_status/comment.html:26 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16 msgid "Progress:" msgstr "进度:" #: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30 msgid "pages" msgstr "页数" #: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31 msgid "percent" msgstr "百分比" #: bookwyrm/templates/snippets/create_status/comment.html:41 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" msgstr "全书 %(pages)s 页" @@ -2492,6 +2489,7 @@ msgid "Include spoiler alert" msgstr "加入剧透警告" #: bookwyrm/templates/snippets/create_status/layout.html:38 +#: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "评论:" @@ -2638,9 +2636,7 @@ msgid "Goal privacy:" msgstr "目标隐私:" #: bookwyrm/templates/snippets/goal_form.html:26 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/layout.html:13 msgid "Post to feed" msgstr "发布到消息流中" @@ -2715,21 +2711,45 @@ msgstr "留下评价" msgid "Rate" msgstr "评价" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "完成《%(book_title)s》" + +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 #: bookwyrm/templates/snippets/readthrough_form.html:7 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "已开始阅读" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30 +#: bookwyrm/templates/snippets/readthrough_form.html:30 +msgid "Finished reading" +msgstr "已完成阅读" + +#: bookwyrm/templates/snippets/reading_modals/form.html:8 +msgid "(Optional)" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 +msgid "Update progress" +msgstr "更新进度" + +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "开始《%(book_title)s》" + +#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "想要阅读《%(book_title)s》" + #: bookwyrm/templates/snippets/readthrough_form.html:14 msgid "Progress" msgstr "进度" -#: bookwyrm/templates/snippets/readthrough_form.html:30 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25 -msgid "Finished reading" -msgstr "已完成阅读" - #: bookwyrm/templates/snippets/register_form.html:32 msgid "Sign Up" msgstr "注册" @@ -2746,16 +2766,6 @@ msgstr "导入书目" msgid "Move book" msgstr "移动书目" -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 -#, python-format -msgid "Finish \"%(book_title)s\"" -msgstr "完成《%(book_title)s》" - -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 -msgid "Update progress" -msgstr "更新进度" - #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 msgid "More shelves" msgstr "更多书架" @@ -2769,7 +2779,6 @@ msgid "Finish reading" msgstr "完成阅读" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26 msgid "Want to read" msgstr "想要阅读" @@ -2778,16 +2787,6 @@ msgstr "想要阅读" msgid "Remove from %(name)s" msgstr "从 %(name)s 移除" -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 -#, python-format -msgid "Start \"%(book_title)s\"" -msgstr "开始《%(book_title)s》" - -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 -#, python-format -msgid "Want to Read \"%(book_title)s\"" -msgstr "想要阅读《%(book_title)s》" - #: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" @@ -2814,7 +2813,6 @@ msgstr "回复了 %(username)s%(username)s" msgid "quoted %(book)s" msgstr "引用了 %(book)s" @@ -2823,12 +2821,12 @@ msgstr "引用了 %(book)s" msgid "rated %(book)s:" msgstr "为 %(book)s 打了分:" -#: bookwyrm/templates/snippets/status/headers/read.html:5 +#: bookwyrm/templates/snippets/status/headers/read.html:7 #, python-format msgid "finished reading %(book)s" msgstr "完成阅读 %(book)s" -#: bookwyrm/templates/snippets/status/headers/reading.html:6 +#: bookwyrm/templates/snippets/status/headers/reading.html:7 #, python-format msgid "started reading %(book)s" msgstr "开始阅读 %(book)s" @@ -2838,7 +2836,7 @@ msgstr "开始阅读 %(book)s" msgid "reviewed %(book)s" msgstr "为 %(book)s 撰写了书评" -#: bookwyrm/templates/snippets/status/headers/to_read.html:6 +#: bookwyrm/templates/snippets/status/headers/to_read.html:7 #, python-format msgid "%(username)s wants to read %(book)s" msgstr "%(username)s 想要阅读 %(book)s" @@ -3143,6 +3141,11 @@ msgstr "没有找到使用该邮箱的用户。" msgid "A password reset link sent to %s" msgstr "密码重置连接已发送给 %s" +#: bookwyrm/views/rss_feed.py:34 +#, python-brace-format +msgid "Status updates from {obj.display_name}" +msgstr "" + #~ msgid "Local Timeline" #~ msgstr "本地时间线" diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index 70caf596e..2a39f3887 100644 --- a/locale/zh_Hant/LC_MESSAGES/django.po +++ b/locale/zh_Hant/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-08-13 02:21+0000\n" +"POT-Creation-Date: 2021-08-16 21:26+0000\n" "PO-Revision-Date: 2021-06-30 10:36+0000\n" "Last-Translator: Grace Cheng \n" "Language-Team: LANGUAGE \n" @@ -18,59 +18,59 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: bookwyrm/forms.py:232 +#: bookwyrm/forms.py:233 msgid "A user with this email already exists." msgstr "已經存在使用該郵箱的使用者。" -#: bookwyrm/forms.py:246 +#: bookwyrm/forms.py:247 msgid "One Day" msgstr "一天" -#: bookwyrm/forms.py:247 +#: bookwyrm/forms.py:248 msgid "One Week" msgstr "一週" -#: bookwyrm/forms.py:248 +#: bookwyrm/forms.py:249 msgid "One Month" msgstr "一個月" -#: bookwyrm/forms.py:249 +#: bookwyrm/forms.py:250 msgid "Does Not Expire" msgstr "永不失效" -#: bookwyrm/forms.py:254 +#: bookwyrm/forms.py:255 #, python-format msgid "%(count)d uses" msgstr "%(count)d 次使用" -#: bookwyrm/forms.py:257 +#: bookwyrm/forms.py:258 msgid "Unlimited" msgstr "不受限" -#: bookwyrm/forms.py:307 +#: bookwyrm/forms.py:308 msgid "List Order" msgstr "列表順序" -#: bookwyrm/forms.py:308 +#: bookwyrm/forms.py:309 msgid "Book Title" msgstr "書名" -#: bookwyrm/forms.py:309 +#: bookwyrm/forms.py:310 #: bookwyrm/templates/snippets/create_status/review.html:25 #: bookwyrm/templates/user/shelf/shelf.html:85 #: bookwyrm/templates/user/shelf/shelf.html:116 msgid "Rating" msgstr "評價" -#: bookwyrm/forms.py:311 bookwyrm/templates/lists/list.html:107 +#: bookwyrm/forms.py:312 bookwyrm/templates/lists/list.html:107 msgid "Sort By" msgstr "排序方式" -#: bookwyrm/forms.py:315 +#: bookwyrm/forms.py:316 msgid "Ascending" msgstr "升序" -#: bookwyrm/forms.py:316 +#: bookwyrm/forms.py:317 msgid "Descending" msgstr "降序" @@ -290,9 +290,8 @@ msgstr "Goodreads key:" #: bookwyrm/templates/settings/edit_server.html:68 #: bookwyrm/templates/settings/federated_server.html:98 #: bookwyrm/templates/settings/site.html:108 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:42 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/layout.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:42 #: bookwyrm/templates/user_admin/user_moderation_actions.html:45 msgid "Save" msgstr "儲存" @@ -306,10 +305,7 @@ msgstr "儲存" #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 #: bookwyrm/templates/snippets/goal_form.html:32 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:43 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:28 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:43 msgid "Cancel" msgstr "取消" @@ -2487,24 +2483,24 @@ msgid "Some thoughts on the book" msgstr "" #: bookwyrm/templates/snippets/create_status/comment.html:26 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:16 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:16 msgid "Progress:" msgstr "進度:" #: bookwyrm/templates/snippets/create_status/comment.html:34 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:30 #: bookwyrm/templates/snippets/readthrough_form.html:22 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:30 msgid "pages" msgstr "頁數" #: bookwyrm/templates/snippets/create_status/comment.html:35 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:31 #: bookwyrm/templates/snippets/readthrough_form.html:23 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:31 msgid "percent" msgstr "百分比" #: bookwyrm/templates/snippets/create_status/comment.html:41 -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:36 +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:36 #, python-format msgid "of %(pages)s pages" msgstr "全書 %(pages)s 頁" @@ -2533,6 +2529,7 @@ msgid "Include spoiler alert" msgstr "加入劇透警告" #: bookwyrm/templates/snippets/create_status/layout.html:38 +#: bookwyrm/templates/snippets/reading_modals/form.html:7 msgid "Comment:" msgstr "評論:" @@ -2685,9 +2682,7 @@ msgid "Goal privacy:" msgstr "目標隱私:" #: bookwyrm/templates/snippets/goal_form.html:26 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:37 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:31 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:20 +#: bookwyrm/templates/snippets/reading_modals/layout.html:13 msgid "Post to feed" msgstr "發佈到即時動態" @@ -2762,21 +2757,45 @@ msgstr "留下評價" msgid "Rate" msgstr "評價" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:6 +#, python-format +msgid "Finish \"%(book_title)s\"" +msgstr "完成 \"%(book_title)s\"" + +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:22 +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:20 #: bookwyrm/templates/snippets/readthrough_form.html:7 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:19 -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:19 msgid "Started reading" msgstr "已開始閱讀" +#: bookwyrm/templates/snippets/reading_modals/finish_reading_modal.html:30 +#: bookwyrm/templates/snippets/readthrough_form.html:30 +msgid "Finished reading" +msgstr "已完成閱讀" + +#: bookwyrm/templates/snippets/reading_modals/form.html:8 +msgid "(Optional)" +msgstr "" + +#: bookwyrm/templates/snippets/reading_modals/progress_update_modal.html:5 +#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 +msgid "Update progress" +msgstr "更新進度" + +#: bookwyrm/templates/snippets/reading_modals/start_reading_modal.html:6 +#, python-format +msgid "Start \"%(book_title)s\"" +msgstr "開始 \"%(book_title)s\"" + +#: bookwyrm/templates/snippets/reading_modals/want_to_read_modal.html:6 +#, python-format +msgid "Want to Read \"%(book_title)s\"" +msgstr "想要閱讀 \"%(book_title)s\"" + #: bookwyrm/templates/snippets/readthrough_form.html:14 msgid "Progress" msgstr "進度" -#: bookwyrm/templates/snippets/readthrough_form.html:30 -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:25 -msgid "Finished reading" -msgstr "已完成閱讀" - #: bookwyrm/templates/snippets/register_form.html:32 msgid "Sign Up" msgstr "註冊" @@ -2793,16 +2812,6 @@ msgstr "匯入書目" msgid "Move book" msgstr "移動書目" -#: bookwyrm/templates/snippets/shelve_button/finish_reading_modal.html:5 -#, python-format -msgid "Finish \"%(book_title)s\"" -msgstr "完成 \"%(book_title)s\"" - -#: bookwyrm/templates/snippets/shelve_button/progress_update_modal.html:5 -#: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:45 -msgid "Update progress" -msgstr "更新進度" - #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown.html:5 msgid "More shelves" msgstr "更多書架" @@ -2816,7 +2825,6 @@ msgid "Finish reading" msgstr "完成閱讀" #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:25 -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:26 msgid "Want to read" msgstr "想要閱讀" @@ -2825,16 +2833,6 @@ msgstr "想要閱讀" msgid "Remove from %(name)s" msgstr "從 %(name)s 移除" -#: bookwyrm/templates/snippets/shelve_button/start_reading_modal.html:5 -#, python-format -msgid "Start \"%(book_title)s\"" -msgstr "開始 \"%(book_title)s\"" - -#: bookwyrm/templates/snippets/shelve_button/want_to_read_modal.html:5 -#, python-format -msgid "Want to Read \"%(book_title)s\"" -msgstr "想要閱讀 \"%(book_title)s\"" - #: bookwyrm/templates/snippets/status/content_status.html:72 #: bookwyrm/templates/snippets/trimmed_text.html:17 msgid "Show more" @@ -2872,13 +2870,13 @@ msgstr "移除 %(name)s" msgid "rated %(book)s:" msgstr "由 %(username)s 建立" -#: bookwyrm/templates/snippets/status/headers/read.html:5 +#: bookwyrm/templates/snippets/status/headers/read.html:7 #, fuzzy, python-format #| msgid "Editions of \"%(work_title)s\"" msgid "finished reading %(book)s" msgstr "\"%(work_title)s\" 的各版本" -#: bookwyrm/templates/snippets/status/headers/reading.html:6 +#: bookwyrm/templates/snippets/status/headers/reading.html:7 #, fuzzy, python-format #| msgid "Created by %(username)s" msgid "started reading %(book)s" @@ -2890,7 +2888,7 @@ msgstr "由 %(username)s 建立" msgid "reviewed %(book)s" msgstr "移除 %(name)s" -#: bookwyrm/templates/snippets/status/headers/to_read.html:6 +#: bookwyrm/templates/snippets/status/headers/to_read.html:7 #, fuzzy, python-format #| msgid "replied to %(username)s's status" msgid "%(username)s wants to read %(book)s" @@ -3201,6 +3199,11 @@ msgstr "沒有找到使用該郵箱的使用者。" msgid "A password reset link sent to %s" msgstr "密碼重置連結已傳送給 %s" +#: bookwyrm/views/rss_feed.py:34 +#, python-brace-format +msgid "Status updates from {obj.display_name}" +msgstr "" + #~ msgid "Local Timeline" #~ msgstr "本地時間線"