Committing extracted and compiled translations

1 files changed, 695 insertions, 289 deletions

diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
index 934fdad6..20788bc6 100644
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
@@ -6,6 +6,7 @@
 # aleksejrs <deletesoftware@yandex.ru>, 2011, 2012
 # ekenbrand <ekenbrand@hotmail.com>, 2011
 # nvjacobo <jacobo@gnu.org>, 2011-2012
+# nvjacobo <jacobo@gnu.org>, 2013
 # Javier Di Mauro <javierdimauro@gmail.com>, 2011
 # case <juangsub@gmail.com>, 2011
 # juanman <juanma@kde.org.ar>, 2011, 2012
@@ -18,9 +19,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
-"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2013-09-04 16:02-0500\n"
-"PO-Revision-Date: 2013-09-04 21:03+0000\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2013-11-04 13:23-0600\n"
+"PO-Revision-Date: 2013-11-04 19:23+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mediagoblin/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -30,41 +31,41 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mediagoblin/decorators.py:252
+#: mediagoblin/decorators.py:299 mediagoblin/plugins/openid/views.py:202
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Lo sentimos, el registro está deshabilitado en este momento."
 
-#: mediagoblin/decorators.py:268 mediagoblin/plugins/openid/views.py:202
+#: mediagoblin/decorators.py:314
+msgid "Sorry, reporting is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/decorators.py:357 mediagoblin/plugins/ldap/views.py:55
 #: mediagoblin/plugins/persona/views.py:77
 msgid "Sorry, authentication is disabled on this instance."
 msgstr "Lo siento, la autenticación está deshabilitada en esta instancia."
 
-#: mediagoblin/auth/forms.py:25
-msgid "Username or email"
-msgstr "Nombre de usuario o email"
-
-#: mediagoblin/auth/tools.py:41
+#: mediagoblin/auth/tools.py:43
 msgid "Invalid User name or email address."
 msgstr "Nombre de usuario o correo electrónico inválido."
 
-#: mediagoblin/auth/tools.py:42
+#: mediagoblin/auth/tools.py:44
 msgid "This field does not take email addresses."
 msgstr "Este campo no acepta direcciones de correo."
 
-#: mediagoblin/auth/tools.py:43
+#: mediagoblin/auth/tools.py:45
 msgid "This field requires an email address."
 msgstr "Este campo requiere una dirección de correo."
 
-#: mediagoblin/auth/tools.py:146
+#: mediagoblin/auth/tools.py:116
 msgid "Sorry, a user with that name already exists."
 msgstr "Lo sentimos, ya existe un usuario con ese nombre."
 
-#: mediagoblin/auth/tools.py:150 mediagoblin/edit/views.py:442
+#: mediagoblin/auth/tools.py:120 mediagoblin/edit/views.py:402
 msgid "Sorry, a user with that email address already exists."
 msgstr "Lo sentimos, ya existe un usuario con esa dirección de email."
 
-#: mediagoblin/auth/views.py:145 mediagoblin/auth/views.py:293
-#: mediagoblin/edit/views.py:398 mediagoblin/edit/views.py:419
+#: mediagoblin/auth/views.py:142 mediagoblin/edit/views.py:358
+#: mediagoblin/edit/views.py:379 mediagoblin/plugins/basic_auth/views.py:110
 msgid "The verification key or user id is incorrect."
 msgstr "La clave de verificación o el identificador de usuario son incorrectos."
 
@@ -90,77 +91,37 @@ msgstr "¡Ya has verificado tu dirección de correo!"
 msgid "Resent your verification email."
 msgstr "Se reenvió tu correo electrónico de verificación."
 
-#: mediagoblin/auth/views.py:237
-msgid ""
-"If that email address (case sensitive!) is registered an email has been sent"
-" with instructions on how to change your password."
-msgstr "Si esa dirección de correo (¡sensible a mayúsculas y minúsculas!) está registrada, se ha enviado un correo con instrucciones para cambiar la contraseña."
-
-#: mediagoblin/auth/views.py:248
-msgid "Couldn't find someone with that username."
-msgstr "No se ha podido encontrar a nadie con ese nombre de usuario."
-
-#: mediagoblin/auth/views.py:251
-msgid ""
-"An email has been sent with instructions on how to change your password."
-msgstr "Un correo electrónico ha sido enviado con instrucciones sobre cómo cambiar tu contraseña."
-
-#: mediagoblin/auth/views.py:258
-msgid ""
-"Could not send password recovery email as your username is inactive or your "
-"account's email address has not been verified."
-msgstr "No se pudo enviar un correo electrónico de recuperación de contraseñas porque tu nombre de usuario está inactivo o la dirección de su cuenta de correo electrónico no ha sido verificada."
-
-#: mediagoblin/auth/views.py:306
-msgid "The user id is incorrect."
-msgstr "El identificador de usuario es incorrecto."
-
-#: mediagoblin/auth/views.py:323
-msgid "You can now log in using your new password."
-msgstr "Ahora tu puedes iniciar sesión usando tu nueva contraseña."
-
-#: mediagoblin/auth/views.py:334
-msgid "You need to verify your email before you can reset your password."
-msgstr "Necesitas verificar tu correo electrónico antes de restablecer tu contraseña."
-
-#: mediagoblin/auth/views.py:340
-msgid ""
-"You are no longer an active user. Please contact the system admin to "
-"reactivate your account."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:86
-#: mediagoblin/submit/forms.py:28 mediagoblin/submit/forms.py:47
+#: mediagoblin/edit/forms.py:27 mediagoblin/edit/forms.py:87
+#: mediagoblin/submit/forms.py:37 mediagoblin/submit/forms.py:61
 #: mediagoblin/user_pages/forms.py:45
 msgid "Title"
 msgstr "Título"
 
