aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/auth/views.py19
-rw-r--r--mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mobin5330 -> 5641 bytes
-rw-r--r--mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po128
-rw-r--r--mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mobin0 -> 5708 bytes
-rw-r--r--mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po312
-rw-r--r--mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mobin0 -> 5406 bytes
-rw-r--r--mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po305
-rw-r--r--mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mobin0 -> 5217 bytes
-rw-r--r--mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po308
-rw-r--r--mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mobin0 -> 5414 bytes
-rw-r--r--mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po310
-rw-r--r--mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mobin0 -> 5629 bytes
-rw-r--r--mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po314
-rw-r--r--mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mobin0 -> 5487 bytes
-rw-r--r--mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po309
-rw-r--r--mediagoblin/storage.py31
-rw-r--r--mediagoblin/submit/forms.py2
-rw-r--r--mediagoblin/submit/views.py6
-rw-r--r--mediagoblin/templates/mediagoblin/submit/start.html5
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html2
-rw-r--r--mediagoblin/templates/mediagoblin/utils/wtforms.html19
-rw-r--r--mediagoblin/user_pages/forms.py6
22 files changed, 1976 insertions, 100 deletions
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 121a8c8e..ce6b5dfc 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -45,20 +45,27 @@ def register(request):
if request.method == 'POST' and register_form.validate():
# TODO: Make sure the user doesn't exist already
- users_with_username = \
- request.db.User.find({
- 'username': request.POST['username'].lower()
- }).count()
+ users_with_username = request.db.User.find(
+ {'username': request.POST['username'].lower()}).count()
+ users_with_email = request.db.User.find(
+ {'email': request.POST['email'].lower()}).count()
+
+ extra_validation_passes = True
if users_with_username:
register_form.username.errors.append(
_(u'Sorry, a user with that name already exists.'))
+ extra_validation_passes = False
+ if users_with_email:
+ register_form.email.errors.append(
+ _(u'Sorry, that email address has already been taken.'))
+ extra_validation_passes = False
- else:
+ if extra_validation_passes:
# Create the user
user = request.db.User()
user['username'] = request.POST['username'].lower()
- user['email'] = request.POST['email']
+ user['email'] = request.POST['email'].lower()
user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(
request.POST['password'])
user.save(validate=True)
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
index eaa79dfa..6bb69ce9 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
index 065a28b8..30c55e21 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
@@ -2,14 +2,17 @@
# Copyright (C) 2011 ORGANIZATION
# This file is distributed under the same license as the PROJECT project.
#
+# Rafael Maguiña <rafael.maguina@gmail.com>, 2011.
+# <mediagoblin.org@samba-tng.org>, 2011.
# <cwebber@dustycloud.org>, 2011.
+# Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: GNU MediaGoblin\n"
"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
"POT-Creation-Date: 2011-08-08 22:53-0500\n"
-"PO-Revision-Date: 2011-08-09 03:57+0000\n"
-"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
+"PO-Revision-Date: 2011-08-10 23:20+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
"Language-Team: German (http://www.transifex.net/projects/p/mediagoblin/team/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,128 +23,132 @@ msgstr ""
#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46
msgid "Username"
-msgstr ""
+msgstr "Benutzername"
#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50
msgid "Password"
-msgstr ""
+msgstr "Passwort"
#: mediagoblin/auth/forms.py:34
msgid "Passwords must match."
-msgstr ""
+msgstr "Passwörter müssen übereinstimmen."
#: mediagoblin/auth/forms.py:36
msgid "Confirm password"
-msgstr ""
+msgstr "Passwort wiederholen"
#: mediagoblin/auth/forms.py:39
msgid "Email address"
-msgstr ""
+msgstr "Email-Adresse"
#: mediagoblin/auth/views.py:40
msgid "Sorry, registration is disabled on this instance."
-msgstr ""
+msgstr "Registrierung ist auf dieser Instanz leider deaktiviert."
#: mediagoblin/auth/views.py:55
msgid "Sorry, a user with that name already exists."
-msgstr ""
+msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen."
#: mediagoblin/auth/views.py:152
msgid ""
"Your email address has been verified. You may now login, edit your profile, "
"and submit images!"
msgstr ""
+"Deine Email-Adresse wurde bestätigt. Du kannst dich nun anmelden, dein "
+"Profil bearbeiten und Bilder hochladen!"
#: mediagoblin/auth/views.py:158
msgid "The verification key or user id is incorrect"
-msgstr ""
+msgstr "Der Bestätigungssschlüssel oder die Nutzernummer ist falsch."
#: mediagoblin/auth/views.py:179
#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
msgid "Resent your verification email."
-msgstr ""
+msgstr "Bestätigungs-Email noch Mal senden."
#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:26
msgid "Title"
-msgstr ""
+msgstr "Titel"
#: mediagoblin/edit/forms.py:29
msgid "Slug"
-msgstr ""
+msgstr "Kurztitel"
#: mediagoblin/edit/forms.py:30
msgid "The slug can't be empty"
-msgstr ""
+msgstr "Bitte gib einen Kurztitel ein"
#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31
msgid "Tags"
-msgstr ""
+msgstr "Markierungen"
#: mediagoblin/edit/forms.py:38
msgid "Bio"
-msgstr ""
+msgstr "Biographie"
#: mediagoblin/edit/forms.py:41
msgid "Website"
-msgstr ""
+msgstr "Webseite"
#: mediagoblin/edit/forms.py:43
msgid "Improperly formed URL"
-msgstr ""
+msgstr "Adresse fehlerhaft"
#: mediagoblin/edit/views.py:54
msgid "An entry with that slug already exists for this user."
-msgstr ""
+msgstr "Diesen Kurztitel hast du bereits vergeben."
#: mediagoblin/edit/views.py:75
msgid "You are editing another user's media. Proceed with caution."
-msgstr ""
+msgstr "Du bearbeitest die Medien eines Anderen. Bitte sei vorsichtig."
#: mediagoblin/edit/views.py:96
msgid "You are editing a user's profile. Proceed with caution."
-msgstr ""
+msgstr "Du bearbeitest das Profil eines Anderen. Bitte sei vorsichtig."
#: mediagoblin/submit/forms.py:29
msgid "File"
-msgstr ""
+msgstr "Datei"
#: mediagoblin/submit/views.py:45
msgid "You must provide a file."
-msgstr ""
+msgstr "Du musst eine Datei angeben."
#: mediagoblin/submit/views.py:48
msgid "The file doesn't seem to be an image!"
-msgstr ""
+msgstr "Diese Datei scheint kein Bild zu sein!"
#: mediagoblin/submit/views.py:96
msgid "Woohoo! Submitted!"
-msgstr ""
+msgstr "Yeeeaaah! Geschafft!"
#: mediagoblin/templates/mediagoblin/base.html:22
msgid "GNU MediaGoblin"
-msgstr ""
+msgstr "GNU MediaGoblin"
#: mediagoblin/templates/mediagoblin/base.html:45
msgid "Mediagoblin logo"
-msgstr ""
+msgstr "Mediagoblin-Logo"
#: mediagoblin/templates/mediagoblin/base.html:51
msgid "Submit media"
-msgstr ""
+msgstr "Medien hochladen"
#: mediagoblin/templates/mediagoblin/base.html:62
msgid "verify your email!"
-msgstr ""
+msgstr "Bitte bestätige deine Email-Adresse!"
#: mediagoblin/templates/mediagoblin/base.html:72
msgid "Login"
-msgstr ""
+msgstr "Anmelden"
#: mediagoblin/templates/mediagoblin/base.html:88
msgid ""
"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
"href=\"http://gnu.org/\">GNU project</a>"
msgstr ""
+"Läüft mit <a href=\"http://mediagoblin.org\">MediaGoblin</a>, einem <a "
+"href=\"http://gnu.org/\">GNU-Projekt</a>"
#: mediagoblin/templates/mediagoblin/root.html:21
msgid "Welcome to GNU MediaGoblin!"
@@ -149,12 +156,14 @@ msgstr "Willkommen bei GNU MediaGoblin!"
#: mediagoblin/templates/mediagoblin/root.html:26
msgid "Submit an item"
-msgstr ""
+msgstr "Eintrag hochladen"
#: mediagoblin/templates/mediagoblin/root.html:31
#, python-format
msgid "If you have an account, you can <a href=\"%(login_url)s\">Login</a>."
msgstr ""
+"Falls du ein Konto hast, kannst du dich <a "
+"href=\"%(login_url)s\">anmelden</a>."
#: mediagoblin/templates/mediagoblin/root.html:37
#, python-format
@@ -162,33 +171,35 @@ msgid ""
"If you don't have an account, please <a "
"href=\"%(register_url)s\">Register</a>."
msgstr ""
+"Wenn du noch kein Konto hast, <a href=\"%(register_url)s\">registriere "
+"dich</a>."
#: mediagoblin/templates/mediagoblin/auth/login.html:26
msgid "Log in"
-msgstr ""
+msgstr "Anmelden"
#: mediagoblin/templates/mediagoblin/auth/login.html:29
msgid "Login failed!"
-msgstr ""
+msgstr "Anmeldung fehlgeschlagen!"
#: mediagoblin/templates/mediagoblin/auth/login.html:34
#: mediagoblin/templates/mediagoblin/auth/register.html:30
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
#: mediagoblin/templates/mediagoblin/submit/start.html:32
msgid "Submit"
-msgstr ""
+msgstr "Bestätigen"
#: mediagoblin/templates/mediagoblin/auth/login.html:42
msgid "Don't have an account yet?"
-msgstr ""
+msgstr "Hast du noch kein Konto?"
#: mediagoblin/templates/mediagoblin/auth/login.html:45
msgid "Create one here!"
-msgstr ""
+msgstr "Registriere dich!"
#: mediagoblin/templates/mediagoblin/auth/register.html:27
msgid "Create an account!"
-msgstr ""
+msgstr "Neues Konto registrieren!"
#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
#, python-format
@@ -200,76 +211,85 @@ msgid ""
"\n"
"%(verification_url)s"
msgstr ""
+"Hi %(username)s,\n"
+"\n"
+"um dein Konto bei GNU MediaGoblin zu aktivieren, musst du folgende Adresse in einem Webbrowser öffnen:\n"
+"\n"
+"%(verification_url)s"
#: mediagoblin/templates/mediagoblin/edit/edit.html:29
#, python-format
msgid "Editing %(media_title)s"
-msgstr ""
+msgstr "%(media_title)s bearbeiten"
#: mediagoblin/templates/mediagoblin/edit/edit.html:36
msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
#: mediagoblin/templates/mediagoblin/edit/edit.html:37
msgid "Save changes"
-msgstr ""
+msgstr "Änderungen speichern"
#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
#, python-format
msgid "Editing %(username)s's profile"
-msgstr ""
+msgstr "%(username)s’s Profil barbeiten"
#: mediagoblin/templates/mediagoblin/listings/tag.html:29
msgid "Media tagged with:"
-msgstr ""
+msgstr "Medien markiert mit:"
#: mediagoblin/templates/mediagoblin/listings/tag.html:40
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:46
#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
msgid "atom feed"
-msgstr ""
+msgstr "Atom-Feed"
#: mediagoblin/templates/mediagoblin/submit/start.html:26
msgid "Submit yer media"
-msgstr ""
+msgstr "Medien hochladen"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
#, python-format
msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
-msgstr ""
+msgstr "<a href=\"%(user_url)s\">%(username)s</a>’s Medien"
#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:51
#: mediagoblin/templates/mediagoblin/user_pages/user.html:30
msgid "Sorry, no such user found."
-msgstr ""
+msgstr "Dieser Benutzer wurde leider nicht gefunden."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:37
#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
msgid "Verification needed"
-msgstr ""
+msgstr "Überprüfung notwendig"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:40
msgid "Almost done! Your account still needs to be verified."
-msgstr ""
+msgstr "Fast geschafft! Dein Konto muss nur noch bestätigt werden."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:45
msgid ""
"An email should arrive in a few moments with instructions on how to do so."
msgstr ""
+"Gleich solltest du eine Email bekommen, die dir sagt was du noch machen "
+"musst."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:49
msgid "In case it doesn't:"
-msgstr ""
+msgstr "Wenn sie nicht ankommt:"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:52
msgid "Resend verification email"
-msgstr ""
+msgstr "Bestätigung noch Mal senden"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:60
msgid ""
"Someone has registered an account with this username, but it still has to be"
" verified."
msgstr ""
+"Jemand hat schon ein Konto mit diesem Nutzernamen registriert, aber es muss "
+"noch bestätigt werden."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:66
#, python-format
@@ -277,19 +297,21 @@ 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 ""
+"Wenn dir dieses Konto gehört und die Bestätigungsmail weg ist, kannst du "
+"dich <a href=\"%(login_url)s\">anmelden</a> und sie erneut senden."
#: mediagoblin/templates/mediagoblin/user_pages/user.html:76
#, python-format
msgid "%(username)s's profile"
-msgstr ""
+msgstr "%(username)s’s Profil"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:84
msgid "Edit profile"
-msgstr ""
+msgstr "Profil bearbeiten"
#: mediagoblin/templates/mediagoblin/user_pages/user.html:95
#, python-format
msgid "View all of %(username)s's media"
-msgstr ""
+msgstr "Alle Medien von %(username)s anschauen"
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 00000000..dfd3a1bc
--- /dev/null
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
new file mode 100644
index 00000000..0a12586c
--- /dev/null
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
@@ -0,0 +1,312 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+#
+# <jacobo@gnu.org>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
+"POT-Creation-Date: 2011-08-08 22:53-0500\n"
+"PO-Revision-Date: 2011-08-10 20:30+0000\n"
+"Last-Translator: nvjacobo <jacobo@gnu.org>\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mediagoblin/team/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46
+msgid "Username"
+msgstr "Nombre de Usuario"
+
+#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50
+msgid "Password"
+msgstr "Contraseña"
+
+#: mediagoblin/auth/forms.py:34
+msgid "Passwords must match."
+msgstr "Las contraseñas deben coincidir."
+
+#: mediagoblin/auth/forms.py:36
+msgid "Confirm password"
+msgstr "Confirme su contraseña"
+
+#: mediagoblin/auth/forms.py:39
+msgid "Email address"
+msgstr "Dirección de correo electrónico"
+
+#: mediagoblin/auth/views.py:40
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Lo sentimos, el registro está deshabilitado en este momento."
+
+#: mediagoblin/auth/views.py:55
+msgid "Sorry, a user with that name already exists."
+msgstr "Lo sentimos, un usuario con ese nombre ya existe."
+
+#: mediagoblin/auth/views.py:152
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+"Su dirección de correo electrónico ha sido verificada. Ahora puede ingresar,"
+" editar su perfil, y enviar las imágenes!"
+
+#: mediagoblin/auth/views.py:158
+msgid "The verification key or user id is incorrect"
+msgstr ""
+"La clave de la verificación o la identificación del usuario es incorrecta"
+
+#: mediagoblin/auth/views.py:179
+#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+msgid "Resent your verification email."
+msgstr "Reenvíe su correo electrónico de verificación"
+
+#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:26
+msgid "Title"
+msgstr "Título"
+
+#: mediagoblin/edit/forms.py:29
+msgid "Slug"
+msgstr "Ficha"
+
+#: mediagoblin/edit/forms.py:30
+msgid "The slug can't be empty"
+msgstr "La ficha no puede estar vacia"
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31
+msgid "Tags"
+msgstr "Etiquetas"
+
+#: mediagoblin/edit/forms.py:38
+msgid "Bio"
+msgstr "Bio"
+
+#: mediagoblin/edit/forms.py:41
+msgid "Website"
+msgstr "Sitio web"
+
+#: mediagoblin/edit/forms.py:43
+msgid "Improperly formed URL"
+msgstr "URL de forma incorrecta"
+
+#: mediagoblin/edit/views.py:54
+msgid "An entry with that slug already exists for this user."
+msgstr "Una entrada con esa ficha ya existe para este usuario."
+
+#: mediagoblin/edit/views.py:75
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+"Usted está editando el contenido de otro usuario. Proceder con precaución."
+
+#: mediagoblin/edit/views.py:96
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr "Usted está editando un perfil de usuario. Proceder con precaucións."
+
+#: mediagoblin/submit/forms.py:29
+msgid "File"
+msgstr "Archivo"
+
+#: mediagoblin/submit/views.py:45
+msgid "You must provide a file."
+msgstr "Usted debe proporcionar un archivo."
+
+#: mediagoblin/submit/views.py:48
+msgid "The file doesn't seem to be an image!"
+msgstr "El archivo no parece ser una imagen!"
+
+#: mediagoblin/submit/views.py:96
+msgid "Woohoo! Submitted!"
+msgstr "Woohoo! Enviado!"
+
+#: mediagoblin/templates/mediagoblin/base.html:22
+msgid "GNU MediaGoblin"
+msgstr "GNU MediaGoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:45
+msgid "Mediagoblin logo"
+msgstr "Mediagoblin logo"
+
+#: mediagoblin/templates/mediagoblin/base.html:51
+msgid "Submit media"
+msgstr "Enviar contenido"
+
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "verify your email!"
+msgstr "Verifique su correo electrónico"
+
+#: mediagoblin/templates/mediagoblin/base.html:72
+msgid "Login"
+msgstr "Conectarse"
+
+#: mediagoblin/templates/mediagoblin/base.html:88
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
+"href=\"http://gnu.org/\">GNU project</a>"
+msgstr ""
+"Potenciado por <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
+"href=\"http://gnu.org/\">GNU project</a>"
+
+#: mediagoblin/templates/mediagoblin/root.html:21
+msgid "Welcome to GNU MediaGoblin!"
+msgstr "¡Bienvenido a GNU MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/root.html:26
+msgid "Submit an item"
+msgstr "Enviar un item"
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+#, python-format
+msgid "If you have an account, you can <a href=\"%(login_url)s\">Login</a>."
+msgstr ""
+"Si tiene una cuenta, puede iniciar sesión <a "
+"href=\"%(login_url)s\">Login</a>."
+
+#: mediagoblin/templates/mediagoblin/root.html:37
+#, python-format
+msgid ""
+"If you don't have an account, please <a "
+"href=\"%(register_url)s\">Register</a>."
+msgstr ""
+"Si no tienes una cuenta, por favor, <a "
+"href=\"%(register_url)s\">Regístrese</a> ."
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:26
+msgid "Log in"
+msgstr "Conectarse"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:29
+msgid "Login failed!"
+msgstr "El inicio de sesión fallo"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:34
+#: mediagoblin/templates/mediagoblin/auth/register.html:30
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/submit/start.html:32
+msgid "Submit"
+msgstr "Enviar"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:42
+msgid "Don't have an account yet?"
+msgstr "¿No tienes una cuenta?"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:45
+msgid "Create one here!"
+msgstr "Crea una aquí"
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:27
+msgid "Create an account!"
+msgstr "Crea una cuenta!"
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+"Hola %(username)s , para activar su cuenta MediaGoblin GNU, abra ls "
+"siguiente URL en su navegador: %(verification_url)s "
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:29
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Edición %(media_title)s "
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:36
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:37
+msgid "Save changes"
+msgstr "Salvar cambios"
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr "Edición %(username)s de perfil"
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:29
+msgid "Media tagged with:"
+msgstr "El contenido con la etiqueta:"
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
+msgid "atom feed"
+msgstr "feed Atom"
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:26
+msgid "Submit yer media"
+msgstr "Envíe su contenido"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr "Contenido de <a href=\"%(user_url)s\">%(username)s</a>'s"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:30
+msgid "Sorry, no such user found."
+msgstr "Lo sentimos, no se ha encontrado el usuario."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:37
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+msgid "Verification needed"
+msgstr "Verificación necesaria"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:40
+msgid "Almost done! Your account still needs to be verified."
+msgstr "Ya está casi hecho! Su cuenta tiene que ser verificada."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:45
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+"Un e-mail debe llegar en unos momentos con las instrucciones para hacerlo."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:49
+msgid "In case it doesn't:"
+msgstr "En caso de que no:"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:52
+msgid "Resend verification email"
+msgstr "Reenviar correo electrónico de verificación"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:60
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" verified."
+msgstr ""
+"Alguien ha registrado una cuenta con este nombre de usuario, pero todavía "
+"tiene que ser verificado."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:66
+#, 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 usted es esa persona, pero usted ha perdido su correo electrónico de "
+"verificación, usted puede reenviarlo <a href=\"%(login_url)s\">acceder</a>."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:76
+#, python-format
+msgid "%(username)s's profile"
+msgstr "Perfil de %(username)s's"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:84
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:95
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr "Ver todo el contenido de %(username)s's "
+
+
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 00000000..a7daf2c9
--- /dev/null
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
new file mode 100644
index 00000000..4606bf47
--- /dev/null
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
@@ -0,0 +1,305 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+#
+# <marktraceur@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
+"POT-Creation-Date: 2011-08-08 22:53-0500\n"
+"PO-Revision-Date: 2011-08-10 21:24+0000\n"
+"Last-Translator: MarkTraceur <marktraceur@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46
+msgid "Username"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50
+msgid "Password"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:34
+msgid "Passwords must match."
+msgstr ""
+
+#: mediagoblin/auth/forms.py:36
+msgid "Confirm password"
+msgstr ""
+
+#: mediagoblin/auth/forms.py:39
+msgid "Email address"
+msgstr ""
+
+#: mediagoblin/auth/views.py:40
+msgid "Sorry, registration is disabled on this instance."
+msgstr ""
+
+#: mediagoblin/auth/views.py:55
+msgid "Sorry, a user with that name already exists."
+msgstr ""
+
+#: mediagoblin/auth/views.py:152
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+
+#: mediagoblin/auth/views.py:158
+msgid "The verification key or user id is incorrect"
+msgstr ""
+
+#: mediagoblin/auth/views.py:179
+#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+msgid "Resent your verification email."
+msgstr "Nous avons renvoyé votre e-mail de vérification."
+
+#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:26
+msgid "Title"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:29
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:30
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31
+msgid "Tags"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:38
+msgid "Bio"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:41
+msgid "Website"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:43
+msgid "Improperly formed URL"
+msgstr ""
+
+#: mediagoblin/edit/views.py:54
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:75
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:96
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/submit/forms.py:29
+msgid "File"
+msgstr ""
+
+#: mediagoblin/submit/views.py:45
+msgid "You must provide a file."
+msgstr ""
+
+#: mediagoblin/submit/views.py:48
+msgid "The file doesn't seem to be an image!"
+msgstr ""
+
+#: mediagoblin/submit/views.py:96
+msgid "Woohoo! Submitted!"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:22
+msgid "GNU MediaGoblin"
+msgstr "GNU MediaGoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:45
+msgid "Mediagoblin logo"
+msgstr "logo de MediaGoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:51
+msgid "Submit media"
+msgstr "Soumettez des médias"
+
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "verify your email!"
+msgstr "vérifiez votre addresse e-mail"
+
+#: mediagoblin/templates/mediagoblin/base.html:72
+msgid "Login"
+msgstr "Connexion"
+
+#: mediagoblin/templates/mediagoblin/base.html:88
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
+"href=\"http://gnu.org/\">GNU project</a>"
+msgstr ""
+"Alimenté par <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un <a "
+"href=\"http://gnu.org/\">projet GNU</a>"
+
+#: mediagoblin/templates/mediagoblin/root.html:21
+msgid "Welcome to GNU MediaGoblin!"
+msgstr "Bienvenue à GNU MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/root.html:26
+msgid "Submit an item"
+msgstr "Soumettez un fichier"
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+#, python-format
+msgid "If you have an account, you can <a href=\"%(login_url)s\">Login</a>."
+msgstr ""
+"Si vous avez un compte, vous pouvez <a href=\"%(login_url)s\">Connecter</a>."
+
+#: mediagoblin/templates/mediagoblin/root.html:37
+#, python-format
+msgid ""
+"If you don't have an account, please <a "
+"href=\"%(register_url)s\">Register</a>."
+msgstr ""
+"Si vous n'avez pas un compte, s'il vous plaît, <a "
+"href=\"%(register_url)s\">vous inscrivez</a>."
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:26
+msgid "Log in"
+msgstr "Connexion"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:29
+msgid "Login failed!"
+msgstr "Connexion manqué"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:34
+#: mediagoblin/templates/mediagoblin/auth/register.html:30
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/submit/start.html:32
+msgid "Submit"
+msgstr "Soumettez"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:42
+msgid "Don't have an account yet?"
+msgstr "N'avez-vous toujours un compte?"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:45
+msgid "Create one here!"
+msgstr "En créez un ici!"
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:27
+msgid "Create an account!"
+msgstr "Créez un compte!"
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+"Bonjour, %(username)s,\n"
+"\n"
+"pour activer votre compte de GNU MediaGoblin, ouvrez l'URL suite avec votre navigateur web:\n"
+"\n"
+"%(verification_url)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:29
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "On édit %(media_title)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:36
+msgid "Cancel"
+msgstr "Annulez"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:37
+msgid "Save changes"
+msgstr "Enregistrez les modifications"
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:29
+msgid "Media tagged with:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
+msgid "atom feed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:26
+msgid "Submit yer media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:30
+msgid "Sorry, no such user found."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:37
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+msgid "Verification needed"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:40
+msgid "Almost done! Your account still needs to be verified."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:45
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:49
+msgid "In case it doesn't:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:52
+msgid "Resend verification email"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:60
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" verified."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:66
+#, 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 ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:76
+#, python-format
+msgid "%(username)s's profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:84
+msgid "Edit profile"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:95
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 00000000..8911785f
--- /dev/null
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
new file mode 100644
index 00000000..bd00fd1f
--- /dev/null
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
@@ -0,0 +1,308 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+#
+# <odin.omdal@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
+"POT-Creation-Date: 2011-08-08 22:53-0500\n"
+"PO-Revision-Date: 2011-08-10 21:23+0000\n"
+"Last-Translator: velmont <odin.omdal@gmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: nn_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46
+msgid "Username"
+msgstr "Brukarnamn"
+
+#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50
+msgid "Password"
+msgstr "Passord"
+
+#: mediagoblin/auth/forms.py:34
+msgid "Passwords must match."
+msgstr "Passorda må vera like."
+
+#: mediagoblin/auth/forms.py:36
+msgid "Confirm password"
+msgstr "Gjenta passord"
+
+#: mediagoblin/auth/forms.py:39
+msgid "Email address"
+msgstr "E-postadresse"
+
+#: mediagoblin/auth/views.py:40
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Registrering er slege av. Orsak."
+
+#: mediagoblin/auth/views.py:55
+msgid "Sorry, a user with that name already exists."
+msgstr "Ein konto med dette brukarnamnet finst allereide."
+
+#: mediagoblin/auth/views.py:152
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+"E-postadressa di, og dimed kontoen din er stadfesta. Du kan no logga inn, "
+"endra profilen din og lasta opp filer."
+
+#: mediagoblin/auth/views.py:158
+msgid "The verification key or user id is incorrect"
+msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil."
+
+#: mediagoblin/auth/views.py:179
+#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+msgid "Resent your verification email."
+msgstr "Send ein ny stadfestingsepost."
+
+#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:26
+msgid "Title"
+msgstr "Tittel"
+
+#: mediagoblin/edit/forms.py:29
+msgid "Slug"
+msgstr "Adressetittel"
+
+#: mediagoblin/edit/forms.py:30
+msgid "The slug can't be empty"
+msgstr "Adressetittelen kan ikkje vera tom"
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31
+msgid "Tags"
+msgstr "Merkelappar"
+
+#: mediagoblin/edit/forms.py:38
+msgid "Bio"
+msgstr "Presentasjon"
+
+#: mediagoblin/edit/forms.py:41
+msgid "Website"
+msgstr "Heimeside"
+
+#: mediagoblin/edit/forms.py:43
+msgid "Improperly formed URL"
+msgstr "Ugyldeg URL"
+
+#: mediagoblin/edit/views.py:54
+msgid "An entry with that slug already exists for this user."
+msgstr "Eit innlegg med denne adressetittelen finst allereie."
+
+#: mediagoblin/edit/views.py:75
+msgid "You are editing another user's media. Proceed with caution."
+msgstr "Ver forsiktig, du redigerer ein annan konto sitt innlegg."
+
+#: mediagoblin/edit/views.py:96
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr "Ver forsiktig, du redigerer ein annan konto sin profil."
+
+#: mediagoblin/submit/forms.py:29
+msgid "File"
+msgstr "Fil"
+
+#: mediagoblin/submit/views.py:45
+msgid "You must provide a file."
+msgstr "Du må velja ei fil."
+
+#: mediagoblin/submit/views.py:48
+msgid "The file doesn't seem to be an image!"
+msgstr "Fila verkar ikkje å vera ei gyldig biletefil."
+
+#: mediagoblin/submit/views.py:96
+msgid "Woohoo! Submitted!"
+msgstr "Johoo! Opplasta!"
+
+#: mediagoblin/templates/mediagoblin/base.html:22
+msgid "GNU MediaGoblin"
+msgstr "GNU MediaGoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:45
+msgid "Mediagoblin logo"
+msgstr "MediaGoblin-logo"
+
+#: mediagoblin/templates/mediagoblin/base.html:51
+msgid "Submit media"
+msgstr "Last opp"
+
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "verify your email!"
+msgstr "Stadfest epostadressa di"
+
+#: mediagoblin/templates/mediagoblin/base.html:72
+msgid "Login"
+msgstr "Logg inn"
+
+#: mediagoblin/templates/mediagoblin/base.html:88
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
+"href=\"http://gnu.org/\">GNU project</a>"
+msgstr ""
+"Driven av <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit <a "
+"href=\"http://gnu.org/\">GNU-prosjekt</a>"
+
+#: mediagoblin/templates/mediagoblin/root.html:21
+msgid "Welcome to GNU MediaGoblin!"
+msgstr "Velkomen til GNU MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/root.html:26
+msgid "Submit an item"
+msgstr "Last opp"
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+#, python-format
+msgid "If you have an account, you can <a href=\"%(login_url)s\">Login</a>."
+msgstr "Har du ein konto? <a href=\"%(login_url)s\">Logg inn</a>."
+
+#: mediagoblin/templates/mediagoblin/root.html:37
+#, python-format
+msgid ""
+"If you don't have an account, please <a "
+"href=\"%(register_url)s\">Register</a>."
+msgstr "Har du ingen konto? <a href=\"%(register_url)s\">Registrer deg</a>."
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:26
+msgid "Log in"
+msgstr "Logg inn"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:29
+msgid "Login failed!"
+msgstr "Innlogging feila!"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:34
+#: mediagoblin/templates/mediagoblin/auth/register.html:30
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/submit/start.html:32
+msgid "Submit"
+msgstr "Send"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:42
+msgid "Don't have an account yet?"
+msgstr "Har du ingen konto?"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:45
+msgid "Create one here!"
+msgstr "Lag ein!"
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:27
+msgid "Create an account!"
+msgstr "Lag ein konto."
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+"Hei %(username)s,\n"
+"\n"
+"opna den følgjande adressa i netlesaren din for å aktivera kontoen din:\n"
+"\n"
+"%(verification_url)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:29
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Redigerer %(media_title)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:36
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:37
+msgid "Save changes"
+msgstr "Lagra"
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr "Redigerar profilen til %(username)s"
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:29
+msgid "Media tagged with:"
+msgstr "Merkelappar:"
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
+msgid "atom feed"
+msgstr "atom-feed"
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:26
+msgid "Submit yer media"
+msgstr "Last opp"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr "<a href=\"%(user_url)s\">%(username)s</a> sin mediafiler"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:30
+msgid "Sorry, no such user found."
+msgstr "Fann ingen slik brukar"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:37
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+msgid "Verification needed"
+msgstr "Treng stadfesting"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:40
+msgid "Almost done! Your account still needs to be verified."
+msgstr "Nesten klart. Du treng berre stadfesta kontoen din."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:45
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr "Ein epost med instruksjonar kjem straks."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:49
+msgid "In case it doesn't:"
+msgstr "I tilfelle det ikkje skjer:"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:52
+msgid "Resend verification email"
+msgstr "Send ein ny epost"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:60
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" verified."
+msgstr ""
+"Det finst allereie ein konto med det brukarnamnet, men den kontoen treng "
+"stadfesting."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:66
+#, 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 ""
+"Viss dette er deg, kan du <a href=\"%(login_url)s\">logga inn</a> for å få "
+"tilsendt ny epost med stadfestingslenkje."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:76
+#, python-format
+msgid "%(username)s's profile"
+msgstr "%(username)s sin profil"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:84
+msgid "Edit profile"
+msgstr "Endra profil"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:95
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr "Sjå all media frå %(username)s"
+
+
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 00000000..4dc4ab5f
--- /dev/null
+++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
new file mode 100644
index 00000000..43f65af6
--- /dev/null
+++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
@@ -0,0 +1,310 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+#
+# <snd.noise@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
+"POT-Creation-Date: 2011-08-08 22:53-0500\n"
+"PO-Revision-Date: 2011-08-10 23:16+0000\n"
+"Last-Translator: osc <snd.noise@gmail.com>\n"
+"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/mediagoblin/team/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+
+#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46
+msgid "Username"
+msgstr "Nome de Usuário"
+
+#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50
+msgid "Password"
+msgstr "Senha"
+
+#: mediagoblin/auth/forms.py:34
+msgid "Passwords must match."
+msgstr "Senhas devem ser iguais."
+
+#: mediagoblin/auth/forms.py:36
+msgid "Confirm password"
+msgstr "Confirmar senha"
+
+#: mediagoblin/auth/forms.py:39
+msgid "Email address"
+msgstr "Endereço de email"
+
+#: mediagoblin/auth/views.py:40
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Desculpa, o registro está desativado neste momento."
+
+#: mediagoblin/auth/views.py:55
+msgid "Sorry, a user with that name already exists."
+msgstr "Desculpe, um usuário com este nome já existe."
+
+#: mediagoblin/auth/views.py:152
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+"O seu endereço de e-mail foi verificado. Você pode agora fazer login, editar"
+" seu perfil, e enviar imagens!"
+
+#: mediagoblin/auth/views.py:158
+msgid "The verification key or user id is incorrect"
+msgstr "A chave de verificação ou nome usuário estão incorretos."
+
+#: mediagoblin/auth/views.py:179
+#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+msgid "Resent your verification email."
+msgstr "O email de verificação foi reenviado."
+
+#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:26
+msgid "Title"
+msgstr "Título"
+
+#: mediagoblin/edit/forms.py:29
+msgid "Slug"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:30
+msgid "The slug can't be empty"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31
+msgid "Tags"
+msgstr "Tags"
+
+#: mediagoblin/edit/forms.py:38
+msgid "Bio"
+msgstr "Biográfia"
+
+#: mediagoblin/edit/forms.py:41
+msgid "Website"
+msgstr "Website"
+
+#: mediagoblin/edit/forms.py:43
+msgid "Improperly formed URL"
+msgstr ""
+
+#: mediagoblin/edit/views.py:54
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+
+#: mediagoblin/edit/views.py:75
+msgid "You are editing another user's media. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/edit/views.py:96
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr ""
+
+#: mediagoblin/submit/forms.py:29
+msgid "File"
+msgstr "Arquivo"
+
+#: mediagoblin/submit/views.py:45
+msgid "You must provide a file."
+msgstr "Você deve fornecer um arquivo."
+
+#: mediagoblin/submit/views.py:48
+msgid "The file doesn't seem to be an image!"
+msgstr "O arquivo não parece ser uma imagem!"
+
+#: mediagoblin/submit/views.py:96
+msgid "Woohoo! Submitted!"
+msgstr "Eba! Enviado!"
+
+#: mediagoblin/templates/mediagoblin/base.html:22
+msgid "GNU MediaGoblin"
+msgstr "GNU MediaGoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:45
+msgid "Mediagoblin logo"
+msgstr "Logo de Mediagoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:51
+msgid "Submit media"
+msgstr "Enviar mídia"
+
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "verify your email!"
+msgstr "Verifique seu email!"
+
+#: mediagoblin/templates/mediagoblin/base.html:72
+msgid "Login"
+msgstr "Login"
+
+#: mediagoblin/templates/mediagoblin/base.html:88
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
+"href=\"http://gnu.org/\">GNU project</a>"
+msgstr ""
+"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
+"href=\"http://gnu.org/\">GNU project</a>"
+
+#: mediagoblin/templates/mediagoblin/root.html:21
+msgid "Welcome to GNU MediaGoblin!"
+msgstr "Bemvindo a GNU Mediagoblin!"
+
+#: mediagoblin/templates/mediagoblin/root.html:26
+msgid "Submit an item"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+#, python-format
+msgid "If you have an account, you can <a href=\"%(login_url)s\">Login</a>."
+msgstr "Se você tem conta, você pode <a href=\"%(login_url)s\">Entrar</a> ."
+
+#: mediagoblin/templates/mediagoblin/root.html:37
+#, python-format
+msgid ""
+"If you don't have an account, please <a "
+"href=\"%(register_url)s\">Register</a>."
+msgstr ""
+"Se você não tem conta, por favor <a href=\"%(register_url)s\">Registrar</a> "
+"."
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:26
+msgid "Log in"
+msgstr "Entrar"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:29
+msgid "Login failed!"
+msgstr "Login falhou!"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:34
+#: mediagoblin/templates/mediagoblin/auth/register.html:30
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/submit/start.html:32
+msgid "Submit"
+msgstr "Enviar"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:42
+msgid "Don't have an account yet?"
+msgstr "Ainda não tem conta?"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:45
+msgid "Create one here!"
+msgstr "Crie uma aqui!"
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:27
+msgid "Create an account!"
+msgstr "Criar uma conta!"
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+"Olá %(username)s,\n"
+"\n"
+"Para ativar sua conta GNU MediaGoblin, visite este endereço no seu navegador:\n"
+"\n"
+"%(verification_url)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:29
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Editando %(media_title)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:36
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:37
+msgid "Save changes"
+msgstr "Salvar mudanças"
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr "Editando perfil de %(username)s"
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:29
+msgid "Media tagged with:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
+msgid "atom feed"
+msgstr "atom feed"
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:26
+msgid "Submit yer media"
+msgstr "Envie sua mídia"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:30
+msgid "Sorry, no such user found."
+msgstr "Desculpe, tal usuário não encontrado."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:37
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+msgid "Verification needed"
+msgstr "Verificação necessária"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:40
+msgid "Almost done! Your account still needs to be verified."
+msgstr "Quase pronto! Sua conta precisa de verificação."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:45
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr "Receberá um email com instruções de como fazer."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:49
+msgid "In case it doesn't:"
+msgstr "Caso contrário:"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:52
+msgid "Resend verification email"
+msgstr "Reenviar email de verificação"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:60
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" verified."
+msgstr ""
+"Alguém já registrou uma conta com este nome, mas ainda tem que ser "
+"verificada."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:66
+#, 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 ""
+"Se você é essa pessoa, mas você perdeu seu e-mail de verificação, você pode "
+"<a href=\"%(login_url)s\">efetuar login</a> e reenviá-la."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:76
+#, python-format
+msgid "%(username)s's profile"
+msgstr "Perfil de %(username)s"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:84
+msgid "Edit profile"
+msgstr "Editar perfil"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:95
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr ""
+
+
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 00000000..361846d4
--- /dev/null
+++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
new file mode 100644
index 00000000..feb261c8
--- /dev/null
+++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
@@ -0,0 +1,314 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+#
+# <gapop@hotmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
+"POT-Creation-Date: 2011-08-08 22:53-0500\n"
+"PO-Revision-Date: 2011-08-10 21:52+0000\n"
+"Last-Translator: gap <gapop@hotmail.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
+
+#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46
+msgid "Username"
+msgstr "Nume de utilizator"
+
+#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50
+msgid "Password"
+msgstr "Parolă"
+
+#: mediagoblin/auth/forms.py:34
+msgid "Passwords must match."
+msgstr "Parolele trebuie să fie identice."
+
+#: mediagoblin/auth/forms.py:36
+msgid "Confirm password"
+msgstr "Reintroduceți parola"
+
+#: mediagoblin/auth/forms.py:39
+msgid "Email address"
+msgstr "Adresa de e-mail"
+
+#: mediagoblin/auth/views.py:40
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Ne pare rău, dar înscrierile sunt dezactivate pe această instanță."
+
+#: mediagoblin/auth/views.py:55
+msgid "Sorry, a user with that name already exists."
+msgstr "Ne pare rău, există deja un utilizator cu același nume."
+
+#: mediagoblin/auth/views.py:152
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+"Adresa dvs. de e-mail a fost confirmată. Puteți să vă autentificați, să vă "
+"modificați profilul și să trimiteți imagini!"
+
+#: mediagoblin/auth/views.py:158
+msgid "The verification key or user id is incorrect"
+msgstr "Cheie de verificare sau user ID incorect."
+
+#: mediagoblin/auth/views.py:179
+#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+msgid "Resent your verification email."
+msgstr "E-mail-ul de verificare a fost retrimis."
+
+#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:26
+msgid "Title"
+msgstr "Titlu"
+
+#: mediagoblin/edit/forms.py:29
+msgid "Slug"
+msgstr "Identificator"
+
+#: mediagoblin/edit/forms.py:30
+msgid "The slug can't be empty"
+msgstr "Identificatorul nu poate să lipsească"
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31
+msgid "Tags"
+msgstr "Etichete"
+
+#: mediagoblin/edit/forms.py:38
+msgid "Bio"
+msgstr "Biografie"
+
+#: mediagoblin/edit/forms.py:41
+msgid "Website"
+msgstr "Sit Web"
+
+#: mediagoblin/edit/forms.py:43
+msgid "Improperly formed URL"
+msgstr "Adresă URL incorectă"
+
+#: mediagoblin/edit/views.py:54
+msgid "An entry with that slug already exists for this user."
+msgstr ""
+"Există deja un entry cu același identificator pentru acest utilizator."
+
+#: mediagoblin/edit/views.py:75
+msgid "You are editing another user's media. Proceed with caution."
+msgstr "Editați fișierul unui alt utilizator. Se recomandă prudență."
+
+#: mediagoblin/edit/views.py:96
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr "Editați profilul unui utilizator. Se recomandă prudență."
+
+#: mediagoblin/submit/forms.py:29
+msgid "File"
+msgstr "Fișier"
+
+#: mediagoblin/submit/views.py:45
+msgid "You must provide a file."
+msgstr "Trebuie să selectați un fișier."
+
+#: mediagoblin/submit/views.py:48
+msgid "The file doesn't seem to be an image!"
+msgstr "Fișierul nu pare a fi o imagine!"
+
+#: mediagoblin/submit/views.py:96
+msgid "Woohoo! Submitted!"
+msgstr "Gata, trimis!"
+
+#: mediagoblin/templates/mediagoblin/base.html:22
+msgid "GNU MediaGoblin"
+msgstr "GNU MediaGoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:45
+msgid "Mediagoblin logo"
+msgstr "Logo MediaGoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:51
+msgid "Submit media"
+msgstr "Transmiteți fișier"
+
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "verify your email!"
+msgstr "verificați e-mail-ul!"
+
+#: mediagoblin/templates/mediagoblin/base.html:72
+msgid "Login"
+msgstr "Autentificare"
+
+#: mediagoblin/templates/mediagoblin/base.html:88
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
+"href=\"http://gnu.org/\">GNU project</a>"
+msgstr ""
+"Construit cu <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un <a "
+"href=\"http://gnu.org/\">proiect GNU</a>"
+
+#: mediagoblin/templates/mediagoblin/root.html:21
+msgid "Welcome to GNU MediaGoblin!"
+msgstr "Bun venit la GNU MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/root.html:26
+msgid "Submit an item"
+msgstr "Trimite un fișier"
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+#, python-format
+msgid "If you have an account, you can <a href=\"%(login_url)s\">Login</a>."
+msgstr ""
+"Dacă aveți deja un cont, vă puteți <a "
+"href=\"%(login_url)s\">autentifica</a>."
+
+#: mediagoblin/templates/mediagoblin/root.html:37
+#, python-format
+msgid ""
+"If you don't have an account, please <a "
+"href=\"%(register_url)s\">Register</a>."
+msgstr ""
+"Dacă nu aveți cont, vă rugăm să vă <a "
+"href=\"%(register_url)s\">înregistrați</a>."
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:26
+msgid "Log in"
+msgstr "Autentificare"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:29
+msgid "Login failed!"
+msgstr "Autentificare nereușită!"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:34
+#: mediagoblin/templates/mediagoblin/auth/register.html:30
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/submit/start.html:32
+msgid "Submit"
+msgstr "Trimite"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:42
+msgid "Don't have an account yet?"
+msgstr "Nu aveți un cont?"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:45
+msgid "Create one here!"
+msgstr "Creați-l aici!"
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:27
+msgid "Create an account!"
+msgstr "Creați un cont!"
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+"Bună, %(username)s,\n"
+"\n"
+"pentru activarea contului tău GNU MediaGoblin, accesează adresa următoare:\n"
+"\n"
+"%(verification_url)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:29
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Editare %(media_title)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:36
+msgid "Cancel"
+msgstr "Anulare"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:37
+msgid "Save changes"
+msgstr "Salvează modificările"
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr "Editare profil %(username)s"
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:29
+msgid "Media tagged with:"
+msgstr "Etichete:"
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
+msgid "atom feed"
+msgstr "flux atom"
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:26
+msgid "Submit yer media"
+msgstr "Trimite fișierele tale"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr "Fișierele lui <a href=\"%(user_url)s\">%(username)s</a>"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:30
+msgid "Sorry, no such user found."
+msgstr "Ne pare rău, nu am găsit utilizatorul căutat."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:37
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+msgid "Verification needed"
+msgstr "Confirmare necesară"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:40
+msgid "Almost done! Your account still needs to be verified."
+msgstr "Aproape gata! Este necesară confirmarea contului dvs."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:45
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr "Veți primi în scurt timp un mesaj prin e-mail cu instrucțiuni."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:49
+msgid "In case it doesn't:"
+msgstr "Dacă nu primiți mesajul:"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:52
+msgid "Resend verification email"
+msgstr "Retrimite mesajul de verificare"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:60
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" verified."
+msgstr ""
+"Cineva s-a înscris pe site cu acest nume de utilizator, dar nu a fost "
+"confirmat încă."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:66
+#, 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 ""
+"Dacă dvs. sunteți persoana respectivă și nu mai aveți e-mail-ul de "
+"verificare, puteți să vă <a href=\"%(login_url)s\">autentificați</a> pentru "
+"a-l retrimite."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:76
+#, python-format
+msgid "%(username)s's profile"
+msgstr "Profil %(username)s"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:84
+msgid "Edit profile"
+msgstr "Editare profil"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:95
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr "Toate fișierele lui %(username)s"
+
+
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 00000000..a70b1fef
--- /dev/null
+++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
Binary files differ
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
new file mode 100644
index 00000000..bf2dd4fa
--- /dev/null
+++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
@@ -0,0 +1,309 @@
+# Translations template for PROJECT.
+# Copyright (C) 2011 ORGANIZATION
+# This file is distributed under the same license as the PROJECT project.
+#
+# Jure Repinc <jlp@holodeck1.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU MediaGoblin\n"
+"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
+"POT-Creation-Date: 2011-08-08 22:53-0500\n"
+"PO-Revision-Date: 2011-08-10 21:28+0000\n"
+"Last-Translator: JLP <jlp@holodeck1.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+
+#: mediagoblin/auth/forms.py:24 mediagoblin/auth/forms.py:46
+msgid "Username"
+msgstr "Uporabniško ime"
+
+#: mediagoblin/auth/forms.py:29 mediagoblin/auth/forms.py:50
+msgid "Password"
+msgstr "Geslo"
+
+#: mediagoblin/auth/forms.py:34
+msgid "Passwords must match."
+msgstr "Gesli morata biti enaki."
+
+#: mediagoblin/auth/forms.py:36
+msgid "Confirm password"
+msgstr "Potrdite geslo"
+
+#: mediagoblin/auth/forms.py:39
+msgid "Email address"
+msgstr "E-poštni naslov"
+
+#: mediagoblin/auth/views.py:40
+msgid "Sorry, registration is disabled on this instance."
+msgstr "Oprostite, prijava za ta izvod ni omogočena."
+
+#: mediagoblin/auth/views.py:55
+msgid "Sorry, a user with that name already exists."
+msgstr "Oprostite, uporabnik s tem imenom že obstaja."
+
+#: mediagoblin/auth/views.py:152
+msgid ""
+"Your email address has been verified. You may now login, edit your profile, "
+"and submit images!"
+msgstr ""
+"Vaš e-poštni naslov je bil potrjen. Sedaj se lahko prijavite, uredite svoj "
+"profil in pošljete slike."
+
+#: mediagoblin/auth/views.py:158
+msgid "The verification key or user id is incorrect"
+msgstr "Potrditveni ključ ali uporabniška identifikacija je napačna"
+
+#: mediagoblin/auth/views.py:179
+#: mediagoblin/templates/mediagoblin/auth/resent_verification_email.html:22
+msgid "Resent your verification email."
+msgstr "Ponovno pošiljanje potrditvene e-pošte."
+
+#: mediagoblin/edit/forms.py:26 mediagoblin/submit/forms.py:26
+msgid "Title"
+msgstr "Naslov"
+
+#: mediagoblin/edit/forms.py:29
+msgid "Slug"
+msgstr "Oznaka"
+
+#: mediagoblin/edit/forms.py:30
+msgid "The slug can't be empty"
+msgstr "Oznaka ne sme biti prazna"
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:31
+msgid "Tags"
+msgstr "Oznake"
+
+#: mediagoblin/edit/forms.py:38
+msgid "Bio"
+msgstr "Biografija"
+
+#: mediagoblin/edit/forms.py:41
+msgid "Website"
+msgstr "Spletna stran"
+
+#: mediagoblin/edit/forms.py:43
+msgid "Improperly formed URL"
+msgstr "Napačno oblikovan URL"
+
+#: mediagoblin/edit/views.py:54
+msgid "An entry with that slug already exists for this user."
+msgstr "Vnos s to oznako za tega uporabnika že obstaja."
+
+#: mediagoblin/edit/views.py:75
+msgid "You are editing another user's media. Proceed with caution."
+msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo."
+
+#: mediagoblin/edit/views.py:96
+msgid "You are editing a user's profile. Proceed with caution."
+msgstr "Urejate uporabniški profil. Nadaljujte pazljivo."
+
+#: mediagoblin/submit/forms.py:29
+msgid "File"
+msgstr "Datoteka"
+
+#: mediagoblin/submit/views.py:45
+msgid "You must provide a file."
+msgstr "Podati morate datoteko."
+
+#: mediagoblin/submit/views.py:48
+msgid "The file doesn't seem to be an image!"
+msgstr "Kot kaže datoteka ni slika."
+
+#: mediagoblin/submit/views.py:96
+msgid "Woohoo! Submitted!"
+msgstr "Juhej! Poslano."
+
+#: mediagoblin/templates/mediagoblin/base.html:22
+msgid "GNU MediaGoblin"
+msgstr "GNU MediaGoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:45
+msgid "Mediagoblin logo"
+msgstr "Logotip MediaGoblin"
+
+#: mediagoblin/templates/mediagoblin/base.html:51
+msgid "Submit media"
+msgstr "Pošlji vsebino"
+
+#: mediagoblin/templates/mediagoblin/base.html:62
+msgid "verify your email!"
+msgstr "Preverite svojo e-pošto."
+
+#: mediagoblin/templates/mediagoblin/base.html:72
+msgid "Login"
+msgstr "Prijava"
+
+#: mediagoblin/templates/mediagoblin/base.html:88
+msgid ""
+"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
+"href=\"http://gnu.org/\">GNU project</a>"
+msgstr ""
+"Stran poganja <a href=\"http://mediagoblin.org\">MediaGoblin</a>, del <a "
+"href=\"http://gnu.org/\">projekta GNU</a>"
+
+#: mediagoblin/templates/mediagoblin/root.html:21
+msgid "Welcome to GNU MediaGoblin!"
+msgstr "Dobrodošli v GNU MediaGoblin!"
+
+#: mediagoblin/templates/mediagoblin/root.html:26
+msgid "Submit an item"
+msgstr "Pošljite datoteko"
+
+#: mediagoblin/templates/mediagoblin/root.html:31
+#, python-format
+msgid "If you have an account, you can <a href=\"%(login_url)s\">Login</a>."
+msgstr "Če imate račun, se lahko <a href=\"%(login_url)s\">Prijavite</a>."
+
+#: mediagoblin/templates/mediagoblin/root.html:37
+#, python-format
+msgid ""
+"If you don't have an account, please <a "
+"href=\"%(register_url)s\">Register</a>."
+msgstr "Če računa še nimate, se <a href=\"%(register_url)s\">Registrirajte</a>."
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:26
+msgid "Log in"
+msgstr "Prijava"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:29
+msgid "Login failed!"
+msgstr "Neuspešna prijava."
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:34
+#: mediagoblin/templates/mediagoblin/auth/register.html:30
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
+#: mediagoblin/templates/mediagoblin/submit/start.html:32
+msgid "Submit"
+msgstr "Pošlji"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:42
+msgid "Don't have an account yet?"
+msgstr "Še nimate računa?"
+
+#: mediagoblin/templates/mediagoblin/auth/login.html:45
+msgid "Create one here!"
+msgstr "Ustvarite si ga."
+
+#: mediagoblin/templates/mediagoblin/auth/register.html:27
+msgid "Create an account!"
+msgstr "Ustvarite račun."
+
+#: mediagoblin/templates/mediagoblin/auth/verification_email.txt:19
+#, python-format
+msgid ""
+"Hi %(username)s,\n"
+"\n"
+"to activate your GNU MediaGoblin account, open the following URL in\n"
+"your web browser:\n"
+"\n"
+"%(verification_url)s"
+msgstr ""
+"Pozdravljeni, %(username)s\n"
+"\n"
+"Za aktivacijo svojega računa GNU MediaGoblin odprite\n"
+"naslednji URL v svojem spletnem brskalniku:\n"
+"\n"
+"%(verification_url)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:29
+#, python-format
+msgid "Editing %(media_title)s"
+msgstr "Urejanje %(media_title)s"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:36
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: mediagoblin/templates/mediagoblin/edit/edit.html:37
+msgid "Save changes"
+msgstr "Shrani spremembe"
+
+#: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
+#, python-format
+msgid "Editing %(username)s's profile"
+msgstr "Urejanje profila – %(username)s"
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:29
+msgid "Media tagged with:"
+msgstr "Vsebina označena z:"
+
+#: mediagoblin/templates/mediagoblin/listings/tag.html:40
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:46
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:101
+msgid "atom feed"
+msgstr "Vir Atom"
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:26
+msgid "Submit yer media"
+msgstr "Pošljite svojo vsebino"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
+#, python-format
+msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
+msgstr "Vsebina uporabnika <a href=\"%(user_url)s\">%(username)s</a>"
+
+#: mediagoblin/templates/mediagoblin/user_pages/gallery.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:30
+msgid "Sorry, no such user found."
+msgstr "Oprostite, tega uporabnika ni bilo moč najti."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:37
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:57
+msgid "Verification needed"
+msgstr "Potrebna je potrditev"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:40
+msgid "Almost done! Your account still needs to be verified."
+msgstr "Skoraj ste zaključili. Račun je potrebno le še potrditi."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:45
+msgid ""
+"An email should arrive in a few moments with instructions on how to do so."
+msgstr "V kratkem bi morali prejeti e-pošto z navodili, kako to storiti."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:49
+msgid "In case it doesn't:"
+msgstr "Če je ne prejmete:"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:52
+msgid "Resend verification email"
+msgstr "Ponovno pošlji potrditveno e-pošto"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:60
+msgid ""
+"Someone has registered an account with this username, but it still has to be"
+" verified."
+msgstr ""
+"Nekdo je s tem uporabniškim imenom že registriral račun, vendar mora biti še"
+" potrjen."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:66
+#, 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 ""
+"Če ste ta oseba vi, a ste izgubili potrditveno e-pošto, se lahko <a "
+"href=\"%(login_url)s\">prijavite</a> in jo ponovno pošljete."
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:76
+#, python-format
+msgid "%(username)s's profile"
+msgstr "Profil – %(username)s"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:84
+msgid "Edit profile"
+msgstr "Uredi profil"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:95
+#, python-format
+msgid "View all of %(username)s's media"
+msgstr "Prikaži vso vsebino uporabnika %(username)s"
+
+
diff --git a/mediagoblin/storage.py b/mediagoblin/storage.py
index 88c748ce..3968fa29 100644
--- a/mediagoblin/storage.py
+++ b/mediagoblin/storage.py
@@ -290,16 +290,29 @@ class MountStorage(StorageInterface):
"""
Experimental "Mount" virtual Storage Interface
- This isn't an interface to some real storage, instead
- it's a redirecting interface, that redirects requests
- to other "StorageInterface"s.
- For example, requests for ["store1", "a"] to first
- storage with the path ["a"], etc.
+ This isn't an interface to some real storage, instead it's a
+ redirecting interface, that redirects requests to other
+ "StorageInterface"s.
+
+ For example, say you have the paths:
+
+ 1. ['user_data', 'cwebber', 'avatar.jpg']
+ 2. ['user_data', 'elrond', 'avatar.jpg']
+ 3. ['media_entries', '34352f304c3f4d0ad8ad0f043522b6f2', 'thumb.jpg']
+
+ You could mount media_entries under CloudFileStorage and user_data
+ under BasicFileStorage. Then 1 would be passed to
+ BasicFileStorage under the path ['cwebber', 'avatar.jpg'] and 3
+ would be passed to CloudFileStorage under
+ ['34352f304c3f4d0ad8ad0f043522b6f2', 'thumb.jpg'].
+
+ In other words, this is kind of like mounting /home/ and /etc/
+ under different filesystems on your operating system... but with
+ mediagoblin filestorages :)
- To set this up, you currently need to call the mount()
- method with the target path and a backend, that shall
- be available under that target path.
- You have to mount things in a sensible order,
+ To set this up, you currently need to call the mount() method with
+ the target path and a backend, that shall be available under that
+ target path. You have to mount things in a sensible order,
especially you can't mount ["a", "b"] before ["a"].
"""
def __init__(self, **kwargs):
diff --git a/mediagoblin/submit/forms.py b/mediagoblin/submit/forms.py
index 241d32dc..4519b057 100644
--- a/mediagoblin/submit/forms.py
+++ b/mediagoblin/submit/forms.py
@@ -22,11 +22,11 @@ from mediagoblin.util import fake_ugettext_passthrough as _
class SubmitStartForm(wtforms.Form):
+ file = wtforms.FileField(_('File'))
title = wtforms.TextField(
_('Title'),
[wtforms.validators.Length(min=0, max=500)])
description = wtforms.TextAreaField('Description of this work')
- file = wtforms.FileField(_('File'))
tags = wtforms.TextField(
_('Tags'),
[tag_length_validator])
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py
index ba13b755..a3a58400 100644
--- a/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@ -20,6 +20,7 @@ from string import split
from werkzeug.utils import secure_filename
+from mediagoblin.db.util import ObjectId
from mediagoblin.util import (
render_to_response, redirect, cleaned_markdown_conversion, \
convert_to_tag_list_of_dicts)
@@ -51,6 +52,7 @@ def submit_start(request):
# create entry and save in database
entry = request.db.MediaEntry()
+ entry['_id'] = ObjectId()
entry['title'] = (
request.POST['title']
or unicode(splitext(filename)[0]))
@@ -66,10 +68,6 @@ def submit_start(request):
entry['tags'] = convert_to_tag_list_of_dicts(
request.POST.get('tags'))
- # Save, just so we can get the entry id for the sake of using
- # it to generate the file path
- entry.save(validate=False)
-
# Generate a slug from the title
entry.generate_slug()
diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html
index eb34c2e2..3a40850d 100644
--- a/mediagoblin/templates/mediagoblin/submit/start.html
+++ b/mediagoblin/templates/mediagoblin/submit/start.html
@@ -24,10 +24,7 @@
method="POST" enctype="multipart/form-data">
<div class="grid_8 prefix_1 suffix_1 form_box">
<h1>{% trans %}Submit yer media{% endtrans %}</h1>
- {{ wtforms_util.render_field_div(submit_form.file) }}
- {{ wtforms_util.render_field_div(submit_form.title) }}
- {{ wtforms_util.render_textarea_div(submit_form.description) }}
- {{ wtforms_util.render_field_div(submit_form.tags) }}
+ {{ wtforms_util.render_divs(submit_form) }}
<div class="form_submit_buttons">
<input type="submit" value="{% trans %}Submit{% endtrans %}" class="button" />
</div>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index afc0d903..9c0a1cca 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -55,7 +55,7 @@
<form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment',
user= media.uploader().username,
media=media._id) }}" method="POST">
- {{ wtforms_util.render_field_div(comment_form.comment_content) }}
+ {{ wtforms_util.render_divs(comment_form) }}
<div class="form_submit_buttons">
<input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" />
</div>
diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index e3d8e137..2639522a 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -34,25 +34,6 @@
</div>
{%- endmacro %}
-{# Generically render a textarea
- # ... mostly the same thing except it includes rows and cols #}
-{% macro render_textarea_div(field, rows=8, cols=20) %}
- <div class="form_field_box">
- <div class="form_field_label">{{ _(field.label.text) }}</div>
- {% if field.description -%}
- <div class="form_field_description">{{ _(field.description) }}</div>
- {%- endif %}
- <div class="form_field_input">{{ field(rows=rows, cols=cols) }}</div>
- {%- if field.errors -%}
- {% for error in field.errors %}
- <div class="form_field_error">
- {{ error }}
- </div>
- {% endfor %}
- {%- endif %}
- </div>
-{%- endmacro %}
-
{# Auto-render a form as a series of divs #}
{% macro render_divs(form) -%}
{% for field in form %}
diff --git a/mediagoblin/user_pages/forms.py b/mediagoblin/user_pages/forms.py
index 0489f76a..25001019 100644
--- a/mediagoblin/user_pages/forms.py
+++ b/mediagoblin/user_pages/forms.py
@@ -16,10 +16,10 @@
import wtforms
-from mediagoblin.util import pass_to_ugettext as _
+from mediagoblin.util import fake_ugettext_passthrough as _
class MediaCommentForm(wtforms.Form):
comment_content = wtforms.TextAreaField(
- _('Comment'),
- [wtforms.validators.Required()])
+ _('Comment'),
+ [wtforms.validators.Required()])