diff --git a/locale/sr_SP/LC_MESSAGES/django.po b/locale/sr_SP/LC_MESSAGES/django.po index d9ce48673..23a454a81 100644 --- a/locale/sr_SP/LC_MESSAGES/django.po +++ b/locale/sr_SP/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-10-02 16:40+0000\n" -"PO-Revision-Date: 2023-10-02 18:13\n" +"POT-Creation-Date: 2023-11-02 21:32+0000\n" +"PO-Revision-Date: 2023-11-02 22:29\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Serbian (Cyrillic)\n" "Language: sr\n" @@ -42,15 +42,15 @@ msgstr "" msgid "Unlimited" msgstr "" -#: bookwyrm/forms/edit_user.py:88 +#: bookwyrm/forms/edit_user.py:104 msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:95 bookwyrm/forms/landing.py:90 +#: bookwyrm/forms/edit_user.py:111 bookwyrm/forms/landing.py:90 msgid "Password does not match" msgstr "" -#: bookwyrm/forms/edit_user.py:118 +#: bookwyrm/forms/edit_user.py:134 msgid "Incorrect Password" msgstr "" @@ -102,8 +102,8 @@ msgstr "" msgid "Book Title" msgstr "" -#: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:156 -#: bookwyrm/templates/shelf/shelf.html:188 +#: bookwyrm/forms/lists.py:28 bookwyrm/templates/shelf/shelf.html:171 +#: bookwyrm/templates/shelf/shelf.html:203 #: bookwyrm/templates/snippets/create_status/review.html:32 msgid "Rating" msgstr "" @@ -145,7 +145,7 @@ msgstr "" msgid "Automatically generated report" msgstr "" -#: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:47 +#: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48 #: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214 #: bookwyrm/templates/settings/link_domains/link_domains.html:19 msgid "Pending" @@ -171,23 +171,23 @@ msgstr "" msgid "Domain block" msgstr "" -#: bookwyrm/models/book.py:283 +#: bookwyrm/models/book.py:282 msgid "Audiobook" msgstr "" -#: bookwyrm/models/book.py:284 +#: bookwyrm/models/book.py:283 msgid "eBook" msgstr "" -#: bookwyrm/models/book.py:285 +#: bookwyrm/models/book.py:284 msgid "Graphic novel" msgstr "" -#: bookwyrm/models/book.py:286 +#: bookwyrm/models/book.py:285 msgid "Hardcover" msgstr "" -#: bookwyrm/models/book.py:287 +#: bookwyrm/models/book.py:286 msgid "Paperback" msgstr "" @@ -205,26 +205,26 @@ msgstr "" msgid "Blocked" msgstr "" -#: bookwyrm/models/fields.py:29 +#: bookwyrm/models/fields.py:30 #, python-format msgid "%(value)s is not a valid remote_id" msgstr "" -#: bookwyrm/models/fields.py:38 bookwyrm/models/fields.py:47 +#: bookwyrm/models/fields.py:39 bookwyrm/models/fields.py:48 #, python-format msgid "%(value)s is not a valid username" msgstr "" -#: bookwyrm/models/fields.py:192 bookwyrm/templates/layout.html:128 +#: bookwyrm/models/fields.py:193 bookwyrm/templates/layout.html:129 #: bookwyrm/templates/ostatus/error.html:29 msgid "username" msgstr "" -#: bookwyrm/models/fields.py:197 +#: bookwyrm/models/fields.py:198 msgid "A user with that username already exists." msgstr "" -#: bookwyrm/models/fields.py:216 +#: bookwyrm/models/fields.py:217 #: bookwyrm/templates/snippets/privacy-icons.html:3 #: bookwyrm/templates/snippets/privacy-icons.html:4 #: bookwyrm/templates/snippets/privacy_select.html:11 @@ -232,7 +232,7 @@ msgstr "" msgid "Public" msgstr "" -#: bookwyrm/models/fields.py:217 +#: bookwyrm/models/fields.py:218 #: bookwyrm/templates/snippets/privacy-icons.html:7 #: bookwyrm/templates/snippets/privacy-icons.html:8 #: bookwyrm/templates/snippets/privacy_select.html:14 @@ -240,7 +240,7 @@ msgstr "" msgid "Unlisted" msgstr "" -#: bookwyrm/models/fields.py:218 +#: bookwyrm/models/fields.py:219 #: bookwyrm/templates/snippets/privacy_select.html:17 #: bookwyrm/templates/user/relationships/followers.html:6 #: bookwyrm/templates/user/relationships/followers.html:11 @@ -249,7 +249,7 @@ msgstr "" msgid "Followers" msgstr "" -#: bookwyrm/models/fields.py:219 +#: bookwyrm/models/fields.py:220 #: bookwyrm/templates/snippets/create_status/post_options_block.html:6 #: bookwyrm/templates/snippets/privacy-icons.html:15 #: bookwyrm/templates/snippets/privacy-icons.html:16 @@ -258,30 +258,30 @@ msgstr "" msgid "Private" msgstr "" -#: bookwyrm/models/import_job.py:48 bookwyrm/templates/import/import.html:174 +#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174 #: bookwyrm/templates/settings/imports/imports.html:98 -#: bookwyrm/templates/settings/users/user_admin.html:81 -#: bookwyrm/templates/settings/users/user_info.html:28 +#: bookwyrm/templates/settings/users/user_admin.html:87 +#: bookwyrm/templates/settings/users/user_info.html:33 msgid "Active" msgstr "" -#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:172 +#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172 msgid "Complete" msgstr "" -#: bookwyrm/models/import_job.py:50 +#: bookwyrm/models/import_job.py:51 msgid "Stopped" msgstr "" -#: bookwyrm/models/import_job.py:83 bookwyrm/models/import_job.py:91 +#: bookwyrm/models/import_job.py:84 bookwyrm/models/import_job.py:92 msgid "Import stopped" msgstr "" -#: bookwyrm/models/import_job.py:363 bookwyrm/models/import_job.py:388 +#: bookwyrm/models/import_job.py:356 bookwyrm/models/import_job.py:381 msgid "Error loading book" msgstr "" -#: bookwyrm/models/import_job.py:372 +#: bookwyrm/models/import_job.py:365 msgid "Could not find a match for book" msgstr "" @@ -368,103 +368,103 @@ msgstr "" msgid "Everything else" msgstr "" -#: bookwyrm/settings.py:223 +#: bookwyrm/settings.py:230 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:223 +#: bookwyrm/settings.py:230 msgid "Home" msgstr "" -#: bookwyrm/settings.py:224 +#: bookwyrm/settings.py:231 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:224 +#: bookwyrm/settings.py:231 #: bookwyrm/templates/guided_tour/user_profile.html:101 #: bookwyrm/templates/search/layout.html:22 #: bookwyrm/templates/search/layout.html:43 -#: bookwyrm/templates/user/layout.html:97 +#: bookwyrm/templates/user/layout.html:112 msgid "Books" msgstr "" -#: bookwyrm/settings.py:296 +#: bookwyrm/settings.py:303 msgid "English" msgstr "" -#: bookwyrm/settings.py:297 +#: bookwyrm/settings.py:304 msgid "Català (Catalan)" msgstr "" -#: bookwyrm/settings.py:298 +#: bookwyrm/settings.py:305 msgid "Deutsch (German)" msgstr "" -#: bookwyrm/settings.py:299 +#: bookwyrm/settings.py:306 msgid "Esperanto (Esperanto)" msgstr "" -#: bookwyrm/settings.py:300 +#: bookwyrm/settings.py:307 msgid "Español (Spanish)" msgstr "" -#: bookwyrm/settings.py:301 +#: bookwyrm/settings.py:308 msgid "Euskara (Basque)" msgstr "" -#: bookwyrm/settings.py:302 +#: bookwyrm/settings.py:309 msgid "Galego (Galician)" msgstr "" -#: bookwyrm/settings.py:303 +#: bookwyrm/settings.py:310 msgid "Italiano (Italian)" msgstr "" -#: bookwyrm/settings.py:304 +#: bookwyrm/settings.py:311 msgid "Suomi (Finnish)" msgstr "" -#: bookwyrm/settings.py:305 +#: bookwyrm/settings.py:312 msgid "Français (French)" msgstr "" -#: bookwyrm/settings.py:306 +#: bookwyrm/settings.py:313 msgid "Lietuvių (Lithuanian)" msgstr "" -#: bookwyrm/settings.py:307 +#: bookwyrm/settings.py:314 msgid "Nederlands (Dutch)" msgstr "" -#: bookwyrm/settings.py:308 +#: bookwyrm/settings.py:315 msgid "Norsk (Norwegian)" msgstr "" -#: bookwyrm/settings.py:309 +#: bookwyrm/settings.py:316 msgid "Polski (Polish)" msgstr "" -#: bookwyrm/settings.py:310 +#: bookwyrm/settings.py:317 msgid "Português do Brasil (Brazilian Portuguese)" msgstr "" -#: bookwyrm/settings.py:311 +#: bookwyrm/settings.py:318 msgid "Português Europeu (European Portuguese)" msgstr "" -#: bookwyrm/settings.py:312 +#: bookwyrm/settings.py:319 msgid "Română (Romanian)" msgstr "" -#: bookwyrm/settings.py:313 +#: bookwyrm/settings.py:320 msgid "Svenska (Swedish)" msgstr "" -#: bookwyrm/settings.py:314 +#: bookwyrm/settings.py:321 msgid "简体中文 (Simplified Chinese)" msgstr "" -#: bookwyrm/settings.py:315 +#: bookwyrm/settings.py:322 msgid "繁體中文 (Traditional Chinese)" msgstr "" @@ -575,7 +575,7 @@ msgid "Software version:" msgstr "" #: bookwyrm/templates/about/layout.html:30 -#: bookwyrm/templates/embed-layout.html:33 +#: bookwyrm/templates/embed-layout.html:34 #: bookwyrm/templates/snippets/footer.html:8 #, python-format msgid "About %(site_name)s" @@ -682,7 +682,7 @@ msgstr "" #: bookwyrm/templates/annual_summary/layout.html:157 #: bookwyrm/templates/annual_summary/layout.html:178 #: bookwyrm/templates/annual_summary/layout.html:247 -#: bookwyrm/templates/book/book.html:63 +#: bookwyrm/templates/book/book.html:65 #: bookwyrm/templates/discover/large-book.html:22 #: bookwyrm/templates/landing/large-book.html:26 #: bookwyrm/templates/landing/small-book.html:18 @@ -772,24 +772,24 @@ msgid "View ISNI record" msgstr "" #: bookwyrm/templates/author/author.html:95 -#: bookwyrm/templates/book/book.html:173 +#: bookwyrm/templates/book/book.html:175 msgid "View on ISFDB" msgstr "" #: bookwyrm/templates/author/author.html:100 #: bookwyrm/templates/author/sync_modal.html:5 -#: bookwyrm/templates/book/book.html:140 +#: bookwyrm/templates/book/book.html:142 #: bookwyrm/templates/book/sync_modal.html:5 msgid "Load data" msgstr "" #: bookwyrm/templates/author/author.html:104 -#: bookwyrm/templates/book/book.html:144 +#: bookwyrm/templates/book/book.html:146 msgid "View on OpenLibrary" msgstr "" #: bookwyrm/templates/author/author.html:119 -#: bookwyrm/templates/book/book.html:158 +#: bookwyrm/templates/book/book.html:160 msgid "View on Inventaire" msgstr "" @@ -801,11 +801,7 @@ msgstr "" msgid "View on Goodreads" msgstr "" -#: bookwyrm/templates/author/author.html:151 -msgid "View ISFDB entry" -msgstr "" - -#: bookwyrm/templates/author/author.html:166 +#: bookwyrm/templates/author/author.html:158 #, python-format msgid "Books by %(name)s" msgstr "" @@ -963,19 +959,19 @@ msgstr "" msgid "Unable to connect to remote source." msgstr "" -#: bookwyrm/templates/book/book.html:71 bookwyrm/templates/book/book.html:72 +#: bookwyrm/templates/book/book.html:73 bookwyrm/templates/book/book.html:74 msgid "Edit Book" msgstr "" -#: bookwyrm/templates/book/book.html:97 bookwyrm/templates/book/book.html:100 +#: bookwyrm/templates/book/book.html:99 bookwyrm/templates/book/book.html:102 msgid "Click to add cover" msgstr "" -#: bookwyrm/templates/book/book.html:106 +#: bookwyrm/templates/book/book.html:108 msgid "Failed to load cover" msgstr "" -#: bookwyrm/templates/book/book.html:117 +#: bookwyrm/templates/book/book.html:119 msgid "Click to enlarge" msgstr "" @@ -1052,13 +1048,13 @@ msgstr "" #: bookwyrm/templates/guided_tour/lists.html:14 #: bookwyrm/templates/guided_tour/user_books.html:102 #: bookwyrm/templates/guided_tour/user_profile.html:78 -#: bookwyrm/templates/layout.html:90 bookwyrm/templates/lists/curate.html:8 +#: bookwyrm/templates/layout.html:91 bookwyrm/templates/lists/curate.html:8 #: bookwyrm/templates/lists/list.html:12 bookwyrm/templates/lists/lists.html:5 #: bookwyrm/templates/lists/lists.html:12 #: bookwyrm/templates/search/layout.html:26 #: bookwyrm/templates/search/layout.html:51 #: bookwyrm/templates/settings/celery.html:77 -#: bookwyrm/templates/user/layout.html:91 bookwyrm/templates/user/lists.html:6 +#: bookwyrm/templates/user/layout.html:106 bookwyrm/templates/user/lists.html:6 msgid "Lists" msgstr "" @@ -1123,7 +1119,7 @@ msgstr "" #: bookwyrm/templates/book/cover_add_modal.html:23 #: bookwyrm/templates/book/edit/edit_book_form.html:250 -msgid "Load cover from url:" +msgid "Load cover from URL:" msgstr "" #: bookwyrm/templates/book/cover_show_modal.html:6 @@ -1334,7 +1330,7 @@ msgid "Add Another Author" msgstr "" #: bookwyrm/templates/book/edit/edit_book_form.html:231 -#: bookwyrm/templates/shelf/shelf.html:147 +#: bookwyrm/templates/shelf/shelf.html:162 msgid "Cover" msgstr "" @@ -1535,22 +1531,22 @@ msgstr "" msgid "%(languages)s language" msgstr "" -#: bookwyrm/templates/book/publisher_info.html:65 +#: bookwyrm/templates/book/publisher_info.html:63 #, python-format msgid "Published %(date)s by %(publisher)s." msgstr "" +#: bookwyrm/templates/book/publisher_info.html:65 +#, python-format +msgid "Published by %(publisher)s." +msgstr "" + #: bookwyrm/templates/book/publisher_info.html:67 #, python-format msgid "Published %(date)s" msgstr "" -#: bookwyrm/templates/book/publisher_info.html:69 -#, python-format -msgid "Published by %(publisher)s." -msgstr "" - -#: bookwyrm/templates/book/rating.html:13 +#: bookwyrm/templates/book/rating.html:19 msgid "rated it" msgstr "" @@ -1558,12 +1554,12 @@ msgstr "" msgid "Series by" msgstr "" -#: bookwyrm/templates/book/series.html:27 +#: bookwyrm/templates/book/series.html:28 #, python-format msgid "Book %(series_number)s" msgstr "" -#: bookwyrm/templates/book/series.html:27 +#: bookwyrm/templates/book/series.html:28 msgid "Unsorted Book" msgstr "" @@ -1593,7 +1589,7 @@ msgid "Sorry! We couldn't find that code." msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:19 -#: bookwyrm/templates/settings/users/user_info.html:92 +#: bookwyrm/templates/settings/users/user_info.html:98 msgid "Confirmation code:" msgstr "" @@ -1687,6 +1683,7 @@ msgstr "" #: bookwyrm/templates/ostatus/subscribe.html:42 #: bookwyrm/templates/ostatus/success.html:17 #: bookwyrm/templates/ostatus/success.html:18 +#: bookwyrm/templates/user/moved.html:19 bookwyrm/templates/user/moved.html:20 #: bookwyrm/templates/user/user_preview.html:16 #: bookwyrm/templates/user/user_preview.html:17 msgid "Locked account" @@ -1763,7 +1760,7 @@ msgstr "" #: bookwyrm/templates/discover/discover.html:4 #: bookwyrm/templates/discover/discover.html:10 -#: bookwyrm/templates/layout.html:93 +#: bookwyrm/templates/layout.html:94 msgid "Discover" msgstr "" @@ -1895,20 +1892,20 @@ msgstr "" msgid "Test email" msgstr "" -#: bookwyrm/templates/embed-layout.html:20 bookwyrm/templates/layout.html:31 -#: bookwyrm/templates/setup/layout.html:15 +#: bookwyrm/templates/embed-layout.html:21 bookwyrm/templates/layout.html:33 +#: bookwyrm/templates/layout.html:163 bookwyrm/templates/setup/layout.html:15 #: bookwyrm/templates/two_factor_auth/two_factor_login.html:18 #: bookwyrm/templates/two_factor_auth/two_factor_prompt.html:18 #, python-format msgid "%(site_name)s home page" msgstr "" -#: bookwyrm/templates/embed-layout.html:39 +#: bookwyrm/templates/embed-layout.html:40 #: bookwyrm/templates/snippets/footer.html:12 msgid "Contact site admin" msgstr "" -#: bookwyrm/templates/embed-layout.html:45 +#: bookwyrm/templates/embed-layout.html:46 msgid "Join BookWyrm" msgstr "" @@ -2004,19 +2001,19 @@ msgid "Add to your books" msgstr "" #: bookwyrm/templates/get_started/book_preview.html:10 -#: bookwyrm/templates/shelf/shelf.html:86 bookwyrm/templates/user/user.html:37 +#: bookwyrm/templates/shelf/shelf.html:101 bookwyrm/templates/user/user.html:37 #: bookwyrm/templatetags/shelf_tags.py:14 msgid "To Read" msgstr "" #: bookwyrm/templates/get_started/book_preview.html:11 -#: bookwyrm/templates/shelf/shelf.html:87 bookwyrm/templates/user/user.html:38 +#: bookwyrm/templates/shelf/shelf.html:102 bookwyrm/templates/user/user.html:38 #: bookwyrm/templatetags/shelf_tags.py:15 msgid "Currently Reading" msgstr "" #: bookwyrm/templates/get_started/book_preview.html:12 -#: bookwyrm/templates/shelf/shelf.html:88 +#: bookwyrm/templates/shelf/shelf.html:103 #: bookwyrm/templates/snippets/shelf_selector.html:46 #: bookwyrm/templates/snippets/shelve_button/shelve_button_dropdown_options.html:24 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:12 @@ -2025,7 +2022,7 @@ msgid "Read" msgstr "" #: bookwyrm/templates/get_started/book_preview.html:13 -#: bookwyrm/templates/shelf/shelf.html:89 bookwyrm/templates/user/user.html:40 +#: bookwyrm/templates/shelf/shelf.html:104 bookwyrm/templates/user/user.html:40 #: bookwyrm/templatetags/shelf_tags.py:17 msgid "Stopped Reading" msgstr "" @@ -2035,7 +2032,7 @@ msgid "What are you reading?" msgstr "" #: bookwyrm/templates/get_started/books.html:9 -#: bookwyrm/templates/layout.html:39 bookwyrm/templates/lists/list.html:213 +#: bookwyrm/templates/layout.html:41 bookwyrm/templates/lists/list.html:213 msgid "Search for a book" msgstr "" @@ -2054,8 +2051,8 @@ msgstr "" #: bookwyrm/templates/get_started/users.html:18 #: bookwyrm/templates/get_started/users.html:19 #: bookwyrm/templates/groups/members.html:15 -#: bookwyrm/templates/groups/members.html:16 bookwyrm/templates/layout.html:45 -#: bookwyrm/templates/layout.html:46 bookwyrm/templates/lists/list.html:217 +#: bookwyrm/templates/groups/members.html:16 bookwyrm/templates/layout.html:47 +#: bookwyrm/templates/layout.html:48 bookwyrm/templates/lists/list.html:217 #: bookwyrm/templates/search/layout.html:5 #: bookwyrm/templates/search/layout.html:10 #: bookwyrm/templates/search/layout.html:32 @@ -2548,8 +2545,8 @@ msgid "The bell will light up when you have a new notification. When it does, cl msgstr "" #: bookwyrm/templates/guided_tour/home.html:177 -#: bookwyrm/templates/layout.html:75 bookwyrm/templates/layout.html:106 -#: bookwyrm/templates/layout.html:107 +#: bookwyrm/templates/layout.html:77 bookwyrm/templates/layout.html:107 +#: bookwyrm/templates/layout.html:108 #: bookwyrm/templates/notifications/notifications_page.html:5 #: bookwyrm/templates/notifications/notifications_page.html:10 msgid "Notifications" @@ -2712,7 +2709,8 @@ msgstr "" #: bookwyrm/templates/guided_tour/user_groups.html:11 #: bookwyrm/templates/guided_tour/user_profile.html:55 -#: bookwyrm/templates/user/groups.html:6 bookwyrm/templates/user/layout.html:85 +#: bookwyrm/templates/user/groups.html:6 +#: bookwyrm/templates/user/layout.html:100 msgid "Groups" msgstr "" @@ -2757,7 +2755,7 @@ msgid "This is your user profile. All your latest activities will be listed here msgstr "" #: bookwyrm/templates/guided_tour/user_profile.html:11 -#: bookwyrm/templates/user/layout.html:19 bookwyrm/templates/user/user.html:14 +#: bookwyrm/templates/user/layout.html:20 bookwyrm/templates/user/user.html:14 msgid "User Profile" msgstr "" @@ -2766,7 +2764,7 @@ msgid "This tab shows everything you have read towards your annual reading goal, msgstr "" #: bookwyrm/templates/guided_tour/user_profile.html:32 -#: bookwyrm/templates/user/goal.html:6 bookwyrm/templates/user/layout.html:79 +#: bookwyrm/templates/user/goal.html:6 bookwyrm/templates/user/layout.html:94 msgid "Reading Goal" msgstr "" @@ -2805,7 +2803,7 @@ msgstr "" #: bookwyrm/templates/import/import.html:5 #: bookwyrm/templates/import/import.html:9 -#: bookwyrm/templates/shelf/shelf.html:64 +#: bookwyrm/templates/shelf/shelf.html:79 msgid "Import Books" msgstr "" @@ -2816,7 +2814,7 @@ msgstr "" #: bookwyrm/templates/import/import.html:21 #, python-format msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day." -msgid_plural "Currently, you are allowed to import %(import_size_limit)s books every %(import_limit_reset)s days." +msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days." msgstr[0] "" msgstr[1] "" msgstr[2] "" @@ -2878,7 +2876,7 @@ msgstr "" #: bookwyrm/templates/import/import.html:106 #: bookwyrm/templates/import/import.html:108 -#: bookwyrm/templates/preferences/layout.html:35 +#: bookwyrm/templates/preferences/layout.html:43 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78 msgid "Import" msgstr "" @@ -2979,8 +2977,8 @@ msgid "Row" msgstr "" #: bookwyrm/templates/import/import_status.html:110 -#: bookwyrm/templates/shelf/shelf.html:148 -#: bookwyrm/templates/shelf/shelf.html:170 +#: bookwyrm/templates/shelf/shelf.html:163 +#: bookwyrm/templates/shelf/shelf.html:185 msgid "Title" msgstr "" @@ -2993,8 +2991,8 @@ msgid "Openlibrary key" msgstr "" #: bookwyrm/templates/import/import_status.html:121 -#: bookwyrm/templates/shelf/shelf.html:149 -#: bookwyrm/templates/shelf/shelf.html:173 +#: bookwyrm/templates/shelf/shelf.html:164 +#: bookwyrm/templates/shelf/shelf.html:188 msgid "Author" msgstr "" @@ -3151,7 +3149,7 @@ msgid "Login" msgstr "" #: bookwyrm/templates/landing/login.html:7 -#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:136 +#: bookwyrm/templates/landing/login.html:36 bookwyrm/templates/layout.html:142 #: bookwyrm/templates/ostatus/error.html:37 msgid "Log in" msgstr "" @@ -3162,7 +3160,7 @@ msgstr "" #: bookwyrm/templates/landing/login.html:21 #: bookwyrm/templates/landing/reactivate.html:17 -#: bookwyrm/templates/layout.html:127 bookwyrm/templates/ostatus/error.html:28 +#: bookwyrm/templates/layout.html:128 bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "" @@ -3170,13 +3168,13 @@ msgstr "" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 #: bookwyrm/templates/landing/reactivate.html:23 -#: bookwyrm/templates/layout.html:131 bookwyrm/templates/ostatus/error.html:32 +#: bookwyrm/templates/layout.html:132 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/preferences/2fa.html:91 #: bookwyrm/templates/snippets/register_form.html:45 msgid "Password:" msgstr "" -#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:133 +#: bookwyrm/templates/landing/login.html:39 bookwyrm/templates/layout.html:139 #: bookwyrm/templates/ostatus/error.html:34 msgid "Forgot your password?" msgstr "" @@ -3219,35 +3217,39 @@ msgstr "" msgid "%(site_name)s search" msgstr "" -#: bookwyrm/templates/layout.html:37 +#: bookwyrm/templates/layout.html:39 msgid "Search for a book, user, or list" msgstr "" -#: bookwyrm/templates/layout.html:52 bookwyrm/templates/layout.html:53 +#: bookwyrm/templates/layout.html:54 bookwyrm/templates/layout.html:55 msgid "Scan Barcode" msgstr "" -#: bookwyrm/templates/layout.html:67 +#: bookwyrm/templates/layout.html:69 msgid "Main navigation menu" msgstr "" -#: bookwyrm/templates/layout.html:87 +#: bookwyrm/templates/layout.html:88 msgid "Feed" msgstr "" -#: bookwyrm/templates/layout.html:132 bookwyrm/templates/ostatus/error.html:33 +#: bookwyrm/templates/layout.html:134 bookwyrm/templates/ostatus/error.html:33 msgid "password" msgstr "" -#: bookwyrm/templates/layout.html:144 +#: bookwyrm/templates/layout.html:136 +msgid "Show/Hide password" +msgstr "" + +#: bookwyrm/templates/layout.html:150 msgid "Join" msgstr "" -#: bookwyrm/templates/layout.html:179 +#: bookwyrm/templates/layout.html:196 msgid "Successfully posted status" msgstr "" -#: bookwyrm/templates/layout.html:180 +#: bookwyrm/templates/layout.html:197 msgid "Error posting status" msgstr "" @@ -3506,6 +3508,23 @@ msgstr "" msgid "Saved Lists" msgstr "" +#: bookwyrm/templates/moved.html:27 +#, python-format +msgid "You have moved your account to %(username)s" +msgstr "" + +#: bookwyrm/templates/moved.html:32 +msgid "You can undo the move to restore full functionality, but some followers may have already unfollowed this account." +msgstr "" + +#: bookwyrm/templates/moved.html:42 bookwyrm/templates/shelf/shelf.html:32 +msgid "Undo move" +msgstr "" + +#: bookwyrm/templates/moved.html:46 bookwyrm/templates/user_menu.html:82 +msgid "Log out" +msgstr "" + #: bookwyrm/templates/notifications/items/accept.html:18 #, python-format msgid "%(related_user)s accepted your invitation to join group \"%(group_name)s\"" @@ -3760,6 +3779,16 @@ msgstr "" msgid "%(related_user)s mentioned you in a status" msgstr "" +#: bookwyrm/templates/notifications/items/move_user.html:18 +#, python-format +msgid "%(related_user)s has moved to %(username)s" +msgstr "" + +#: bookwyrm/templates/notifications/items/move_user.html:25 +#, python-format +msgid "%(related_user)s has undone their move" +msgstr "" + #: bookwyrm/templates/notifications/items/remove.html:17 #, python-format msgid "has been removed from your group \"%(group_name)s\"" @@ -3799,7 +3828,7 @@ msgstr[1] "" msgstr[2] "" #: bookwyrm/templates/notifications/items/status_preview.html:4 -#: bookwyrm/templates/snippets/status/content_status.html:73 +#: bookwyrm/templates/snippets/status/content_status.html:62 msgid "Content warning" msgstr "" @@ -4017,9 +4046,51 @@ msgstr "" msgid "Set up 2FA" msgstr "" +#: bookwyrm/templates/preferences/alias_user.html:4 +#: bookwyrm/templates/preferences/move_user.html:4 +#: bookwyrm/templates/preferences/move_user.html:7 +#: bookwyrm/templates/preferences/move_user.html:39 +msgid "Move Account" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:7 +#: bookwyrm/templates/preferences/alias_user.html:34 +msgid "Create Alias" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:12 +msgid "Add another account as an alias" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:16 +msgid "Marking another account as an alias is required if you want to move that account to this one." +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:19 +msgid "This is a reversable action and will not change the functionality of this account." +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:25 +msgid "Enter the username for the account you want to add as an alias e.g. user@example.com :" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:30 +#: bookwyrm/templates/preferences/move_user.html:35 +msgid "Confirm your password:" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:39 +#: bookwyrm/templates/preferences/layout.html:28 +msgid "Aliases" +msgstr "" + +#: bookwyrm/templates/preferences/alias_user.html:49 +msgid "Remove alias" +msgstr "" + #: bookwyrm/templates/preferences/blocks.html:4 #: bookwyrm/templates/preferences/blocks.html:7 -#: bookwyrm/templates/preferences/layout.html:46 +#: bookwyrm/templates/preferences/layout.html:54 msgid "Blocked Users" msgstr "" @@ -4049,7 +4120,7 @@ msgstr "" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 #: bookwyrm/templates/preferences/delete_user.html:40 -#: bookwyrm/templates/preferences/layout.html:28 +#: bookwyrm/templates/preferences/layout.html:36 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "" @@ -4171,18 +4242,45 @@ msgstr "" msgid "Account" msgstr "" -#: bookwyrm/templates/preferences/layout.html:31 -msgid "Data" +#: bookwyrm/templates/preferences/layout.html:32 +msgid "Move Account" msgstr "" #: bookwyrm/templates/preferences/layout.html:39 +msgid "Data" +msgstr "" + +#: bookwyrm/templates/preferences/layout.html:47 msgid "CSV export" msgstr "" -#: bookwyrm/templates/preferences/layout.html:42 +#: bookwyrm/templates/preferences/layout.html:50 msgid "Relationships" msgstr "" +#: bookwyrm/templates/preferences/move_user.html:12 +msgid "Migrate account to another server" +msgstr "" + +#: bookwyrm/templates/preferences/move_user.html:16 +msgid "Moving your account will notify all your followers and direct them to follow the new account." +msgstr "" + +#: bookwyrm/templates/preferences/move_user.html:19 +#, python-format +msgid "\n" +" %(user)s will be marked as moved and will not be discoverable or usable unless you undo the move.\n" +" " +msgstr "" + +#: bookwyrm/templates/preferences/move_user.html:25 +msgid "Remember to add this user as an alias of the target account before you try to move." +msgstr "" + +#: bookwyrm/templates/preferences/move_user.html:30 +msgid "Enter the username for the account you want to move to e.g. user@example.com :" +msgstr "" + #: bookwyrm/templates/reading_progress/finish.html:5 #, python-format msgid "Finish \"%(book_title)s\"" @@ -4591,7 +4689,7 @@ msgid "Streams" msgstr "" #: bookwyrm/templates/settings/celery.html:32 -msgid "Broadcasts" +msgid "Broadcast" msgstr "" #: bookwyrm/templates/settings/celery.html:38 @@ -4921,19 +5019,19 @@ msgstr "" #: bookwyrm/templates/settings/federation/edit_instance.html:52 #: bookwyrm/templates/settings/federation/instance.html:46 -#: bookwyrm/templates/settings/users/user_info.html:113 +#: bookwyrm/templates/settings/users/user_info.html:119 msgid "Status:" msgstr "" #: bookwyrm/templates/settings/federation/edit_instance.html:66 #: bookwyrm/templates/settings/federation/instance.html:40 -#: bookwyrm/templates/settings/users/user_info.html:107 +#: bookwyrm/templates/settings/users/user_info.html:113 msgid "Software:" msgstr "" #: bookwyrm/templates/settings/federation/edit_instance.html:76 #: bookwyrm/templates/settings/federation/instance.html:43 -#: bookwyrm/templates/settings/users/user_info.html:110 +#: bookwyrm/templates/settings/users/user_info.html:116 msgid "Version:" msgstr "" @@ -4946,7 +5044,7 @@ msgid "Details" msgstr "" #: bookwyrm/templates/settings/federation/instance.html:53 -#: bookwyrm/templates/user/layout.html:69 +#: bookwyrm/templates/user/layout.html:84 msgid "Activity" msgstr "" @@ -4960,7 +5058,7 @@ msgid "View all" msgstr "" #: bookwyrm/templates/settings/federation/instance.html:62 -#: bookwyrm/templates/settings/users/user_info.html:60 +#: bookwyrm/templates/settings/users/user_info.html:66 msgid "Reports:" msgstr "" @@ -4977,7 +5075,7 @@ msgid "Blocked by us:" msgstr "" #: bookwyrm/templates/settings/federation/instance.html:90 -#: bookwyrm/templates/settings/users/user_info.html:117 +#: bookwyrm/templates/settings/users/user_info.html:123 msgid "Notes" msgstr "" @@ -5697,17 +5795,22 @@ msgstr "" msgid "Remote instance" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:86 +#: bookwyrm/templates/settings/users/user_admin.html:82 +#: bookwyrm/templates/settings/users/user_info.html:29 +msgid "Moved" +msgstr "" + +#: bookwyrm/templates/settings/users/user_admin.html:93 msgid "Deleted" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:92 -#: bookwyrm/templates/settings/users/user_info.html:32 +#: bookwyrm/templates/settings/users/user_admin.html:99 +#: bookwyrm/templates/settings/users/user_info.html:38 msgid "Inactive" msgstr "" -#: bookwyrm/templates/settings/users/user_admin.html:101 -#: bookwyrm/templates/settings/users/user_info.html:127 +#: bookwyrm/templates/settings/users/user_admin.html:108 +#: bookwyrm/templates/settings/users/user_info.html:133 msgid "Not set" msgstr "" @@ -5719,55 +5822,55 @@ msgstr "" msgid "Go to user admin" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:40 +#: bookwyrm/templates/settings/users/user_info.html:46 msgid "Local" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:42 +#: bookwyrm/templates/settings/users/user_info.html:48 msgid "Remote" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:51 +#: bookwyrm/templates/settings/users/user_info.html:57 msgid "User details" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:55 +#: bookwyrm/templates/settings/users/user_info.html:61 msgid "Email:" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:65 +#: bookwyrm/templates/settings/users/user_info.html:71 msgid "(View reports)" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:71 +#: bookwyrm/templates/settings/users/user_info.html:77 msgid "Blocked by count:" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:74 +#: bookwyrm/templates/settings/users/user_info.html:80 msgid "Date added:" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:77 +#: bookwyrm/templates/settings/users/user_info.html:83 msgid "Last active date:" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:80 +#: bookwyrm/templates/settings/users/user_info.html:86 msgid "Manually approved followers:" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:83 +#: bookwyrm/templates/settings/users/user_info.html:89 msgid "Discoverable:" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:87 +#: bookwyrm/templates/settings/users/user_info.html:93 msgid "Deactivation reason:" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:102 +#: bookwyrm/templates/settings/users/user_info.html:108 msgid "Instance details" msgstr "" -#: bookwyrm/templates/settings/users/user_info.html:124 +#: bookwyrm/templates/settings/users/user_info.html:130 msgid "View instance" msgstr "" @@ -5904,7 +6007,7 @@ msgid "Need help?" msgstr "" #: bookwyrm/templates/shelf/create_shelf_form.html:5 -#: bookwyrm/templates/shelf/shelf.html:72 +#: bookwyrm/templates/shelf/shelf.html:87 msgid "Create shelf" msgstr "" @@ -5912,18 +6015,26 @@ msgstr "" msgid "Edit Shelf" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:24 +#: bookwyrm/templates/shelf/shelf.html:25 +msgid "You have have moved to" +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:28 +msgid "You can undo this move to restore full functionality, but some followers may have already unfollowed this account." +msgstr "" + +#: bookwyrm/templates/shelf/shelf.html:39 #: bookwyrm/templates/user/relationships/followers.html:18 #: bookwyrm/templates/user/relationships/following.html:18 msgid "User profile" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:39 +#: bookwyrm/templates/shelf/shelf.html:54 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53 msgid "All books" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:97 +#: bookwyrm/templates/shelf/shelf.html:112 #, python-format msgid "%(formatted_count)s book" msgid_plural "%(formatted_count)s books" @@ -5931,40 +6042,40 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templates/shelf/shelf.html:104 +#: bookwyrm/templates/shelf/shelf.html:119 #, python-format msgid "(showing %(start)s-%(end)s)" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:116 +#: bookwyrm/templates/shelf/shelf.html:131 msgid "Edit shelf" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:124 +#: bookwyrm/templates/shelf/shelf.html:139 msgid "Delete shelf" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:152 -#: bookwyrm/templates/shelf/shelf.html:178 +#: bookwyrm/templates/shelf/shelf.html:167 +#: bookwyrm/templates/shelf/shelf.html:193 msgid "Shelved" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:153 -#: bookwyrm/templates/shelf/shelf.html:181 +#: bookwyrm/templates/shelf/shelf.html:168 +#: bookwyrm/templates/shelf/shelf.html:196 msgid "Started" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:154 -#: bookwyrm/templates/shelf/shelf.html:184 +#: bookwyrm/templates/shelf/shelf.html:169 +#: bookwyrm/templates/shelf/shelf.html:199 msgid "Finished" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:154 -#: bookwyrm/templates/shelf/shelf.html:184 +#: bookwyrm/templates/shelf/shelf.html:169 +#: bookwyrm/templates/shelf/shelf.html:199 msgid "Until" msgstr "" -#: bookwyrm/templates/shelf/shelf.html:210 +#: bookwyrm/templates/shelf/shelf.html:225 msgid "This shelf is empty." msgstr "" @@ -6276,6 +6387,10 @@ msgstr "" msgid "%(username)s has read %(read_count)s of %(goal_count)s books." msgstr "" +#: bookwyrm/templates/snippets/move_user_buttons.html:10 +msgid "Follow at new account" +msgstr "" + #: bookwyrm/templates/snippets/page_text.html:8 #, python-format msgid "page %(page)s of %(total_pages)s" @@ -6417,35 +6532,35 @@ msgstr "" msgid "Finish reading" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:80 +#: bookwyrm/templates/snippets/status/content_status.html:69 msgid "Show status" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:102 +#: bookwyrm/templates/snippets/status/content_status.html:91 #, python-format msgid "(Page %(page)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:102 +#: bookwyrm/templates/snippets/status/content_status.html:91 #, python-format msgid "%(endpage)s" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:104 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid "(%(percent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:104 +#: bookwyrm/templates/snippets/status/content_status.html:93 #, python-format msgid " - %(endpercent)s%%" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:127 +#: bookwyrm/templates/snippets/status/content_status.html:116 msgid "Open image in new window" msgstr "" -#: bookwyrm/templates/snippets/status/content_status.html:148 +#: bookwyrm/templates/snippets/status/content_status.html:137 msgid "Hide status" msgstr "" @@ -6637,10 +6752,14 @@ msgid "Groups: %(username)s" msgstr "" #: bookwyrm/templates/user/layout.html:50 +msgid "has moved to" +msgstr "" + +#: bookwyrm/templates/user/layout.html:64 msgid "Follow Requests" msgstr "" -#: bookwyrm/templates/user/layout.html:73 +#: bookwyrm/templates/user/layout.html:88 #: bookwyrm/templates/user/reviews_comments.html:6 #: bookwyrm/templates/user/reviews_comments.html:12 msgid "Reviews and Comments" @@ -6655,6 +6774,12 @@ msgstr "" msgid "Create list" msgstr "" +#: bookwyrm/templates/user/moved.html:25 +#: bookwyrm/templates/user/user_preview.html:22 +#, python-format +msgid "Joined %(date)s" +msgstr "" + #: bookwyrm/templates/user/relationships/followers.html:31 #, python-format msgid "%(username)s has no followers" @@ -6726,11 +6851,6 @@ msgstr "" msgid "No activities yet!" msgstr "" -#: bookwyrm/templates/user/user_preview.html:22 -#, python-format -msgid "Joined %(date)s" -msgstr "" - #: bookwyrm/templates/user/user_preview.html:26 #, python-format msgid "%(display_count)s follower" @@ -6760,10 +6880,6 @@ msgstr "" msgid "View profile and more" msgstr "" -#: bookwyrm/templates/user_menu.html:82 -msgid "Log out" -msgstr "" - #: bookwyrm/templates/widgets/clearable_file_input_with_warning.html:28 msgid "File exceeds maximum size: 10MB" msgstr "" @@ -6781,7 +6897,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: bookwyrm/templatetags/utilities.py:39 +#: bookwyrm/templatetags/utilities.py:48 #, python-format msgid "%(title)s: %(subtitle)s" msgstr ""