From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 29 Jan 2012 19:31:47 +0000 (-0600)
Subject: Committing extracted and compiled translations
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f62b697eb2245e14d86f1c0b7295550687e23c94;p=mediagoblin.git

Committing extracted and compiled translations
---

diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
index 1a7267e5..b23b0be4 100644
Binary files a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
index c53fc387..578be678 100644
--- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -94,91 +94,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "العنوان"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "وصف هذا العمل."
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "الوسوم"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "المسار"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "لا يمكن ترك المسار فارغًا"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "السيرة"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "الموقع الإلكتروني"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "يوجد ملف آخر بهذا المسار لدى هذى المستخدم."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "أنت تحرّر وسائط مستخدم آخر. كن حذرًا أثناء العملية."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "أنت تحرّر ملف مستخدم آخر. كن حذرًا أثناء العملية."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -190,15 +188,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "الملف"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "يجب أن تضع ملفًا."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "يا سلام! نُشرَت!"
 
@@ -221,30 +219,30 @@ msgid ""
 msgstr ""
 "إن كنت متأكدًا من صحة العنوان فربما تكون الصفحة التي تريدها نُقلت أو حُذفت."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "شعار ميدياغوبلن"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "أضف وسائط"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "لِج"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -433,53 +431,53 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "وسائط <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -602,6 +600,14 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -632,6 +638,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "أنا متأكد من رغبتي بحذف هذا العمل"
diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo
index 45f2331f..6fdb7cbf 100644
Binary files a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
index a5d6732b..0c956b9b 100644
--- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -92,91 +92,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Títol"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Biografia"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Lloc web"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Esteu editant fitxers d'un altre usuari. Aneu amb compte."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Esteu editant el perfil d'un usuari. Aneu amb compte"
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -188,15 +186,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Fitxer"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Heu d'escollir un fitxer."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Visca! S'ha enviat!"
 
@@ -220,30 +218,30 @@ msgstr ""
 "Si esteu convençut que l'adreça és correcta, pot ser que la pàgina que "
 "cerqueu s'hagi canviat d'ubicació o s'hagi eliminat."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "Logo de mediagoblin"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Tots els fitxers"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Entra"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -425,53 +423,53 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -596,6 +594,14 @@ msgstr "Icona RSS"
 msgid "Atom feed"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -626,6 +632,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr ""
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
index 4f4bbfda..0a5af04c 100644
Binary files a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
index 1fb472f0..f71f139f 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
@@ -5,8 +5,8 @@
 # Translators:
 #   <benjamin@lebsanft.org>, 2011.
 #   <cwebber@dustycloud.org>, 2011.
-#  Elrond <elrond+mediagoblin.org@samba-tng.org>, 2011.
-#   <jakob.kramer@gmx.de>, 2011.
+#  Elrond <elrond+mediagoblin.org@samba-tng.org>, 2011, 2012.
+#   <jakob.kramer@gmx.de>, 2011, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 #   <kyoo@kyoo.ch>, 2011.
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/mediagoblin/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -102,91 +102,91 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Titel"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Beschreibung des Werkes"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Markierungen"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
-msgstr ""
+msgstr "Kommaseparierte Schlagwörter"
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Kurztitel"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "Bitte gib einen Kurztitel ein"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
+"Der Titelteil der Medienadresse. Normalerweise muss hier nichts geändert "
+"werden."
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Biographie"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Webseite"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "Altes Passwort"
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
-msgstr ""
+msgstr "Neues Passwort"
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "Diesen Kurztitel hast du bereits vergeben."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Du bearbeitest die Medien eines Anderen. Bitte sei vorsichtig."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Du bearbeitest das Profil eines Anderen. Bitte sei vorsichtig."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
-msgstr ""
+msgstr "Das Profil wurde aktualisiert"
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Falsches Passwort"
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -198,15 +198,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Datei"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Du musst eine Datei angeben."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Yeeeaaah! Geschafft!"
 
@@ -230,30 +230,30 @@ msgstr ""
 "Wenn du sicher bist, dass die Adresse stimmt, wurde die Seite eventuell "
 "verschoben oder gelöscht."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "MediaGoblin-Logo"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Medien hinzufügen"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "Bitte bestätige deine E-Mail-Adresse!"
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "Abmelden"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Anmelden"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -296,6 +296,9 @@ msgid ""
 "        or\n"
 "        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
 msgstr ""
+"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Registriere dich auf dieser Seite</a>\n"
+"        oder\n"
+"        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Installiere MediaGoblin auf deinem eigenen Server</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:40
 msgid "Most recent media"
@@ -447,53 +450,53 @@ msgstr "%(username)ss Medien"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>s Medien"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Löschen"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
-msgstr ""
+msgstr "%(comment_count)s Kommentar"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
-msgstr ""
+msgstr "%(comment_count)s Kommentare"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr "bei"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -608,7 +611,7 @@ msgstr "Alle Medien von %(username)s anschauen"
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr "Hier erscheinen deine Medien. Sobald du etwas hochgeladen hast."
+msgstr "Hier erscheinen deine Medien, sobald du etwas hochgeladen hast."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
@@ -623,13 +626,21 @@ msgstr "Feed-Symbol"
 msgid "Atom feed"
 msgstr "Atom-Feed"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
-msgstr ""
+msgstr "← Neuere"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:45
 msgid "Older →"
-msgstr ""
+msgstr "Ältere →"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
@@ -651,6 +662,10 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:25
 msgid "or"
+msgstr "oder"
+
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
 msgstr ""
 
 #: mediagoblin/user_pages/forms.py:30
diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
index 3584cd4f..9841beec 100644
--- a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -85,15 +85,16 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a "
@@ -101,77 +102,73 @@ msgid ""
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
-msgid "Bio"
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a "
-"href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
+#: mediagoblin/edit/forms.py:50
+msgid "Bio"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -183,15 +180,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr ""
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr ""
 
@@ -213,30 +210,30 @@ msgid ""
 "has been moved or deleted."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -415,53 +412,53 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> "
 "for formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -580,6 +577,14 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -610,6 +615,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr ""
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
index d0c5f2bf..63cf7739 100644
Binary files a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
index 6536f4d5..a98409ac 100644
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
-#   <deletesoftware@yandex.ru>, 2011.
+#   <deletesoftware@yandex.ru>, 2011, 2012.
 # Fernando Inocencio <faigos@gmail.com>, 2011.
 #   <john_w1954@fastmail.fm>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr "Resendi vian kontrol-mesaĝon."
 #: mediagoblin/auth/views.py:260
 msgid ""
 "An email has been sent with instructions on how to change your password."
-msgstr ""
+msgstr "Senditas retletero kun instrukcio pri kiel ŝanĝi vian pasvorton."
 
 #: mediagoblin/auth/views.py:270
 msgid ""
@@ -88,99 +88,99 @@ msgstr ""
 
 #: mediagoblin/auth/views.py:282
 msgid "Couldn't find someone with that username or email."
-msgstr ""
+msgstr "Mi trovis neniun kun tiu salutnomo aŭ retpoŝtadreso."
 
 #: mediagoblin/auth/views.py:330
 msgid "You can now log in using your new password."
-msgstr ""
+msgstr "Nun vi povas ensaluti per via nova pasvorto."
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Titolo"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Priskribo de ĉi tiu verko"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Etikedoj"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
-msgstr ""
+msgstr "Dividu la etikedojn per komoj."
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "La distingiga adresparto"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "La distingiga adresparto ne povas esti malplena"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
+"La dosiertitol-bazita parto de la dosieradreso. Ordinare ne necesas ĝin "
+"ŝanĝi."
+
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Bio"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Retejo"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "La malnova pasvorto"
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
-msgstr ""
+msgstr "Enigu vian malnovan pasvorton por pruvi, ke ĉi tiu konto estas via."
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
-msgstr ""
+msgstr "La nova pasvorto"
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "Ĉi tiu uzanto jam havas dosieron kun tiu distingiga adresparto."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
-msgstr ""
+msgstr "Profilŝanĝoj estis konservitaj"
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Malĝusta pasvorto"
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
-msgstr ""
+msgstr "Kontagordoj estis konservitaj"
 
 #: mediagoblin/media_types/__init__.py:77
 msgid "Could not extract any file extension from \"{filename}\""
@@ -188,17 +188,17 @@ msgstr ""
 
 #: mediagoblin/media_types/__init__.py:88
 msgid "Sorry, I don't support that file type :("
-msgstr ""
+msgstr "Mi pardonpetas, mi ne subtenas tiun dosiertipon :("
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Dosiero"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Vi devas provizi dosieron."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Hura! Alŝutitas!"
 
@@ -222,30 +222,30 @@ msgstr ""
 "Se vi estas certa, ke la adreso estas ĝusta, eble la serĉata de vi paĝo "
 "estis movita aÅ­ forigita."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "Emblemo de MediaGoblin"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Aldoni dosieron"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "Konfirmu viecon de la retpoŝtadreso!"
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "elsaluti"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Ensaluti"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -390,7 +390,7 @@ msgstr "Konservi ŝanĝojn"
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
 #, python-format
 msgid "Changing %(username)s's account settings"
-msgstr ""
+msgstr "Ŝanĝado de kontagordoj de %(username)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
 #, python-format
@@ -414,6 +414,9 @@ msgid ""
 "\t    your web browser does not support HTML5 \n"
 "\t    video."
 msgstr ""
+"Bedaŭrinde ĉi tiu filmo ne spekteblas, ĉar\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    via TTT-legilo ne subtenas montradon\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    de filmoj laŭ HTML5."
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:36
 msgid ""
@@ -421,14 +424,17 @@ msgid ""
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
 "\t    http://getfirefox.com</a>!"
 msgstr ""
+"Vi povas akiri modernan TTT-legilon,\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    kapablan montri ĉi tiun filmon, ĉe <a href=\"http://getfirefox.com\">\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
 msgid "Add your media"
-msgstr ""
+msgstr "Aldono de via dosiero"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add"
-msgstr ""
+msgstr "Aldoni"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -440,53 +446,53 @@ msgstr "Dosieroj de %(username)s"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Dosieroj de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
-msgstr ""
+msgstr "Aldonita je %(date)s."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Ŝanĝi"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Forigi"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
-msgstr ""
+msgstr "%(comment_count)s komento"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
-msgstr ""
+msgstr "%(comment_count)s komentoj"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
-msgstr ""
+msgstr "Estas neniom da komentoj."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
-msgstr ""
+msgstr "Aldoni sian."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
-msgstr ""
+msgstr "Aldoni ĉi tiun komenton"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr "je"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -588,12 +594,12 @@ msgstr "Ĉi tiu uzanto ne jam aldonis informojn pri si."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:125
 msgid "Change account settings"
-msgstr ""
+msgstr "Ŝanĝi kontagordojn"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
 msgid "View all of %(username)s's media"
-msgstr "Rigardi ĉiujn dosierojn de %(username)s'"
+msgstr "Rigardi ĉiujn dosierojn de %(username)s"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:151
 msgid ""
@@ -615,6 +621,14 @@ msgstr "flusimbolo"
 msgid "Atom feed"
 msgstr "Atom-a informfluo"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -639,10 +653,14 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
 msgid "View more media tagged with"
-msgstr ""
+msgstr "Vidi aliajn dosierojn kun la etikedo"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:25
 msgid "or"
