diff --git a/locale/es/LC_MESSAGES/django.mo b/locale/es/LC_MESSAGES/django.mo
index d41050e6..ee2cf48d 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 f8034b94..75e24e0e 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -20,40 +20,40 @@ msgstr ""
 
 #: bookwyrm/forms.py:185
 msgid "One Day"
-msgstr ""
+msgstr "Un día"
 
 #: bookwyrm/forms.py:186
 msgid "One Week"
-msgstr ""
+msgstr "Una semana"
 
 #: bookwyrm/forms.py:187
 msgid "One Month"
-msgstr ""
+msgstr "Un mes"
 
 #: bookwyrm/forms.py:188
 msgid "Does Not Expire"
-msgstr ""
+msgstr "Nunca se vence"
 
 #: bookwyrm/forms.py:190
 #, python-format
 msgid "%(count)d uses"
-msgstr ""
+msgstr "%(count)d usos"
 
 #: bookwyrm/forms.py:192
 #, fuzzy
 #| msgid "Unlisted"
 msgid "Unlimited"
-msgstr "Privado"
+msgstr "Sin límite"
 
 #: bookwyrm/models/fields.py:24
 #, python-format
 msgid "%(value)s is not a valid remote_id"
-msgstr ""
+msgstr "%(value)s no es un remote_id válido"
 
 #: bookwyrm/models/fields.py:33 bookwyrm/models/fields.py:42
 #, python-format
 msgid "%(value)s is not a valid username"
-msgstr ""
+msgstr "%(value)s no es un usuario válido"
 
 #: bookwyrm/models/fields.py:164
 #, fuzzy
@@ -63,27 +63,27 @@ msgstr "Nombre de usuario:"
 
 #: bookwyrm/models/fields.py:169
 msgid "A user with that username already exists."
-msgstr ""
+msgstr "Ya existe un usuario con ese nombre."
 
 #: bookwyrm/settings.py:142
 msgid "English"
-msgstr ""
+msgstr "Inglés"
 
 #: bookwyrm/settings.py:143
 msgid "German"
-msgstr ""
+msgstr "Aléman"
 
 #: bookwyrm/settings.py:144
 msgid "Spanish"
-msgstr ""
+msgstr "Español"
 
 #: bookwyrm/settings.py:145
 msgid "French"
-msgstr ""
+msgstr "Francés"
 
 #: bookwyrm/settings.py:146
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "Chino simplificado"
 
 #: bookwyrm/templates/author.html:16 bookwyrm/templates/author.html:17
 #: bookwyrm/templates/edit_author.html:5
@@ -101,7 +101,7 @@ msgstr "Libros de %(name)s"
 
 #: bookwyrm/templates/book.html:21
 msgid "by"
-msgstr ""
+msgstr "por"
 
 #: bookwyrm/templates/book.html:29 bookwyrm/templates/book.html:30
 #: bookwyrm/templates/edit_book.html:5
@@ -148,8 +148,8 @@ msgstr "Ver en OpenLibrary"
 #, python-format
 msgid "(%(review_count)s review)"
 msgid_plural "(%(review_count)s reviews)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%(review_count)s reseña)"
+msgstr[1] "(%(review_count)s reseñas)"
 
 #: bookwyrm/templates/book.html:106
 msgid "Add Description"
@@ -186,19 +186,19 @@ msgstr "Cancelar"
 #, fuzzy, python-format
 #| msgid "<a href=\"%(path)s\">%(title)s</a> by "
 msgid "<a href=\"%(path)s/editions\">%(count)s editions</a>"
-msgstr "<a href=\"%(path)s\">%(title)s</a> por "
+msgstr "<a href=\"%(path)s/editions\">%(count)s ediciones</a>"
 
 #: bookwyrm/templates/book.html:135
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "This edition is on your <a href=\"%(path)s\">%(shelf_name)s</a> shelf."
-msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Esta edición está en tu <a href=\"%(path)s\">%(shelf_name)s</a> estante."
 
 #: bookwyrm/templates/book.html:141
 #, fuzzy, python-format
 #| msgid " added <em><a href=\"%(book_path)s\">%(book_title)s</a></em> to your list \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
 msgid "A <a href=\"%(book_path)s\">different edition</a> of this book is on your <a href=\"%(shelf_path)s\">%(shelf_name)s</a> shelf."