-#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:40
 msgid "Description of this work"
 msgstr "Descripción de esta obra"
 
 #: mediagoblin/edit/forms.py:31 mediagoblin/edit/forms.py:54
-#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:32
-#: mediagoblin/submit/forms.py:51
+#: mediagoblin/edit/forms.py:91 mediagoblin/submit/forms.py:65
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr "Puedes usar\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                      Markdown</a> para el formato."
 
-#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:36
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:45
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:38
+#: mediagoblin/edit/forms.py:37 mediagoblin/submit/forms.py:47
 msgid "Separate tags by commas."
 msgstr "Separa las etiquetas por comas."
 
-#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:94
+#: mediagoblin/edit/forms.py:40 mediagoblin/edit/forms.py:95
 msgid "Slug"
 msgstr "Ficha"
 
-#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:95
+#: mediagoblin/edit/forms.py:41 mediagoblin/edit/forms.py:96
 msgid "The slug can't be empty"
 msgstr "La ficha no puede estar vacía"
 
@@ -170,7 +131,7 @@ msgid ""
 "this."
 msgstr "El título de esta parte de la dirección de los contenidos. Por lo general no es necesario cambiar esto."
 
-#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:41
+#: mediagoblin/edit/forms.py:46 mediagoblin/submit/forms.py:50
 #: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr "Licencia"
@@ -193,7 +154,7 @@ msgstr "Envíame un correo cuando otros escriban comentarios sobre mi contenido"
 
 #: mediagoblin/edit/forms.py:67
 msgid "Enable insite notifications about events."
-msgstr ""
+msgstr "Habilitar dentro del sitio notificaciones sobre eventos."
 
 #: mediagoblin/edit/forms.py:69
 msgid "License preference"
@@ -203,45 +164,46 @@ msgstr "Preferencias de licencia"
 msgid "This will be your default license on upload forms."
 msgstr "Ésta será tu licencia predeterminada en los formularios de subida."
 
-#: mediagoblin/edit/forms.py:87
+#: mediagoblin/edit/forms.py:88
 msgid "The title can't be empty"
 msgstr "El título no puede estar vacío"
 
-#: mediagoblin/edit/forms.py:89 mediagoblin/submit/forms.py:50
+#: mediagoblin/edit/forms.py:90 mediagoblin/submit/forms.py:64
 #: mediagoblin/user_pages/forms.py:48
 msgid "Description of this collection"
 msgstr "Descripción de esta colección"
 
-#: mediagoblin/edit/forms.py:96
+#: mediagoblin/edit/forms.py:97
 msgid ""
 "The title part of this collection's address. You usually don't need to "
 "change this."
 msgstr "El título de la dirección de esta colección. Generalmente no necesitas cambiar esto."
 
-#: mediagoblin/edit/forms.py:103
+#: mediagoblin/edit/forms.py:104 mediagoblin/plugins/basic_auth/forms.py:68
 msgid "Old password"
 msgstr "Vieja contraseña"
 
-#: mediagoblin/edit/forms.py:105
+#: mediagoblin/edit/forms.py:106 mediagoblin/plugins/basic_auth/forms.py:70
 msgid "Enter your old password to prove you own this account."
 msgstr "Escriba la anterior contraseña para demostrar que esta cuenta te pertenece."
 
-#: mediagoblin/edit/forms.py:108
+#: mediagoblin/edit/forms.py:109 mediagoblin/plugins/basic_auth/forms.py:73
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: mediagoblin/edit/forms.py:116
+#: mediagoblin/edit/forms.py:117
 msgid "New email address"
 msgstr "Nueva dirección de correo electrónico"
 
-#: mediagoblin/edit/forms.py:120 mediagoblin/plugins/basic_auth/forms.py:28
+#: mediagoblin/edit/forms.py:121 mediagoblin/plugins/basic_auth/forms.py:28
 #: mediagoblin/plugins/basic_auth/forms.py:43
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:63
+#: mediagoblin/plugins/ldap/forms.py:39
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:64
 #: mediagoblin/tests/test_util.py:110
 msgid "Password"
 msgstr "Contraseña"
 
-#: mediagoblin/edit/forms.py:122
+#: mediagoblin/edit/forms.py:123
 msgid "Enter your password to prove you own this account."
 msgstr "Introduce tu contraseña para probar que posees la cuenta."
 
@@ -278,7 +240,7 @@ msgstr "las configuraciones de cuenta fueron salvadas"
 msgid "You need to confirm the deletion of your account."
 msgstr "Necesitas confirmar el borrado de tu cuenta."
 
-#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:148
+#: mediagoblin/edit/views.py:313 mediagoblin/submit/views.py:194
 #: mediagoblin/user_pages/views.py:242
 #, python-format
 msgid "You already have a collection called \"%s\"!"
@@ -292,18 +254,14 @@ msgstr "Una colección con esa ficha ya existe para este usuario/a."
 msgid "You are editing another user's collection. Proceed with caution."
 msgstr "Estás editando la colección de otro usuario/a. Ten cuidado."
 
-#: mediagoblin/edit/views.py:355 mediagoblin/edit/views.py:448
-msgid "Wrong password"
-msgstr "Contraseña incorrecta"
-
-#: mediagoblin/edit/views.py:370
-msgid "Your password was changed successfully"
-msgstr "Se ha cambiado la contraseña correctamente"
-
-#: mediagoblin/edit/views.py:413
+#: mediagoblin/edit/views.py:373
 msgid "Your email address has been verified."
 msgstr "Tu dirección de correo electrónico ha sido verificada."
 
+#: mediagoblin/edit/views.py:408 mediagoblin/plugins/basic_auth/views.py:200
+msgid "Wrong password"
+msgstr "Contraseña incorrecta"
+
 #: mediagoblin/gmg_commands/assetlink.py:60
 msgid "Cannot link theme... no theme set\n"
 msgstr "No se puede enlazar al tema... no hay un tema seleccionado\n"
