diff --git a/locale/de_DE/LC_MESSAGES/django.mo b/locale/de_DE/LC_MESSAGES/django.mo index d2d1bc5f..90371802 100644 Binary files a/locale/de_DE/LC_MESSAGES/django.mo and b/locale/de_DE/LC_MESSAGES/django.mo differ diff --git a/locale/de_DE/LC_MESSAGES/django.po b/locale/de_DE/LC_MESSAGES/django.po index b3623765..517dacac 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-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-08 15:57+0000\n" "PO-Revision-Date: 2021-03-02 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -102,21 +102,21 @@ msgstr "Username" msgid "A user with that username already exists." msgstr "Dieser Benutzename ist bereits vergeben." -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home" msgstr "" -#: bookwyrm/settings.py:125 +#: bookwyrm/settings.py:114 #, fuzzy #| msgid "Title" msgid "Books Timeline" msgstr "Titel" -#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:114 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:81 #, fuzzy @@ -124,27 +124,27 @@ msgstr "Titel" msgid "Books" msgstr "Buch" -#: bookwyrm/settings.py:171 +#: bookwyrm/settings.py:160 msgid "English" msgstr "Englisch" -#: bookwyrm/settings.py:172 +#: bookwyrm/settings.py:161 msgid "German" msgstr "Deutsch" -#: bookwyrm/settings.py:173 +#: bookwyrm/settings.py:162 msgid "Spanish" msgstr "Spanisch" -#: bookwyrm/settings.py:174 +#: bookwyrm/settings.py:163 msgid "French" msgstr "Französisch" -#: bookwyrm/settings.py:175 +#: bookwyrm/settings.py:164 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" -#: bookwyrm/settings.py:176 +#: bookwyrm/settings.py:165 msgid "Traditional Chinese" msgstr "" @@ -303,7 +303,7 @@ msgstr "" #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -320,6 +320,7 @@ msgstr "Speichern" #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -731,6 +732,7 @@ msgstr "Suchergebnisse" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/components/modal.html:11 +#: bookwyrm/templates/components/tooltip.html:7 #: bookwyrm/templates/feed/layout.html:71 #: bookwyrm/templates/get_started/layout.html:20 #: bookwyrm/templates/get_started/layout.html:53 @@ -739,6 +741,10 @@ msgstr "Suchergebnisse" msgid "Close" msgstr "Schließen" +#: bookwyrm/templates/components/tooltip.html:3 +msgid "Help" +msgstr "" + #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8 #, fuzzy #| msgid "Boost status" @@ -766,6 +772,7 @@ msgid "Sorry! We couldn't find that code." msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 #, fuzzy #| msgid "Confirm password:" msgid "Confirmation code:" @@ -1283,125 +1290,130 @@ msgstr "Deine Bücher %(year)s" msgid "%(username)s's %(year)s Books" msgstr "%(username)ss %(year)s Bücher" -#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 +#: bookwyrm/templates/import/import.html:5 +#: bookwyrm/templates/import/import.html:9 #: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "Bücher importieren" -#: bookwyrm/templates/import.html:16 +#: bookwyrm/templates/import/import.html:18 #, fuzzy #| msgid "Data source" msgid "Data source:" msgstr "Datenquelle" -#: bookwyrm/templates/import.html:32 +#: bookwyrm/templates/import/import.html:37 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import.html:40 +#: bookwyrm/templates/import/import.html:45 msgid "Include reviews" msgstr "Bewertungen importieren" -#: bookwyrm/templates/import.html:45 +#: bookwyrm/templates/import/import.html:50 msgid "Privacy setting for imported reviews:" msgstr "Datenschutzeinstellung für importierte Bewertungen" -#: bookwyrm/templates/import.html:51 +#: bookwyrm/templates/import/import.html:56 #: bookwyrm/templates/settings/server_blocklist.html:64 msgid "Import" msgstr "Importieren" -#: bookwyrm/templates/import.html:56 +#: bookwyrm/templates/import/import.html:61 msgid "Recent Imports" msgstr "Aktuelle Importe" -#: bookwyrm/templates/import.html:58 +#: bookwyrm/templates/import/import.html:63 msgid "No recent imports" msgstr "Keine aktuellen Importe" -#: bookwyrm/templates/import_status.html:6 -#: bookwyrm/templates/import_status.html:10 +#: bookwyrm/templates/import/import_status.html:6 +#: bookwyrm/templates/import/import_status.html:10 msgid "Import Status" msgstr "Importstatus" -#: bookwyrm/templates/import_status.html:11 +#: bookwyrm/templates/import/import_status.html:11 #, fuzzy #| msgid "Back to reports" msgid "Back to imports" msgstr "Zurück zu den Meldungen" -#: bookwyrm/templates/import_status.html:15 +#: bookwyrm/templates/import/import_status.html:15 msgid "Import started:" msgstr "Import gestartet:" -#: bookwyrm/templates/import_status.html:20 +#: bookwyrm/templates/import/import_status.html:20 msgid "Import completed:" msgstr "Import abgeschlossen:" -#: bookwyrm/templates/import_status.html:24 +#: bookwyrm/templates/import/import_status.html:24 msgid "TASK FAILED" msgstr "AUFGABE GESCHEITERT" -#: bookwyrm/templates/import_status.html:32 +#: bookwyrm/templates/import/import_status.html:32 msgid "Import still in progress." msgstr "Import läuft noch." -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import/import_status.html:34 msgid "(Hit reload to update!)" msgstr "(Aktualisiere für ein Update!)" -#: bookwyrm/templates/import_status.html:41 +#: bookwyrm/templates/import/import_status.html:41 msgid "Failed to load" msgstr "Laden fehlgeschlagen" -#: bookwyrm/templates/import_status.html:50 +#: bookwyrm/templates/import/import_status.html:50 #, python-format msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import." msgstr "Zum Ende der Liste springen, um die %(failed_count)s Einträge, deren Import fehlschlug, auszuwählen." -#: bookwyrm/templates/import_status.html:62 +#: bookwyrm/templates/import/import_status.html:62 #, python-format msgid "Line %(index)s: %(title)s by %(author)s" msgstr "" -#: bookwyrm/templates/import_status.html:82 +#: bookwyrm/templates/import/import_status.html:82 msgid "Select all" msgstr "Alle auswählen" -#: bookwyrm/templates/import_status.html:85 +#: bookwyrm/templates/import/import_status.html:85 msgid "Retry items" msgstr "Punkte erneut versuchen" -#: bookwyrm/templates/import_status.html:112 +#: bookwyrm/templates/import/import_status.html:112 msgid "Successfully imported" msgstr "Erfolgreich importiert" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import/import_status.html:114 #, fuzzy #| msgid "Import still in progress." msgid "Import Progress" msgstr "Import läuft noch." -#: bookwyrm/templates/import_status.html:119 +#: bookwyrm/templates/import/import_status.html:119 msgid "Book" msgstr "Buch" -#: bookwyrm/templates/import_status.html:122 +#: bookwyrm/templates/import/import_status.html:122 #: bookwyrm/templates/user/shelf/shelf.html:111 #: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "Titel" -#: bookwyrm/templates/import_status.html:125 +#: bookwyrm/templates/import/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:112 #: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "Autor*in" -#: bookwyrm/templates/import_status.html:148 +#: bookwyrm/templates/import/import_status.html:148 msgid "Imported" msgstr "Importiert" +#: bookwyrm/templates/import/tooltip.html:6 +msgid "You can download your GoodReads data from the Import/Export page of your GoodReads account." +msgstr "" + #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 #: bookwyrm/templates/login.html:51 msgid "Create an Account" @@ -1605,8 +1617,27 @@ msgstr "Bestätigen" msgid "Discard" msgstr "Ablehnen" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "Dieses Fortschrittsupdate löschen" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +#, fuzzy +#| msgid "This shelf is empty." +msgid "This action cannot be un-done" +msgstr "Dieses Regal ist leer." + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "Löschen" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "Liste bearbeiten" @@ -1641,6 +1672,12 @@ msgstr "Offen" msgid "Anyone can add books to this list" msgstr "Alle können Bücher hinzufügen" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "Post löschen" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "" @@ -2070,6 +2107,7 @@ msgid "Account" msgstr "" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "Profil" @@ -2208,12 +2246,6 @@ msgstr "Zurück zu den Meldungen" msgid "Edit Announcement" msgstr "Ankündigungen" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "Löschen" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "" @@ -2280,6 +2312,7 @@ msgstr "Lesedaten bearbeiten" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "" @@ -2329,7 +2362,7 @@ msgstr "Instanzname" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 #, fuzzy #| msgid "Import Status" msgid "Status:" @@ -2348,13 +2381,13 @@ msgstr "Blockierte Nutzer*innen" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 #, fuzzy #| msgid "Description:" msgid "Version:" @@ -2383,6 +2416,7 @@ msgid "View all" msgstr "" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 #, fuzzy #| msgid "Recent Imports" msgid "Reports:" @@ -2407,7 +2441,7 @@ msgid "Blocked by us:" msgstr "Blockierte Nutzer*innen" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "" @@ -3428,7 +3462,7 @@ msgstr[1] "folgt dir" msgid "No followers you follow" msgstr "folgt dir" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 #, fuzzy #| msgid "Back to reports" msgid "Back to users" @@ -3464,37 +3498,89 @@ msgid "Remote instance" msgstr "Instanzname" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 #, fuzzy #| msgid "Activity" msgid "Active" msgstr "Aktivität" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 #, fuzzy #| msgid "User Profile" msgid "View user profile" msgstr "Benutzerprofil" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "Lokal" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "Entfernen" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email address:" +msgid "Email:" +msgstr "E-Mail Adresse" + +#: bookwyrm/templates/user_admin/user_info.html:64 +msgid "(View reports)" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked Users" +msgid "Blocked by count:" +msgstr "Blockierte Nutzer*innen" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "Birth date:" +msgid "Last active date:" +msgstr "Geburtsdatum:" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "Folgende manuell bestätigen" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discard" +msgid "Discoverable:" +msgstr "Ablehnen" + +#: bookwyrm/templates/user_admin/user_info.html:93 +#, fuzzy +#| msgid "Deactivate user" +msgid "Deactivation reason:" +msgstr "Nutzer:in deaktivieren" + +#: bookwyrm/templates/user_admin/user_info.html:111 #, fuzzy #| msgid "Instance Settings" msgid "Instance details" msgstr "Instanzeinstellungen" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "" @@ -3523,16 +3609,16 @@ msgstr "" msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/views/authentication.py:69 -msgid "Username or password are incorrect" -msgstr "" - #: bookwyrm/views/import_data.py:67 #, fuzzy #| msgid "Email address:" msgid "Not a valid csv file" msgstr "E-Mail Adresse" +#: bookwyrm/views/login.py:70 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/password.py:32 #, fuzzy #| msgid "A user with that username already exists." @@ -3560,9 +3646,6 @@ msgstr "" #~ msgid "Federated Timeline" #~ msgstr "Föderierende Server" -#~ msgid "Local" -#~ msgstr "Lokal" - #, fuzzy #~| msgid "Lists: %(username)s" #~ msgid "Reports: %(server_name)s" @@ -3639,11 +3722,6 @@ msgstr "" #~ msgid "Value %(value)r is not a valid choice." #~ msgstr "%(value)s ist keine gültige remote_id" -#, fuzzy -#~| msgid "This shelf is empty." -#~ msgid "This field cannot be null." -#~ msgstr "Dieses Regal ist leer." - #, fuzzy #~| msgid "A user with that username already exists." #~ msgid "%(model_name)s with this %(field_label)s already exists." @@ -3873,9 +3951,6 @@ msgstr "" #~ msgid "by %(author)s" #~ msgstr "von %(author)s" -#~ msgid "Deactivate user" -#~ msgstr "Nutzer:in deaktivieren" - #~ msgid "Reactivate user" #~ msgstr "Nutzer:in reaktivieren" diff --git a/locale/en_US/LC_MESSAGES/django.po b/locale/en_US/LC_MESSAGES/django.po index 5fb90611..cc7bf949 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-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-08 15:57+0000\n" "PO-Revision-Date: 2021-02-28 17:19-0800\n" "Last-Translator: Mouse Reeve \n" "Language-Team: English \n" @@ -92,45 +92,45 @@ msgstr "" msgid "A user with that username already exists." msgstr "" -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home Timeline" msgstr "" -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home" msgstr "" -#: bookwyrm/settings.py:125 +#: bookwyrm/settings.py:114 msgid "Books Timeline" msgstr "" -#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:114 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:81 msgid "Books" msgstr "" -#: bookwyrm/settings.py:171 +#: bookwyrm/settings.py:160 msgid "English" msgstr "" -#: bookwyrm/settings.py:172 +#: bookwyrm/settings.py:161 msgid "German" msgstr "" -#: bookwyrm/settings.py:173 +#: bookwyrm/settings.py:162 msgid "Spanish" msgstr "" -#: bookwyrm/settings.py:174 +#: bookwyrm/settings.py:163 msgid "French" msgstr "" -#: bookwyrm/settings.py:175 +#: bookwyrm/settings.py:164 msgid "Simplified Chinese" msgstr "" -#: bookwyrm/settings.py:176 +#: bookwyrm/settings.py:165 msgid "Traditional Chinese" msgstr "" @@ -279,7 +279,7 @@ msgstr "" #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -296,6 +296,7 @@ msgstr "" #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -672,6 +673,7 @@ msgstr "" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/components/modal.html:11 +#: bookwyrm/templates/components/tooltip.html:7 #: bookwyrm/templates/feed/layout.html:71 #: bookwyrm/templates/get_started/layout.html:20 #: bookwyrm/templates/get_started/layout.html:53 @@ -680,6 +682,10 @@ msgstr "" msgid "Close" msgstr "" +#: bookwyrm/templates/components/tooltip.html:3 +msgid "Help" +msgstr "" + #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8 msgid "Compose status" msgstr "" @@ -701,6 +707,7 @@ msgid "Sorry! We couldn't find that code." msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 msgid "Confirmation code:" msgstr "" @@ -1168,119 +1175,124 @@ msgstr "" msgid "%(username)s's %(year)s Books" msgstr "" -#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 +#: bookwyrm/templates/import/import.html:5 +#: bookwyrm/templates/import/import.html:9 #: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "" -#: bookwyrm/templates/import.html:16 +#: bookwyrm/templates/import/import.html:18 msgid "Data source:" msgstr "" -#: bookwyrm/templates/import.html:32 +#: bookwyrm/templates/import/import.html:37 msgid "Data file:" msgstr "" -#: bookwyrm/templates/import.html:40 +#: bookwyrm/templates/import/import.html:45 msgid "Include reviews" msgstr "" -#: bookwyrm/templates/import.html:45 +#: bookwyrm/templates/import/import.html:50 msgid "Privacy setting for imported reviews:" msgstr "" -#: bookwyrm/templates/import.html:51 +#: bookwyrm/templates/import/import.html:56 #: bookwyrm/templates/settings/server_blocklist.html:64 msgid "Import" msgstr "" -#: bookwyrm/templates/import.html:56 +#: bookwyrm/templates/import/import.html:61 msgid "Recent Imports" msgstr "" -#: bookwyrm/templates/import.html:58 +#: bookwyrm/templates/import/import.html:63 msgid "No recent imports" msgstr "" -#: bookwyrm/templates/import_status.html:6 -#: bookwyrm/templates/import_status.html:10 +#: bookwyrm/templates/import/import_status.html:6 +#: bookwyrm/templates/import/import_status.html:10 msgid "Import Status" msgstr "" -#: bookwyrm/templates/import_status.html:11 +#: bookwyrm/templates/import/import_status.html:11 msgid "Back to imports" msgstr "" -#: bookwyrm/templates/import_status.html:15 +#: bookwyrm/templates/import/import_status.html:15 msgid "Import started:" msgstr "" -#: bookwyrm/templates/import_status.html:20 +#: bookwyrm/templates/import/import_status.html:20 msgid "Import completed:" msgstr "" -#: bookwyrm/templates/import_status.html:24 +#: bookwyrm/templates/import/import_status.html:24 msgid "TASK FAILED" msgstr "" -#: bookwyrm/templates/import_status.html:32 +#: bookwyrm/templates/import/import_status.html:32 msgid "Import still in progress." msgstr "" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import/import_status.html:34 msgid "(Hit reload to update!)" msgstr "" -#: bookwyrm/templates/import_status.html:41 +#: bookwyrm/templates/import/import_status.html:41 msgid "Failed to load" msgstr "" -#: bookwyrm/templates/import_status.html:50 +#: bookwyrm/templates/import/import_status.html:50 #, python-format msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import." msgstr "" -#: bookwyrm/templates/import_status.html:62 +#: bookwyrm/templates/import/import_status.html:62 #, python-format msgid "Line %(index)s: %(title)s by %(author)s" msgstr "" -#: bookwyrm/templates/import_status.html:82 +#: bookwyrm/templates/import/import_status.html:82 msgid "Select all" msgstr "" -#: bookwyrm/templates/import_status.html:85 +#: bookwyrm/templates/import/import_status.html:85 msgid "Retry items" msgstr "" -#: bookwyrm/templates/import_status.html:112 +#: bookwyrm/templates/import/import_status.html:112 msgid "Successfully imported" msgstr "" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import/import_status.html:114 msgid "Import Progress" msgstr "" -#: bookwyrm/templates/import_status.html:119 +#: bookwyrm/templates/import/import_status.html:119 msgid "Book" msgstr "" -#: bookwyrm/templates/import_status.html:122 +#: bookwyrm/templates/import/import_status.html:122 #: bookwyrm/templates/user/shelf/shelf.html:111 #: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "" -#: bookwyrm/templates/import_status.html:125 +#: bookwyrm/templates/import/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:112 #: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "" -#: bookwyrm/templates/import_status.html:148 +#: bookwyrm/templates/import/import_status.html:148 msgid "Imported" msgstr "" +#: bookwyrm/templates/import/tooltip.html:6 +msgid "You can download your GoodReads data from the Import/Export page of your GoodReads account." +msgstr "" + #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 #: bookwyrm/templates/login.html:51 msgid "Create an Account" @@ -1476,8 +1488,23 @@ msgstr "" msgid "Discard" msgstr "" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +msgid "Delete this list?" +msgstr "" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +msgid "This action cannot be un-done" +msgstr "" + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "" @@ -1512,6 +1539,10 @@ msgstr "" msgid "Anyone can add books to this list" msgstr "" +#: bookwyrm/templates/lists/form.html:49 +msgid "Delete list" +msgstr "" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "" @@ -1901,6 +1932,7 @@ msgid "Account" msgstr "" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "" @@ -2021,12 +2053,6 @@ msgstr "" msgid "Edit Announcement" msgstr "" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "" @@ -2077,6 +2103,7 @@ msgstr "" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "" @@ -2114,7 +2141,7 @@ msgstr "" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "" @@ -2129,13 +2156,13 @@ msgstr "" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "" @@ -2162,6 +2189,7 @@ msgid "View all" msgstr "" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "" @@ -2178,7 +2206,7 @@ msgid "Blocked by us:" msgstr "" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "" @@ -3100,7 +3128,7 @@ msgstr[1] "" msgid "No followers you follow" msgstr "" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "" @@ -3127,31 +3155,69 @@ msgid "Remote instance" msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:38 +msgid "Remote" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:52 +msgid "Email:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:64 +msgid "(View reports)" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:72 +msgid "Blocked by count:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:77 +msgid "Last active date:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:82 +msgid "Manually approved followers:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:87 +msgid "Discoverable:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:93 +msgid "Deactivation reason:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "" @@ -3180,14 +3246,14 @@ msgstr "" msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/views/authentication.py:69 -msgid "Username or password are incorrect" -msgstr "" - #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "" +#: bookwyrm/views/login.py:70 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." msgstr "" diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo index 6881c102..5c3af79c 100644 Binary files a/locale/es/LC_MESSAGES/django.mo and b/locale/es/LC_MESSAGES/django.mo differ diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 48e8e8ce..2e4a45fe 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-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-08 15:57+0000\n" "PO-Revision-Date: 2021-03-19 11:49+0800\n" "Last-Translator: Reese Porter \n" "Language-Team: LANGUAGE \n" @@ -92,45 +92,45 @@ msgstr "nombre de usuario" msgid "A user with that username already exists." msgstr "Ya existe un usuario con ese nombre." -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home Timeline" msgstr "Línea temporal de hogar" -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home" msgstr "Hogar" -#: bookwyrm/settings.py:125 +#: bookwyrm/settings.py:114 msgid "Books Timeline" msgstr "Línea temporal de libros" -#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:114 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:81 msgid "Books" msgstr "Libros" -#: bookwyrm/settings.py:171 +#: bookwyrm/settings.py:160 msgid "English" msgstr "Inglés" -#: bookwyrm/settings.py:172 +#: bookwyrm/settings.py:161 msgid "German" msgstr "Aléman" -#: bookwyrm/settings.py:173 +#: bookwyrm/settings.py:162 msgid "Spanish" msgstr "Español" -#: bookwyrm/settings.py:174 +#: bookwyrm/settings.py:163 msgid "French" msgstr "Francés" -#: bookwyrm/settings.py:175 +#: bookwyrm/settings.py:164 msgid "Simplified Chinese" msgstr "Chino simplificado" -#: bookwyrm/settings.py:176 +#: bookwyrm/settings.py:165 msgid "Traditional Chinese" msgstr "Chino tradicional" @@ -279,7 +279,7 @@ msgstr "Clave Goodreads:" #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -296,6 +296,7 @@ msgstr "Guardar" #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -672,6 +673,7 @@ msgstr "Buscar ediciones" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/components/modal.html:11 +#: bookwyrm/templates/components/tooltip.html:7 #: bookwyrm/templates/feed/layout.html:71 #: bookwyrm/templates/get_started/layout.html:20 #: bookwyrm/templates/get_started/layout.html:53 @@ -680,6 +682,10 @@ msgstr "Buscar ediciones" msgid "Close" msgstr "Cerrar" +#: bookwyrm/templates/components/tooltip.html:3 +msgid "Help" +msgstr "" + #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8 msgid "Compose status" msgstr "Componer status" @@ -701,6 +707,7 @@ msgid "Sorry! We couldn't find that code." msgstr "Sentimos que no pudimos encontrar ese código" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 msgid "Confirmation code:" msgstr "Código de confirmación:" @@ -1168,119 +1175,124 @@ msgstr "Tus libros de %(year)s" msgid "%(username)s's %(year)s Books" msgstr "Los libros de %(username)s para %(year)s" -#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 +#: bookwyrm/templates/import/import.html:5 +#: bookwyrm/templates/import/import.html:9 #: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "Importar libros" -#: bookwyrm/templates/import.html:16 +#: bookwyrm/templates/import/import.html:18 msgid "Data source:" msgstr "Fuente de datos:" -#: bookwyrm/templates/import.html:32 +#: bookwyrm/templates/import/import.html:37 msgid "Data file:" msgstr "Archivo de datos:" -#: bookwyrm/templates/import.html:40 +#: bookwyrm/templates/import/import.html:45 msgid "Include reviews" msgstr "Incluir reseñas" -#: bookwyrm/templates/import.html:45 +#: bookwyrm/templates/import/import.html:50 msgid "Privacy setting for imported reviews:" msgstr "Configuración de privacidad para las reseñas importadas:" -#: bookwyrm/templates/import.html:51 +#: bookwyrm/templates/import/import.html:56 #: bookwyrm/templates/settings/server_blocklist.html:64 msgid "Import" msgstr "Importar" -#: bookwyrm/templates/import.html:56 +#: bookwyrm/templates/import/import.html:61 msgid "Recent Imports" msgstr "Importaciones recientes" -#: bookwyrm/templates/import.html:58 +#: bookwyrm/templates/import/import.html:63 msgid "No recent imports" msgstr "No hay ninguna importación reciente" -#: bookwyrm/templates/import_status.html:6 -#: bookwyrm/templates/import_status.html:10 +#: bookwyrm/templates/import/import_status.html:6 +#: bookwyrm/templates/import/import_status.html:10 msgid "Import Status" msgstr "Status de importación" -#: bookwyrm/templates/import_status.html:11 +#: bookwyrm/templates/import/import_status.html:11 msgid "Back to imports" msgstr "Volver a las importaciones" -#: bookwyrm/templates/import_status.html:15 +#: bookwyrm/templates/import/import_status.html:15 msgid "Import started:" msgstr "Importación ha empezado:" -#: bookwyrm/templates/import_status.html:20 +#: bookwyrm/templates/import/import_status.html:20 msgid "Import completed:" msgstr "Importación ha terminado:" -#: bookwyrm/templates/import_status.html:24 +#: bookwyrm/templates/import/import_status.html:24 msgid "TASK FAILED" msgstr "TAREA FALLÓ" -#: bookwyrm/templates/import_status.html:32 +#: bookwyrm/templates/import/import_status.html:32 msgid "Import still in progress." msgstr "Importación todavia en progreso" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import/import_status.html:34 msgid "(Hit reload to update!)" msgstr "(¡Refresca para actualizar!)" -#: bookwyrm/templates/import_status.html:41 +#: bookwyrm/templates/import/import_status.html:41 msgid "Failed to load" msgstr "No se pudo cargar" -#: bookwyrm/templates/import_status.html:50 +#: bookwyrm/templates/import/import_status.html:50 #, python-format msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import." msgstr "Saltar al final de la lista para seleccionar los %(failed_count)s artículos que no se pudieron importar." -#: bookwyrm/templates/import_status.html:62 +#: bookwyrm/templates/import/import_status.html:62 #, python-format msgid "Line %(index)s: %(title)s by %(author)s" msgstr "Renglón %(index)s: %(title)s por %(author)s" -#: bookwyrm/templates/import_status.html:82 +#: bookwyrm/templates/import/import_status.html:82 msgid "Select all" msgstr "Seleccionar todo" -#: bookwyrm/templates/import_status.html:85 +#: bookwyrm/templates/import/import_status.html:85 msgid "Retry items" msgstr "Reintentar ítems" -#: bookwyrm/templates/import_status.html:112 +#: bookwyrm/templates/import/import_status.html:112 msgid "Successfully imported" msgstr "Importado exitosamente" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import/import_status.html:114 msgid "Import Progress" msgstr "Progreso de importación" -#: bookwyrm/templates/import_status.html:119 +#: bookwyrm/templates/import/import_status.html:119 msgid "Book" msgstr "Libro" -#: bookwyrm/templates/import_status.html:122 +#: bookwyrm/templates/import/import_status.html:122 #: bookwyrm/templates/user/shelf/shelf.html:111 #: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "Título" -#: bookwyrm/templates/import_status.html:125 +#: bookwyrm/templates/import/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:112 #: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "Autor/Autora" -#: bookwyrm/templates/import_status.html:148 +#: bookwyrm/templates/import/import_status.html:148 msgid "Imported" msgstr "Importado" +#: bookwyrm/templates/import/tooltip.html:6 +msgid "You can download your GoodReads data from the Import/Export page of your GoodReads account." +msgstr "" + #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 #: bookwyrm/templates/login.html:51 msgid "Create an Account" @@ -1476,8 +1488,27 @@ msgstr "Aprobar" msgid "Discard" msgstr "Desechar" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "Eliminar esta actualización de progreso" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +#, fuzzy +#| msgid "This field cannot be null." +msgid "This action cannot be un-done" +msgstr "Este campo no puede ser nulo." + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "Eliminar" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "Editar lista" @@ -1512,6 +1543,12 @@ msgstr "Abierto" msgid "Anyone can add books to this list" msgstr "Cualquer usuario puede agregar libros a esta lista" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "Eliminar status" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "¡Has sugerido un libro para esta lista exitosamente!" @@ -1901,6 +1938,7 @@ msgid "Account" msgstr "Cuenta" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "Perfil" @@ -2021,12 +2059,6 @@ msgstr "Volver a la lista de servidores" msgid "Edit Announcement" msgstr "Editar anuncio" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "Eliminar" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "Visible:" @@ -2077,6 +2109,7 @@ msgstr "Fecha final" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "Status" @@ -2114,7 +2147,7 @@ msgstr "Instancia:" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "Status:" @@ -2129,13 +2162,13 @@ msgstr "Bloqueado" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "Software:" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "Versión:" @@ -2162,6 +2195,7 @@ msgid "View all" msgstr "Ver todos" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "Informes:" @@ -2178,7 +2212,7 @@ msgid "Blocked by us:" msgstr "Bloqueado por nosotros:" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "Notas" @@ -3108,7 +3142,7 @@ msgstr[1] "%(mutuals_display)s seguidores que sigues" msgid "No followers you follow" msgstr "Ningún seguidor que tu sigues" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "Volver a usuarios" @@ -3135,31 +3169,85 @@ msgid "Remote instance" msgstr "Instancia remota" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "Activ@" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "Inactiv@" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "No establecido" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "Detalles" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "Ver perfil de usuario" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "Local" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "Quitar" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "Detalles" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email" +msgid "Email:" +msgstr "Correo electronico" + +#: bookwyrm/templates/user_admin/user_info.html:64 +#, fuzzy +#| msgid "View directory" +msgid "(View reports)" +msgstr "Ver directorio" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked by us:" +msgid "Blocked by count:" +msgstr "Bloqueado por nosotros:" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "last active" +msgid "Last active date:" +msgstr "actividad reciente" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "Aprobar seguidores a mano:" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discover" +msgid "Discoverable:" +msgstr "Descubrir" + +#: bookwyrm/templates/user_admin/user_info.html:93 +#, fuzzy +#| msgid "Deactivate user" +msgid "Deactivation reason:" +msgstr "Desactivar usuario" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "Detalles de instancia" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "Ver instancia" @@ -3188,14 +3276,14 @@ msgstr "Archivo excede el tamaño máximo: 10MB" msgid "%(title)s: %(subtitle)s" msgstr "%(title)s: %(subtitle)s" -#: bookwyrm/views/authentication.py:69 -msgid "Username or password are incorrect" -msgstr "Nombre de usuario o contraseña es incorrecta" - #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "No un archivo csv válido" +#: bookwyrm/views/login.py:70 +msgid "Username or password are incorrect" +msgstr "Nombre de usuario o contraseña es incorrecta" + #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." msgstr "No se pudo encontrar un usuario con esa dirección de correo electrónico." @@ -3222,9 +3310,6 @@ msgstr "Actualizaciones de status de {obj.display_name}" #~ msgid "Federated Timeline" #~ msgstr "Línea temporal federalizado" -#~ msgid "Local" -#~ msgstr "Local" - #~ msgid "Federated Servers" #~ msgstr "Servidores federalizados" @@ -3348,9 +3433,6 @@ msgstr "Actualizaciones de status de {obj.display_name}" #~ msgid "Value %(value)r is not a valid choice." #~ msgstr "El valor %(value)s no es una opción válida." -#~ msgid "This field cannot be null." -#~ msgstr "Este campo no puede ser nulo." - #~ msgid "This field cannot be blank." #~ msgstr "Este campo no puede ser vacio." @@ -4128,9 +4210,6 @@ msgstr "Actualizaciones de status de {obj.display_name}" #~ msgid "Books tagged \"%(tag.name)s\"" #~ msgstr "Libros etiquetados con \"%(tag.name)s\"" -#~ msgid "Deactivate user" -#~ msgstr "Desactivar usuario" - #~ msgid "Reactivate user" #~ msgstr "Reactivar usuario" diff --git a/locale/fr_FR/LC_MESSAGES/django.mo b/locale/fr_FR/LC_MESSAGES/django.mo index a28c903f..a5f2cc2d 100644 Binary files a/locale/fr_FR/LC_MESSAGES/django.mo and b/locale/fr_FR/LC_MESSAGES/django.mo differ diff --git a/locale/fr_FR/LC_MESSAGES/django.po b/locale/fr_FR/LC_MESSAGES/django.po index 647d18ec..46e1b683 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-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-08 15:57+0000\n" "PO-Revision-Date: 2021-04-05 12:44+0100\n" "Last-Translator: Fabien Basmaison \n" "Language-Team: Mouse Reeve \n" @@ -92,47 +92,47 @@ msgstr "nom du compte :" msgid "A user with that username already exists." msgstr "Ce nom est déjà associé à un compte." -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home Timeline" msgstr "Mon fil d’actualité" -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home" msgstr "Accueil" -#: bookwyrm/settings.py:125 +#: bookwyrm/settings.py:114 #, fuzzy #| msgid "Book Title" msgid "Books Timeline" msgstr "Titre du livre" -#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:114 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:81 msgid "Books" msgstr "Livres" -#: bookwyrm/settings.py:171 +#: bookwyrm/settings.py:160 msgid "English" msgstr "English" -#: bookwyrm/settings.py:172 +#: bookwyrm/settings.py:161 msgid "German" msgstr "Deutsch" -#: bookwyrm/settings.py:173 +#: bookwyrm/settings.py:162 msgid "Spanish" msgstr "Español" -#: bookwyrm/settings.py:174 +#: bookwyrm/settings.py:163 msgid "French" msgstr "Français" -#: bookwyrm/settings.py:175 +#: bookwyrm/settings.py:164 msgid "Simplified Chinese" msgstr "简化字" -#: bookwyrm/settings.py:176 +#: bookwyrm/settings.py:165 #, fuzzy #| msgid "Additional info:" msgid "Traditional Chinese" @@ -283,7 +283,7 @@ msgstr "Clé Goodreads :" #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -300,6 +300,7 @@ msgstr "Enregistrer" #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -678,6 +679,7 @@ msgstr "Résultats de recherche" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/components/modal.html:11 +#: bookwyrm/templates/components/tooltip.html:7 #: bookwyrm/templates/feed/layout.html:71 #: bookwyrm/templates/get_started/layout.html:20 #: bookwyrm/templates/get_started/layout.html:53 @@ -686,6 +688,10 @@ msgstr "Résultats de recherche" msgid "Close" msgstr "Fermer" +#: bookwyrm/templates/components/tooltip.html:3 +msgid "Help" +msgstr "" + #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8 msgid "Compose status" msgstr "Rédiger un statut" @@ -707,6 +713,7 @@ msgid "Sorry! We couldn't find that code." msgstr "Pardon ! Nous ne reconnaissons pas ce code." #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 msgid "Confirmation code:" msgstr "Code de confirmation :" @@ -1183,123 +1190,128 @@ msgstr "Vos livres en %(year)s" msgid "%(username)s's %(year)s Books" msgstr "Livres de %(username)s en %(year)s" -#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 +#: bookwyrm/templates/import/import.html:5 +#: bookwyrm/templates/import/import.html:9 #: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "Importer des livres" -#: bookwyrm/templates/import.html:16 +#: bookwyrm/templates/import/import.html:18 msgid "Data source:" msgstr "Source de données :" -#: bookwyrm/templates/import.html:32 +#: bookwyrm/templates/import/import.html:37 msgid "Data file:" msgstr "Fichier de données :" -#: bookwyrm/templates/import.html:40 +#: bookwyrm/templates/import/import.html:45 msgid "Include reviews" msgstr "Importer les critiques" -#: bookwyrm/templates/import.html:45 +#: bookwyrm/templates/import/import.html:50 msgid "Privacy setting for imported reviews:" msgstr "Confidentialité des critiques importées :" -#: bookwyrm/templates/import.html:51 +#: bookwyrm/templates/import/import.html:56 #: bookwyrm/templates/settings/server_blocklist.html:64 msgid "Import" msgstr "Importer" -#: bookwyrm/templates/import.html:56 +#: bookwyrm/templates/import/import.html:61 msgid "Recent Imports" msgstr "Importations récentes" -#: bookwyrm/templates/import.html:58 +#: bookwyrm/templates/import/import.html:63 msgid "No recent imports" msgstr "Aucune importation récente" -#: bookwyrm/templates/import_status.html:6 -#: bookwyrm/templates/import_status.html:10 +#: bookwyrm/templates/import/import_status.html:6 +#: bookwyrm/templates/import/import_status.html:10 msgid "Import Status" msgstr "Statut de l’importation" -#: bookwyrm/templates/import_status.html:11 +#: bookwyrm/templates/import/import_status.html:11 #, fuzzy #| msgid "Back to reports" msgid "Back to imports" msgstr "Retour aux signalements" -#: bookwyrm/templates/import_status.html:15 +#: bookwyrm/templates/import/import_status.html:15 msgid "Import started:" msgstr "Début de l’importation :" -#: bookwyrm/templates/import_status.html:20 +#: bookwyrm/templates/import/import_status.html:20 msgid "Import completed:" msgstr "Fin de l’importation :" -#: bookwyrm/templates/import_status.html:24 +#: bookwyrm/templates/import/import_status.html:24 msgid "TASK FAILED" msgstr "la tâche a échoué" -#: bookwyrm/templates/import_status.html:32 +#: bookwyrm/templates/import/import_status.html:32 msgid "Import still in progress." msgstr "L’importation est toujours en cours" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import/import_status.html:34 msgid "(Hit reload to update!)" msgstr "(Rechargez la page pour la mettre à jour !)" -#: bookwyrm/templates/import_status.html:41 +#: bookwyrm/templates/import/import_status.html:41 msgid "Failed to load" msgstr "Éléments non importés" -#: bookwyrm/templates/import_status.html:50 +#: bookwyrm/templates/import/import_status.html:50 #, python-format msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import." msgstr "Sauter en bas de liste pour sélectionner les %(failed_count)s items n’ayant pu être importés." -#: bookwyrm/templates/import_status.html:62 +#: bookwyrm/templates/import/import_status.html:62 #, python-format msgid "Line %(index)s: %(title)s by %(author)s" msgstr "Ligne %(index)s : %(title)s par %(author)s" -#: bookwyrm/templates/import_status.html:82 +#: bookwyrm/templates/import/import_status.html:82 msgid "Select all" msgstr "Tout sélectionner" -#: bookwyrm/templates/import_status.html:85 +#: bookwyrm/templates/import/import_status.html:85 msgid "Retry items" msgstr "Réessayer l’importation de ces éléments" -#: bookwyrm/templates/import_status.html:112 +#: bookwyrm/templates/import/import_status.html:112 msgid "Successfully imported" msgstr "Importation réussie" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import/import_status.html:114 #, fuzzy #| msgid "Import still in progress." msgid "Import Progress" msgstr "L’importation est toujours en cours" -#: bookwyrm/templates/import_status.html:119 +#: bookwyrm/templates/import/import_status.html:119 msgid "Book" msgstr "Livre" -#: bookwyrm/templates/import_status.html:122 +#: bookwyrm/templates/import/import_status.html:122 #: bookwyrm/templates/user/shelf/shelf.html:111 #: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "Titre" -#: bookwyrm/templates/import_status.html:125 +#: bookwyrm/templates/import/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:112 #: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "Auteur/autrice" -#: bookwyrm/templates/import_status.html:148 +#: bookwyrm/templates/import/import_status.html:148 msgid "Imported" msgstr "Importé" +#: bookwyrm/templates/import/tooltip.html:6 +msgid "You can download your GoodReads data from the Import/Export page of your GoodReads account." +msgstr "" + #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 #: bookwyrm/templates/login.html:51 msgid "Create an Account" @@ -1495,8 +1507,27 @@ msgstr "Approuver" msgid "Discard" msgstr "Rejeter" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "Supprimer cette mise à jour" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +#, fuzzy +#| msgid "This shelf is empty." +msgid "This action cannot be un-done" +msgstr "Cette étagère est vide" + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "Supprimer" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "Modifier la liste" @@ -1531,6 +1562,12 @@ msgstr "Ouverte" msgid "Anyone can add books to this list" msgstr "N’importe qui peut suggérer des livres" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "Supprimer le statut" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "Vous avez suggéré un livre à cette liste !" @@ -1930,6 +1967,7 @@ msgid "Account" msgstr "Compte" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "Profil" @@ -2053,12 +2091,6 @@ msgstr "Retour à la liste" msgid "Edit Announcement" msgstr "Modifier l’annonce" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "Supprimer" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "Visible :" @@ -2109,6 +2141,7 @@ msgstr "Date de fin" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "Statut" @@ -2146,7 +2179,7 @@ msgstr "Instance :" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "Statut :" @@ -2161,13 +2194,13 @@ msgstr "Bloqué" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "Logiciel :" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "Description :" @@ -2194,6 +2227,7 @@ msgid "View all" msgstr "Voir tous" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "Signalements :" @@ -2210,7 +2244,7 @@ msgid "Blocked by us:" msgstr "Bloqués par nous :" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "Remarques" @@ -3159,7 +3193,7 @@ msgstr[1] "%(mutuals_display)s abonné(e)s que vous suivez" msgid "No followers you follow" msgstr "compte que vous suivez" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "Retour aux comptes" @@ -3186,31 +3220,85 @@ msgid "Remote instance" msgstr "Instance distante" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "Actif" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "Inactif" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "Non défini" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "Détails du compte" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "Voir le profil" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "Local" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "Retirer" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "Détails du compte" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email" +msgid "Email:" +msgstr "Email" + +#: bookwyrm/templates/user_admin/user_info.html:64 +#, fuzzy +#| msgid "Directory" +msgid "(View reports)" +msgstr "Répertoire" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked by us:" +msgid "Blocked by count:" +msgstr "Bloqués par nous :" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "last active" +msgid "Last active date:" +msgstr "dernière activité" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "Autoriser les abonnements manuellement :" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discard" +msgid "Discoverable:" +msgstr "Rejeter" + +#: bookwyrm/templates/user_admin/user_info.html:93 +#, fuzzy +#| msgid "Deactivate user" +msgid "Deactivation reason:" +msgstr "Désactiver le compte" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "Détails de l’instance" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "Voir l’instance" @@ -3239,14 +3327,14 @@ msgstr "Ce fichier dépasse la taille limite : 10 Mo" msgid "%(title)s: %(subtitle)s" msgstr "%(title)s (%(subtitle)s)" -#: bookwyrm/views/authentication.py:69 -msgid "Username or password are incorrect" -msgstr "" - #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "Fichier CSV non valide" +#: bookwyrm/views/login.py:70 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." msgstr "Aucun compte avec cette adresse email n’a été trouvé." @@ -3273,9 +3361,6 @@ msgstr "" #~ msgid "Federated Timeline" #~ msgstr "Fil d’actualité des instances fédérées" -#~ msgid "Local" -#~ msgstr "Local" - #, fuzzy #~| msgid "BookWyrm users" #~ msgid "BookWyrm\\" @@ -3331,11 +3416,6 @@ msgstr "" #~ msgid "Value %(value)r is not a valid choice." #~ msgstr "%(value)s n’est pas une remote_id valide." -#, fuzzy -#~| msgid "This shelf is empty." -#~ msgid "This field cannot be null." -#~ msgstr "Cette étagère est vide" - #, fuzzy #~| msgid "A user with this email already exists." #~ msgid "%(model_name)s with this %(field_label)s already exists." @@ -3555,9 +3635,6 @@ msgstr "" #~ msgid "by %(author)s" #~ msgstr "par %(author)s" -#~ msgid "Deactivate user" -#~ msgstr "Désactiver le compte" - #~ msgid "Reactivate user" #~ msgstr "Réactiver le compte" diff --git a/locale/zh_Hans/LC_MESSAGES/django.mo b/locale/zh_Hans/LC_MESSAGES/django.mo index bfcd3d01..8f8015d7 100644 Binary files a/locale/zh_Hans/LC_MESSAGES/django.mo and b/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po index 3adb5aef..67de6921 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-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-08 15:57+0000\n" "PO-Revision-Date: 2021-03-20 00:56+0000\n" "Last-Translator: Kana \n" "Language-Team: Mouse Reeve \n" @@ -92,45 +92,45 @@ msgstr "用户名" msgid "A user with that username already exists." msgstr "已经存在使用该用户名的用户。" -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home Timeline" msgstr "主页时间线" -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home" msgstr "主页" -#: bookwyrm/settings.py:125 +#: bookwyrm/settings.py:114 msgid "Books Timeline" msgstr "书目时间线" -#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:114 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:81 msgid "Books" msgstr "书目" -#: bookwyrm/settings.py:171 +#: bookwyrm/settings.py:160 msgid "English" msgstr "English（英语）" -#: bookwyrm/settings.py:172 +#: bookwyrm/settings.py:161 msgid "German" msgstr "Deutsch（德语）" -#: bookwyrm/settings.py:173 +#: bookwyrm/settings.py:162 msgid "Spanish" msgstr "Español（西班牙语）" -#: bookwyrm/settings.py:174 +#: bookwyrm/settings.py:163 msgid "French" msgstr "Français（法语）" -#: bookwyrm/settings.py:175 +#: bookwyrm/settings.py:164 msgid "Simplified Chinese" msgstr "简体中文" -#: bookwyrm/settings.py:176 +#: bookwyrm/settings.py:165 msgid "Traditional Chinese" msgstr "繁體中文（繁体中文）" @@ -279,7 +279,7 @@ msgstr "Goodreads key:" #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -296,6 +296,7 @@ msgstr "保存" #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -673,6 +674,7 @@ msgstr "搜索结果" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/components/modal.html:11 +#: bookwyrm/templates/components/tooltip.html:7 #: bookwyrm/templates/feed/layout.html:71 #: bookwyrm/templates/get_started/layout.html:20 #: bookwyrm/templates/get_started/layout.html:53 @@ -681,6 +683,10 @@ msgstr "搜索结果" msgid "Close" msgstr "关闭" +#: bookwyrm/templates/components/tooltip.html:3 +msgid "Help" +msgstr "" + #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8 msgid "Compose status" msgstr "撰写状态" @@ -702,6 +708,7 @@ msgid "Sorry! We couldn't find that code." msgstr "抱歉！我们无法找到该代码。" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 msgid "Confirmation code:" msgstr "确认代码:" @@ -1169,119 +1176,124 @@ msgstr "你 %(year)s 的书目" msgid "%(username)s's %(year)s Books" msgstr "%(username)s 在 %(year)s 的书目" -#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 +#: bookwyrm/templates/import/import.html:5 +#: bookwyrm/templates/import/import.html:9 #: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "导入书目" -#: bookwyrm/templates/import.html:16 +#: bookwyrm/templates/import/import.html:18 msgid "Data source:" msgstr "数据来源:" -#: bookwyrm/templates/import.html:32 +#: bookwyrm/templates/import/import.html:37 msgid "Data file:" msgstr "数据文件:" -#: bookwyrm/templates/import.html:40 +#: bookwyrm/templates/import/import.html:45 msgid "Include reviews" msgstr "纳入书评" -#: bookwyrm/templates/import.html:45 +#: bookwyrm/templates/import/import.html:50 msgid "Privacy setting for imported reviews:" msgstr "导入书评的隐私设定" -#: bookwyrm/templates/import.html:51 +#: bookwyrm/templates/import/import.html:56 #: bookwyrm/templates/settings/server_blocklist.html:64 msgid "Import" msgstr "导入" -#: bookwyrm/templates/import.html:56 +#: bookwyrm/templates/import/import.html:61 msgid "Recent Imports" msgstr "最近的导入" -#: bookwyrm/templates/import.html:58 +#: bookwyrm/templates/import/import.html:63 msgid "No recent imports" msgstr "无最近的导入" -#: bookwyrm/templates/import_status.html:6 -#: bookwyrm/templates/import_status.html:10 +#: bookwyrm/templates/import/import_status.html:6 +#: bookwyrm/templates/import/import_status.html:10 msgid "Import Status" msgstr "导入状态" -#: bookwyrm/templates/import_status.html:11 +#: bookwyrm/templates/import/import_status.html:11 msgid "Back to imports" msgstr "回到导入" -#: bookwyrm/templates/import_status.html:15 +#: bookwyrm/templates/import/import_status.html:15 msgid "Import started:" msgstr "导入开始:" -#: bookwyrm/templates/import_status.html:20 +#: bookwyrm/templates/import/import_status.html:20 msgid "Import completed:" msgstr "导入完成:" -#: bookwyrm/templates/import_status.html:24 +#: bookwyrm/templates/import/import_status.html:24 msgid "TASK FAILED" msgstr "任务失败" -#: bookwyrm/templates/import_status.html:32 +#: bookwyrm/templates/import/import_status.html:32 msgid "Import still in progress." msgstr "还在导入中。" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import/import_status.html:34 msgid "(Hit reload to update!)" msgstr "（按下重新加载来更新！）" -#: bookwyrm/templates/import_status.html:41 +#: bookwyrm/templates/import/import_status.html:41 msgid "Failed to load" msgstr "加载失败" -#: bookwyrm/templates/import_status.html:50 +#: bookwyrm/templates/import/import_status.html:50 #, python-format msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import." msgstr "跳转至列表底部来选取 %(failed_count)s 个导入失败的项目。" -#: bookwyrm/templates/import_status.html:62 +#: bookwyrm/templates/import/import_status.html:62 #, python-format msgid "Line %(index)s: %(title)s by %(author)s" msgstr "第 %(index)s 行: %(author)s 所著的 %(title)s" -#: bookwyrm/templates/import_status.html:82 +#: bookwyrm/templates/import/import_status.html:82 msgid "Select all" msgstr "全选" -#: bookwyrm/templates/import_status.html:85 +#: bookwyrm/templates/import/import_status.html:85 msgid "Retry items" msgstr "重试项目" -#: bookwyrm/templates/import_status.html:112 +#: bookwyrm/templates/import/import_status.html:112 msgid "Successfully imported" msgstr "成功导入了" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import/import_status.html:114 msgid "Import Progress" msgstr "导入进度" -#: bookwyrm/templates/import_status.html:119 +#: bookwyrm/templates/import/import_status.html:119 msgid "Book" msgstr "书目" -#: bookwyrm/templates/import_status.html:122 +#: bookwyrm/templates/import/import_status.html:122 #: bookwyrm/templates/user/shelf/shelf.html:111 #: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "标题" -#: bookwyrm/templates/import_status.html:125 +#: bookwyrm/templates/import/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:112 #: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "作者" -#: bookwyrm/templates/import_status.html:148 +#: bookwyrm/templates/import/import_status.html:148 msgid "Imported" msgstr "已导入" +#: bookwyrm/templates/import/tooltip.html:6 +msgid "You can download your GoodReads data from the Import/Export page of your GoodReads account." +msgstr "" + #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 #: bookwyrm/templates/login.html:51 msgid "Create an Account" @@ -1477,8 +1489,25 @@ msgstr "批准" msgid "Discard" msgstr "削除" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "删除此进度更新" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +msgid "This action cannot be un-done" +msgstr "" + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "删除" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "编辑列表" @@ -1513,6 +1542,12 @@ msgstr "开放" msgid "Anyone can add books to this list" msgstr "任何人都可以向此列表中添加书目" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "删除发文" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "你成功向该列表推荐了一本书！" @@ -1909,6 +1944,7 @@ msgid "Account" msgstr "帐号" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "个人资料" @@ -2029,12 +2065,6 @@ msgstr "回到列表" msgid "Edit Announcement" msgstr "编辑公告" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "删除" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "可见:" @@ -2085,6 +2115,7 @@ msgstr "结束日期" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "状态" @@ -2122,7 +2153,7 @@ msgstr "实例:" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "状态:" @@ -2137,13 +2168,13 @@ msgstr "已屏蔽" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "软件:" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "版本:" @@ -2170,6 +2201,7 @@ msgid "View all" msgstr "查看全部" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "报告:" @@ -2186,7 +2218,7 @@ msgid "Blocked by us:" msgstr "我们所屏蔽的:" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "备注" @@ -3106,7 +3138,7 @@ msgstr[0] "%(mutuals_display)s 个你也关注的关注者" msgid "No followers you follow" msgstr "没有你关注的关注者" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "回到用户" @@ -3133,31 +3165,83 @@ msgid "Remote instance" msgstr "移除服务器" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "活跃" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "停用" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "未设置" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "用户详情" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "查看用户个人资料" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "本站" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "移除" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "用户详情" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email" +msgid "Email:" +msgstr "邮箱" + +#: bookwyrm/templates/user_admin/user_info.html:64 +#, fuzzy +#| msgid "Directory" +msgid "(View reports)" +msgstr "目录" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked by us:" +msgid "Blocked by count:" +msgstr "我们所屏蔽的:" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "last active" +msgid "Last active date:" +msgstr "最后活跃" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "手动批准关注者:" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discover" +msgid "Discoverable:" +msgstr "发现" + +#: bookwyrm/templates/user_admin/user_info.html:93 +msgid "Deactivation reason:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "实例详情" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "查看实例" @@ -3186,14 +3270,14 @@ msgstr "文件超过了最大大小: 10MB" msgid "%(title)s: %(subtitle)s" msgstr "%(title)s：%(subtitle)s" -#: bookwyrm/views/authentication.py:69 -msgid "Username or password are incorrect" -msgstr "用户名或密码不正确" - #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "不是有效的 csv 文件" +#: bookwyrm/views/login.py:70 +msgid "Username or password are incorrect" +msgstr "用户名或密码不正确" + #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." msgstr "没有找到使用该邮箱的用户。" @@ -3219,6 +3303,3 @@ msgstr "" #~ msgid "Federated Timeline" #~ msgstr "跨站时间线" - -#~ msgid "Local" -#~ msgstr "本站" diff --git a/locale/zh_Hant/LC_MESSAGES/django.mo b/locale/zh_Hant/LC_MESSAGES/django.mo index 0ee84d69..f925df75 100644 Binary files a/locale/zh_Hant/LC_MESSAGES/django.mo and b/locale/zh_Hant/LC_MESSAGES/django.mo differ diff --git a/locale/zh_Hant/LC_MESSAGES/django.po b/locale/zh_Hant/LC_MESSAGES/django.po index 2149c913..6715cf70 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-09-05 23:09+0000\n" +"POT-Creation-Date: 2021-09-08 15:57+0000\n" "PO-Revision-Date: 2021-06-30 10:36+0000\n" "Last-Translator: Grace Cheng \n" "Language-Team: LANGUAGE \n" @@ -92,47 +92,47 @@ msgstr "使用者名稱" msgid "A user with that username already exists." msgstr "已經存在使用該名稱的使用者。" -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home Timeline" msgstr "主頁時間線" -#: bookwyrm/settings.py:124 +#: bookwyrm/settings.py:113 msgid "Home" msgstr "主頁" -#: bookwyrm/settings.py:125 +#: bookwyrm/settings.py:114 #, fuzzy #| msgid "Book Title" msgid "Books Timeline" msgstr "書名" -#: bookwyrm/settings.py:125 bookwyrm/templates/search/layout.html:21 +#: bookwyrm/settings.py:114 bookwyrm/templates/search/layout.html:21 #: bookwyrm/templates/search/layout.html:42 #: bookwyrm/templates/user/layout.html:81 msgid "Books" msgstr "書目" -#: bookwyrm/settings.py:171 +#: bookwyrm/settings.py:160 msgid "English" msgstr "English（英語）" -#: bookwyrm/settings.py:172 +#: bookwyrm/settings.py:161 msgid "German" msgstr "Deutsch（德語）" -#: bookwyrm/settings.py:173 +#: bookwyrm/settings.py:162 msgid "Spanish" msgstr "Español（西班牙語）" -#: bookwyrm/settings.py:174 +#: bookwyrm/settings.py:163 msgid "French" msgstr "Français（法語）" -#: bookwyrm/settings.py:175 +#: bookwyrm/settings.py:164 msgid "Simplified Chinese" msgstr "簡體中文" -#: bookwyrm/settings.py:176 +#: bookwyrm/settings.py:165 #, fuzzy #| msgid "Tranditional Chinese" msgid "Traditional Chinese" @@ -285,7 +285,7 @@ msgstr "Goodreads key:" #: bookwyrm/templates/book/edit_book.html:328 #: bookwyrm/templates/book/readthrough.html:76 #: bookwyrm/templates/lists/bookmark_button.html:15 -#: bookwyrm/templates/lists/form.html:42 +#: bookwyrm/templates/lists/form.html:44 #: bookwyrm/templates/preferences/edit_user.html:78 #: bookwyrm/templates/settings/announcement_form.html:69 #: bookwyrm/templates/settings/edit_server.html:68 @@ -302,6 +302,7 @@ msgstr "儲存" #: bookwyrm/templates/book/cover_modal.html:32 #: bookwyrm/templates/book/edit_book.html:329 #: bookwyrm/templates/book/readthrough.html:77 +#: bookwyrm/templates/lists/delete_list_modal.html:17 #: bookwyrm/templates/moderation/report_modal.html:34 #: bookwyrm/templates/settings/federated_server.html:99 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:17 @@ -681,6 +682,7 @@ msgstr "搜尋結果" #: bookwyrm/templates/components/inline_form.html:8 #: bookwyrm/templates/components/modal.html:11 +#: bookwyrm/templates/components/tooltip.html:7 #: bookwyrm/templates/feed/layout.html:71 #: bookwyrm/templates/get_started/layout.html:20 #: bookwyrm/templates/get_started/layout.html:53 @@ -689,6 +691,10 @@ msgstr "搜尋結果" msgid "Close" msgstr "關閉" +#: bookwyrm/templates/components/tooltip.html:3 +msgid "Help" +msgstr "" + #: bookwyrm/templates/compose.html:5 bookwyrm/templates/compose.html:8 msgid "Compose status" msgstr "撰寫狀態" @@ -714,6 +720,7 @@ msgid "Sorry! We couldn't find that code." msgstr "" #: bookwyrm/templates/confirm_email/confirm_email.html:19 +#: bookwyrm/templates/user_admin/user_info.html:100 #, fuzzy #| msgid "Confirm password:" msgid "Confirmation code:" @@ -1194,123 +1201,128 @@ msgstr "你 %(year)s 的書目" msgid "%(username)s's %(year)s Books" msgstr "%(username)s 在 %(year)s 的書目" -#: bookwyrm/templates/import.html:5 bookwyrm/templates/import.html:9 +#: bookwyrm/templates/import/import.html:5 +#: bookwyrm/templates/import/import.html:9 #: bookwyrm/templates/user/shelf/shelf.html:57 msgid "Import Books" msgstr "匯入書目" -#: bookwyrm/templates/import.html:16 +#: bookwyrm/templates/import/import.html:18 msgid "Data source:" msgstr "資料來源:" -#: bookwyrm/templates/import.html:32 +#: bookwyrm/templates/import/import.html:37 msgid "Data file:" msgstr "資料檔案:" -#: bookwyrm/templates/import.html:40 +#: bookwyrm/templates/import/import.html:45 msgid "Include reviews" msgstr "納入書評" -#: bookwyrm/templates/import.html:45 +#: bookwyrm/templates/import/import.html:50 msgid "Privacy setting for imported reviews:" msgstr "匯入書評的隱私設定" -#: bookwyrm/templates/import.html:51 +#: bookwyrm/templates/import/import.html:56 #: bookwyrm/templates/settings/server_blocklist.html:64 msgid "Import" msgstr "匯入" -#: bookwyrm/templates/import.html:56 +#: bookwyrm/templates/import/import.html:61 msgid "Recent Imports" msgstr "最近的匯入" -#: bookwyrm/templates/import.html:58 +#: bookwyrm/templates/import/import.html:63 msgid "No recent imports" msgstr "無最近的匯入" -#: bookwyrm/templates/import_status.html:6 -#: bookwyrm/templates/import_status.html:10 +#: bookwyrm/templates/import/import_status.html:6 +#: bookwyrm/templates/import/import_status.html:10 msgid "Import Status" msgstr "匯入狀態" -#: bookwyrm/templates/import_status.html:11 +#: bookwyrm/templates/import/import_status.html:11 #, fuzzy #| msgid "Back to reports" msgid "Back to imports" msgstr "回到舉報" -#: bookwyrm/templates/import_status.html:15 +#: bookwyrm/templates/import/import_status.html:15 msgid "Import started:" msgstr "匯入開始:" -#: bookwyrm/templates/import_status.html:20 +#: bookwyrm/templates/import/import_status.html:20 msgid "Import completed:" msgstr "匯入完成:" -#: bookwyrm/templates/import_status.html:24 +#: bookwyrm/templates/import/import_status.html:24 msgid "TASK FAILED" msgstr "任務失敗" -#: bookwyrm/templates/import_status.html:32 +#: bookwyrm/templates/import/import_status.html:32 msgid "Import still in progress." msgstr "還在匯入中。" -#: bookwyrm/templates/import_status.html:34 +#: bookwyrm/templates/import/import_status.html:34 msgid "(Hit reload to update!)" msgstr "（按下重新載入來更新！）" -#: bookwyrm/templates/import_status.html:41 +#: bookwyrm/templates/import/import_status.html:41 msgid "Failed to load" msgstr "載入失敗" -#: bookwyrm/templates/import_status.html:50 +#: bookwyrm/templates/import/import_status.html:50 #, python-format msgid "Jump to the bottom of the list to select the %(failed_count)s items which failed to import." msgstr "跳轉至列表底部來選取 %(failed_count)s 個匯入失敗的項目。" -#: bookwyrm/templates/import_status.html:62 +#: bookwyrm/templates/import/import_status.html:62 #, python-format msgid "Line %(index)s: %(title)s by %(author)s" msgstr "" -#: bookwyrm/templates/import_status.html:82 +#: bookwyrm/templates/import/import_status.html:82 msgid "Select all" msgstr "全選" -#: bookwyrm/templates/import_status.html:85 +#: bookwyrm/templates/import/import_status.html:85 msgid "Retry items" msgstr "重試項目" -#: bookwyrm/templates/import_status.html:112 +#: bookwyrm/templates/import/import_status.html:112 msgid "Successfully imported" msgstr "成功匯入了" -#: bookwyrm/templates/import_status.html:114 +#: bookwyrm/templates/import/import_status.html:114 #, fuzzy #| msgid "Import still in progress." msgid "Import Progress" msgstr "還在匯入中。" -#: bookwyrm/templates/import_status.html:119 +#: bookwyrm/templates/import/import_status.html:119 msgid "Book" msgstr "書目" -#: bookwyrm/templates/import_status.html:122 +#: bookwyrm/templates/import/import_status.html:122 #: bookwyrm/templates/user/shelf/shelf.html:111 #: bookwyrm/templates/user/shelf/shelf.html:131 msgid "Title" msgstr "標題" -#: bookwyrm/templates/import_status.html:125 +#: bookwyrm/templates/import/import_status.html:125 #: bookwyrm/templates/user/shelf/shelf.html:112 #: bookwyrm/templates/user/shelf/shelf.html:134 msgid "Author" msgstr "作者" -#: bookwyrm/templates/import_status.html:148 +#: bookwyrm/templates/import/import_status.html:148 msgid "Imported" msgstr "已匯入" +#: bookwyrm/templates/import/tooltip.html:6 +msgid "You can download your GoodReads data from the Import/Export page of your GoodReads account." +msgstr "" + #: bookwyrm/templates/invite.html:4 bookwyrm/templates/invite.html:12 #: bookwyrm/templates/login.html:51 msgid "Create an Account" @@ -1506,8 +1518,25 @@ msgstr "批准" msgid "Discard" msgstr "放棄" +#: bookwyrm/templates/lists/delete_list_modal.html:4 +#, fuzzy +#| msgid "Delete this progress update" +msgid "Delete this list?" +msgstr "刪除此進度更新" + +#: bookwyrm/templates/lists/delete_list_modal.html:7 +msgid "This action cannot be un-done" +msgstr "" + +#: bookwyrm/templates/lists/delete_list_modal.html:15 +#: bookwyrm/templates/settings/announcement.html:20 +#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 +#: bookwyrm/templates/snippets/follow_request_buttons.html:12 +msgid "Delete" +msgstr "刪除" + #: bookwyrm/templates/lists/edit_form.html:5 -#: bookwyrm/templates/lists/list_layout.html:16 +#: bookwyrm/templates/lists/layout.html:16 msgid "Edit List" msgstr "編輯列表" @@ -1542,6 +1571,12 @@ msgstr "開放" msgid "Anyone can add books to this list" msgstr "任何人都可以向此列表新增書目" +#: bookwyrm/templates/lists/form.html:49 +#, fuzzy +#| msgid "Delete status" +msgid "Delete list" +msgstr "刪除狀態" + #: bookwyrm/templates/lists/list.html:20 msgid "You successfully suggested a book for this list!" msgstr "你成功！向該列表推薦了一本書" @@ -1941,6 +1976,7 @@ msgid "Account" msgstr "帳號" #: bookwyrm/templates/preferences/layout.html:15 +#: bookwyrm/templates/user_admin/user_info.html:7 msgid "Profile" msgstr "使用者資料" @@ -2064,12 +2100,6 @@ msgstr "回到列表" msgid "Edit Announcement" msgstr "編輯公告" -#: bookwyrm/templates/settings/announcement.html:20 -#: bookwyrm/templates/snippets/delete_readthrough_modal.html:15 -#: bookwyrm/templates/snippets/follow_request_buttons.html:12 -msgid "Delete" -msgstr "刪除" - #: bookwyrm/templates/settings/announcement.html:35 msgid "Visible:" msgstr "可見:" @@ -2120,6 +2150,7 @@ msgstr "結束日期" #: bookwyrm/templates/settings/manage_invite_requests.html:44 #: bookwyrm/templates/settings/status_filter.html:5 #: bookwyrm/templates/user_admin/user_admin.html:34 +#: bookwyrm/templates/user_admin/user_info.html:20 msgid "Status" msgstr "狀態" @@ -2157,7 +2188,7 @@ msgstr "實例:" #: bookwyrm/templates/settings/edit_server.html:37 #: bookwyrm/templates/settings/federated_server.html:31 -#: bookwyrm/templates/user_admin/user_info.html:34 +#: bookwyrm/templates/user_admin/user_info.html:125 msgid "Status:" msgstr "狀態:" @@ -2172,13 +2203,13 @@ msgstr "已封鎖" #: bookwyrm/templates/settings/edit_server.html:48 #: bookwyrm/templates/settings/federated_server.html:23 -#: bookwyrm/templates/user_admin/user_info.html:26 +#: bookwyrm/templates/user_admin/user_info.html:117 msgid "Software:" msgstr "軟件:" #: bookwyrm/templates/settings/edit_server.html:55 #: bookwyrm/templates/settings/federated_server.html:27 -#: bookwyrm/templates/user_admin/user_info.html:30 +#: bookwyrm/templates/user_admin/user_info.html:121 msgid "Version:" msgstr "版本:" @@ -2205,6 +2236,7 @@ msgid "View all" msgstr "檢視全部" #: bookwyrm/templates/settings/federated_server.html:50 +#: bookwyrm/templates/user_admin/user_info.html:59 msgid "Reports:" msgstr "舉報:" @@ -2221,7 +2253,7 @@ msgid "Blocked by us:" msgstr "我們所封鎖的:" #: bookwyrm/templates/settings/federated_server.html:82 -#: bookwyrm/templates/user_admin/user_info.html:39 +#: bookwyrm/templates/user_admin/user_info.html:130 msgid "Notes" msgstr "備註" @@ -3164,7 +3196,7 @@ msgstr[0] "%(mutuals_display)s 個你也關注的關注者" msgid "No followers you follow" msgstr "你關注的關注者" -#: bookwyrm/templates/user_admin/user.html:9 +#: bookwyrm/templates/user_admin/user.html:8 msgid "Back to users" msgstr "回到使用者" @@ -3191,31 +3223,83 @@ msgid "Remote instance" msgstr "移除伺服器" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:24 msgid "Active" msgstr "活躍" #: bookwyrm/templates/user_admin/user_admin.html:47 +#: bookwyrm/templates/user_admin/user_info.html:28 msgid "Inactive" msgstr "停用" #: bookwyrm/templates/user_admin/user_admin.html:52 -#: bookwyrm/templates/user_admin/user_info.html:49 +#: bookwyrm/templates/user_admin/user_info.html:140 msgid "Not set" msgstr "未設定" -#: bookwyrm/templates/user_admin/user_info.html:5 -msgid "User details" -msgstr "使用者詳情" - -#: bookwyrm/templates/user_admin/user_info.html:14 +#: bookwyrm/templates/user_admin/user_info.html:16 msgid "View user profile" msgstr "檢視使用者資料" -#: bookwyrm/templates/user_admin/user_info.html:20 +#: bookwyrm/templates/user_admin/user_info.html:36 +msgid "Local" +msgstr "本站" + +#: bookwyrm/templates/user_admin/user_info.html:38 +#, fuzzy +#| msgid "Remove" +msgid "Remote" +msgstr "移除" + +#: bookwyrm/templates/user_admin/user_info.html:47 +msgid "User details" +msgstr "使用者詳情" + +#: bookwyrm/templates/user_admin/user_info.html:52 +#, fuzzy +#| msgid "Email" +msgid "Email:" +msgstr "郵箱" + +#: bookwyrm/templates/user_admin/user_info.html:64 +#, fuzzy +#| msgid "Directory" +msgid "(View reports)" +msgstr "目錄" + +#: bookwyrm/templates/user_admin/user_info.html:72 +#, fuzzy +#| msgid "Blocked by us:" +msgid "Blocked by count:" +msgstr "我們所封鎖的:" + +#: bookwyrm/templates/user_admin/user_info.html:77 +#, fuzzy +#| msgid "last active" +msgid "Last active date:" +msgstr "最後活躍" + +#: bookwyrm/templates/user_admin/user_info.html:82 +#, fuzzy +#| msgid "Manually approve followers:" +msgid "Manually approved followers:" +msgstr "手動批准關注者:" + +#: bookwyrm/templates/user_admin/user_info.html:87 +#, fuzzy +#| msgid "Discard" +msgid "Discoverable:" +msgstr "放棄" + +#: bookwyrm/templates/user_admin/user_info.html:93 +msgid "Deactivation reason:" +msgstr "" + +#: bookwyrm/templates/user_admin/user_info.html:111 msgid "Instance details" msgstr "實例詳情" -#: bookwyrm/templates/user_admin/user_info.html:46 +#: bookwyrm/templates/user_admin/user_info.html:137 msgid "View instance" msgstr "檢視實例" @@ -3244,14 +3328,14 @@ msgstr "檔案超過了最大大小: 10MB" msgid "%(title)s: %(subtitle)s" msgstr "" -#: bookwyrm/views/authentication.py:69 -msgid "Username or password are incorrect" -msgstr "" - #: bookwyrm/views/import_data.py:67 msgid "Not a valid csv file" msgstr "不是有效的 csv 檔案" +#: bookwyrm/views/login.py:70 +msgid "Username or password are incorrect" +msgstr "" + #: bookwyrm/views/password.py:32 msgid "No user with that email address was found." msgstr "沒有找到使用該郵箱的使用者。" @@ -3277,6 +3361,3 @@ msgstr "" #~ msgid "Federated Timeline" #~ msgstr "跨站時間線" - -#~ msgid "Local" -#~ msgstr "本站"