+msgstr "aÅ­"
+
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
 msgstr ""
 
 #: mediagoblin/user_pages/forms.py:30
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
index b9f8eeed..93a849fb 100644
Binary files a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
index ab8c6b3f..3bb46098 100644
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
@@ -5,7 +5,7 @@
 # Translators:
 #   <deletesoftware@yandex.ru>, 2011.
 #   <ekenbrand@hotmail.com>, 2011.
-#   <jacobo@gnu.org>, 2011.
+#   <jacobo@gnu.org>, 2011, 2012.
 # Javier Di Mauro <javierdimauro@gmail.com>, 2011.
 #   <juangsub@gmail.com>, 2011.
 #   <juanma@kde.org.ar>, 2011.
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mediagoblin/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -85,6 +85,8 @@ msgstr "Se reenvió tu correo electrónico de verificación."
 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:270
 msgid ""
@@ -98,116 +100,122 @@ msgstr ""
 #: mediagoblin/auth/views.py:282
 msgid "Couldn't find someone with that username or email."
 msgstr ""
+"No se pudo encontrar a alguien con ese nombre de usuario o correo "
+"electrónico."
 
 #: mediagoblin/auth/views.py:330
 msgid "You can now log in using your new password."
-msgstr ""
+msgstr "Ahora tu puedes entrar usando tu nueva contraseña."
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Título"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Descripción de esta obra"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
+"Tu puedes usar\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> Para el formato."
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
-msgstr ""
+msgstr "Separa las etiquetas por comas."
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Ficha"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "La ficha no puede estar vacía"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "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:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Bio"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Sitio web"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "Vieja contraseña"
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
+"Escriba la anterior contraseña para demostrar la propiedad de la cuenta."
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
-msgstr ""
+msgstr "Nueva contraseña"
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 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:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Estás editando el contenido de otro usuario. Proceder con precaución."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Estás editando un perfil de usuario. Proceder con precaución."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
-msgstr ""
+msgstr "Los cambios de perfil fueron salvados"
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
-msgstr ""
+msgstr "las configuraciones de cuenta fueron salvadas"
 
 #: mediagoblin/media_types/__init__.py:77
 msgid "Could not extract any file extension from \"{filename}\""
-msgstr ""
+msgstr "No se pudo extraer ninguna extensión de archivo de \"{filename}\""
 
 #: mediagoblin/media_types/__init__.py:88
 msgid "Sorry, I don't support that file type :("
-msgstr ""
+msgstr "Lo sentidos, No soportamos ese tipo de archivo :("
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Archivo"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Debes proporcionar un archivo."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "¡Yujú! ¡Enviado!"
 
@@ -231,30 +239,30 @@ msgstr ""
 "Si estás seguro que la dirección es correcta, puede ser que la pagina haya "
 "sido movida o borrada."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "Logo de MediaGoblin"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Añadir contenido"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "¡Verifica tu email!"
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "Cerrar sesión"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Conectarse"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -298,6 +306,9 @@ msgid ""
 "        or\n"
 "        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
 msgstr ""
+"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Crea una cuenta en este sitio</a>\n"
+"        o\n"
+"        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Instala Mediagoblin en tu propio servidor</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:40
 msgid "Most recent media"
@@ -305,11 +316,11 @@ msgstr "El contenido más reciente"
 
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
 msgid "Set your new password"
-msgstr ""
+msgstr "Coloca tu nueva contraseña "
 
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
 msgid "Set password"
-msgstr ""
+msgstr "Coloca la contraseña"
 
 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
 msgid "Recover password"
@@ -399,7 +410,7 @@ msgstr "Guardar cambios"
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
 #, python-format
 msgid "Changing %(username)s's account settings"
-msgstr ""
+msgstr "Cambio de %(username)s's la configuración de la cuenta "
 
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
 #, python-format
@@ -423,6 +434,9 @@ msgid ""
 "\t    your web browser does not support HTML5 \n"
 "\t    video."
 msgstr ""
+"Lo sentidos,  este video no va funcionar porque\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>   Tu explorador web no soporta HTML5\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    video."
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:36
 msgid ""
@@ -430,14 +444,17 @@ msgid ""
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
 "\t    http://getfirefox.com</a>!"
 msgstr ""
+"Ti puedes conseguir un navegador web moderno que\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    que puede reproducir este vídeo en <a href=\"http://getfirefox.com\">\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
 msgid "Add your media"
-msgstr ""
+msgstr "Añade tu contenido "
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add"
-msgstr ""
+msgstr "Añadir "
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -449,56 +466,56 @@ msgstr "Contenidos de %(username)s"
 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/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
-msgstr ""
+msgstr "Agregado el %(date)s."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Editar"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Borrar"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
-msgstr ""
+msgstr "%(comment_count)s comentarios de"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
-msgstr ""
+msgstr "%(comment_count)s comentarios de"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
-msgstr ""
+msgstr "No hay comentarios aún. "
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
-msgstr ""
+msgstr "Añadir un"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
-msgstr ""
+msgstr "Añade un comentario "
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr "en"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
-msgstr ""
+msgstr "<p>❖ Buscar contenido por <a href=\"%(user_url)s\">%(username)s</a></p>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
@@ -598,7 +615,7 @@ msgstr "Este usuario (todavia) no ha completado su perfil."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:125
 msgid "Change account settings"
-msgstr ""
+msgstr "Cambiar la configuración de la cuenta"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
@@ -625,13 +642,21 @@ msgstr "ícono feed"
 msgid "Atom feed"
 msgstr "Atom feed"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
-msgstr ""
+msgstr "← Más viejo"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:45
 msgid "Older →"
-msgstr ""
+msgstr "Más viejo →"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
@@ -640,19 +665,23 @@ msgstr "Ir a la página:"
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
 msgid "newer"
-msgstr ""
+msgstr "Más nuevo"
 
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
 msgid "older"
-msgstr ""
+msgstr "Más viejo"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
 msgid "View more media tagged with"
-msgstr ""
+msgstr "Ver más contenido etiquetado con"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:25
 msgid "or"
+msgstr "o"
+
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
 msgstr ""
 
 #: mediagoblin/user_pages/forms.py:30
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
index b805cca5..c29f7f08 100644
Binary files a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
index ba5c639d..3bffeef8 100644
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-12-04 10:24-0600\n"
-"PO-Revision-Date: 2011-12-29 17:39+0000\n"
-"Last-Translator: ianux <a5565930@nepwk.com>\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,29 +29,15 @@ msgstr ""
 msgid "Invalid file given for media type."
 msgstr "Le fichier envoyé  ne correspond pas au type de média."
 
-#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
 msgid "Password"
 msgstr "Mot de passe"
 
-#: mediagoblin/auth/forms.py:35
-msgid "Passwords must match."
-msgstr "Les mots de passe doivent correspondre."
-
-#: mediagoblin/auth/forms.py:37
-msgid "Confirm password"
-msgstr "Confirmer le mot de passe"
-
-#: mediagoblin/auth/forms.py:39
-msgid "Type it again here to make sure there are no spelling mistakes."
-msgstr ""
-"Tapez-le à nouveau ici pour vous assurer qu'il n'y a pas de fautes "
-"d'orthographe."
-
-#: mediagoblin/auth/forms.py:42
+#: mediagoblin/auth/forms.py:34
 msgid "Email address"
 msgstr "Adresse e-mail"
 
@@ -67,7 +53,7 @@ msgstr "Un utilisateur existe déjà avec ce nom, désolé."
 msgid "Sorry, a user with that email address already exists."
 msgstr "Désolé, il existe déjà un utilisateur ayant cette adresse e-mail."
 
-#: mediagoblin/auth/views.py:179
+#: mediagoblin/auth/views.py:180
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
@@ -75,24 +61,29 @@ msgstr ""
 "Votre adresse e-mail a bien été vérifiée. Vous pouvez maintenant vous "
 "identifier, modifier votre profil, et soumettre des images !"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:186
 msgid "The verification key or user id is incorrect"
 msgstr "La clé de vérification ou le nom d'utilisateur est incorrect."
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:204
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 "Vous devez être authentifié afin que nous sachions à qui envoyer l'e-mail !"
 
-#: mediagoblin/auth/views.py:211
+#: mediagoblin/auth/views.py:212
 msgid "You've already verified your email address!"
 msgstr "Votre adresse e-mail a déjà été vérifiée !"
 
-#: mediagoblin/auth/views.py:224
+#: mediagoblin/auth/views.py:225
 msgid "Resent your verification email."
 msgstr "E-mail de vérification renvoyé."
 
-#: mediagoblin/auth/views.py:265
+#: mediagoblin/auth/views.py:260
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr ""
+
+#: mediagoblin/auth/views.py:270
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
@@ -100,98 +91,129 @@ msgstr ""
 "Impossible d'envoyer un email de récupération de mot de passe : votre compte"
 " est inactif ou bien l'email de votre compte n'a pas été vérifiée."
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/auth/views.py:282
+msgid "Couldn't find someone with that username or email."
+msgstr ""
+
+#: mediagoblin/auth/views.py:330
+msgid "You can now log in using your new password."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Titre"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+msgid "Description of this work"
+msgstr "Descriptif pour ce travail"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Tags"
 
-#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:34
-msgid "Seperate tags by commas."
-msgstr "Séparez les tags par des virgules."
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+msgid "Separate tags by commas."
+msgstr ""
 
-#: mediagoblin/edit/forms.py:33
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Légende"
 
-#: mediagoblin/edit/forms.py:34
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "La légende ne peut pas être laissée vide."
 
-#: mediagoblin/edit/forms.py:35
+#: mediagoblin/edit/forms.py:40
 msgid ""
-"The title part of this media's URL. You usually don't need to change this."
+"The title part of this media's address. You usually don't need to change "
+"this."
 msgstr ""
-"Le nom de ce media dans l'URL. Vous n'avez normalement pas besoin de le "
-"changer"
 
-#: mediagoblin/edit/forms.py:42
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Bio"
 
-#: mediagoblin/edit/forms.py:45
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Site web"
 
-#: mediagoblin/edit/forms.py:49
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "Ancien mot de passe."
 
-#: mediagoblin/edit/forms.py:52
-msgid "New Password"
-msgstr "Nouveau mot de passe"
+#: mediagoblin/edit/forms.py:65
+msgid "Enter your old password to prove you own this account."
+msgstr ""
+
+#: mediagoblin/edit/forms.py:68
+msgid "New password"
+msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "Une entrée existe déjà pour cet utilisateur avec la même légende."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 "Vous vous apprêtez à modifier le média d'un autre utilisateur. Veuillez "
 "prendre garde."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 "Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez prendre "
 "garde."
 
-#: mediagoblin/edit/views.py:171
+#: mediagoblin/edit/views.py:180
+msgid "Profile changes saved"
+msgstr ""
+
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
-#: mediagoblin/edit/views.py:192
-msgid "Profile edited!"
-msgstr "Profile mis à jour !"
+#: mediagoblin/edit/views.py:222
+msgid "Account settings saved"
+msgstr ""
 
-#: mediagoblin/media_types/__init__.py:65
-msgid "Could not find any file extension in \"{filename}\""
-msgstr "Impossible d'extraire une extension de fichier de \"{nomfichier}\""
+#: mediagoblin/media_types/__init__.py:77
+msgid "Could not extract any file extension from \"{filename}\""
+msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/media_types/__init__.py:88
+msgid "Sorry, I don't support that file type :("
+msgstr ""
+
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Fichier"
 
