Browse Source

Merge pull request #3180 from bookwyrm-social/version-0-7-0

Version 0.7.0 miscellenea
Mouse Reeve 9 months ago
parent
commit
0756c5ac5c
43 changed files with 4922 additions and 3509 deletions
  1. 13 0
      bookwyrm/migrations/0191_merge_20240102_0326.py
  2. 1 1
      bookwyrm/settings.py
  3. BIN
      locale/ca_ES/LC_MESSAGES/django.mo
  4. 229 172
      locale/ca_ES/LC_MESSAGES/django.po
  5. BIN
      locale/de_DE/LC_MESSAGES/django.mo
  6. 229 172
      locale/de_DE/LC_MESSAGES/django.po
  7. 331 76
      locale/en_US/LC_MESSAGES/django.po
  8. BIN
      locale/eo_UY/LC_MESSAGES/django.mo
  9. 229 172
      locale/eo_UY/LC_MESSAGES/django.po
  10. BIN
      locale/es_ES/LC_MESSAGES/django.mo
  11. 229 172
      locale/es_ES/LC_MESSAGES/django.po
  12. BIN
      locale/eu_ES/LC_MESSAGES/django.mo
  13. 229 172
      locale/eu_ES/LC_MESSAGES/django.po
  14. BIN
      locale/fi_FI/LC_MESSAGES/django.mo
  15. 229 172
      locale/fi_FI/LC_MESSAGES/django.po
  16. BIN
      locale/fr_FR/LC_MESSAGES/django.mo
  17. 229 172
      locale/fr_FR/LC_MESSAGES/django.po
  18. BIN
      locale/gl_ES/LC_MESSAGES/django.mo
  19. 229 172
      locale/gl_ES/LC_MESSAGES/django.po
  20. BIN
      locale/it_IT/LC_MESSAGES/django.mo
  21. 229 172
      locale/it_IT/LC_MESSAGES/django.po
  22. BIN
      locale/lt_LT/LC_MESSAGES/django.mo
  23. 231 172
      locale/lt_LT/LC_MESSAGES/django.po
  24. BIN
      locale/nl_NL/LC_MESSAGES/django.mo
  25. 229 172
      locale/nl_NL/LC_MESSAGES/django.po
  26. BIN
      locale/no_NO/LC_MESSAGES/django.mo
  27. 229 172
      locale/no_NO/LC_MESSAGES/django.po
  28. BIN
      locale/pl_PL/LC_MESSAGES/django.mo
  29. 229 170
      locale/pl_PL/LC_MESSAGES/django.po
  30. BIN
      locale/pt_BR/LC_MESSAGES/django.mo
  31. 227 170
      locale/pt_BR/LC_MESSAGES/django.po
  32. BIN
      locale/pt_PT/LC_MESSAGES/django.mo
  33. 229 172
      locale/pt_PT/LC_MESSAGES/django.po
  34. BIN
      locale/ro_RO/LC_MESSAGES/django.mo
  35. 230 172
      locale/ro_RO/LC_MESSAGES/django.po
  36. BIN
      locale/sv_SE/LC_MESSAGES/django.mo
  37. 229 172
      locale/sv_SE/LC_MESSAGES/django.po
  38. BIN
      locale/uk_UA/LC_MESSAGES/django.mo
  39. 231 172
      locale/uk_UA/LC_MESSAGES/django.po
  40. BIN
      locale/zh_Hans/LC_MESSAGES/django.mo
  41. 226 170
      locale/zh_Hans/LC_MESSAGES/django.po
  42. BIN
      locale/zh_Hant/LC_MESSAGES/django.mo
  43. 226 170
      locale/zh_Hant/LC_MESSAGES/django.po

+ 13 - 0
bookwyrm/migrations/0191_merge_20240102_0326.py

@@ -0,0 +1,13 @@
+# Generated by Django 3.2.23 on 2024-01-02 03:26
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookwyrm", "0189_alter_user_preferred_language"),
+        ("bookwyrm", "0190_alter_notification_notification_type"),
+    ]
+
+    operations = []

+ 1 - 1
bookwyrm/settings.py

