From d5a61250887fa146aa3961057553ccc4ade4c91d Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Thu, 10 Nov 2022 14:54:02 -0800 Subject: [PATCH] New translations django.po (Oulipo) --- locale/en_Oulipo/LC_MESSAGES/django.po | 83 +++++++++++++++++--------- 1 file changed, 56 insertions(+), 27 deletions(-) diff --git a/locale/en_Oulipo/LC_MESSAGES/django.po b/locale/en_Oulipo/LC_MESSAGES/django.po index 34a355fea..8e8c25618 100644 --- a/locale/en_Oulipo/LC_MESSAGES/django.po +++ b/locale/en_Oulipo/LC_MESSAGES/django.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: bookwyrm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-11-07 19:14+0000\n" -"PO-Revision-Date: 2022-11-07 19:53\n" +"POT-Creation-Date: 2022-11-10 21:42+0000\n" +"PO-Revision-Date: 2022-11-10 22:54\n" "Last-Translator: Mouse Reeve \n" "Language-Team: Oulipo\n" "Language: en_Oulipo\n" @@ -46,7 +46,7 @@ msgstr "No limit" msgid "Incorrect password" msgstr "" -#: bookwyrm/forms/edit_user.py:95 bookwyrm/forms/landing.py:73 +#: bookwyrm/forms/edit_user.py:95 bookwyrm/forms/landing.py:89 msgid "Password does not match" msgstr "" @@ -70,15 +70,19 @@ msgstr "" msgid "Reading finished date cannot be in the future." msgstr "" -#: bookwyrm/forms/landing.py:40 +#: bookwyrm/forms/landing.py:37 +msgid "Username or password are incorrect" +msgstr "Alias and password don't match" + +#: bookwyrm/forms/landing.py:56 msgid "User with this username already exists" msgstr "" -#: bookwyrm/forms/landing.py:49 +#: bookwyrm/forms/landing.py:65 msgid "A user with this email already exists." msgstr "An account is using this mail." -#: bookwyrm/forms/landing.py:107 bookwyrm/forms/landing.py:115 +#: bookwyrm/forms/landing.py:123 bookwyrm/forms/landing.py:131 msgid "Incorrect code" msgstr "" @@ -152,14 +156,18 @@ msgid "Self deletion" msgstr "Discard of own account" #: bookwyrm/models/base_model.py:20 +msgid "Self deactivation" +msgstr "" + +#: bookwyrm/models/base_model.py:21 msgid "Moderator suspension" msgstr "Admin moratorium" -#: bookwyrm/models/base_model.py:21 +#: bookwyrm/models/base_model.py:22 msgid "Moderator deletion" msgstr "Admin discard" -#: bookwyrm/models/base_model.py:22 +#: bookwyrm/models/base_model.py:23 msgid "Domain block" msgstr "Domain block" @@ -1325,7 +1333,7 @@ msgstr "" #: bookwyrm/templates/book/file_links/edit_links.html:37 #: bookwyrm/templates/settings/announcements/announcements.html:41 #: bookwyrm/templates/settings/federation/instance.html:112 -#: bookwyrm/templates/settings/imports/imports.html:60 +#: bookwyrm/templates/settings/imports/imports.html:62 #: bookwyrm/templates/settings/reports/report_links_table.html:6 #: bookwyrm/templates/settings/themes.html:99 msgid "Actions" @@ -2678,7 +2686,7 @@ msgid "Recent Imports" msgstr "Your Imports" #: bookwyrm/templates/import/import.html:96 -#: bookwyrm/templates/settings/imports/imports.html:40 +#: bookwyrm/templates/settings/imports/imports.html:41 msgid "Date Created" msgstr "" @@ -2687,7 +2695,7 @@ msgid "Last Updated" msgstr "" #: bookwyrm/templates/import/import.html:102 -#: bookwyrm/templates/settings/imports/imports.html:48 +#: bookwyrm/templates/settings/imports/imports.html:50 msgid "Items" msgstr "" @@ -2726,7 +2734,7 @@ msgid "Refresh" msgstr "" #: bookwyrm/templates/import/import_status.html:72 -#: bookwyrm/templates/settings/imports/imports.html:80 +#: bookwyrm/templates/settings/imports/imports.html:82 msgid "Stop import" msgstr "" @@ -2844,7 +2852,7 @@ msgid "Reject" msgstr "" #: bookwyrm/templates/import/troubleshoot.html:7 -#: bookwyrm/templates/settings/imports/imports.html:57 +#: bookwyrm/templates/settings/imports/imports.html:59 msgid "Failed items" msgstr "" @@ -2875,6 +2883,7 @@ msgstr "" #: bookwyrm/templates/landing/invite.html:4 #: bookwyrm/templates/landing/invite.html:8 #: bookwyrm/templates/landing/login.html:48 +#: bookwyrm/templates/landing/reactivate.html:41 msgid "Create an Account" msgstr "Join" @@ -2938,14 +2947,16 @@ msgstr "Log in" msgid "Success! Email address confirmed." msgstr "" -#: bookwyrm/templates/landing/login.html:21 bookwyrm/templates/layout.html:140 -#: bookwyrm/templates/ostatus/error.html:28 +#: bookwyrm/templates/landing/login.html:21 +#: bookwyrm/templates/landing/reactivate.html:17 +#: bookwyrm/templates/layout.html:140 bookwyrm/templates/ostatus/error.html:28 #: bookwyrm/templates/snippets/register_form.html:4 msgid "Username:" msgstr "Alias" #: bookwyrm/templates/landing/login.html:27 #: bookwyrm/templates/landing/password_reset.html:26 +#: bookwyrm/templates/landing/reactivate.html:23 #: bookwyrm/templates/layout.html:144 bookwyrm/templates/ostatus/error.html:32 #: bookwyrm/templates/preferences/2fa.html:68 #: bookwyrm/templates/snippets/register_form.html:45 @@ -2958,12 +2969,13 @@ msgid "Forgot your password?" msgstr "Forgot your password?" #: bookwyrm/templates/landing/login.html:61 +#: bookwyrm/templates/landing/reactivate.html:54 msgid "More about this site" msgstr "Additional information" #: bookwyrm/templates/landing/password_reset.html:43 #: bookwyrm/templates/preferences/change_password.html:33 -#: bookwyrm/templates/preferences/delete_user.html:20 +#: bookwyrm/templates/preferences/delete_user.html:35 msgid "Confirm password:" msgstr "" @@ -2980,6 +2992,15 @@ msgstr "A link to fix your password will go to your mail" msgid "Reset password" msgstr "Forogt password" +#: bookwyrm/templates/landing/reactivate.html:4 +#: bookwyrm/templates/landing/reactivate.html:7 +msgid "Reactivate Account" +msgstr "" + +#: bookwyrm/templates/landing/reactivate.html:32 +msgid "Reactivate account" +msgstr "" + #: bookwyrm/templates/layout.html:13 #, python-format msgid "%(site_name)s search" @@ -3795,17 +3816,29 @@ msgstr "" #: bookwyrm/templates/preferences/delete_user.html:4 #: bookwyrm/templates/preferences/delete_user.html:7 -#: bookwyrm/templates/preferences/delete_user.html:25 +#: bookwyrm/templates/preferences/delete_user.html:40 #: bookwyrm/templates/preferences/layout.html:28 #: bookwyrm/templates/settings/users/delete_user_form.html:22 msgid "Delete Account" msgstr "Discard Account" #: bookwyrm/templates/preferences/delete_user.html:12 +msgid "Deactivate account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:15 +msgid "Your account will be hidden. You can log back in at any time to re-activate your account." +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:20 +msgid "Deactivate Account" +msgstr "" + +#: bookwyrm/templates/preferences/delete_user.html:26 msgid "Permanently delete account" msgstr "" -#: bookwyrm/templates/preferences/delete_user.html:14 +#: bookwyrm/templates/preferences/delete_user.html:29 msgid "Deleting your account cannot be undone. The username will not be available to register in the future." msgstr "You cannot undo this action. Nobody can add an account with your alias." @@ -4663,19 +4696,19 @@ msgstr "" msgid "User" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:44 +#: bookwyrm/templates/settings/imports/imports.html:46 msgid "Date Updated" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:51 +#: bookwyrm/templates/settings/imports/imports.html:53 msgid "Pending items" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:54 +#: bookwyrm/templates/settings/imports/imports.html:56 msgid "Successful items" msgstr "" -#: bookwyrm/templates/settings/imports/imports.html:89 +#: bookwyrm/templates/settings/imports/imports.html:91 msgid "No matching imports found." msgstr "" @@ -6217,14 +6250,10 @@ msgstr "That upload was too big; max upload is 10MB" msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/views/imports/import_data.py:98 +#: bookwyrm/views/imports/import_data.py:86 msgid "Not a valid csv file" msgstr "Not a valid upload" -#: bookwyrm/views/landing/login.py:86 -msgid "Username or password are incorrect" -msgstr "Alias and password don't match" - #: bookwyrm/views/rss_feed.py:34 #, python-brace-format msgid "Status updates from {obj.display_name}"