@@ -351,7 +309,55 @@ msgstr "ha fallado la ejecución de unoconv, comprueba el fichero de registro (l
 msgid "Video transcoding failed"
 msgstr "Ha fallado la conversión de vídeo"
 
-#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:58
+#: mediagoblin/moderation/forms.py:20
+msgid "takeaway"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:20
+msgid "Take away privilege"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "userban"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:21
+msgid "Ban the user"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:22
+msgid "sendmessage"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "delete"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:23
+msgid "Delete the content"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:52 mediagoblin/moderation/forms.py:117
+msgid "User will be banned until:"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:56
+msgid "Why are you banning this User?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:108
+msgid "What action will you take to resolve the report?"
+msgstr ""
+
+#: mediagoblin/moderation/forms.py:114
+msgid "What privileges will you take away?"
+msgstr ""
+
+#: mediagoblin/moderation/tools.py:91
+msgid "Warning from"
+msgstr ""
+
+#: mediagoblin/notifications/tools.py:54 mediagoblin/user_pages/lib.py:60
 msgid "commented on your post"
 msgstr "comentó tu publicación"
 
@@ -374,13 +380,14 @@ msgid "No request token found."
 msgstr "No se ha encontrado el código (token) de petición."
 
 #: mediagoblin/plugins/basic_auth/forms.py:24
-#: mediagoblin/plugins/openid/forms.py:27
+#: mediagoblin/plugins/ldap/forms.py:35 mediagoblin/plugins/openid/forms.py:27
 #: mediagoblin/plugins/persona/forms.py:24
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:76
 msgid "Username"
 msgstr "Nombre de usuario"
 
 #: mediagoblin/plugins/basic_auth/forms.py:32
-#: mediagoblin/plugins/openid/forms.py:31
+#: mediagoblin/plugins/ldap/forms.py:28 mediagoblin/plugins/openid/forms.py:31
 #: mediagoblin/plugins/persona/forms.py:28
 #: mediagoblin/plugins/persona/forms.py:39
 msgid "Email address"
@@ -394,6 +401,94 @@ msgstr "Nombre de usuario o correo electrónico"
 msgid "Stay logged in"
 msgstr "Mantener iniciada la sesión"
 
+#: mediagoblin/plugins/basic_auth/forms.py:51
+msgid "Username or email"
+msgstr "Nombre de usuario o email"
+
+#: mediagoblin/plugins/basic_auth/views.py:54
+msgid ""
+"If that email address (case sensitive!) is registered an email has been sent"
+" with instructions on how to change your password."
+msgstr "Si esa dirección de correo (¡sensible a mayúsculas y minúsculas!) está registrada, se ha enviado un correo con instrucciones para cambiar la contraseña."
+
+#: mediagoblin/plugins/basic_auth/views.py:65
+msgid "Couldn't find someone with that username."
+msgstr "No se ha podido encontrar a nadie con ese nombre de usuario."
+
+#: mediagoblin/plugins/basic_auth/views.py:68
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr "Un correo electrónico ha sido enviado con instrucciones sobre cómo cambiar tu contraseña."
+
+#: mediagoblin/plugins/basic_auth/views.py:75
+msgid ""
+"Could not send password recovery email as your username is inactive or your "
+"account's email address has not been verified."
+msgstr "No se pudo enviar un correo electrónico de recuperación de contraseñas porque tu nombre de usuario está inactivo o la dirección de su cuenta de correo electrónico no ha sido verificada."
+
+#: mediagoblin/plugins/basic_auth/views.py:123
+msgid "The user id is incorrect."
+msgstr "El identificador de usuario es incorrecto."
+
+#: mediagoblin/plugins/basic_auth/views.py:139
+msgid "You can now log in using your new password."
+msgstr "Ahora tu puedes iniciar sesión usando tu nueva contraseña."
+
+#: mediagoblin/plugins/basic_auth/views.py:163
+msgid ""
+"You are no longer an active user. Please contact the system admin to "
+"reactivate your accoutn."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/views.py:215
+msgid "Your password was changed successfully"
+msgstr "Se ha cambiado la contraseña correctamente"
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:36
+msgid "Set your new password"
+msgstr "Coloca tu nueva contraseña "
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_fp.html:39
+msgid "Set password"
+msgstr "Coloca la contraseña"
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:28
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:38
+#, python-format
+msgid "Changing %(username)s's password"
+msgstr "Cambiando la contraseña de %(username)s"
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/change_pass.html:45
+#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
+msgid "Save"
+msgstr "Guardar"
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:22
+msgid "Don't have an account yet?"
+msgstr "¿No tienes una cuenta?"
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/create_account_link.html:24
+msgid "Create one here!"
+msgstr "¡Crea una aquí!"
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/edit_link.html:22
+msgid "Change your password."
+msgstr ""
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:23
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:31
+msgid "Recover password"
+msgstr "Recuperar contraseña"
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/forgot_password.html:34
+msgid "Send instructions"
+msgstr "Enviar instrucciones"
+
+#: mediagoblin/plugins/basic_auth/templates/mediagoblin/plugins/basic_auth/fp_link.html:22
+msgid "Forgot your password?"
+msgstr "¿Olvidaste tu contraseña?"
+
 #: mediagoblin/plugins/geolocation/templates/mediagoblin/plugins/geolocation/map.html:24
 msgid "Location"
 msgstr "Locación"
@@ -403,6 +498,10 @@ msgstr "Locación"
 msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr "Ver en <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 