-#: mediagoblin/submit/forms.py:30
-msgid "Description of this work"
-msgstr "Descriptif pour ce travail"
-
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Il vous faut fournir un fichier."
 
-#: mediagoblin/submit/views.py:127
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Youhou, c'est envoyé !"
 
-#: mediagoblin/submit/views.py:133
-msgid "Invalid file type."
-msgstr "Type de fichier invalide."
+#: mediagoblin/templates/mediagoblin/404.html:22
+msgid "Image of 404 goblin stressing out"
+msgstr "Image de 404 gobelin angoissé"
 
-#: mediagoblin/templates/mediagoblin/404.html:21
+#: mediagoblin/templates/mediagoblin/404.html:23
 msgid "Oops!"
 msgstr "Zut !"
 
@@ -207,33 +229,30 @@ msgstr ""
 "Si vous êtes sûr que l'adresse est correcte, peut-être la page que vous "
 "recherchez a été déplacée ou supprimée."
 
-#: mediagoblin/templates/mediagoblin/404.html:32
-msgid "Image of 404 goblin stressing out"
-msgstr "Image de 404 gobelin angoissé"
-
-#: mediagoblin/templates/mediagoblin/base.html:49
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "Logo MediaGoblin"
 
-#: mediagoblin/templates/mediagoblin/base.html:54
-msgid "Submit media"
-msgstr "Soumettre un média"
+#: mediagoblin/templates/mediagoblin/base.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
+msgid "Add media"
+msgstr "Ajouter des médias"
 
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "Vérifiez votre adresse e-mail !"
 
-#: mediagoblin/templates/mediagoblin/base.html:72
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "déconnexion"
 
-#: mediagoblin/templates/mediagoblin/base.html:75
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "S'identifier"
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -245,7 +264,7 @@ msgstr ""
 msgid "Explore"
 msgstr "Explorer"
 
-#: mediagoblin/templates/mediagoblin/root.html:27
+#: mediagoblin/templates/mediagoblin/root.html:26
 msgid "Hi there, welcome to this MediaGoblin site!"
 msgstr "Bonjour, et bienvenu sur ce site MediaGoblin !"
 
@@ -273,25 +292,21 @@ msgstr "Vous n'en avez pas ? C'est facile !"
 #, python-format
 msgid ""
 "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n"
-"          or\n"
-"          <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
+"        or\n"
+"        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
 msgstr ""
-"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Créez un compte sur ce site</a>\n"
-"          ou\n"
-"          <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Déployez MediaGoblin sur votre propre serveur</a>"
 
-#: mediagoblin/templates/mediagoblin/root.html:44
+#: mediagoblin/templates/mediagoblin/root.html:40
 msgid "Most recent media"
 msgstr "Tout derniers media"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:29
-msgid "Enter your new password"
-msgstr "Entrez un nouveau mot de passe"
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
+msgid "Set your new password"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:33
-#: mediagoblin/templates/mediagoblin/submit/start.html:30
-msgid "Submit"
-msgstr "Soumettre"
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
+msgid "Set password"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
 msgid "Recover password"
@@ -301,18 +316,6 @@ msgstr "Récupérer le mot de passe"
 msgid "Send instructions"
 msgstr "Envoyer les instructions"
 
-#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
-msgid "Your password has been changed. Try to log in now."
-msgstr ""
-"Votre mot de passe a été changé. Essayez maintenant de vous identifier."
-
-#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
-msgid ""
-"Check your inbox. We sent an email with a URL for changing your password."
-msgstr ""
-"Verifiez votre boîte de réception. Nous vous avons envoyé un email avec une "
-"URL vous permettant de changer votre mot de passe."
-
 #: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
 #, python-format
 msgid ""
@@ -352,11 +355,11 @@ msgstr "Créez-en un ici !"
 msgid "Forgot your password?"
 msgstr "Vous avez oublié votre mot de passe ?"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:27
+#: mediagoblin/templates/mediagoblin/auth/register.html:32
 msgid "Create an account!"
 msgstr "Créer un compte !"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:31
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
 msgid "Create"
 msgstr "Créer"
 
@@ -387,10 +390,16 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:37
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 msgid "Save changes"
 msgstr "Enregistrer les modifications"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
 #, python-format
 msgid "Editing %(username)s's profile"
@@ -402,13 +411,32 @@ msgstr "Modification du profil de %(username)s"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Médias taggés avec : %(tag_name)s "
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:19
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
 msgid "Original"
 msgstr "Original"
 
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+msgid ""
+"Sorry, this video will not work because \n"
+"\t    your web browser does not support HTML5 \n"
+"\t    video."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:36
+msgid ""
+"You can get a modern web browser that \n"
+"\t    can play this video at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
-msgid "Submit yer media"
-msgstr "Soumettez ce média"
+msgid "Add your media"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:30
+msgid "Add"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -420,31 +448,57 @@ msgstr "Medias de %(username)s"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Médias de <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
-msgid "By <a href=\"%(user_url)s\">%(username)s</a> on %(date)s"
-msgstr "Par <a href=\"%(user_url)s\">%(username)s</a> le %(date)s"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:67
-msgid "Post a comment"
-msgstr "Poster un commentaire"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
-msgid "at"
-msgstr "à"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
-msgid "Post comment!"
-msgstr "Poster le commentaire !"
+msgid "Added on %(date)s."
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Éditer"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:130
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Effacer"
 
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#, python-format
+msgid "%(comment_count)s comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
+#, python-format
+msgid "%(comment_count)s comments"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+msgid "No comments yet."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
+msgid "Add one"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid ""
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
+" formatting."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+msgid "at"
+msgstr "à"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#, python-format
+msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
 msgid "Really delete %(title)s?"
@@ -534,20 +588,24 @@ msgid "Here's a spot to tell others about yourself."
 msgstr "Voici un endroit pour parler aux autres de vous-même."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:101
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:118
 msgid "Edit profile"
 msgstr "Modifier le profil"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:106
 msgid "This user hasn't filled in their profile (yet)."
 msgstr "Cet utilisateur n'a pas (encore) rempli son profil."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:133
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
+msgid "Change account settings"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
 msgid "View all of %(username)s's media"
 msgstr "Voir tous les médias de %(username)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:146
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
@@ -555,11 +613,8 @@ msgstr ""
 "C'est là où vos médias apparaîssent, mais vous ne semblez pas avoir encore "
 "ajouté quoi que ce soit."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:152
-msgid "Add media"
-msgstr "Ajouter des médias"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:158
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Il ne semble pas y avoir de média là, pour l'instant ..."
 
@@ -571,29 +626,47 @@ msgstr "icone de flux"
 msgid "Atom feed"
 msgstr "flux Atom"
 
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:40
-msgid "Newer"
-msgstr "Nouveaux"
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:46
-msgid "Older"
-msgstr "Anciens"
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "← Newer"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:50
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
 msgstr "Aller à la page :"
 
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+msgid "newer"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+msgid "older"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "Tagged with"
-msgstr "Taggé avec"
+msgid "View more media tagged with"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "and"
-msgstr "et"
+msgid "or"
+msgstr ""
 
-#: mediagoblin/user_pages/forms.py:24
-msgid "Comment"
-msgstr "Commentaire"
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
 
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo
index 94b378d2..5bf0f220 100644
Binary files a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
index 56f74573..017cd64d 100644
--- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -88,91 +88,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Titulo"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
-msgid "Bio"
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
+#: mediagoblin/edit/forms.py:50
+msgid "Bio"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Sito web"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -184,15 +182,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr ""
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr ""
 
@@ -214,30 +212,30 @@ msgid ""
 " been moved or deleted."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Initiar session"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -413,53 +411,53 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -580,6 +578,14 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -610,6 +616,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr ""
diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo
index d5fb3eac..9b94ec7f 100644
Binary files a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
index 6a8b8b65..2b896572 100644
--- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -94,93 +94,91 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Titolo"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Descrizione di questo lavoro"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Tags"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Bio"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Sito web"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "Password vecchia"
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 "Stai modificando documenti multimediale di un altro utente. Procedi con "
 "attenzione."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Stai modificando il profilo di un utente. Procedi con attenzione."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Password errata"
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -192,15 +190,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Documento"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Devi specificare un documento."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Evviva! "
 
@@ -224,30 +222,30 @@ msgstr ""
 "Se sei sicuro che l'indirizzo è corretto, forse la pagina che stai cercando "
 "è stata spostata o cancellata."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "MediaGoblin logo"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Aggiungi documenti multimediali"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "Verifica la tua email!"
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "disconnettiti"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Accedi"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -443,53 +441,53 @@ msgstr "file di %(username)s"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Documenti multimediali di <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Modifica"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Elimina"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr "a"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -617,6 +615,14 @@ msgstr "feed icon"
 msgid "Atom feed"
 msgstr "Atom feed"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -647,6 +653,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "Sono sicuro di volerlo cancellare"
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
index 21aeed26..3b24dd2d 100644
Binary files a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
index 7ed8652b..35231f66 100644
--- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -88,91 +88,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "タイトル"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "タグ"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "スラグ"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "スラグは必要です。"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "自己紹介"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "URL"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "そのスラグを持つエントリは、このユーザーは既に存在します。"
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "あなたは、他のユーザーのメディアを編集しています。ご注意ください。"
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "あなたは、他のユーザーのプロファイルを編集しています。ご注意ください。"
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -184,15 +182,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "ファイル"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "ファイルを提供する必要があります。"
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "投稿終了！"
 
@@ -214,30 +212,30 @@ msgid ""
 " been moved or deleted."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "ログイン"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -418,53 +416,53 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>さんのコンテンツ"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -585,6 +583,14 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -615,6 +621,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr ""
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
index 4d03c586..455849b2 100644
Binary files a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
index 7b63a859..c70bb19e 100644
--- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-12-04 10:24-0600\n"
-"PO-Revision-Date: 2012-01-04 18:42+0000\n"
-"Last-Translator: schendje <mail@jefvanschendel.nl>\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,27 +23,15 @@ msgstr ""
 msgid "Invalid file given for media type."
 msgstr "Verkeerd bestandsformaat voor mediatype opgegeven."
 
-#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: mediagoblin/auth/forms.py:35
-msgid "Passwords must match."
-msgstr "Wachtwoorden moeten overeenkomen."
-
-#: mediagoblin/auth/forms.py:37
-msgid "Confirm password"
-msgstr "Bevestig wachtwoord"
-
-#: mediagoblin/auth/forms.py:39
-msgid "Type it again here to make sure there are no spelling mistakes."
-msgstr "Typ het hier nog een keer om spelfouten te voorkomen."
-
-#: mediagoblin/auth/forms.py:42
+#: mediagoblin/auth/forms.py:34
 msgid "Email address"
 msgstr "E-mail adres"
 
@@ -59,7 +47,7 @@ msgstr "Sorry, er bestaat al een gebruiker met die naam."
 msgid "Sorry, a user with that email address already exists."
 msgstr "Sorry, een gebruiker met dat e-mailadres bestaat al."
 
-#: mediagoblin/auth/views.py:179
+#: mediagoblin/auth/views.py:180
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
@@ -67,25 +55,31 @@ msgstr ""
 "Uw e-mailadres is geverifieerd. U kunt nu inloggen, uw profiel bewerken, en "
 "afbeeldingen toevoegen!"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:186
 msgid "The verification key or user id is incorrect"
 msgstr "De verificatie sleutel of gebruikers-ID is onjuist"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:204
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 "Je moet ingelogd zijn, anders weten we niet waar we de e-mail naartoe moeten"
 " sturen!"
 