-msgstr " agregó <em><a href=\"%(book_path)s\">%(book_title)s</a></em> a tu lista \"<a href=\"%(list_path)s\">%(list_name)s</a>\""
+msgstr "Una <a href=\"%(book_path)s\">edición diferente</a> de este libro está en tu <a href=\"%(shelf_path)s\">%(shelf_name)s</a> estante."
 
 #: bookwyrm/templates/book.html:150
 msgid "Your reading activity"
@@ -467,7 +467,7 @@ msgstr "Anuncios"
 
 #: bookwyrm/templates/feed/feed.html:32
 msgid "There aren't any activities right now! Try following a user to get started"
-msgstr "¡No hay ninguna actividad ahorita! Sigue a otro usuario para empezar"
+msgstr "¡No hay actividades en este momento! Sigue a otro usuario para empezar"
 
 #: bookwyrm/templates/feed/feed_layout.html:5
 msgid "Updates"
@@ -493,7 +493,7 @@ msgstr "Leer"
 #, fuzzy
 #| msgid "Start reading"
 msgid "Currently Reading"
-msgstr "Empezar leer"
+msgstr "Leyendo actualmente"
 
 #: bookwyrm/templates/feed/feed_layout.html:25
 #: bookwyrm/templates/snippets/shelve_button/shelve_button_options.html:11
@@ -787,7 +787,7 @@ msgstr "Esta lista está vacia"
 #, fuzzy, python-format
 #| msgid "Direct Messages with <a href=\"%(path)s\">%(username)s</a>"
 msgid "Added by <a href=\"%(user_path)s\">%(username)s</a>"
-msgstr "Mensajes directos con <a href=\"%(path)s\">%(username)s</a>"
+msgstr "Agregado por <a href=\"%(user_path)s\">%(username)s</a>"
 
 #: bookwyrm/templates/lists/list.html:41
 msgid "Remove"
@@ -844,7 +844,7 @@ msgstr "Tus listas"
 #, fuzzy, python-format
 #| msgid "See all %(size)s"
 msgid "See all %(size)s lists"
-msgstr "Ver %(size)s"
+msgstr "Ver las %(size)s listas"
 
 #: bookwyrm/templates/lists/lists.html:40
 msgid "Recent Lists"
@@ -926,22 +926,22 @@ msgstr "te mencionó en un <a href=\"%(related_path)s\">status</a>"
 #: bookwyrm/templates/notifications.html:71
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">review of <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">reseña de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:73
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">comment on <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">comentario en <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:75
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">quote from <em>%(book_title)s</em></a>"
-msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">cita de <em>%(book_title)s</em></a>"
 
 #: bookwyrm/templates/notifications.html:77
 #, python-format
 msgid "<a href=\"%(related_path)s\">replied</a> to your <a href=\"%(parent_path)s\">status</a>"
-msgstr "<a href=\"%(related_path)s\">contestó</a> tu <a href=\"%(parent_path)s\">status</a>"
+msgstr "<a href=\"%(related_path)s\">respondió a</a> tu <a href=\"%(parent_path)s\">status</a>"
 
 #: bookwyrm/templates/notifications.html:81
 msgid "followed you"
@@ -1340,7 +1340,7 @@ msgstr "¿Eliminar estas fechas de lectura?"
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:7
 #, python-format
 msgid "You are deleting this readthrough and its %(count)s associated progress updates."
-msgstr "Estás eliminando y sus %(count)s actualizaciones de progreso asociados."
+msgstr "Estás eliminando esta lectura y sus %(count)s actualizaciones de progreso asociados."
 
 #: bookwyrm/templates/snippets/delete_readthrough_modal.html:15
 #: bookwyrm/templates/snippets/follow_request_buttons.html:13
@@ -1393,7 +1393,7 @@ msgstr "Desechar mensaje"
 #: bookwyrm/templates/snippets/goal_card.html:22
 #, python-format
 msgid "You can set or change your reading goal any time from your <a href=\"%(path)s\">profile page</a>"
-msgstr "Puedes establecer o cambiar en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
+msgstr "Puedes establecer o cambiar tu meta de lectura en cualquier momento que desees desde tu <a href=\"%(path)s\">perfil</a>"
 
 #: bookwyrm/templates/snippets/goal_form.html:9
 msgid "Reading goal:"
@@ -1675,7 +1675,7 @@ msgstr "Más opciones"
 #, fuzzy
 #| msgid "Delete post"
 msgid "Delete status"
-msgstr "Eliminar publicación"
+msgstr "Eliminar status"
 
 #: bookwyrm/templates/snippets/status/status_options.html:23
 #: bookwyrm/templates/snippets/user_options.html:13