+#: mediagoblin/plugins/ldap/templates/mediagoblin/plugins/ldap/create_account_link.html:22
+msgid "Sign in to create an account!"
+msgstr ""
+
 #: mediagoblin/plugins/oauth/forms.py:29
 msgid "Allow"
 msgstr "Permitir"
@@ -472,7 +571,7 @@ msgstr "Tus clientes OAuth"
 #: mediagoblin/plugins/oauth/templates/oauth/client/register.html:29
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/add.html:39
 #: mediagoblin/templates/mediagoblin/submit/collection.html:30
-#: mediagoblin/templates/mediagoblin/submit/start.html:34
+#: mediagoblin/templates/mediagoblin/submit/start.html:39
 #: mediagoblin/templates/mediagoblin/user_pages/media_collect.html:68
 msgid "Add"
 msgstr "Añadir "
@@ -550,10 +649,10 @@ msgstr "OpenID's"
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:28
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:36
 #: mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html:57
-#: mediagoblin/templates/mediagoblin/base.html:96
+#: mediagoblin/templates/mediagoblin/base.html:106
 #: mediagoblin/templates/mediagoblin/auth/login.html:28
 #: mediagoblin/templates/mediagoblin/auth/login.html:36
-#: mediagoblin/templates/mediagoblin/auth/login.html:58
+#: mediagoblin/templates/mediagoblin/auth/login.html:47
 msgid "Log in"
 msgstr "Iniciar sesión"
 
@@ -613,9 +712,9 @@ msgstr "Eliminar una dirección de correo electrónico de Persona"
 msgid "Add a Persona email address"
 msgstr "Agregar una dirección de correo electrónico de Persona"
 
-#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:22
-msgid "Edit your Persona email addresses"
-msgstr "Editar tus direcciones de correo electrónico de Persona"
+#: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html:21
+msgid "Persona's"
+msgstr ""
 
 #: mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html:22
 msgid "Or login with Persona!"
@@ -625,117 +724,133 @@ msgstr "¡O inicia sesión con Persona!"
 msgid "Or register with Persona!"
 msgstr "¡O regístrate con Persona!"
 
-#: mediagoblin/processing/__init__.py:413
+#: mediagoblin/processing/__init__.py:422
 msgid "Invalid file given for media type."
 msgstr "Archivo inválido para el formato seleccionado."
 
-#: mediagoblin/processing/__init__.py:420
+#: mediagoblin/processing/__init__.py:429
 msgid "Copying to public storage failed."
 msgstr "La copia al almacenamiento público ha fallado."
 
-#: mediagoblin/processing/__init__.py:428
+#: mediagoblin/processing/__init__.py:437
 msgid "An acceptable processing file was not found"
 msgstr "No se ha encontrado un fichero de procesamiento aceptable"
 
-#: mediagoblin/submit/forms.py:26
+#: mediagoblin/submit/forms.py:30
+msgid "Max file size: {0} mb"
+msgstr ""
+
+#: mediagoblin/submit/forms.py:34
 msgid "File"
 msgstr "Archivo"
 
-#: mediagoblin/submit/views.py:52
+#: mediagoblin/submit/forms.py:41
+msgid ""
+"You can use\n"
+"                        <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                        Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/submit/views.py:57
+msgid "Sorry, you have reached your upload limit."
+msgstr ""
+
+#: mediagoblin/submit/views.py:73
 msgid "You must provide a file."
 msgstr "Debes proporcionar un archivo."
 
-#: mediagoblin/submit/views.py:101
+#: mediagoblin/submit/views.py:120
+msgid "Sorry, the file size is too big."
+msgstr ""
+
+#: mediagoblin/submit/views.py:126
+msgid "Sorry, uploading this file will put you over your upload limit."
+msgstr ""
+
+#: mediagoblin/submit/views.py:147
 msgid "Woohoo! Submitted!"
 msgstr "¡Yuju! ¡Enviado!"
 
-#: mediagoblin/submit/views.py:154
+#: mediagoblin/submit/views.py:200
 #, python-format
 msgid "Collection \"%s\" added!"
 msgstr "¡Colección \"%s\" añadida!"
 
-#: mediagoblin/templates/mediagoblin/base.html:79
+#: mediagoblin/templates/mediagoblin/banned.html:20
+msgid "You are Banned."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:24
+#: mediagoblin/templates/mediagoblin/error.html:24
+msgid "Image of goblin stressing out"
+msgstr "Imagen de un goblin estresándose"
+
+#: mediagoblin/templates/mediagoblin/banned.html:26
+msgid "You have been banned"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:28
+#, python-format
+msgid "until %(until_when)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/banned.html:30
+msgid "indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:81
 msgid "Verify your email!"
 msgstr "¡Verifica tu email!"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:88
+#: mediagoblin/templates/mediagoblin/base.html:96
 msgid "log out"
 msgstr "cerrar sesión"
 
-#: mediagoblin/templates/mediagoblin/base.html:105
+#: mediagoblin/templates/mediagoblin/base.html:115
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(user_name)s</a>'s account"
 msgstr "Cuenta de <a href=\"%(user_url)s\">%(user_name)s</a>"
 
-#: mediagoblin/templates/mediagoblin/base.html:112
+#: mediagoblin/templates/mediagoblin/base.html:122
 msgid "Change account settings"
 msgstr "Cambiar la configuración de la cuenta"
 
-#: mediagoblin/templates/mediagoblin/base.html:116
-#: mediagoblin/templates/mediagoblin/base.html:137
-#: mediagoblin/templates/mediagoblin/admin/panel.html:21
-#: mediagoblin/templates/mediagoblin/admin/panel.html:26
+#: mediagoblin/templates/mediagoblin/base.html:126
+#: mediagoblin/templates/mediagoblin/base.html:147
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:27
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:21
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:26
 msgid "Media processing panel"
 msgstr "Panel de procesamiento de contenido"
 