-#: mediagoblin/auth/views.py:211
+#: mediagoblin/auth/views.py:212
 msgid "You've already verified your email address!"
 msgstr "Je hebt je e-mailadres al geverifieerd!"
 
-#: mediagoblin/auth/views.py:224
+#: mediagoblin/auth/views.py:225
 msgid "Resent your verification email."
 msgstr "Verificatie e-mail opnieuw opgestuurd."
 
-#: mediagoblin/auth/views.py:265
+#: mediagoblin/auth/views.py:260
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr ""
+"Een e-mail met instructies om je wachtwoord te veranderen is verstuurd."
+
+#: mediagoblin/auth/views.py:270
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
@@ -93,97 +87,133 @@ msgstr ""
 "Email kon niet verstuurd worden omdat je gebruikersnaam inactief is of omdat"
 " je e-mailadres nog niet geverifieerd is."
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/auth/views.py:282
+msgid "Couldn't find someone with that username or email."
+msgstr "Kon niemand vinden met die gebruikersnaam of dat e-mailadres."
+
+#: mediagoblin/auth/views.py:330
+msgid "You can now log in using your new password."
+msgstr "Je kunt nu inloggen met je nieuwe wachtwoord."
+
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Titel"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+msgid "Description of this work"
+msgstr "Beschrijving van dit werk"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+"Voor opmaak kun je <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> "
+"gebruiken."
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Etiket"
 
-#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:34
-msgid "Seperate tags by commas."
-msgstr "Scheidt labels met komma's."
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+msgid "Separate tags by commas."
+msgstr "Hou labels gescheiden met komma's."
 
-#: mediagoblin/edit/forms.py:33
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Slug"
 
-#: mediagoblin/edit/forms.py:34
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "De slug kan niet leeg zijn"
 
-#: mediagoblin/edit/forms.py:35
+#: mediagoblin/edit/forms.py:40
 msgid ""
-"The title part of this media's URL. You usually don't need to change this."
+"The title part of this media's address. You usually don't need to change "
+"this."
+msgstr ""
+"Het titelgedeelte van het adres van deze media. Normaal gesproken hoef je "
+"deze niet te veranderen."
+
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
 msgstr ""
-"Het titeldeel van het adres van deze media. Meestal hoef je dit niet aan te "
-"passen."
 
-#: mediagoblin/edit/forms.py:42
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Bio"
 
-#: mediagoblin/edit/forms.py:45
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Website"
 
-#: mediagoblin/edit/forms.py:49
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "Oud wachtwoord"
 
-#: mediagoblin/edit/forms.py:52
-msgid "New Password"
+#: mediagoblin/edit/forms.py:65
+msgid "Enter your old password to prove you own this account."
+msgstr "Vul je oude wachtwoord in om te bewijzen dat dit jouw account is"
+
+#: mediagoblin/edit/forms.py:68
+msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "Er bestaat al een met die slug voor deze gebruiker."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 "U bent de media van een andere gebruiker aan het aanpassen. Ga voorzichtig "
 "te werk."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 "U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk."
 
-#: mediagoblin/edit/views.py:171
+#: mediagoblin/edit/views.py:180
+msgid "Profile changes saved"
+msgstr "Profielaanpassingen opgeslagen"
+
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Verkeerd wachtwoord"
 
-#: mediagoblin/edit/views.py:192
-msgid "Profile edited!"
-msgstr "Profiel aangepast!"
+#: mediagoblin/edit/views.py:222
+msgid "Account settings saved"
+msgstr "Accountinstellingen opgeslagen"
+
+#: mediagoblin/media_types/__init__.py:77
+msgid "Could not extract any file extension from \"{filename}\""
+msgstr "Kon geen bestandsextensie uit \"{filename}\" halen"
 
-#: mediagoblin/media_types/__init__.py:65
-msgid "Could not find any file extension in \"{filename}\""
-msgstr "Kon geen bestandsformaat voor \"{filename}\" vinden"
+#: mediagoblin/media_types/__init__.py:88
+msgid "Sorry, I don't support that file type :("
+msgstr "Sorry, dat bestandstype wordt niet ondersteunt."
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Bestand"
 
-#: mediagoblin/submit/forms.py:30
-msgid "Description of this work"
-msgstr "Beschrijving van dit werk"
-
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "U moet een bestand aangeven."
 
-#: mediagoblin/submit/views.py:127
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Mooizo! Toegevoegd!"
 
-#: mediagoblin/submit/views.py:133
-msgid "Invalid file type."
-msgstr "Ongeldig bestandstype"
+#: mediagoblin/templates/mediagoblin/404.html:22
+msgid "Image of 404 goblin stressing out"
+msgstr "Afbeelding van de 404 goblin onder stress"
 
-#: mediagoblin/templates/mediagoblin/404.html:21
+#: mediagoblin/templates/mediagoblin/404.html:23
 msgid "Oops!"
 msgstr "Oeps!"
 
@@ -199,33 +229,30 @@ msgstr ""
 "Als je zeker weet dat het adres klopt is de pagina misschien verplaatst of "
 "verwijderd."
 
-#: mediagoblin/templates/mediagoblin/404.html:32
-msgid "Image of 404 goblin stressing out"
-msgstr "Afbeelding van de 404 goblin onder stress"
-
-#: mediagoblin/templates/mediagoblin/base.html:49
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "MediaGoblin logo"
 
-#: mediagoblin/templates/mediagoblin/base.html:54
-msgid "Submit media"
+#: mediagoblin/templates/mediagoblin/base.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
+msgid "Add media"
 msgstr "Voeg media toe"
 
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "Verifieer je e-mailadres!"
 
-#: mediagoblin/templates/mediagoblin/base.html:72
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "uitloggen"
 
-#: mediagoblin/templates/mediagoblin/base.html:75
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Inloggen"
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -238,7 +265,7 @@ msgstr ""
 msgid "Explore"
 msgstr "Verkennen"
 
-#: mediagoblin/templates/mediagoblin/root.html:27
+#: mediagoblin/templates/mediagoblin/root.html:26
 msgid "Hi there, welcome to this MediaGoblin site!"
 msgstr "Hoi, welkom op deze MediaGoblin website!"
 
@@ -266,25 +293,24 @@ msgstr "Heb je er nog geen? Het is heel eenvoudig!"
 #, python-format
 msgid ""
 "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n"
-"          or\n"
-"          <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
+"        or\n"
+"        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
 msgstr ""
-"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Creëer een account op deze website</a>\n"
+"&lt;a class=\"button_action_highlight\" href=\"%(register_url)s\"&gt;Creëer een account op deze website&lt;/a&gt;\n"
 "          of\n"
-"          <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Gebruik MediaGoblin op je eigen server</a>"
+"          &lt;a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\"&gt;Gebruik MediaGoblin op je eigen server&lt;/a&gt;"
 
-#: mediagoblin/templates/mediagoblin/root.html:44
+#: mediagoblin/templates/mediagoblin/root.html:40
 msgid "Most recent media"
 msgstr "Nieuwste media"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:29
-msgid "Enter your new password"
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
+msgid "Set your new password"
 msgstr "Voer je nieuwe wachtwoord in"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:33
-#: mediagoblin/templates/mediagoblin/submit/start.html:30
-msgid "Submit"
-msgstr "Voeg toe"
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
+msgid "Set password"
+msgstr "Wachtwoord opslaan"
 
 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
 msgid "Recover password"
@@ -294,17 +320,6 @@ msgstr "Wachtwoord herstellen"
 msgid "Send instructions"
 msgstr "Stuur instructies"
 
-#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
-msgid "Your password has been changed. Try to log in now."
-msgstr "Je wachtwoord is veranderd. Probeer om opnieuw in te loggen."
-
-#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
-msgid ""
-"Check your inbox. We sent an email with a URL for changing your password."
-msgstr ""
-"Check je inbox. Er is een e-mail verstuurd waarmee je je wachtwoord kunt "
-"veranderen."
-
 #: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
 #, python-format
 msgid ""
@@ -342,11 +357,11 @@ msgstr "Maak er hier een!"
 msgid "Forgot your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:27
+#: mediagoblin/templates/mediagoblin/auth/register.html:32
 msgid "Create an account!"
 msgstr "Maak een account aan!"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:31
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
 msgid "Create"
 msgstr "Creëer"
 
@@ -374,10 +389,16 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:37
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 msgid "Save changes"
 msgstr "Wijzigingen opslaan"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr "%(username)ss accountinstellingen aanpassen"
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
 #, python-format
 msgid "Editing %(username)s's profile"
@@ -389,14 +410,37 @@ msgstr "Het profiel aanpassen van %(username)s"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "Media met het label: %(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:19
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
 msgid "Original"
 msgstr "Origineel"
 
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+msgid ""
+"Sorry, this video will not work because \n"
+"\t    your web browser does not support HTML5 \n"
+"\t    video."
+msgstr ""
+"Sorry, deze video werkt niet omdat je webbrowser geen HTML5 video "
+"ondersteunt."
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:36
+msgid ""
+"You can get a modern web browser that \n"
+"\t    can play this video at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+"Je kunt een moderne webbrowser die deze video af kan spelen krijgen op <a "
+"href=\"http://getfirefox.com\">http://getfirefox.com</a>!"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
-msgid "Submit yer media"
+msgid "Add your media"
 msgstr "Voeg media toe"
 
+#: mediagoblin/templates/mediagoblin/submit/start.html:30
+msgid "Add"
+msgstr "Voeg toe"
+
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
 msgid "%(username)s's media"
@@ -407,31 +451,59 @@ msgstr "Media van %(username)s"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Media van <a href=\"%(user_url)s\"> %(username)s </a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
-msgid "By <a href=\"%(user_url)s\">%(username)s</a> on %(date)s"
-msgstr "Door <a href=\"%(user_url)s\">%(username)s</a> op %(date)s"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:67
-msgid "Post a comment"
-msgstr "Plaats een bericht"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
-msgid "at"
-msgstr "op"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
-msgid "Post comment!"
-msgstr "Plaats bericht!"
+msgid "Added on %(date)s."
+msgstr "Toegevoegd op %(date)s."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Pas aan"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:130
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Verwijderen"
 
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#, python-format
+msgid "%(comment_count)s comment"
+msgstr "%(comment_count)s bericht"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
+#, python-format
+msgid "%(comment_count)s comments"
+msgstr "%(comment_count)s berichten"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+msgid "No comments yet."
+msgstr "Er zijn nog geen berichten."
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
+msgid "Add one"
+msgstr "Voeg er een toe"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid ""
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
+" formatting."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr "Voeg dit bericht toe"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+msgid "at"
+msgstr "op"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#, python-format
+msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgstr ""
+"<p>❖ Media aan het bekijken van <a "
+"href=\"%(user_url)s\">%(username)s</a></p>"
+
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
 msgid "Really delete %(title)s?"
@@ -518,20 +590,24 @@ msgid "Here's a spot to tell others about yourself."
 msgstr "Hier is een plekje om anderen over jezelf te vertellen."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:101
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:118
 msgid "Edit profile"
 msgstr "Profiel aanpassen."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:106
 msgid "This user hasn't filled in their profile (yet)."
 msgstr "Deze gebruiker heeft zijn of haar profiel (nog) niet ingevuld."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:133
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
+msgid "Change account settings"
+msgstr "Accountinstellingen aanpassen"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
 msgid "View all of %(username)s's media"
 msgstr "Bekijk alle media van %(username)s"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:146
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
@@ -539,11 +615,8 @@ msgstr ""
 "Dit is waar je nieuwe media zal verschijnen, maar het lijkt erop dat je nog "
 "niets heb toegevoegd."
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:152
-msgid "Add media"
-msgstr "Voeg media toe"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:158
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "Het lijkt erop dat er nog geen media is."
 