@@ -31,7 +31,7 @@ RELEASE_API = env(
 PAGE_LENGTH = env.int("PAGE_LENGTH", 15)
 PAGE_LENGTH = env.int("PAGE_LENGTH", 15)
 DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English")
 DEFAULT_LANGUAGE = env("DEFAULT_LANGUAGE", "English")
 
 
-JS_CACHE = "ac315a3b"
+JS_CACHE = "8a89cad7"
 
 
 # email
 # email
 EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")
 EMAIL_BACKEND = env("EMAIL_BACKEND", "django.core.mail.backends.smtp.EmailBackend")

BIN
locale/ca_ES/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/ca_ES/LC_MESSAGES/django.po


BIN
locale/de_DE/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/de_DE/LC_MESSAGES/django.po


+ 331 - 76
locale/en_US/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 msgstr ""
 "Project-Id-Version: 0.0.1\n"
 "Project-Id-Version: 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-30 23:52+0000\n"
+"POT-Creation-Date: 2024-01-02 03:27+0000\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "PO-Revision-Date: 2021-02-28 17:19-0800\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Last-Translator: Mouse Reeve <mousereeve@riseup.net>\n"
 "Language-Team: English <LL@li.org>\n"
 "Language-Team: English <LL@li.org>\n"
@@ -55,19 +55,19 @@ msgstr ""
 msgid "Incorrect Password"
 msgid "Incorrect Password"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/forms/forms.py:54
+#: bookwyrm/forms/forms.py:58
 msgid "Reading finish date cannot be before start date."
 msgid "Reading finish date cannot be before start date."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/forms/forms.py:59
+#: bookwyrm/forms/forms.py:63
 msgid "Reading stopped date cannot be before start date."
 msgid "Reading stopped date cannot be before start date."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/forms/forms.py:67
+#: bookwyrm/forms/forms.py:71
 msgid "Reading stopped date cannot be in the future."
 msgid "Reading stopped date cannot be in the future."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/forms/forms.py:74
+#: bookwyrm/forms/forms.py:78
 msgid "Reading finished date cannot be in the future."
 msgid "Reading finished date cannot be in the future."
 msgstr ""
 msgstr ""
 
 
@@ -147,7 +147,8 @@ msgid "Automatically generated report"
 msgstr ""
 msgstr ""
 
 
 #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48
 #: bookwyrm/models/base_model.py:18 bookwyrm/models/import_job.py:48
-#: bookwyrm/models/link.py:72 bookwyrm/templates/import/import_status.html:214
+#: bookwyrm/models/job.py:18 bookwyrm/models/link.py:72
+#: bookwyrm/templates/import/import_status.html:214
 #: bookwyrm/templates/settings/link_domains/link_domains.html:19
 #: bookwyrm/templates/settings/link_domains/link_domains.html:19
 msgid "Pending"
 msgid "Pending"
 msgstr ""
 msgstr ""
@@ -259,17 +260,24 @@ msgstr ""
 msgid "Private"
 msgid "Private"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/models/import_job.py:49 bookwyrm/templates/import/import.html:174
-#: bookwyrm/templates/settings/imports/imports.html:98
+#: bookwyrm/models/import_job.py:49 bookwyrm/models/job.py:19
+#: bookwyrm/templates/import/import.html:173
+#: bookwyrm/templates/import/import_user.html:211
+#: bookwyrm/templates/preferences/export-user.html:112
+#: bookwyrm/templates/settings/imports/imports.html:131
+#: bookwyrm/templates/settings/imports/imports.html:221
 #: bookwyrm/templates/snippets/user_active_tag.html:8
 #: bookwyrm/templates/snippets/user_active_tag.html:8
 msgid "Active"
 msgid "Active"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/models/import_job.py:50 bookwyrm/templates/import/import.html:172
+#: bookwyrm/models/import_job.py:50 bookwyrm/models/job.py:20
+#: bookwyrm/templates/import/import.html:171
+#: bookwyrm/templates/import/import_user.html:209
+#: bookwyrm/templates/preferences/export-user.html:110
 msgid "Complete"
 msgid "Complete"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/models/import_job.py:51
+#: bookwyrm/models/import_job.py:51 bookwyrm/models/job.py:21
 msgid "Stopped"
 msgid "Stopped"
 msgstr ""
 msgstr ""
 
 
@@ -285,6 +293,10 @@ msgstr ""
 msgid "Could not find a match for book"
 msgid "Could not find a match for book"
 msgstr ""
 msgstr ""
 
 
+#: bookwyrm/models/job.py:22
+msgid "Failed"
+msgstr ""
+
 #: bookwyrm/models/link.py:51
 #: bookwyrm/models/link.py:51
 msgid "Free"
 msgid "Free"
 msgstr ""
 msgstr ""
@@ -360,7 +372,7 @@ msgstr ""
 msgid "Comments"
 msgid "Comments"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/models/user.py:35
+#: bookwyrm/models/user.py:35 bookwyrm/templates/import/import_user.html:139
 msgid "Quotations"
 msgid "Quotations"
 msgstr ""
 msgstr ""
 
 
@@ -966,6 +978,7 @@ msgstr ""
 #: bookwyrm/templates/search/barcode_modal.html:43
 #: bookwyrm/templates/search/barcode_modal.html:43
 #: bookwyrm/templates/settings/federation/instance.html:106
 #: bookwyrm/templates/settings/federation/instance.html:106
 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16
 #: bookwyrm/templates/settings/imports/complete_import_modal.html:16
+#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:16
 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
 #: bookwyrm/templates/settings/link_domains/edit_domain_modal.html:22
 #: bookwyrm/templates/snippets/report_modal.html:52
 #: bookwyrm/templates/snippets/report_modal.html:52
 msgid "Cancel"
 msgid "Cancel"
@@ -983,6 +996,7 @@ msgstr ""
 #: bookwyrm/templates/landing/password_reset.html:52
 #: bookwyrm/templates/landing/password_reset.html:52
 #: bookwyrm/templates/preferences/2fa.html:77
 #: bookwyrm/templates/preferences/2fa.html:77
 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19
 #: bookwyrm/templates/settings/imports/complete_import_modal.html:19
+#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:19
 #: bookwyrm/templates/snippets/remove_from_group_button.html:17
 #: bookwyrm/templates/snippets/remove_from_group_button.html:17
 msgid "Confirm"
 msgid "Confirm"
 msgstr ""
 msgstr ""
@@ -1482,9 +1496,12 @@ msgid "Domain"
 msgstr ""
 msgstr ""
 
 
 #: bookwyrm/templates/book/file_links/edit_links.html:36
 #: bookwyrm/templates/book/file_links/edit_links.html:36
-#: bookwyrm/templates/import/import.html:139
+#: bookwyrm/templates/import/import.html:138
 #: bookwyrm/templates/import/import_status.html:134
 #: bookwyrm/templates/import/import_status.html:134
+#: bookwyrm/templates/import/import_user.html:177
+#: bookwyrm/templates/preferences/export-user.html:78
 #: bookwyrm/templates/settings/announcements/announcements.html:37
 #: bookwyrm/templates/settings/announcements/announcements.html:37
+#: bookwyrm/templates/settings/imports/imports.html:255
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:48
 #: bookwyrm/templates/settings/invites/status_filter.html:5
 #: bookwyrm/templates/settings/invites/status_filter.html:5
 #: bookwyrm/templates/settings/themes.html:111
 #: bookwyrm/templates/settings/themes.html:111
@@ -1496,7 +1513,8 @@ msgstr ""
 #: bookwyrm/templates/book/file_links/edit_links.html:37
 #: bookwyrm/templates/book/file_links/edit_links.html:37
 #: bookwyrm/templates/settings/announcements/announcements.html:41
 #: bookwyrm/templates/settings/announcements/announcements.html:41
 #: bookwyrm/templates/settings/federation/instance.html:112
 #: bookwyrm/templates/settings/federation/instance.html:112
-#: bookwyrm/templates/settings/imports/imports.html:141
+#: bookwyrm/templates/settings/imports/imports.html:174
+#: bookwyrm/templates/settings/imports/imports.html:253
 #: bookwyrm/templates/settings/reports/report_links_table.html:6
 #: bookwyrm/templates/settings/reports/report_links_table.html:6
 #: bookwyrm/templates/settings/themes.html:108
 #: bookwyrm/templates/settings/themes.html:108
 msgid "Actions"
 msgid "Actions"
@@ -2828,111 +2846,121 @@ msgid "No activities for this hashtag yet!"
 msgstr ""
 msgstr ""
 
 
 #: bookwyrm/templates/import/import.html:5
 #: bookwyrm/templates/import/import.html:5
-#: bookwyrm/templates/import/import.html:9
-#: bookwyrm/templates/shelf/shelf.html:66
-msgid "Import Books"
+#: bookwyrm/templates/import/import.html:6
+#: bookwyrm/templates/preferences/layout.html:43
+msgid "Import Book List"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:13
+#: bookwyrm/templates/import/import.html:12
 msgid "Not a valid CSV file"
 msgid "Not a valid CSV file"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:21
+#: bookwyrm/templates/import/import.html:20
 #, python-format
 #, python-format
 msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
 msgid "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s day."
 msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days."
 msgid_plural "Currently, you are allowed to import %(display_size)s books every %(import_limit_reset)s days."
 msgstr[0] ""
 msgstr[0] ""
 msgstr[1] ""
 msgstr[1] ""
 
 
-#: bookwyrm/templates/import/import.html:27
+#: bookwyrm/templates/import/import.html:26
 #, python-format
 #, python-format
 msgid "You have %(display_left)s left."
 msgid "You have %(display_left)s left."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:34
+#: bookwyrm/templates/import/import.html:33
 #, python-format
 #, python-format
 msgid "On average, recent imports have taken %(hours)s hours."
 msgid "On average, recent imports have taken %(hours)s hours."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:38
+#: bookwyrm/templates/import/import.html:37
 #, python-format
 #, python-format
 msgid "On average, recent imports have taken %(minutes)s minutes."
 msgid "On average, recent imports have taken %(minutes)s minutes."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:53
+#: bookwyrm/templates/import/import.html:52
 msgid "Data source:"
 msgid "Data source:"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:59
+#: bookwyrm/templates/import/import.html:58
 msgid "Goodreads (CSV)"
 msgid "Goodreads (CSV)"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:62
+#: bookwyrm/templates/import/import.html:61
 msgid "Storygraph (CSV)"
 msgid "Storygraph (CSV)"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:65
+#: bookwyrm/templates/import/import.html:64
 msgid "LibraryThing (TSV)"
 msgid "LibraryThing (TSV)"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:68
+#: bookwyrm/templates/import/import.html:67
 msgid "OpenLibrary (CSV)"
 msgid "OpenLibrary (CSV)"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:71
+#: bookwyrm/templates/import/import.html:70
 msgid "Calibre (CSV)"
 msgid "Calibre (CSV)"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:77
+#: bookwyrm/templates/import/import.html:76
 msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">Import/Export page</a> of your Goodreads account."
 msgid "You can download your Goodreads data from the <a href=\"https://www.goodreads.com/review/import\" target=\"_blank\" rel=\"nofollow noopener noreferrer\">Import/Export page</a> of your Goodreads account."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:86
+#: bookwyrm/templates/import/import.html:85
+#: bookwyrm/templates/import/import_user.html:49
 msgid "Data file:"
 msgid "Data file:"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:94
+#: bookwyrm/templates/import/import.html:93
 msgid "Include reviews"
 msgid "Include reviews"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:99
+#: bookwyrm/templates/import/import.html:98
 msgid "Privacy setting for imported reviews:"
 msgid "Privacy setting for imported reviews:"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:106
-#: bookwyrm/templates/import/import.html:108
-#: bookwyrm/templates/preferences/layout.html:43
+#: bookwyrm/templates/import/import.html:105
+#: bookwyrm/templates/import/import.html:107
+#: bookwyrm/templates/import/import_user.html:155
+#: bookwyrm/templates/import/import_user.html:157
 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78
 #: bookwyrm/templates/settings/federation/instance_blocklist.html:78
 msgid "Import"
 msgid "Import"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:109
+#: bookwyrm/templates/import/import.html:108
+#: bookwyrm/templates/import/import_user.html:158
 msgid "You've reached the import limit."
 msgid "You've reached the import limit."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:118
+#: bookwyrm/templates/import/import.html:117
+#: bookwyrm/templates/import/import_user.html:27
 msgid "Imports are temporarily disabled; thank you for your patience."
 msgid "Imports are temporarily disabled; thank you for your patience."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:125
+#: bookwyrm/templates/import/import.html:124
+#: bookwyrm/templates/import/import_user.html:166
 msgid "Recent Imports"
 msgid "Recent Imports"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:130
-#: bookwyrm/templates/settings/imports/imports.html:120
+#: bookwyrm/templates/import/import.html:129
+#: bookwyrm/templates/import/import_user.html:171
+#: bookwyrm/templates/settings/imports/imports.html:153
+#: bookwyrm/templates/settings/imports/imports.html:243
 msgid "Date Created"
 msgid "Date Created"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:133
+#: bookwyrm/templates/import/import.html:132
+#: bookwyrm/templates/import/import_user.html:174
 msgid "Last Updated"
 msgid "Last Updated"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:136
-#: bookwyrm/templates/settings/imports/imports.html:129
+#: bookwyrm/templates/import/import.html:135
+#: bookwyrm/templates/settings/imports/imports.html:162
 msgid "Items"
 msgid "Items"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/import/import.html:145
+#: bookwyrm/templates/import/import.html:144
+#: bookwyrm/templates/import/import_user.html:183
+#: bookwyrm/templates/preferences/export-user.html:87
 msgid "No recent imports"
 msgid "No recent imports"
 msgstr ""
 msgstr ""
 
 
@@ -2968,7 +2996,8 @@ msgid "Refresh"
 msgstr ""
 msgstr ""
 
 
 #: bookwyrm/templates/import/import_status.html:72
 #: bookwyrm/templates/import/import_status.html:72
-#: bookwyrm/templates/settings/imports/imports.html:161
+#: bookwyrm/templates/settings/imports/imports.html:194
+#: bookwyrm/templates/settings/imports/imports.html:271
 msgid "Stop import"
 msgid "Stop import"
 msgstr ""
 msgstr ""
 
 
@@ -3066,6 +3095,133 @@ msgstr ""
 msgid "Update import"
 msgid "Update import"
 msgstr ""
 msgstr ""
 
 
+#: bookwyrm/templates/import/import_user.html:5
+#: bookwyrm/templates/import/import_user.html:6
+#: bookwyrm/templates/preferences/layout.html:51
+msgid "Import BookWyrm Account"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:13
+msgid "Not a valid import file"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:18
+msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set this account as an <strong>alias</strong> of the one you are migrating from, or <strong>move</strong> that account to this one, before you import your user data."
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:32
+#, python-format
+msgid "Currently you are allowed to import one user every %(user_import_hours)s hours."
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:33
+#, python-format
+msgid "You will next be able to import a user file at %(next_available)s"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:41
+msgid "Step 1:"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:43
+msgid "Select an export file generated from another BookWyrm account. The file format should be <code>.tar.gz</code>."
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:58
+msgid "Step 2:"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:60
+msgid "Deselect any checkboxes for data you do not wish to include in your import."
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:71
+#: bookwyrm/templates/shelf/shelf.html:26
+#: bookwyrm/templates/user/relationships/followers.html:18
+#: bookwyrm/templates/user/relationships/following.html:18
+msgid "User profile"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:74
+msgid "Overwrites display name, summary, and avatar"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:80
+msgid "User settings"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:83
+msgid "Overwrites:"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:86
+msgid "Whether manual approval is required for other users to follow your account"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:89
+msgid "Whether following/followers are shown on your profile"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:92
+msgid "Whether your reading goal is shown on your profile"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:95
+msgid "Whether you see user follow suggestions"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:98
+msgid "Whether your account is suggested to others"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:101
+msgid "Your timezone"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:104
+msgid "Your default post privacy setting"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:112
+msgid "Followers and following"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:116
+msgid "User blocks"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:123
+msgid "Reading goals"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:126
+msgid "Overwrites reading goals for all years listed in the import file"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:130
+msgid "Shelves"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:133
+msgid "Reading history"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:136
+msgid "Book reviews"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:142
+msgid "Comments about books"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:145
+msgid "Book lists"
+msgstr ""
+
+#: bookwyrm/templates/import/import_user.html:148
+msgid "Saved lists"
+msgstr ""
+
 #: bookwyrm/templates/import/manual_review.html:5
 #: bookwyrm/templates/import/manual_review.html:5
 #: bookwyrm/templates/import/troubleshoot.html:4
 #: bookwyrm/templates/import/troubleshoot.html:4
 msgid "Import Troubleshooting"
 msgid "Import Troubleshooting"
@@ -3086,7 +3242,7 @@ msgid "Reject"
 msgstr ""
 msgstr ""
 
 
 #: bookwyrm/templates/import/troubleshoot.html:7
 #: bookwyrm/templates/import/troubleshoot.html:7
-#: bookwyrm/templates/settings/imports/imports.html:138
+#: bookwyrm/templates/settings/imports/imports.html:171
 msgid "Failed items"
 msgid "Failed items"
 msgstr ""
 msgstr ""
 
 
@@ -3866,6 +4022,16 @@ msgstr ""
 msgid "has changed the description of <a href=\"%(group_path)s\">%(group_name)s</a>"
 msgid "has changed the description of <a href=\"%(group_path)s\">%(group_name)s</a>"
 msgstr ""
 msgstr ""
 
 
+#: bookwyrm/templates/notifications/items/user_export.html:14
+#, python-format
+msgid "Your <a href=\"%(url)s\">user export</a> is ready."
+msgstr ""
+
+#: bookwyrm/templates/notifications/items/user_import.html:14
+#, python-format
+msgid "Your <a href=\"%(import_url)s\">user import</a> is complete."
+msgstr ""
+
 #: bookwyrm/templates/notifications/notifications_page.html:19
 #: bookwyrm/templates/notifications/notifications_page.html:19
 msgid "Delete notifications"
 msgid "Delete notifications"
 msgstr ""
 msgstr ""
@@ -4109,7 +4275,7 @@ msgstr ""
 
 
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:4
 #: bookwyrm/templates/preferences/blocks.html:7
 #: bookwyrm/templates/preferences/blocks.html:7
-#: bookwyrm/templates/preferences/layout.html:54
+#: bookwyrm/templates/preferences/layout.html:62
 msgid "Blocked Users"
 msgid "Blocked Users"
 msgstr ""
 msgstr ""
 
 
@@ -4244,13 +4410,65 @@ msgstr ""
 msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to <a href=\"%(path)s\">Your Books</a>, pick a shelf from the tab bar, and click \"Edit shelf.\""
 msgid "Looking for shelf privacy? You can set a separate visibility level for each of your shelves. Go to <a href=\"%(path)s\">Your Books</a>, pick a shelf from the tab bar, and click \"Edit shelf.\""
 msgstr ""
 msgstr ""
 
 
+#: bookwyrm/templates/preferences/export-user.html:5
+#: bookwyrm/templates/preferences/export-user.html:8
+#: bookwyrm/templates/preferences/layout.html:55
+msgid "Export BookWyrm Account"
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:14
+msgid "You can create an export file here. This will allow you to migrate your data to another BookWyrm account."
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:17
+msgid "<div class=\"column is-half\"> <h2 class=\"is-size-5\">Your file will include:</h2> <ul> <li>User profile</li> <li>Most user settings</li> <li>Reading goals</li> <li>Shelves</li> <li>Reading history</li> <li>Book reviews</li> <li>Statuses</li> <li>Your own lists and saved lists</li> <li>Which users you follow and block</li> </ul> </div> <div class=\"column is-half\"> <h2 class=\"is-size-5\">Your file will not include:</h2> <ul> <li>Direct messages</li> <li>Replies to your statuses</li> <li>Groups</li> <li>Favorites</li> </ul> </div>"
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:43
+msgid "In your new BookWyrm account can choose what to import: you will not have to import everything that is exported."
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:46
+msgid "If you wish to migrate any statuses (comments, reviews, or quotes) you must either set the account you are moving to as an <strong>alias</strong> of this one, or <strong>move</strong> this account to the new account, before you import your user data."
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:51
+#, python-format
+msgid "You will be able to create a new export file at %(next_available)s"
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:60
+msgid "Create user export file"
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:67
+msgid "Recent Exports"
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:69
+msgid "User export files will show 'complete' once ready. This may take a little while. Click the link to download your file."
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:75
+msgid "Date"
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:81
+msgid "Size"
+msgstr ""
+
+#: bookwyrm/templates/preferences/export-user.html:125
+msgid "Download your export"
+msgstr ""
+
 #: bookwyrm/templates/preferences/export.html:4
 #: bookwyrm/templates/preferences/export.html:4
 #: bookwyrm/templates/preferences/export.html:7
 #: bookwyrm/templates/preferences/export.html:7
-msgid "CSV Export"
+#: bookwyrm/templates/preferences/layout.html:47
+msgid "Export Book List"
 msgstr ""
 msgstr ""
 
 
 #: bookwyrm/templates/preferences/export.html:13
 #: bookwyrm/templates/preferences/export.html:13
-msgid "Your export will include all the books on your shelves, books you have reviewed, and books with reading activity."
+msgid "Your CSV export file will include all the books on your shelves, books you have reviewed, and books with reading activity. <br/>Use this to import into a service like Goodreads."
 msgstr ""
 msgstr ""
 
 
 #: bookwyrm/templates/preferences/export.html:20
 #: bookwyrm/templates/preferences/export.html:20
@@ -4269,11 +4487,7 @@ msgstr ""
 msgid "Data"
 msgid "Data"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/preferences/layout.html:47
-msgid "CSV export"
-msgstr ""
-
-#: bookwyrm/templates/preferences/layout.html:50
+#: bookwyrm/templates/preferences/layout.html:58
 msgid "Relationships"
 msgid "Relationships"
 msgstr ""
 msgstr ""
 
 
@@ -4763,7 +4977,8 @@ msgid "Active Tasks"
 msgstr ""
 msgstr ""
 
 
 #: bookwyrm/templates/settings/celery.html:131
 #: bookwyrm/templates/settings/celery.html:131
-#: bookwyrm/templates/settings/imports/imports.html:113
+#: bookwyrm/templates/settings/imports/imports.html:146
+#: bookwyrm/templates/settings/imports/imports.html:236
 msgid "ID"
 msgid "ID"
 msgstr ""
 msgstr ""
 
 
@@ -5157,9 +5372,14 @@ msgid "No instances found"
 msgstr ""
 msgstr ""
 
 
 #: bookwyrm/templates/settings/imports/complete_import_modal.html:4
 #: bookwyrm/templates/settings/imports/complete_import_modal.html:4
+#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:4
 msgid "Stop import?"
 msgid "Stop import?"
 msgstr ""
 msgstr ""
 
 
+#: bookwyrm/templates/settings/imports/complete_user_import_modal.html:7
+msgid "This action will stop the user import before it is complete and cannot be un-done"
+msgstr ""
+
 #: bookwyrm/templates/settings/imports/imports.html:19
 #: bookwyrm/templates/settings/imports/imports.html:19
 msgid "Disable starting new imports"
 msgid "Disable starting new imports"
 msgstr ""
 msgstr ""
@@ -5172,70 +5392,107 @@ msgstr ""
 msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected."
 msgid "While imports are disabled, users will not be allowed to start new imports, but existing imports will not be affected."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:36
+#: bookwyrm/templates/settings/imports/imports.html:32
+msgid "This setting prevents both book imports and user imports."
+msgstr ""
+
+#: bookwyrm/templates/settings/imports/imports.html:37
 msgid "Disable imports"
 msgid "Disable imports"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:50
+#: bookwyrm/templates/settings/imports/imports.html:51
 msgid "Users are currently unable to start new imports"
 msgid "Users are currently unable to start new imports"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:55
+#: bookwyrm/templates/settings/imports/imports.html:56
 msgid "Enable imports"
 msgid "Enable imports"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:63
+#: bookwyrm/templates/settings/imports/imports.html:64
 msgid "Limit the amount of imports"
 msgid "Limit the amount of imports"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:74
+#: bookwyrm/templates/settings/imports/imports.html:75
 msgid "Some users might try to import a large number of books, which you want to limit."
 msgid "Some users might try to import a large number of books, which you want to limit."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:75
+#: bookwyrm/templates/settings/imports/imports.html:76
+#: bookwyrm/templates/settings/imports/imports.html:108
 msgid "Set the value to 0 to not enforce any limit."
 msgid "Set the value to 0 to not enforce any limit."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:78
+#: bookwyrm/templates/settings/imports/imports.html:79
 msgid "Set import limit to"
 msgid "Set import limit to"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:80
+#: bookwyrm/templates/settings/imports/imports.html:81
 msgid "books every"
 msgid "books every"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:82
+#: bookwyrm/templates/settings/imports/imports.html:83
 msgid "days."
 msgid "days."
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:86
+#: bookwyrm/templates/settings/imports/imports.html:87
 msgid "Set limit"
 msgid "Set limit"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:102
+#: bookwyrm/templates/settings/imports/imports.html:96
+msgid "Limit how often users can import and export"
+msgstr ""
+
+#: bookwyrm/templates/settings/imports/imports.html:107
+msgid "Some users might try to run user imports or exports very frequently, which you want to limit."
+msgstr ""
+
+#: bookwyrm/templates/settings/imports/imports.html:111
+msgid "Restrict user imports and exports to once every "
+msgstr ""
+
+#: bookwyrm/templates/settings/imports/imports.html:113
+msgid "hours"
+msgstr ""
+
+#: bookwyrm/templates/settings/imports/imports.html:117
+msgid "Change limit"
+msgstr ""
+
+#: bookwyrm/templates/settings/imports/imports.html:125
+msgid "Book Imports"
+msgstr ""
+
+#: bookwyrm/templates/settings/imports/imports.html:135
+#: bookwyrm/templates/settings/imports/imports.html:225
 msgid "Completed"
 msgid "Completed"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:116
+#: bookwyrm/templates/settings/imports/imports.html:149
+#: bookwyrm/templates/settings/imports/imports.html:239
 msgid "User"
 msgid "User"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:125
+#: bookwyrm/templates/settings/imports/imports.html:158
+#: bookwyrm/templates/settings/imports/imports.html:248
 msgid "Date Updated"
 msgid "Date Updated"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:132
+#: bookwyrm/templates/settings/imports/imports.html:165
 msgid "Pending items"
 msgid "Pending items"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:135
+#: bookwyrm/templates/settings/imports/imports.html:168
 msgid "Successful items"
 msgid "Successful items"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/settings/imports/imports.html:170
+#: bookwyrm/templates/settings/imports/imports.html:203
+#: bookwyrm/templates/settings/imports/imports.html:295
 msgid "No matching imports found."
 msgid "No matching imports found."
 msgstr ""
 msgstr ""
 
 
+#: bookwyrm/templates/settings/imports/imports.html:215
+msgid "User Imports"
+msgstr ""
+
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:4
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:11
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25
 #: bookwyrm/templates/settings/invites/manage_invite_requests.html:25
@@ -6048,17 +6305,15 @@ msgstr ""
 msgid "Edit Shelf"
 msgid "Edit Shelf"
 msgstr ""
 msgstr ""
 
 
-#: bookwyrm/templates/shelf/shelf.html:26
-#: bookwyrm/templates/user/relationships/followers.html:18
-#: bookwyrm/templates/user/relationships/following.html:18
-msgid "User profile"
-msgstr ""
-
 #: bookwyrm/templates/shelf/shelf.html:41
 #: bookwyrm/templates/shelf/shelf.html:41
 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53
 #: bookwyrm/templatetags/shelf_tags.py:13 bookwyrm/views/shelf/shelf.py:53
 msgid "All books"
 msgid "All books"
 msgstr ""
 msgstr ""
 
 
+#: bookwyrm/templates/shelf/shelf.html:66
+msgid "Import Books"
+msgstr ""
+
 #: bookwyrm/templates/shelf/shelf.html:99
 #: bookwyrm/templates/shelf/shelf.html:99
 #, python-format
 #, python-format
 msgid "%(formatted_count)s book"
 msgid "%(formatted_count)s book"

BIN
locale/eo_UY/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/eo_UY/LC_MESSAGES/django.po


BIN
locale/es_ES/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/es_ES/LC_MESSAGES/django.po


BIN
locale/eu_ES/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/eu_ES/LC_MESSAGES/django.po


BIN
locale/fi_FI/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/fi_FI/LC_MESSAGES/django.po


BIN
locale/fr_FR/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/fr_FR/LC_MESSAGES/django.po


BIN
locale/gl_ES/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/gl_ES/LC_MESSAGES/django.po


BIN
locale/it_IT/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/it_IT/LC_MESSAGES/django.po


BIN
locale/lt_LT/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 231 - 172
locale/lt_LT/LC_MESSAGES/django.po


BIN
locale/nl_NL/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/nl_NL/LC_MESSAGES/django.po


BIN
locale/no_NO/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/no_NO/LC_MESSAGES/django.po


BIN
locale/pl_PL/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 170
locale/pl_PL/LC_MESSAGES/django.po


BIN
locale/pt_BR/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 227 - 170
locale/pt_BR/LC_MESSAGES/django.po


BIN
locale/pt_PT/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/pt_PT/LC_MESSAGES/django.po


BIN
locale/ro_RO/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 230 - 172
locale/ro_RO/LC_MESSAGES/django.po


BIN
locale/sv_SE/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 229 - 172
locale/sv_SE/LC_MESSAGES/django.po


BIN
locale/uk_UA/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 231 - 172
locale/uk_UA/LC_MESSAGES/django.po


BIN
locale/zh_Hans/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 226 - 170
locale/zh_Hans/LC_MESSAGES/django.po


BIN
locale/zh_Hant/LC_MESSAGES/django.mo


File diff suppressed because it is too large
+ 226 - 170
locale/zh_Hant/LC_MESSAGES/django.po


Some files were not shown because too many files changed in this diff