-#: mediagoblin/templates/mediagoblin/base.html:125
+#: mediagoblin/templates/mediagoblin/base.html:135
 msgid "Log out"
 msgstr "Cerrar sesión"
 
-#: mediagoblin/templates/mediagoblin/base.html:128
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:156
+#: mediagoblin/templates/mediagoblin/base.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:112
 msgid "Add media"
 msgstr "Añadir contenido"
 
-#: mediagoblin/templates/mediagoblin/base.html:131
+#: mediagoblin/templates/mediagoblin/base.html:141
 #: mediagoblin/templates/mediagoblin/user_pages/collection_list.html:41
 msgid "Create new collection"
 msgstr "Crear nueva colección"
 
-#: mediagoblin/templates/mediagoblin/error.html:24
-msgid "Image of goblin stressing out"
-msgstr "Imagen de un goblin estresándose"
+#: mediagoblin/templates/mediagoblin/base.html:151
+msgid "User management panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:155
+msgid "Report management panel"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:32
 msgid "Most recent media"
 msgstr "El contenido más reciente"
 
-#: mediagoblin/templates/mediagoblin/admin/panel.html:29
-msgid ""
-"Here you can track the state of media being processed on this instance."
-msgstr "Aquí puedes llevar un seguimiento del estado del contenido que se está procesando en esta instancia."
-
-#: mediagoblin/templates/mediagoblin/admin/panel.html:32
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
-msgid "Media in-processing"
-msgstr "Procesando contenido"
-
-#: mediagoblin/templates/mediagoblin/admin/panel.html:58
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
-msgid "No media in-processing"
-msgstr "No hay contenidos en procesamiento"
-
-#: mediagoblin/templates/mediagoblin/admin/panel.html:61
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
-msgid "These uploads failed to process:"
-msgstr "Estos archivos no pudieron ser procesados:"
-
-#: mediagoblin/templates/mediagoblin/admin/panel.html:90
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
-msgid "No failed entries!"
-msgstr "¡No han fallado entradas!"
-
-#: mediagoblin/templates/mediagoblin/admin/panel.html:92
-msgid "Last 10 successful uploads"
-msgstr "Últimos 10 envíos con éxito"
-
-#: mediagoblin/templates/mediagoblin/admin/panel.html:112
-#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
-msgid "No processed entries, yet!"
-msgstr "¡Aún no hay entradas procesadas!"
-
 #: mediagoblin/templates/mediagoblin/api/authorize.html:21
 msgid "Authorization"
 msgstr "Autorización"
@@ -789,50 +904,6 @@ msgstr "Autorización completa"
 msgid "Copy and paste this into your client:"
 msgstr "Copia y pega esto en tu cliente:"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:28
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:36
-msgid "Set your new password"
-msgstr "Coloca tu nueva contraseña "
-
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:39
-msgid "Set password"
-msgstr "Coloca la contraseña"
-
-#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:23
-#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:31
-msgid "Recover password"
-msgstr "Recuperar contraseña"
-
-#: mediagoblin/templates/mediagoblin/auth/forgot_password.html:34
-msgid "Send instructions"
-msgstr "Enviar instrucciones"
-
-#: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
-#, python-format
-msgid ""
-"Hi %(username)s,\n"
-"\n"
-"to change your GNU MediaGoblin password, open the following URL in \n"
-"your web browser:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"If you think this is an error, just ignore this email and continue being\n"
-"a happy goblin!"
-msgstr "Hola %(username)s,\n\nPara cambiar tu contraseña de GNU MediaGoblin, abre la siguiente URL en un navegador:\n\n%(verification_url)s \n\nSi piensas que esto es un error, simplemente ignora este mensaje y sigue siendo un duende feliz."
-
-#: mediagoblin/templates/mediagoblin/auth/login.html:44
-msgid "Don't have an account yet?"
-msgstr "¿No tienes una cuenta?"
-
-#: mediagoblin/templates/mediagoblin/auth/login.html:46
-msgid "Create one here!"
-msgstr "¡Crea una aquí!"
-
-#: mediagoblin/templates/mediagoblin/auth/login.html:54
-msgid "Forgot your password?"
-msgstr "¿Olvidaste tu contraseña?"
-
 #: mediagoblin/templates/mediagoblin/auth/register.html:28
 #: mediagoblin/templates/mediagoblin/auth/register.html:36
 msgid "Create an account!"
@@ -868,6 +939,10 @@ msgid ""
 "href=\"%(source_link)s\">Source code</a> available."
 msgstr "Publicado bajo la <a href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a href=\"%(source_link)s\"> Código fuente</a> disponible."
 
+#: mediagoblin/templates/mediagoblin/bits/base_footer.html:30
+msgid "Terms of Service"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html:20
 msgid "Explore"
 msgstr "Explorar"
@@ -917,13 +992,13 @@ msgid "Editing attachments for %(media_title)s"
 msgstr "Editando archivos adjuntos a %(media_title)s"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:44
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:178
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:194
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:191
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:207
 msgid "Attachments"
 msgstr "Adjuntos"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:57
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:200
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:213
 msgid "Add attachment"
 msgstr "Agregar adjunto"
 
@@ -940,7 +1015,7 @@ msgstr "Cancelar"
 
 #: mediagoblin/templates/mediagoblin/edit/attachments.html:63
 #: mediagoblin/templates/mediagoblin/edit/edit.html:42
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:46
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:47
 #: mediagoblin/templates/mediagoblin/edit/edit_collection.html:33
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:40
 msgid "Save changes"
@@ -952,17 +1027,6 @@ msgstr "Guardar cambios"
 msgid "Changing %(username)s's email"
 msgstr "Cambiando el correo electrónico de %(username)s"
 