@@ -555,29 +628,47 @@ msgstr "feed icoon"
 msgid "Atom feed"
 msgstr "Atom feed"
 
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:40
-msgid "Newer"
-msgstr "Nieuwer"
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "← Newer"
+msgstr "← Nieuwer"
 
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:46
-msgid "Older"
-msgstr "Ouder"
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr "Ouder →"
 
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:50
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
 msgstr "Ga naar pagina:"
 
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+msgid "newer"
+msgstr "nieuwer"
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+msgid "older"
+msgstr "ouder"
+
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "Tagged with"
-msgstr "Gelabeld met"
+msgid "View more media tagged with"
+msgstr "Bekijk meer media gelabeld met"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "and"
-msgstr "en"
+msgid "or"
+msgstr "of"
 
-#: mediagoblin/user_pages/forms.py:24
-msgid "Comment"
-msgstr "Commentaar"
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
 
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
index 11b00041..01179e47 100644
Binary files a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
index dcc82f90..1cc0b878 100644
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -91,91 +91,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Tittel"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Skildring av mediefila"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Merkelappar"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Nettnamn"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "Nettnamnet kan ikkje vera tomt"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Presentasjon"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Heimeside"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "Eit innlegg med denne adressetittelen finst allereie."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sine mediefiler."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sin profil."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -187,15 +185,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Fil"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Du må velja ei fil."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Johoo! Opplasta!"
 