-#: mediagoblin/templates/mediagoblin/edit/change_email.html:40
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:45
-msgid "Save"
-msgstr "Guardar"
-
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:28
-#: mediagoblin/templates/mediagoblin/edit/change_pass.html:38
-#, python-format
-msgid "Changing %(username)s's password"
-msgstr "Cambiando la contraseña de %(username)s"
-
 #: mediagoblin/templates/mediagoblin/edit/delete_account.html:28
 #, python-format
 msgid "Really delete user '%(user_name)s' and all related media/comments?"
@@ -990,11 +1054,11 @@ msgstr "Editando %(media_title)s "
 msgid "Changing %(username)s's account settings"
 msgstr "Cambio de %(username)s la configuración de la cuenta "
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:53
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:54
 msgid "Delete my account"
 msgstr "Borrar mi cuenta"
 
-#: mediagoblin/templates/mediagoblin/edit/edit_account.html:58
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:59
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -1029,8 +1093,11 @@ msgstr "Nuevos comentarios"
 
 #: mediagoblin/templates/mediagoblin/fragments/header_notifications.html:24
 #: mediagoblin/templates/mediagoblin/media_displays/image.html:39
+#: mediagoblin/templates/mediagoblin/moderation/report.html:55
+#: mediagoblin/templates/mediagoblin/moderation/report.html:117
 #: mediagoblin/templates/mediagoblin/user_pages/media.html:139
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:168
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:48
 #, python-format
 msgid "%(formatted_time)s ago"
 msgstr "hace %(formatted_time)s"
@@ -1050,7 +1117,7 @@ msgstr "Contenido etiquetado con: %(tag_name)s"
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:56
 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:67
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:55
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:74
 msgid "Download"
 msgstr "Descargar"
 
@@ -1074,7 +1141,7 @@ msgstr "Tú puedes obtener un navegador más moderno que \n\tpueda reproducir el
 
 #: mediagoblin/templates/mediagoblin/media_displays/audio.html:60
 #: mediagoblin/templates/mediagoblin/media_displays/pdf.html:73
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:61
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:80
 msgid "Original file"
 msgstr "Archivo original"
 
@@ -1133,30 +1200,359 @@ msgstr "Formato de Archivo"
 msgid "Object Height"
 msgstr "Altura del Objeto"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:44
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:63
 msgid ""
 "Sorry, this video will not work because\n"
 "      your web browser does not support HTML5 \n"
 "      video."
 msgstr "Lo siento, este vídeo no funcionará\n      porque tu navegador no soporta \n      vídeo HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:47
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:66
 msgid ""
 "You can get a modern web browser that \n"
 "      can play this video at <a href=\"http://getfirefox.com\">\n"
 "      http://getfirefox.com</a>!"
 msgstr "¡Puedes conseguir un navegador moderno \n      que pueda reproducir este vídeo en <a href=\"http://getfirefox.com\">\n      http://getfirefox.com</a>!"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:69
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:88
 msgid "WebM file (VP8/Vorbis)"
 msgstr "Archivo WebM (VP8/Vorbis)"
 
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:30
+msgid ""
+"Here you can track the state of media being processed on this instance."
+msgstr "Aquí puedes llevar un seguimiento del estado del contenido que se está procesando en esta instancia."
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:32
+msgid "Media in-processing"
+msgstr "Procesando contenido"
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:59
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:56
+msgid "No media in-processing"
+msgstr "No hay contenidos en procesamiento"
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:59
+msgid "These uploads failed to process:"
+msgstr "Estos archivos no pudieron ser procesados:"
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:86
+msgid "No failed entries!"
+msgstr "¡No han fallado entradas!"
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:93
+msgid "Last 10 successful uploads"
+msgstr "Últimos 10 envíos con éxito"
+
+#: mediagoblin/templates/mediagoblin/moderation/media_panel.html:113
+#: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:107
+msgid "No processed entries, yet!"
+msgstr "¡Aún no hay entradas procesadas!"
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:27
+msgid "Sorry, no such report found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:32
+msgid "Return to Reports Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:33
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:155
+msgid "Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:36
+msgid "Reported comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:81
+#, python-format
+msgid ""
+"\n"
+"        ❖ Reported media by <a href=\"%(user_url)s\">%(user_name)s</a>\n"
+"    "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:90
+#, python-format
+msgid ""
+"\n"
+"          CONTENT BY\n"
+"            <a href=\"%(user_url)s\"> %(user_name)s</a>\n"
+"          HAS BEEN DELETED\n"
+"        "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:130
+#: mediagoblin/templates/mediagoblin/moderation/user.html:128
+msgid "Resolve"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:134
+#: mediagoblin/templates/mediagoblin/moderation/report.html:153
+msgid "Resolve This Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:145
+msgid "Status"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:147
+msgid "RESOLVED"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report.html:155
+msgid "You cannot take action against an administrator"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:22
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:27
+msgid "Report panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:30
+msgid ""
+"\n"
+"    Here you can look up open reports that have been filed by users.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:35
+msgid "Active Reports Filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:77
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:171
+msgid "Offender"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:78
+msgid "When Reported"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:79
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:173
+msgid "Reported By"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:80
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:174
+msgid "Reason"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:94
+#, python-format
+msgid ""
+"\n"
+"                Comment Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:109
+#, python-format
+msgid ""
+"\n"
+"                Media Report #%(report_id)s\n"
+"              "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:123
+msgid "No open reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:125
+msgid "Closed Reports"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:170
+msgid "Resolved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:172
+msgid "Action Taken"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:185
+#, python-format
+msgid ""
+"\n"
+"              Closed Report #%(report_id)s\n"
+"            "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/report_panel.html:199
+msgid "No closed reports found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:23
+#, python-format
+msgid "User: %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:39
+msgid "Sorry, no such user found."
+msgstr "Lo sentimos, no se encontró ese usuario."
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:43
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:60
+msgid "Email verification needed"
+msgstr "Es necesario que verifiques tu cuenta mediante el correo de notiicación"
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:45
+msgid ""
+"Someone has registered an account with this username, but it still has\n"
+"        to be activated."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:58
+msgid "Return to Users Panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:34
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:45
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:25
+#, python-format
+msgid "%(username)s's profile"
+msgstr "Perfil de %(username)s"
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:62
+#, python-format
+msgid "BANNED until %(expiration_date)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:66
+msgid "Banned Indefinitely"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:72
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:61
+msgid "This user hasn't filled in their profile (yet)."
+msgstr "Este usuario (todavía) no ha completado su perfil."
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:56
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:73
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:90
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:80
+msgid "Browse collections"
+msgstr "Explorar colecciones"
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:97
+#, python-format
+msgid "Active Reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:104
+msgid "Report ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:105
+msgid "Reported Content"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:106
+msgid "Description of Report"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:114
+#, python-format
+msgid "Report #%(report_number)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:121
+msgid "Reported Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:123
+msgid "Reported Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:134
+#, python-format
+msgid "No active reports filed on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:141
+#, python-format
+msgid "All reports on %(username)s"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:146
+#, python-format
+msgid "All reports that %(username)s has filed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:160
+msgid "Ban User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:165
+msgid "UnBan User"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:173
+msgid "Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:174
+msgid "User Has Privilege"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:181
+msgid "Yes"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user.html:183
+msgid "No"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:21
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:26
+msgid "User panel"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:29
+msgid ""
+"\n"
+"    Here you can look up users in order to take punitive actions on them.\n"
+"  "
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:34
+msgid "Active Users"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:75
+msgid "ID"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:77
+msgid "When Joined"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:78
+msgid "# of Comments Posted"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/moderation/user_panel.html:95
+msgid "No users found."
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/collection.html:26
 msgid "Add a collection"
 msgstr "Añadir una colección"
 
-#: mediagoblin/templates/mediagoblin/submit/start.html:23
-#: mediagoblin/templates/mediagoblin/submit/start.html:30
+#: mediagoblin/templates/mediagoblin/submit/start.html:28
+#: mediagoblin/templates/mediagoblin/submit/start.html:35
 msgid "Add your media"
 msgstr "Añade tu contenido "
 
@@ -1241,7 +1637,7 @@ msgstr "Añade un comentario "
 msgid "Comment Preview"
 msgstr "Previsualización del comentario"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:157
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:166
 msgid "Added"
 msgstr "Agregado"
 
@@ -1268,84 +1664,86 @@ msgstr "Aquí puedes hacer un seguimiento del contenido que está siendo procesa
 msgid "Your last 10 successful uploads"
 msgstr "Tus últimos 10 envíos exitosos"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:31
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:89
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:21
+msgid "<h2>File a Report</h2>"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:24
+msgid "Reporting this Comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:60
+msgid "Reporting this Media Entry"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:72
 #, python-format
-msgid "%(username)s's profile"
-msgstr "Perfil de %(username)s"
+msgid ""
+"\n"
+"            ❖ Published by <a href=\"%(user_url)s\"\n"
+"                          class=\"comment_authorlink\">%(username)s</a>\n"
+"      "
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:43
-msgid "Sorry, no such user found."
-msgstr "Lo sentimos, no se encontró ese usuario."
+#: mediagoblin/templates/mediagoblin/user_pages/report.html:81
+msgid "File Report "
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:50
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:70
-msgid "Email verification needed"
-msgstr "Es necesario que verifiques tu cuenta mediante el correo de notiicación"
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:52
+msgid "Here's a spot to tell others about yourself."
+msgstr "Aquí hay un lugar para que le cuentes a los demás sobre ti."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:93
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr "Ver todo el contenido de %(username)s"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:106
+msgid ""
+"This is where your media will appear, but you don't seem to have added "
+"anything yet."
+msgstr "Aquí es donde estará ubicado tu contenido, pero parece que aún no has añadido nada."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:53
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:118
+#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
+msgid "There doesn't seem to be any media here yet..."
+msgstr "Parece que aún no hay ningún contenido aquí..."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:43
 msgid "Almost done! Your account still needs to be activated."
 msgstr "¡Casi hemos terminado! Solo falta activar la cuenta."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:58
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:48
 msgid ""
 "An email should arrive in a few moments with instructions on how to do so."
 msgstr "En unos momentos te debería llegar un correo electrónico con las instrucciones para hacerlo."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:62
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:52
 msgid "In case it doesn't:"
 msgstr "En caso de que no:"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:65
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:55
 msgid "Resend verification email"
 msgstr "Reenviar correo electrónico de verificación"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:63
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
 msgstr "Alguien ya registró una cuenta con ese nombre de usuario, pero todavía no ha sido activada."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:68
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
 msgstr "Si tú eres esa persona, pero has perdido tu correo electrónico de verificación, puedes <a href=\"%(login_url)s\">iniciar sesión</a> y reenviarlo."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:96
-msgid "Here's a spot to tell others about yourself."
-msgstr "Aquí hay un lugar para que le cuentes a los demás sobre ti."
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:100
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:117
-msgid "Edit profile"
-msgstr "Editar perfil"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:105
-msgid "This user hasn't filled in their profile (yet)."
-msgstr "Este usuario (todavía) no ha completado su perfil."
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:124
-msgid "Browse collections"
-msgstr "Explorar colecciones"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:137
+#: mediagoblin/templates/mediagoblin/user_pages/user_nonactive.html:78
 #, python-format