@@ -219,30 +217,30 @@ msgstr ""
 "Er du sikker på at adressa er korrekt, so er sida truleg flytta eller "
 "sletta."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "MediaGoblin"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Legg til mediefiler"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Logg inn"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -432,53 +430,53 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a> sine mediefiler"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -601,6 +599,14 @@ msgstr " "
 msgid "Atom feed"
 msgstr "Atom-kjelde"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -631,6 +637,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "Eg er sikker eg vil sletta dette"
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
index 5b7445f7..6d2e6fc6 100644
Binary files a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
index 11400a2f..14c54fb3 100644
--- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
@@ -9,10 +9,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/mediagoblin/team/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (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"
@@ -93,91 +93,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Título"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Descrição desse trabalho"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Arquivo"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "O arquivo não pode estar vazio"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Biografia"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Website"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "Senha antiga"
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "Uma entrada com esse arquivo já existe para esse usuário"
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Você está editando a mídia de outro usuário. Tenha cuidado."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Você está editando um perfil de usuário. Tenha cuidado."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Senha errada"
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -189,15 +187,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Arquivo"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Você deve fornecer um arquivo."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Eba! Enviado!"
 
@@ -221,30 +219,30 @@ msgstr ""
 "Se você está certo de que o endereço está correto, talvez a página que "
 "esteja procurando tenha sido apagada ou mudou de endereço"
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "Logo MediaGoblin"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Adicionar mídia"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "Verifique seu email!"
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "Sair"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Entrar"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -435,53 +433,53 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Mídia de <a href=\"%(user_url)s\"> %(username)s </a>  "
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Editar"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Apagar"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -609,6 +607,14 @@ msgstr "ícone feed"
 msgid "Atom feed"
 msgstr "Atom feed"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -639,6 +645,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "Eu tenho certeza de que quero pagar isso"
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
index 5a711266..226474af 100644
Binary files a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
index 4981e988..9139e59d 100644
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 #   <gapop@hotmail.com>, 2011.
-# George Pop <gapop@hotmail.com>, 2011.
+# George Pop <gapop@hotmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +75,7 @@ msgstr "E-mail-ul de verificare a fost retrimis."
 #: mediagoblin/auth/views.py:260
 msgid ""
 "An email has been sent with instructions on how to change your password."
-msgstr ""
+msgstr "S-a trimis un e-mail cu instrucțiuni pentru schimbarea parolei."
 
 #: mediagoblin/auth/views.py:270
 msgid ""
@@ -88,117 +88,122 @@ msgstr ""
 #: mediagoblin/auth/views.py:282
 msgid "Couldn't find someone with that username or email."
 msgstr ""
+"Nu s-a găsit nicio persoană cu acel nume de utilizator sau adresă de e-mail."
 
 #: mediagoblin/auth/views.py:330
 msgid "You can now log in using your new password."
-msgstr ""
+msgstr "Acum te poți autentifica cu noua parolă."
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Titlu"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Descrierea acestui fișier"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
+"Poți folosi\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> pentru formatare."
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Tag-uri"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
-msgstr ""
+msgstr "Desparte tag-urile prin virgulă."
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Identificator"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "Identificatorul nu poate să lipsească"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
+"Partea corespunzătoare titlului din adresa acestui fișier media. De regulă "
+"poate fi lăsată nemodificată."
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Biografie"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Sit Web"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "Vechea parolă"
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
+"Introdu vechea parolă pentru a demonstra că ești titularul acestui cont."
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
-msgstr ""
+msgstr "Noua parolă"
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 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:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Editezi fișierul unui alt utilizator. Se recomandă prudență."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Editezi profilul unui utilizator. Se recomandă prudență."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
-msgstr ""
+msgstr "Modificările profilului au fost salvate"
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Parolă incorectă"
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
-msgstr ""
+msgstr "Setările pentru acest cont au fost salvate"
 
 #: mediagoblin/media_types/__init__.py:77
 msgid "Could not extract any file extension from \"{filename}\""
-msgstr ""
+msgstr "Nu s-a putut extrage o extensie de fișier din „{filename}”."
 
 #: mediagoblin/media_types/__init__.py:88
 msgid "Sorry, I don't support that file type :("
-msgstr ""
+msgstr "Scuze, nu recunosc acest tip de fișier :("
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Fișier"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Trebuie să selectezi un fișier."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Ura! Trimis!"
 
@@ -222,30 +227,30 @@ msgstr ""
 "Dacă ești sigur că adresa e corectă, poate că pagina pe care o cauți a fost "
 "mutată sau ștearsă."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "logo MediaGoblin"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Trimite fișier"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "Verifică adresa de e-mail!"
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "ieșire"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Autentificare"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -288,6 +293,9 @@ msgid ""
 "        or\n"
 "        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
 msgstr ""
+"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Creează un cont pe acest site</a>\n"
+"        sau\n"
+"        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Instalează MediaGoblin pe serverul tău</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:40
 msgid "Most recent media"
@@ -295,11 +303,11 @@ msgstr "Cele mai recente fișiere"
 
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
 msgid "Set your new password"
-msgstr ""
+msgstr "Stabilește noua parolă"
 
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
 msgid "Set password"
-msgstr ""
+msgstr "Stabilește parola"
 
 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
 msgid "Recover password"
@@ -389,7 +397,7 @@ msgstr "Salvează modificările"
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
 #, python-format
 msgid "Changing %(username)s's account settings"
-msgstr ""
+msgstr "Se modifică setările contului pentru userul %(username)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
 #, python-format
@@ -413,6 +421,8 @@ msgid ""
 "\t    your web browser does not support HTML5 \n"
 "\t    video."
 msgstr ""
+"Ne pare rău, această înregistrare video nu funcționează deoarece \n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    browserul tău nu este compatibil cu funcția video din HTML5."
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:36
 msgid ""
@@ -420,14 +430,17 @@ msgid ""
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
 "\t    http://getfirefox.com</a>!"
 msgstr ""
+"Poți lua un browser modern cu care\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    care poți vedea această înregistrare video de la <a href=\"http://getfirefox.com\">\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
 msgid "Add your media"
-msgstr ""
+msgstr "Adaugă fișierele tale media"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add"
-msgstr ""
+msgstr "Adaugă"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -439,56 +452,57 @@ msgstr "Fișierele lui %(username)s"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
-msgstr ""
+msgstr "Adăugat la data %(date)s."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Editare"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Șterge"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
-msgstr ""
+msgstr "%(comment_count)s comentariu"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
-msgstr ""
+msgstr "%(comment_count)s comentarii"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
-msgstr ""
+msgstr "Deocamdată nu există comentarii."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
-msgstr ""
+msgstr "Trimite unul"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
-msgstr ""
+msgstr "Trimite acest comentariu"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr "la"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
+"<p>❖ Fișierele media ale lui <a href=\"%(user_url)s\">%(username)s</a></p>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
@@ -584,7 +598,7 @@ msgstr "Acest utilizator nu și-a completat (încă) profilul."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:125
 msgid "Change account settings"
-msgstr ""
+msgstr "Modifică setările contului"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
@@ -612,13 +626,21 @@ msgstr "icon feed"
 msgid "Atom feed"
 msgstr "feed Atom"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
-msgstr ""
+msgstr "← Mai noi"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:45
 msgid "Older →"
-msgstr ""
+msgstr "Mai vechi →"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
@@ -627,19 +649,23 @@ msgstr "Salt la pagina:"
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
 msgid "newer"
-msgstr ""
+msgstr "mai noi"
 
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
 msgid "older"
-msgstr ""
+msgstr "mai vechi"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
 msgid "View more media tagged with"
-msgstr ""
+msgstr "Vezi și alte fișiere etichetate cu tag-ul"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:25
 msgid "or"
+msgstr "sau"
+
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
 msgstr ""
 
 #: mediagoblin/user_pages/forms.py:30
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
index 3ddb0c8e..9c1f739c 100644
Binary files a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
index 38748a97..91329920 100644
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
-#   <deletesoftware@yandex.ru>, 2011.
+#   <deletesoftware@yandex.ru>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -95,92 +95,92 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Название"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Описание этого произведения"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Метки"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
-msgstr ""
+msgstr "(через запятую)"
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Отличительная часть адреса"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "Отличительная часть адреса необходима"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
+"Часть адреса этого файла, производная от его названия. Её обычно не "
+"требуется изменять."
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Биография"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Сайт"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "Старый пароль"
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
-msgstr ""
+msgstr "Новый пароль"
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 "У этого пользователя уже есть файл с такой отличительной частью адреса."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Вы редактируете файлы другого пользователя. Будьте осторожны."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Вы редактируете профиль пользователя. Будьте осторожны."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Неправильный пароль"
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -192,15 +192,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Файл"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Вы должны загрузить файл."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Ура! Файл загружен!"
 
@@ -222,30 +222,30 @@ msgid ""
 " been moved or deleted."
 msgstr "Возможно, страница, которую вы ищете, была удалена или переехала."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "Символ MediaGoblin"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Добавить файлы"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "Подтвердите ваш адрес электронной почты!"
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "завершение сеанса"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Войти"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -423,14 +423,17 @@ msgid ""
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
 "\t    http://getfirefox.com</a>!"
 msgstr ""
+"Вы можете скачать современный браузер,\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    способный воспроизводить это видео, с <a href=\"http://getfirefox.com\">\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
 msgid "Add your media"
-msgstr ""
+msgstr "Добавление ваших файлов"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add"
-msgstr ""
+msgstr "Добавить"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -442,53 +445,53 @@ msgstr "Файлы %(username)s"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Файлы пользователя <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
-msgstr ""
+msgstr "Добавлено %(date)s."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Изменить"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Удалить"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
-msgstr ""
+msgstr "%(comment_count)s комментарий"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
-msgstr ""
+msgstr "%(comment_count)s комментариев"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
-msgstr ""
+msgstr "Комментариев пока нет."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
-msgstr ""
+msgstr "Добавить свой"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
-msgstr ""
+msgstr "Добавить этот комментарий"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr "в"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -589,7 +592,7 @@ msgstr "Это пользователь не заполнил свой проф
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:125
 msgid "Change account settings"
-msgstr ""
+msgstr "Изменить настройки учётной записи"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
@@ -615,13 +618,21 @@ msgstr "значок ленты"
 msgid "Atom feed"
 msgstr "лента в формате Atom"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
-msgstr ""
+msgstr "← Более новые"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:45
 msgid "Older →"
-msgstr ""
+msgstr "Более старые →"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
@@ -630,19 +641,23 @@ msgstr "Перейти к странице:"
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
 msgid "newer"
-msgstr ""
+msgstr "более новые"
 
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
 msgid "older"
-msgstr ""
+msgstr "более старые"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
 msgid "View more media tagged with"
-msgstr ""
+msgstr "Найти другие файлы с меткой"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:25
 msgid "or"
+msgstr "или"
+
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
 msgstr ""
 
 #: mediagoblin/user_pages/forms.py:30
diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo
index 2d3f505f..e79b6848 100644
Binary files a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
index 53ad3080..8cde8800 100644
--- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
-#   <zatroch.martin@gmail.com>, 2011.
+#   <zatroch.martin@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +75,7 @@ msgstr "Opätovne zaslať overovaciu správu na e-mail."
 #: mediagoblin/auth/views.py:260
 msgid ""
 "An email has been sent with instructions on how to change your password."
-msgstr ""
+msgstr "E-mailová správa s inštrukciami pre zmenu tvojho hesla bola odoslaná."
 
 #: mediagoblin/auth/views.py:270
 msgid ""
@@ -89,116 +89,119 @@ msgstr ""
 #: mediagoblin/auth/views.py:282
 msgid "Couldn't find someone with that username or email."
 msgstr ""
+"Nebolo možné nájsť nikoho s týmto používateľským menom alebo e-mailovou "
+"adresou."
 
 #: mediagoblin/auth/views.py:330
 msgid "You can now log in using your new password."
-msgstr ""
+msgstr "Teraz sa môžeš prihlásiť so svojim novým heslom."
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Nadpis"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Charakteristika tohto diela"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
+"Môžeš využiť\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> pri formátovaní."
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Značky"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
-msgstr ""
+msgstr "Oddeľ jednotlivé štítky čiarkami."
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Unikátna časť adresy"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "Unikátna časť adresy nesmie byť prázdna"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
+msgstr "Titulná časť adresy tohto výtvoru. Väčšinou nie je potrebná zmena."
+
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Bio"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Webstránka"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "Staré heslo"
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
-msgstr ""
+msgstr "Potvrď, že vlastníš tento účet zadaním svojho starého hesla."
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
-msgstr ""
+msgstr "Nové heslo"
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "Položku s rovnakou unikátnou časťou adresy už niekde máš."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Upravuješ médiá niekoho iného. Dbaj na to."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Upravuješ používateľský profil. Dbaj na to."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
-msgstr ""
+msgstr "Úpravy profilu uložené"
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "Nesprávne heslo"
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
-msgstr ""
+msgstr "Nastavenia účtu uložené"
 
 #: mediagoblin/media_types/__init__.py:77
 msgid "Could not extract any file extension from \"{filename}\""
-msgstr ""
+msgstr "Nebolo možné extrahovať žiadnu súborovú príponu z \"{filename}\""
 
 #: mediagoblin/media_types/__init__.py:88
 msgid "Sorry, I don't support that file type :("
-msgstr ""
+msgstr "Prepáč, nepodporujem tento súborový typ =("
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Súbor"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Musíš poskytnúť súbor."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Juchú! Úspešne vložené!"
 
@@ -222,30 +225,30 @@ msgstr ""
 "Ak vieš s istotou, že adresa je správna, tak najskôr bola hľadaná stánka "
 "presunutá alebo zmazaná."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "MediaGoblin logo"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Pridať výtvor"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "Over si e-mailovú adresu!"
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "odhlásiť sa"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Prihlásenie"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -288,6 +291,9 @@ msgid ""
 "        or\n"
 "        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
 msgstr ""
+"<a class=\"button_action_highlight\" href=\"%(register_url)s\">Vytvoriť účet na tejto stránke</a>\n"
+"        alebo\n"
+"        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Založiť MediaGoblin na vlastnom serveri</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:40
 msgid "Most recent media"
@@ -295,11 +301,11 @@ msgstr "Najčerstvejšie výtvory"
 
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
 msgid "Set your new password"
-msgstr ""
+msgstr "Vlož svoje nové heslo"
 
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
 msgid "Set password"
-msgstr ""
+msgstr "Vlož heslo"
 
 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
 msgid "Recover password"
@@ -390,7 +396,7 @@ msgstr "Uložiť zmeny"
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
 #, python-format
 msgid "Changing %(username)s's account settings"
-msgstr ""
+msgstr "Mením nastavenia účtu používateľa %(username)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
 #, python-format
@@ -414,6 +420,9 @@ msgid ""
 "\t    your web browser does not support HTML5 \n"
 "\t    video."
 msgstr ""
+"Prepáč, toto video nepôjde prehrať \n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    tvoj webový prehliadač nepodporuje HTML5 \n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    video."
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:36
 msgid ""
@@ -421,14 +430,17 @@ msgid ""
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
 "\t    http://getfirefox.com</a>!"
 msgstr ""
+"Môžeš získať moderný prehliadač, ktorý \n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    vie prehrať toto video na <a href=\"http://getfirefox.com\">\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    http://getfirefox.com</a>!"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
 msgid "Add your media"
-msgstr ""
+msgstr "Pridaj svoj výtvor"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add"
-msgstr ""
+msgstr "Pridať"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -440,56 +452,57 @@ msgstr "Výtvory, ktoré vlastní %(username)s"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "Výtvory, ktoré vlastní <a href=\"%(user_url)s\">%(username)s</a>"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
-msgstr ""
+msgstr "Pridané v %(date)s."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "Upraviť"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
-msgstr ""
+msgstr "%(comment_count)s komentár"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
-msgstr ""
+msgstr "%(comment_count)s komentáre"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
-msgstr ""
+msgstr "Zatiaľ žiadny komentár."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
-msgstr ""
+msgstr "Pridaj jeden"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
-msgstr ""
+msgstr "Pridať tento komentár"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr "o"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
+"<p>❖ Prezeranie výtvorov podľa <a href=\"%(user_url)s\">%(username)s</a></p>"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
@@ -585,7 +598,7 @@ msgstr "Dotyčný používateľ ešte nevyplnil svoj profil (zatiaľ)."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:125
 msgid "Change account settings"
-msgstr ""
+msgstr "Zmeniť nastavenia účtu"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
@@ -612,13 +625,21 @@ msgstr "ikona čítačky"
 msgid "Atom feed"
 msgstr "Čítačka Atom"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
-msgstr ""
+msgstr "← Novšie"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:45
 msgid "Older →"
-msgstr ""
+msgstr "Staršie →"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
@@ -627,19 +648,23 @@ msgstr "Prejsť na stránku:"
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
 msgid "newer"
-msgstr ""
+msgstr "novšie"
 
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
 #: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
 msgid "older"
-msgstr ""
+msgstr "staršie"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
 msgid "View more media tagged with"
-msgstr ""
+msgstr "Zobraziť viac výtvorov označených ako"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:25
 msgid "or"
+msgstr "alebo"
+
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
 msgstr ""
 
 #: mediagoblin/user_pages/forms.py:30
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
index 73bb4113..daa6b23b 100644
Binary files a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
index c5d3104c..35fb4841 100644
--- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -90,91 +90,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Naslov"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Oznake"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Oznaka"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "Oznaka ne sme biti prazna"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Biografija"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Spletna stran"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 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:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Urejate uporabniški profil. Nadaljujte pazljivo."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -186,15 +184,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Datoteka"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Podati morate datoteko."
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Juhej! Poslano."
 
@@ -218,30 +216,30 @@ msgstr ""
 "Če ste v točnost naslova prepričani, je bila iskana stran morda premaknjena "
 "ali pa izbrisana."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "Logotip MediaGoblin"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Dodaj vsebino"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Prijava"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -423,53 +421,53 @@ msgstr ""
 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/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -594,6 +592,14 @@ msgstr "Ikona vira"
 msgid "Atom feed"
 msgstr "Ikona Atom"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -624,6 +630,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr ""
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo
index 2a99cb53..8191444c 100644
Binary files a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
index cdfdad05..e0f59766 100644
--- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Serbian (http://www.transifex.net/projects/p/mediagoblin/team/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -87,91 +87,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
-msgid "Bio"
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
+#: mediagoblin/edit/forms.py:50
+msgid "Bio"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -183,15 +181,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr ""
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr ""
 
@@ -213,30 +211,30 @@ msgid ""
 " been moved or deleted."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -412,53 +410,53 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -579,6 +577,14 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -609,6 +615,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr ""
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
index d647e373..095deaa2 100644
Binary files a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
index acace870..91791796 100644
--- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 #   <simon@ingenmansland.se>, 2011.
-#   <transifex@wandborg.se>, 2011.
+#   <transifex@wandborg.se>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/mediagoblin/team/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgstr "En användare med det användarnamnet finns redan."
 
 #: mediagoblin/auth/views.py:77
 msgid "Sorry, a user with that email address already exists."
-msgstr ""
+msgstr "Det finns redan en användare med den e-postadressen."
 
 #: mediagoblin/auth/views.py:180
 msgid ""
@@ -63,10 +63,11 @@ msgstr "Verifieringsnyckeln eller användar-IDt är fel."
 #: mediagoblin/auth/views.py:204
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
+"Du måste vara inloggad för att vi ska kunna skicka meddelandet till dig."
 
 #: mediagoblin/auth/views.py:212
 msgid "You've already verified your email address!"
-msgstr ""
+msgstr "Du har redan verifierat din e-postadress!"
 
 #: mediagoblin/auth/views.py:225
 msgid "Resent your verification email."
@@ -93,91 +94,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "Titel"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr "Beskrivning av verket"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "Taggar"
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "Sökvägsnamn"
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "Sökvägsnamnet kan inte vara tomt"
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "Presentation"
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
-msgstr ""
-
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "Hemsida"
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
-msgstr ""
+msgstr "Tidigare lösenord"
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "Ett inlägg med det sökvägsnamnet existerar redan."
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Var försiktig, du redigerar någon annans inlägg."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Var försiktig, du redigerar en annan användares profil."
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
-msgstr ""
+msgstr "Fel lösenord"
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -189,15 +188,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "Fil"
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "Du måste ange en fil"
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "Tjohoo! Upladdat!"
 
@@ -221,30 +220,30 @@ msgstr ""
 "Om du är säker på att adressen stämmer så kanske sidan du letar efter har "
 "flyttats eller tagits bort."
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "MediaGoblin-logotyp"
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr "Lägg till media"
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
-msgstr ""
+msgstr "Verifiera din e-postadress"
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
-msgstr ""
+msgstr "Logga ut"
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "Logga in"
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -258,7 +257,7 @@ msgstr "Utforska"
 
 #: mediagoblin/templates/mediagoblin/root.html:26
 msgid "Hi there, welcome to this MediaGoblin site!"
-msgstr ""
+msgstr "Hej, välkommen till den här MediaGoblin-sidan!"
 
 #: mediagoblin/templates/mediagoblin/root.html:28
 msgid ""
@@ -274,7 +273,7 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
-msgstr ""
+msgstr "Har du inte ett redan?"
 
 #: mediagoblin/templates/mediagoblin/root.html:32
 #, python-format
@@ -298,11 +297,11 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
 msgid "Recover password"
-msgstr ""
+msgstr "Återställ lösenord"
 
 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:30
 msgid "Send instructions"
-msgstr ""
+msgstr "Skicka instruktioner"
 
 #: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
 #, python-format
@@ -396,12 +395,12 @@ msgstr "Redigerar %(username)ss profil"
 #: mediagoblin/templates/mediagoblin/listings/tag.html:35
 #, python-format
 msgid "Media tagged with: %(tag_name)s"
-msgstr ""
+msgstr "Media taggat med: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:46
 msgid "Original"
-msgstr ""
+msgstr "Original"
 
 #: mediagoblin/templates/mediagoblin/media_displays/video.html:33
 msgid ""
@@ -428,60 +427,60 @@ msgstr ""
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
 msgid "%(username)s's media"
-msgstr ""
+msgstr "%(username)ss media"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:37
 #, python-format
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>s media"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -610,6 +609,14 @@ msgstr "feed-ikon"
 msgid "Atom feed"
 msgstr "Atom-feed"
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -640,6 +647,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "Jag är säker på att jag vill radera detta"
diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo
index 5480404c..9467a3f1 100644
Binary files a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
index 14e12315..24155bff 100644
--- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-07 13:47-0600\n"
-"PO-Revision-Date: 2012-01-07 19:44+0000\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -88,91 +88,89 @@ msgstr ""
 msgid "You can now log in using your new password."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "శీర్షిక"
 
-#: mediagoblin/edit/forms.py:27 mediagoblin/submit/forms.py:30
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
 msgid "Description of this work"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
 msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:32 mediagoblin/submit/forms.py:35
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:34 mediagoblin/submit/forms.py:37
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:37
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:38
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:39
+#: mediagoblin/edit/forms.py:40
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:46
-msgid "Bio"
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:48
-msgid ""
-"You can use\n"
-"            <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"            Markdown</a> for formatting."
+#: mediagoblin/edit/forms.py:50
+msgid "Bio"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:53
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:60
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr ""
 
-#: mediagoblin/edit/forms.py:62
+#: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
 msgstr ""
 
-#: mediagoblin/edit/forms.py:65
+#: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:174
+#: mediagoblin/edit/views.py:180
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:200
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:216
+#: mediagoblin/edit/views.py:222
 msgid "Account settings saved"
 msgstr ""
 
@@ -184,15 +182,15 @@ msgstr ""
 msgid "Sorry, I don't support that file type :("
 msgstr ""
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr ""
 
-#: mediagoblin/submit/views.py:50
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:128
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr ""
 
@@ -214,30 +212,30 @@ msgid ""
 " been moved or deleted."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:48
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:53
+#: mediagoblin/templates/mediagoblin/base.html:51
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:157
 msgid "Add media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:64
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:71
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:74
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/base.html:86
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -413,53 +411,53 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:60
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
 msgid "Added on %(date)s."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:69
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:73
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:79
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
 #, python-format
 msgid "%(comment_count)s comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
 #, python-format
 msgid "%(comment_count)s comments"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:83
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
 msgid "No comments yet."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
 msgid "Add one"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:100
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
 msgid ""
-"Type your comment here. You can use <a "
+"You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:104
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:126
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:141
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
 #, python-format
 msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
 msgstr ""
@@ -580,6 +578,14 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
+
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
 msgstr ""
@@ -610,6 +616,10 @@ msgstr ""
 msgid "or"
 msgstr ""
 
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
+
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr ""
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
index a7820c49..e907562e 100644
Binary files a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo and b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo differ
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
index 2864ef8a..03571c01 100644
--- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
@@ -1,5 +1,5 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2012 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2011-12-04 10:24-0600\n"
-"PO-Revision-Date: 2012-01-03 16:35+0000\n"
-"Last-Translator: Harry Chen <harryhow@gmail.com>\n"
+"POT-Creation-Date: 2012-01-29 13:31-0600\n"
+"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,27 +24,15 @@ msgstr ""
 msgid "Invalid file given for media type."
 msgstr "指定錯誤的媒體類別！"
 
-#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:49
+#: mediagoblin/auth/forms.py:25 mediagoblin/auth/forms.py:41
 msgid "Username"
 msgstr "使用者名稱"
 
-#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:53
+#: mediagoblin/auth/forms.py:30 mediagoblin/auth/forms.py:45
 msgid "Password"
 msgstr "密碼"
 
-#: mediagoblin/auth/forms.py:35
-msgid "Passwords must match."
-msgstr "密碼必須一致"
-
-#: mediagoblin/auth/forms.py:37
-msgid "Confirm password"
-msgstr "確認密碼"
-
-#: mediagoblin/auth/forms.py:39
-msgid "Type it again here to make sure there are no spelling mistakes."
-msgstr "再輸入一次，確定你沒有打錯字。"
-
-#: mediagoblin/auth/forms.py:42
+#: mediagoblin/auth/forms.py:34
 msgid "Email address"
 msgstr "電子郵件位置"
 
@@ -60,120 +48,161 @@ msgstr "抱歉, 這個使用者名稱已經存在."
 msgid "Sorry, a user with that email address already exists."
 msgstr "抱歉，此電子郵件已被註冊了。"
 
-#: mediagoblin/auth/views.py:179
+#: mediagoblin/auth/views.py:180
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "你的電子郵件位址已被認證. 你現在就可以登入, 編輯你的個人檔案而且遞交照片!"
 
-#: mediagoblin/auth/views.py:185
+#: mediagoblin/auth/views.py:186
 msgid "The verification key or user id is incorrect"
 msgstr "認證碼或是使用者帳號錯誤"
 
-#: mediagoblin/auth/views.py:203
+#: mediagoblin/auth/views.py:204
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "你必須登入，我們才知道信要送給誰！"
 
-#: mediagoblin/auth/views.py:211
+#: mediagoblin/auth/views.py:212
 msgid "You've already verified your email address!"
 msgstr "你的電子郵件已經確認了！"
 
-#: mediagoblin/auth/views.py:224
+#: mediagoblin/auth/views.py:225
 msgid "Resent your verification email."
 msgstr "重送認證信."
 
-#: mediagoblin/auth/views.py:265
+#: mediagoblin/auth/views.py:260
+msgid ""
+"An email has been sent with instructions on how to change your password."
+msgstr "修改密碼的指示已經由電子郵件寄送到你的信箱。"
+
+#: mediagoblin/auth/views.py:270
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr "無法傳送密碼回復信件，因為你的使用者名稱已失效或是帳號尚未認證。"
 
-#: mediagoblin/edit/forms.py:24 mediagoblin/submit/forms.py:27
+#: mediagoblin/auth/views.py:282
+msgid "Couldn't find someone with that username or email."
+msgstr "找不到相關的使用者名稱或是電子郵件。"
+
+#: mediagoblin/auth/views.py:330
+msgid "You can now log in using your new password."
+msgstr "你現在可以用新的密碼登入了！"
+
+#: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
 msgstr "標題"
 
-#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:32
+#: mediagoblin/edit/forms.py:28 mediagoblin/submit/forms.py:31
+msgid "Description of this work"
+msgstr "這個作品的描述"
+
+#: mediagoblin/edit/forms.py:29 mediagoblin/edit/forms.py:52
+#: mediagoblin/submit/forms.py:32
+msgid ""
+"You can use\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> for formatting."
+msgstr ""
+"你可以用\n"
+"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
+"                      Markdown</a> 來排版."
+
+#: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
 msgstr "標籤"
 
-#: mediagoblin/edit/forms.py:30 mediagoblin/submit/forms.py:34
-msgid "Seperate tags by commas."
-msgstr "用逗點分開標籤。"
+#: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
+msgid "Separate tags by commas."
+msgstr "用逗號分隔標籤。"
 
-#: mediagoblin/edit/forms.py:33
+#: mediagoblin/edit/forms.py:38
 msgid "Slug"
 msgstr "自訂字串"
 
-#: mediagoblin/edit/forms.py:34
+#: mediagoblin/edit/forms.py:39
 msgid "The slug can't be empty"
 msgstr "自訂字串不能空白"
 
-#: mediagoblin/edit/forms.py:35
+#: mediagoblin/edit/forms.py:40
 msgid ""
-"The title part of this media's URL. You usually don't need to change this."
+"The title part of this media's address. You usually don't need to change "
+"this."
 msgstr "此媒體網址的名稱。你通常不需要變動這個的。"
 
-#: mediagoblin/edit/forms.py:42
+#: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+msgid "License"
+msgstr ""
+
+#: mediagoblin/edit/forms.py:50
 msgid "Bio"
 msgstr "自我介紹"
 
-#: mediagoblin/edit/forms.py:45
+#: mediagoblin/edit/forms.py:56
 msgid "Website"
 msgstr "網站"
 
-#: mediagoblin/edit/forms.py:49
+#: mediagoblin/edit/forms.py:63
 msgid "Old password"
 msgstr "舊的密碼"
 
-#: mediagoblin/edit/forms.py:52
-msgid "New Password"
-msgstr "新的密碼"
+#: mediagoblin/edit/forms.py:65
+msgid "Enter your old password to prove you own this account."
+msgstr "輸入你的舊密碼來證明你擁有這個帳號。"
 
-#: mediagoblin/edit/views.py:65
+#: mediagoblin/edit/forms.py:68
+msgid "New password"
+msgstr "新密碼"
+
+#: mediagoblin/edit/views.py:68
 msgid "An entry with that slug already exists for this user."
 msgstr "這個自訂字串已經被其他人用了"
 
-#: mediagoblin/edit/views.py:86
+#: mediagoblin/edit/views.py:92
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "你正在編輯他人的媒體檔案. 請謹慎處理."
 
-#: mediagoblin/edit/views.py:156
+#: mediagoblin/edit/views.py:162
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "你正在編輯一位用戶的檔案. 請謹慎處理."
 
-#: mediagoblin/edit/views.py:171
+#: mediagoblin/edit/views.py:180
+msgid "Profile changes saved"
+msgstr "修改的檔案已存檔"
+
+#: mediagoblin/edit/views.py:206
 msgid "Wrong password"
 msgstr "密碼錯誤"
 
-#: mediagoblin/edit/views.py:192
-msgid "Profile edited!"
-msgstr "個人資料已被編輯了！"
+#: mediagoblin/edit/views.py:222
+msgid "Account settings saved"
+msgstr "帳號設定已存檔"
+
+#: mediagoblin/media_types/__init__.py:77
+msgid "Could not extract any file extension from \"{filename}\""
+msgstr "無法從 \"{filename}\"分析出任何的附檔名"
 
-#: mediagoblin/media_types/__init__.py:65
-msgid "Could not find any file extension in \"{filename}\""
-msgstr "找不到任何 \"{filename}\" 的附檔名。"
+#: mediagoblin/media_types/__init__.py:88
+msgid "Sorry, I don't support that file type :("
+msgstr "抱歉，我不支援這樣的檔案格式 :("
 
-#: mediagoblin/submit/forms.py:25
+#: mediagoblin/submit/forms.py:26
 msgid "File"
 msgstr "檔案"
 
-#: mediagoblin/submit/forms.py:30
-msgid "Description of this work"
-msgstr "這個作品的描述"
-
-#: mediagoblin/submit/views.py:49
+#: mediagoblin/submit/views.py:54
 msgid "You must provide a file."
 msgstr "你必須提供一個檔案"
 
-#: mediagoblin/submit/views.py:127
+#: mediagoblin/submit/views.py:158
 msgid "Woohoo! Submitted!"
 msgstr "呼呼! 送出去嚕!"
 
-#: mediagoblin/submit/views.py:133
-msgid "Invalid file type."
-msgstr "不正確的檔案格式"
+#: mediagoblin/templates/mediagoblin/404.html:22
+msgid "Image of 404 goblin stressing out"
+msgstr "Image of 404 goblin stressing out"
 
-#: mediagoblin/templates/mediagoblin/404.html:21
+#: mediagoblin/templates/mediagoblin/404.html:23
 msgid "Oops!"
 msgstr "糟糕！"
 
@@ -187,33 +216,30 @@ msgid ""
 " been moved or deleted."
 msgstr "如果你確定這個位址是正確的，或許你在找的網頁已經被移除或是刪除了。"
 
-#: mediagoblin/templates/mediagoblin/404.html:32
-msgid "Image of 404 goblin stressing out"
-msgstr "Image of 404 goblin stressing out"
-
-#: mediagoblin/templates/mediagoblin/base.html:49
+#: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
 msgstr "MediaGoblin 標誌"
 
-#: mediagoblin/templates/mediagoblin/base.html:54
-msgid "Submit media"
-msgstr "遞交媒體"
+#: mediagoblin/templates/mediagoblin/base.html:51
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:157
+msgid "Add media"
+msgstr "新增媒體檔案"
 
-#: mediagoblin/templates/mediagoblin/base.html:65
+#: mediagoblin/templates/mediagoblin/base.html:62
 msgid "Verify your email!"
 msgstr "確認你的電子郵件"
 
-#: mediagoblin/templates/mediagoblin/base.html:72
+#: mediagoblin/templates/mediagoblin/base.html:69
 msgid "log out"
 msgstr "登出"
 
-#: mediagoblin/templates/mediagoblin/base.html:75
+#: mediagoblin/templates/mediagoblin/base.html:72
 #: mediagoblin/templates/mediagoblin/auth/login.html:27
 #: mediagoblin/templates/mediagoblin/auth/login.html:45
 msgid "Log in"
 msgstr "登入"
 
-#: mediagoblin/templates/mediagoblin/base.html:91
+#: mediagoblin/templates/mediagoblin/base.html:84
 msgid ""
 "Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
 "href=\"http://gnu.org/\">GNU</a> project"
@@ -225,7 +251,7 @@ msgstr ""
 msgid "Explore"
 msgstr "探索"
 
-#: mediagoblin/templates/mediagoblin/root.html:27
+#: mediagoblin/templates/mediagoblin/root.html:26
 msgid "Hi there, welcome to this MediaGoblin site!"
 msgstr "嘿！歡迎來到 媒體怪獸(MediaGoblin) 網站"
 
@@ -251,25 +277,24 @@ msgstr "還沒有嗎？其實非常簡單！"
 #, python-format
 msgid ""
 "<a class=\"button_action_highlight\" href=\"%(register_url)s\">Create an account at this site</a>\n"
-"          or\n"
-"          <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
+"        or\n"
+"        <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">Set up MediaGoblin on your own server</a>"
 msgstr ""
-"<a class=\"button_action_highlight\" href=\"%(register_url)s\">在這網站建立帳號</a>\n"
+"&lt;a class=\"button_action_highlight\" href=\"%(register_url)s\"&gt;在這網站建立帳號&lt;/a&gt;\n"
 "          或是\n"
-"          <a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\">建立一個自己的媒體怪獸(MedaiGoblin)</a>"
+"          &lt;a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\"&gt;建立一個自己的媒體怪獸(MedaiGoblin)&lt;/a&gt;"
 
-#: mediagoblin/templates/mediagoblin/root.html:44
+#: mediagoblin/templates/mediagoblin/root.html:40
 msgid "Most recent media"
 msgstr "最新的媒體"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:29
-msgid "Enter your new password"
-msgstr "輸入你的新密碼"
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
+msgid "Set your new password"
+msgstr "設定你的新密碼"
 
-#: mediagoblin/templates/mediagoblin/auth/change_fp.html:33
-#: mediagoblin/templates/mediagoblin/submit/start.html:30
-msgid "Submit"
-msgstr "送出"
+#: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
+msgid "Set password"
+msgstr "設定新密碼"
 
 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
 msgid "Recover password"
@@ -279,15 +304,6 @@ msgstr "找回密碼"
 msgid "Send instructions"
 msgstr "送出指示"
 
-#: mediagoblin/templates/mediagoblin/auth/fp_changed_success.html:22
-msgid "Your password has been changed. Try to log in now."
-msgstr "你的密碼已經改變了。現在就登入試試看。"
-
-#: mediagoblin/templates/mediagoblin/auth/fp_email_sent.html:22
-msgid ""
-"Check your inbox. We sent an email with a URL for changing your password."
-msgstr "檢查你的收件匣。我們已經傳送了電子郵件，你可利用郵件中的網址變更密碼。"
-
 #: mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt:19
 #, python-format
 msgid ""
@@ -325,11 +341,11 @@ msgstr "在這裡建立一個吧!"
 msgid "Forgot your password?"
 msgstr "忘了密碼嗎？"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:27
+#: mediagoblin/templates/mediagoblin/auth/register.html:32
 msgid "Create an account!"
 msgstr "建立一個帳號!"
 
-#: mediagoblin/templates/mediagoblin/auth/register.html:31
+#: mediagoblin/templates/mediagoblin/auth/register.html:36
 msgid "Create"
 msgstr "建立"
 
@@ -360,10 +376,16 @@ msgid "Cancel"
 msgstr "取消"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:37
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:40
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:35
 msgid "Save changes"
 msgstr "儲存變更"
 
+#: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
+#, python-format
+msgid "Changing %(username)s's account settings"
+msgstr "正在改變 %(username)s的帳號設定"
+
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
 #, python-format
 msgid "Editing %(username)s's profile"
@@ -375,13 +397,38 @@ msgstr "編輯 %(username)s'的檔案中"
 msgid "Media tagged with: %(tag_name)s"
 msgstr "此媒體被標識為：%(tag_name)s"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:19
+#: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
 msgid "Original"
 msgstr "原始的"
 
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+msgid ""
+"Sorry, this video will not work because \n"
+"\t    your web browser does not support HTML5 \n"
+"\t    video."
+msgstr ""
+"抱歉, 此影片無法使用，因為 \n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    你的瀏覽器不支援 HTML5 \n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    的影片."
+
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:36
+msgid ""
+"You can get a modern web browser that \n"
+"\t    can play this video at <a href=\"http://getfirefox.com\">\n"
+"\t    http://getfirefox.com</a>!"
+msgstr ""
+"你可以取得\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    播放這樣檔案的最新瀏覽器 <a href=\"http://getfirefox.com\">\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>    http://getfirefox.com</a>!"
+
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
-msgid "Submit yer media"
-msgstr "遞交你的媒體檔案"
+msgid "Add your media"
+msgstr "加入你的媒體"
+
+#: mediagoblin/templates/mediagoblin/submit/start.html:30
+msgid "Add"
+msgstr "增加"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -393,31 +440,57 @@ msgstr "%(username)s的媒體"
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr "<a href=\"%(user_url)s\">%(username)s</a>的媒體檔案"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:57
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
 #, python-format
-msgid "By <a href=\"%(user_url)s\">%(username)s</a> on %(date)s"
-msgstr "由 <a href=\"%(user_url)s\">%(username)s</a> 於 %(date)s"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:67
-msgid "Post a comment"
-msgstr "刊登評論"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
-msgid "at"
-msgstr "在"
+msgid "Added on %(date)s."
+msgstr "%(date)s. 加入"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:102
-msgid "Post comment!"
-msgstr "刊登評論！"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
 msgid "Edit"
 msgstr "編輯"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:130
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Delete"
 msgstr "刪除"
 
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
+#, python-format
+msgid "%(comment_count)s comment"
+msgstr "%(comment_count)s 評論"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
+#, python-format
+msgid "%(comment_count)s comments"
+msgstr "%(comment_count)s 評論"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
+msgid "No comments yet."
+msgstr "尚未有評論"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
+msgid "Add one"
+msgstr "新增一個"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+msgid ""
+"You can use <a "
+"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
+" formatting."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+msgid "Add this comment"
+msgstr "增加此評論"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+msgid "at"
+msgstr "在"
+
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#, python-format
+msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgstr "<p>❖ 以%(username)s瀏覽媒體檔案 <a href=\"%(user_url)s\"></a></p>"
+
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
 msgid "Really delete %(title)s?"
@@ -498,30 +571,31 @@ msgid "Here's a spot to tell others about yourself."
 msgstr "這是一個地方，能讓你向他人介紹自己。"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:101
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:119
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:118
 msgid "Edit profile"
 msgstr "編輯個人檔案"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:107
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:106
 msgid "This user hasn't filled in their profile (yet)."
 msgstr "這個使用者還沒(來得及)填寫個人檔案。"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:133
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:125
+msgid "Change account settings"
+msgstr "更改帳號設定"
+
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
 msgid "View all of %(username)s's media"
 msgstr "查看%(username)s的全部媒體檔案"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:146
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:151
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
 msgstr "這個地方是你的媒體檔案會出現的地方，但是你似乎還沒有加入任何東西。"
 
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:152
-msgid "Add media"
-msgstr "新增媒體檔案"
-
-#: mediagoblin/templates/mediagoblin/user_pages/user.html:158
+#: mediagoblin/templates/mediagoblin/user_pages/user.html:163
+#: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
 msgid "There doesn't seem to be any media here yet..."
 msgstr "似乎還沒有任何的媒體檔案..."
 
@@ -533,29 +607,47 @@ msgstr "feed圖示"
 msgid "Atom feed"
 msgstr "Atom feed"
 
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:40
-msgid "Newer"
-msgstr "新一點"
+#: mediagoblin/templates/mediagoblin/utils/license.html:21
+msgid "License:"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/license.html:25
+msgid "All rights reserved"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:46
-msgid "Older"
-msgstr "舊一點"
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:39
+msgid "← Newer"
+msgstr "← 更新"
 
-#: mediagoblin/templates/mediagoblin/utils/pagination.html:50
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:45
+msgid "Older →"
+msgstr "更舊 →"
+
+#: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
 msgstr "跳到頁數："
 
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+msgid "newer"
+msgstr "更新"
+
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+msgid "older"
+msgstr "更舊"
+
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "Tagged with"
-msgstr "被標籤為"
+msgid "View more media tagged with"
+msgstr "看更多被標籤的媒體"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "and"
-msgstr "且"
+msgid "or"
+msgstr "或是"
 
-#: mediagoblin/user_pages/forms.py:24
-msgid "Comment"
-msgstr "評論"
+#: mediagoblin/tools/exif.py:68
+msgid "Could not read the image file."
+msgstr ""
 
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"