-msgid "View all of %(username)s's media"
-msgstr "Ver todo el contenido de %(username)s"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:150
-msgid ""
-"This is where your media will appear, but you don't seem to have added "
-"anything yet."
-msgstr "Aquí es donde estará ubicado tu contenido, pero parece que aún no has añadido nada."
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:162
-#: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:84
-#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:70
-msgid "There doesn't seem to be any media here yet..."
-msgstr "Parece que aún no hay ningún contenido aquí..."
+msgid "%(username)s"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/collection_gallery.html:49
 msgid "(remove)"
@@ -1395,6 +1793,10 @@ msgstr "Más nuevo"
 msgid "older"
 msgstr "Más viejo"
 
+#: mediagoblin/templates/mediagoblin/utils/report.html:25
+msgid "Report media"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
 msgid "Tagged with"
 msgstr "Marcado con"
@@ -1403,34 +1805,34 @@ msgstr "Marcado con"
 msgid "Could not read the image file."
 msgstr "No se pudo leer el archivo de imagen."
 
-#: mediagoblin/tools/response.py:36
+#: mediagoblin/tools/response.py:38
 msgid "Oops!"
 msgstr "¡Ups!"
 
-#: mediagoblin/tools/response.py:37
+#: mediagoblin/tools/response.py:39
 msgid "An error occured"
 msgstr "Ha ocurrido un error"
 
-#: mediagoblin/tools/response.py:51
+#: mediagoblin/tools/response.py:53
 msgid "Bad Request"
 msgstr "Petición errónea"
 
-#: mediagoblin/tools/response.py:53
+#: mediagoblin/tools/response.py:55
 msgid "The request sent to the server is invalid, please double check it"
 msgstr "La petición enviada al servidor no es válida, por favor compruébala"
 
-#: mediagoblin/tools/response.py:60
+#: mediagoblin/tools/response.py:63
 msgid "Operation not allowed"
 msgstr "Operación no permitida"
 
-#: mediagoblin/tools/response.py:61
+#: mediagoblin/tools/response.py:64
 msgid ""
 "Sorry Dave, I can't let you do that!</p><p>You have tried  to perform a "
 "function that you are not allowed to. Have you been trying to delete all "
 "user accounts again?"
 msgstr "¡Lo siento Dave, no puedo permitir que hagas eso!</p><p>Has intentado realizar una operación no permitida. ¿Has vuelto a intentar borrar todas las cuentas de usuario?"
 
-#: mediagoblin/tools/response.py:69
+#: mediagoblin/tools/response.py:72
 msgid ""
 "There doesn't seem to be a page at this address. Sorry!</p><p>If you're sure"
 " the address is correct, maybe the page you're looking for has been moved or"
@@ -1498,15 +1900,19 @@ msgid ""
 "                      Markdown</a> for formatting."
 msgstr "Puedes usar\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\" target=\"_blank\">\n                      Markdown</a> para dar formato."
 
-#: mediagoblin/user_pages/views.py:179
+#: mediagoblin/user_pages/forms.py:55 mediagoblin/user_pages/forms.py:61
+msgid "Reason for Reporting"
+msgstr ""
+
+#: mediagoblin/user_pages/views.py:178
 msgid "Sorry, comments are disabled."
 msgstr "Lo siento, los comentarios están desactivados."
 
-#: mediagoblin/user_pages/views.py:184
+#: mediagoblin/user_pages/views.py:183
 msgid "Oops, your comment was empty."
 msgstr "Ups, tu comentario estaba vacío."
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:189
 msgid "Your comment has been posted!"
 msgstr "¡Tu comentario ha sido publicado!"
 
@@ -1528,43 +1934,43 @@ msgstr "%s\" ya está en la colección \"%s\""
 msgid "\"%s\" added to collection \"%s\""
 msgstr "\"%s\" añadido a la colección \"%s\""
 
-#: mediagoblin/user_pages/views.py:302
+#: mediagoblin/user_pages/views.py:307
 msgid "You deleted the media."
 msgstr "Eliminaste el contenido"
 
-#: mediagoblin/user_pages/views.py:314
+#: mediagoblin/user_pages/views.py:319
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "El contenido no se eliminó porque no marcaste que estabas seguro."
 
-#: mediagoblin/user_pages/views.py:321
+#: mediagoblin/user_pages/views.py:326
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Estás a punto de eliminar un contenido de otro usuario. Procede con precaución."
 
-#: mediagoblin/user_pages/views.py:395
+#: mediagoblin/user_pages/views.py:400
 msgid "You deleted the item from the collection."
 msgstr "Borraste el ítem de la colección."
 
-#: mediagoblin/user_pages/views.py:399
+#: mediagoblin/user_pages/views.py:404
 msgid "The item was not removed because you didn't check that you were sure."
 msgstr "El ítem no fue removido porque no confirmaste que estuvieras seguro/a."
 
-#: mediagoblin/user_pages/views.py:407
+#: mediagoblin/user_pages/views.py:412
 msgid ""
 "You are about to delete an item from another user's collection. Proceed with"
 " caution."
 msgstr "Estás a punto de borrar un ítem de la colección de otro usuario. Procede con cuidado."
 
-#: mediagoblin/user_pages/views.py:440
+#: mediagoblin/user_pages/views.py:445
 #, python-format
 msgid "You deleted the collection \"%s\""
 msgstr "Borraste la colección \"%s\""
 
-#: mediagoblin/user_pages/views.py:447
+#: mediagoblin/user_pages/views.py:452
 msgid ""
 "The collection was not deleted because you didn't check that you were sure."
 msgstr "La colección no fue borrada porque no confirmaste que estuvieras seguro/a."
 
-#: mediagoblin/user_pages/views.py:455
+#: mediagoblin/user_pages/views.py:460
 msgid ""
 "You are about to delete another user's collection. Proceed with caution."
 msgstr "Estás a punto de borrar la colección de otro usuario. Procede con cuidado."