From 5f081163521d0cb9fe62211a0e3044c36028760e Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 18 Mar 2012 15:16:37 -0500
Subject: [PATCH] Committing extracted and compiled translations

---
 .../i18n/ar/LC_MESSAGES/mediagoblin.mo        | Bin 14278 -> 14468 bytes
 .../i18n/ar/LC_MESSAGES/mediagoblin.po        | 170 +++++------
 .../i18n/ca/LC_MESSAGES/mediagoblin.mo        | Bin 13279 -> 13474 bytes
 .../i18n/ca/LC_MESSAGES/mediagoblin.po        | 163 +++++------
 .../i18n/da/LC_MESSAGES/mediagoblin.mo        | Bin 0 -> 13022 bytes
 .../i18n/de/LC_MESSAGES/mediagoblin.mo        | Bin 14018 -> 13977 bytes
 .../i18n/de/LC_MESSAGES/mediagoblin.po        | 248 +++++++----------
 .../i18n/en/LC_MESSAGES/mediagoblin.po        | 102 ++++---
 .../i18n/eo/LC_MESSAGES/mediagoblin.mo        | Bin 13828 -> 13995 bytes
 .../i18n/eo/LC_MESSAGES/mediagoblin.po        | 148 +++++-----
 .../i18n/es/LC_MESSAGES/mediagoblin.mo        | Bin 14298 -> 14467 bytes
 .../i18n/es/LC_MESSAGES/mediagoblin.po        | 263 +++++++-----------
 .../i18n/fr/LC_MESSAGES/mediagoblin.mo        | Bin 13938 -> 14122 bytes
 .../i18n/fr/LC_MESSAGES/mediagoblin.po        | 218 ++++++---------
 .../i18n/ia/LC_MESSAGES/mediagoblin.mo        | Bin 13043 -> 13238 bytes
 .../i18n/ia/LC_MESSAGES/mediagoblin.po        | 136 +++++----
 .../i18n/it/LC_MESSAGES/mediagoblin.mo        | Bin 13456 -> 13879 bytes
 .../i18n/it/LC_MESSAGES/mediagoblin.po        | 258 +++++++----------
 .../i18n/ja/LC_MESSAGES/mediagoblin.mo        | Bin 13618 -> 13813 bytes
 .../i18n/ja/LC_MESSAGES/mediagoblin.po        | 143 +++++-----
 .../i18n/nl/LC_MESSAGES/mediagoblin.mo        | Bin 13526 -> 13667 bytes
 .../i18n/nl/LC_MESSAGES/mediagoblin.po        | 248 +++++++----------
 .../i18n/nn_NO/LC_MESSAGES/mediagoblin.mo     | Bin 12783 -> 12980 bytes
 .../i18n/nn_NO/LC_MESSAGES/mediagoblin.po     | 174 +++++-------
 .../i18n/pt_BR/LC_MESSAGES/mediagoblin.mo     | Bin 13158 -> 13346 bytes
 .../i18n/pt_BR/LC_MESSAGES/mediagoblin.po     | 186 +++++--------
 .../i18n/ro/LC_MESSAGES/mediagoblin.mo        | Bin 14058 -> 14214 bytes
 .../i18n/ro/LC_MESSAGES/mediagoblin.po        | 239 +++++++---------
 .../i18n/ru/LC_MESSAGES/mediagoblin.mo        | Bin 18027 -> 18042 bytes
 .../i18n/ru/LC_MESSAGES/mediagoblin.po        | 148 +++++-----
 .../i18n/sk/LC_MESSAGES/mediagoblin.mo        | Bin 14214 -> 14378 bytes
 .../i18n/sk/LC_MESSAGES/mediagoblin.po        | 232 ++++++---------
 .../i18n/sl/LC_MESSAGES/mediagoblin.mo        | Bin 13232 -> 13427 bytes
 .../i18n/sl/LC_MESSAGES/mediagoblin.po        | 160 +++++------
 .../i18n/sr/LC_MESSAGES/mediagoblin.mo        | Bin 13141 -> 13340 bytes
 .../i18n/sr/LC_MESSAGES/mediagoblin.po        | 138 +++++----
 .../i18n/sv/LC_MESSAGES/mediagoblin.mo        | Bin 13361 -> 13562 bytes
 .../i18n/sv/LC_MESSAGES/mediagoblin.po        | 190 ++++++-------
 .../i18n/te/LC_MESSAGES/mediagoblin.mo        | Bin 13291 -> 13486 bytes
 .../i18n/te/LC_MESSAGES/mediagoblin.po        | 136 +++++----
 .../i18n/zh_TW/LC_MESSAGES/mediagoblin.mo     | Bin 13179 -> 13350 bytes
 .../i18n/zh_TW/LC_MESSAGES/mediagoblin.po     | 196 ++++++-------
 42 files changed, 1653 insertions(+), 2243 deletions(-)
 create mode 100644 mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo

diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.mo
index b23b0be4a3a20229e2aa87fefa782919776075f4..ae932eaa9d9b80a745bbd737467423267cf3f597 100644
GIT binary patch
delta 2984
zcmc)Kdu&rx9Ki9@J!EWSj6K+cO)iti#^_^Z8!)@^8Vqne<dJDWpxf@YhOVt`VS<qI
z$}%G;S-}Ki1TzCM1cNk+Xb71E6J$m}qMIZjEMN>oB!Xn9==Zl)K>yOeT(*7Ax%ZxP
ze)sn~=YHni`eNWxO3W_BPb+^p{8h(D@6pftIHl6)Zor|~j=lIUnsNI;rN-cKl>65(
z8h^t<sN$8Psgf`mGcgGZFjc95nn<IR3)MIax8NM?!V=6#2v0B<W#Srq0+(V2)?z-c
zLz$-opTuu*9rmFW{fXgm2QY>Hdzj4nsxxxqeB?$CX7a#I%*I$=LnhQvk~0~(r7BSZ
zcs6q1f&8jA{$=4CC;=VD0r)-2_*<BccQAqVRXq6^heL4#PRDPs6AN+oV5NrRDO`)!
zunt#{&k=YMNu|1mdDw@tV9pSwsFE6qk})I7n-`-zUxfjw*-{#^fEO97+L2$?!9RJ^
z4^W=_G}7-usp)l$#h)-2e?eI=ja9^4bl_-|H{OAg+5IT%oJb-6uhTfo1xeXT!jeGN
zp)9-ynNuA=8F(ym{XEKqmr+uB7i;i7%3fH=j+MRhGD>FOM=9kcEW$pl#lm#*&;C%a
zF`G=Z2WR45l-gd$dH4WjqPe7D0<J?79zhMS;9`to&_=95Gj^k7D30iTn1qs<&B!~e
zR|7OO8gHQtIDt~TTagFuA=^O3lb-3Ag%ZFE_%!aqEqD%PuPos;t8f#x<7w1!*|10n
zv5bBXGPMe%ap+~B5v7LD<8o}lDEu0w);%bJ^`gAdjfl4+_wQjj*9}Z^!@wy)vaAZJ
zr-oCo7wu@p8C)DA=l>-dWKZqGXgrFX4D|_0?N6g@mWwEvxQUcm{fZLk;1S{Ph6`)x
zAH{09&QXxSm!a&X29(tMkgBNlm@nslCyi1r97j3lckmFVJ{69%6J_8Xlt6z+$yD0N
z@UgO@)N&G11yzlsumNShZ5V?Gk*U>T%*L;<koDD%G-PvSGpY=$Py*VFlJaB7$53@5
zSyo*roAw8sj(71LoHUww4D520k|yLUWy1;hHu|v*hZckb*oy&4@y9eIvM!VbZ($tX
zL-}y1vEf<{K$$oPiCN7;%Bh-BGO`^dwFgmBeiAKsHqtjRcp&|xh?#}tUk2uJK^B~X
z63}dP;8Nt|sZ&VS)kT!O@CV9wBbl@jquPgZ96v`kw(3KfC*2s{<zq0B{uGq?=0^H;
zM)L3Ff`<!aNA+R}CNkR$oQBU}8;-{dSc`F-)dXCHGI0yacVjE^h&qGw@IFq)*`%Qg
zUx|1QiBV+*ij;be#!TFZd$Alf&PWn2NBM9xqono<reGg(d{iP)v4$!}HomGy*(0qe
z<2$eckD#oRRm_P%FK)rWmo&(xTEuHFlndC7=TS$UohZBh49e!bin6P7Cxpk@P)gW@
zJFyj`aM;9ft)E2MQ~4N+mWZX{`-7B?hP?4i44sRcX2@$AUoo}5Ua!~OE}NN7yw?9?
z^Hhw=ueba40$*^yre*MqX4mT6&CR;YucX(k*E{UN%UWLOqxb_+22W_^pvss5?mD~Q
z;dTWN4%r=Cl5*N$3f?Zv2$rOd3pjPVk7ZW7>UFQ?Z_+iJU2F2{4dr=Fe!r*8Y;I|3
zF*W!aOm1(Z+3Bd$T|S5Fua@pJ+Z#Pj<9L(B)Z}k==2c9sT2O5>+bc|u<{6dmbFcQ+
z=_{NL*Qx?vUd5vRE>YL(wj`d_>}%`}r@hvxn?lP|tx<7}1k~d2H-)yP7e<eDyB?p*
z?Q34K+Ut~g=6iJ4BEMJH{d4UeSv2%T=D?WvtF1e<d3uZPRY8YV9=w_}EyLmSt=4^}
z{@gUWYYC+Pb%G0Wv#sNeMH986lCq*wqou@RiC-|^xKLl?@R2TKC7CYMtd=6H(bE5%
z)lybe9C|Z%jv;s<E;VEtKIz|<YWUwv)!otkVb3P5r>#5GeV}`P_tE~6rHv?$PN~$L
zx?k5ky0_WxqO8ufp{9|CVjtEpXY9G)gRwvN*RVRUkf;C03MT84_{S?~8`l+;u-M-C
Uu!sZ9C;w9szq9uIvxo-uCm>Al<^TWy

delta 2782
zcmb8we@v8h9Ki7}+$ldiOh8mL;t@dsf#VL5z+b4O4jqU&wasO~J>XT`>D>|P%A+Jg
zT`N6xnK^U*N|ViemOnP<7L{|Esjc*mCaKiQwldQ;twy~+-c|llYcbgC`F`(tKHtyx
z^Z7nU+wxOxe@~Kmv*M?NzX$nSY?jgAKX1e;mCA5C4#%T77(c}!_zm`AA6oHRoKh8-
z6d(S4A(|MwkdKrHWAIrVq?BK^aWRmI&6tF{F&U5Icszr%FnWMel{g!VaSKYok5Lx5
zi2bn}hvHSt#=9tSGAv3xgpc7WT!D7hSGTy32S+D_6Uaw0Q{^c0HIey6IE?XAD3xeK
z3Ah8LXeW_S>V1?1&PP7~7Wq{%>{2S3f|8IGV_07`a3KL)n1Ws;X|)#fa5FxKU3dx0
zA5dy64kOEStiYA%z<TV#kvJ_eTuBFJFkXRD`fW(J)GqYP4i9o6r8iJYe+s3y-6#v(
zL}IE$ZsJm9pzL%U%KTK6`{zaGohYq&2K!+vreQnE!n-4OCQ<*TOdMfCcAn1aQsQEi
zz*Q(ETY{3vN|c4Sq9n2x<^E%l`3op<dQd8Q8yDhTl(SI7$(6IS3Z=4#22+3O<z*&p
zcn9k+mnah8Wt@Q<QF<D}D!hpjpqy=&U=tSL9@OwNoR2?aD^~Kbyd7syD)K9OG0IQ+
zQj%t*2x>KIxB*AtVU(VI68ZchatzdUoQ`);5|~JtCZG@3;31SVGLGHN#3yhgzJ)qY
zAUL_Hnw?yfad8ZZrEZ}-XyMC1diF3rjtejv-$m)|F_gr*P<HfD#PfkfbFyD<?PW%q
z_Z2S*tExVvyegGWYFL21SdDfpVzL4oP*QsvP1uFf>{BQ!22l>j6_irkL@Aw|dHSr9
zM{=qp<uOdm!ggGU=Wve9^D@X5d?=@BHA)ZGBYjbuP)^H19FLzPxhu;kr8;peO2Q$O
z=Pa4wgi}yTmY2z?lJ}~T2?<z(QVAz!;Tn{H`_YW2ku}s=luG@G(t`oqET^mlrAH2w
zgm$1*;v(|xsCtlMtLr!b`};?SPe&5&W?}*6MRDv<0%x<mi8vp3;s)%%qMUF7Cs0a$
z2_>=XC<|J0!#f^~{TZjBv@{bXZYh$x^6OmCR<#bLBnMC`aT=xMS5SKRJr-hLWZp`Y
zIK~qr&Omv7F2<q@C9xJ<iffTqQT>E;L&Z`q;`&t{7bLAFp}d%l$jMe)Py!rAIqn~z
z1uvrn`Ytk7`TVP5oPZQZwPG>u$4Br>oQ+uoFT&+mhkMW>|5ajn-Dfb7f|9^utits;
z1-o%34rlvf9kRAMfQ#@Fwql`;P2f8?5O1J-bM&E9)Wb=X)4vYK;C39r`szb2IPmH!
z%Hc4PrUcNi0j($tZNbHO1J~f3ap7K`$9ar@!;M(Y_I135@_NqVB+8*&f^wK&N4lVn
zqhEUVH5Z%ER1*H?cnzhu+fWYE9_)vm5e<xHd>rMz6R5JX>)lOFy34nu-rel-<#@Ho
z_}@SAsw`u5Y<X1lvdMv{v`K+0ahVBCy2DwkraBy&+ocD(wTwiELzjV;mF=kY={ep4
zqa=QRbktnqs-?ml<E+<RUcD@km$)?{vY=O6srw27?<JlMyplBCs7tm+8{1RHn1(dD
zJ-T*p0nJz2*httGr*En8!>~BB#qCko+F#YG^cLL{n4C84(YoeFZ$X3GUGMfRD{$#P
z>oSk~Nxk0Zwcd-+=&pO(>9RV#-e%n!Keu{*{&bIC>vOtY`4yyDrr8T^_WVLyzP(hl
z6_pj)@(afYPNt2B56_gA*-MSyw8|*^|F4>nn_hii&9v0uuHcc-^IE7QXax5K_Xdyt
zNBw@$rkI9uXJ_z`Jk}n1NgfNW3#||CGiGOY_WP@<zvo;SROSA&laa!n%e_ruhX%eF
tTWq|UcP83sv38k8{c~|ua9^k`^kS$Z^g{4>z?PM2tSvIk3HMi9{Q-#uz>5F?

diff --git a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
index 578be678..044968be 100644
--- a/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ar/LC_MESSAGES/mediagoblin.po
@@ -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: 2012-01-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr ""
 
@@ -41,56 +41,52 @@ msgstr "عنوان البريد الإلكتروني"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "عفوًا، التسجيل غير متاح هنا."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "عذرًا، لقد اختار مستخدم آخر هذا الاسم."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"تم التحقق من بريدك الإلكتروني. يمكنك الآن الولوج، وتحرير ملفك الشخصي، ونشر "
-"الصور!"
+msgstr "تم التحقق من بريدك الإلكتروني. يمكنك الآن الولوج، وتحرير ملفك الشخصي، ونشر الصور!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "مفتاح التحقق أو معرف المستخدم خاطئ"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "أعدنا إرسال رسالة التحقق."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"تعذر إرسال رسالة استعادة كلمة السر لأن اسم المستخدم معطل أو لأننا لم نتحقق "
-"من بريدك الإلكتروني."
+msgstr "تعذر إرسال رسالة استعادة كلمة السر لأن اسم المستخدم معطل أو لأننا لم نتحقق من بريدك الإلكتروني."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -133,6 +129,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -156,27 +153,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr "يوجد ملف آخر بهذا المسار لدى هذى المستخدم."
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "أنت تحرّر وسائط مستخدم آخر. كن حذرًا أثناء العملية."
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "أنت تحرّر ملف مستخدم آخر. كن حذرًا أثناء العملية."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -196,7 +193,7 @@ msgstr "الملف"
 msgid "You must provide a file."
 msgstr "يجب أن تضع ملفًا."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "يا سلام! نُشرَت!"
 
@@ -216,8 +213,7 @@ msgstr "يبدو أنه لا توجد صفحة في العنوان. عذرًا!"
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"إن كنت متأكدًا من صحة العنوان فربما تكون الصفحة التي تريدها نُقلت أو حُذفت."
+msgstr "إن كنت متأكدًا من صحة العنوان فربما تكون الصفحة التي تريدها نُقلت أو حُذفت."
 
 #: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
@@ -245,7 +241,15 @@ msgstr "لِج"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
@@ -312,14 +316,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"مرحبًا يا %(username)s،\n"
-"\n"
-"إن أردت تغيير كلمة سرك في غنو ميدياغوبلن فافتح الوصلة التالية في متصفحك:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"إن كنت ترى أن هذه الرسالة وصلتك خطأً فتجاهلها واستمتع بحياتك!"
+msgstr "مرحبًا يا %(username)s،\n\nإن أردت تغيير كلمة سرك في غنو ميدياغوبلن فافتح الوصلة التالية في متصفحك:\n\n%(verification_url)s\n\nإن كنت ترى أن هذه الرسالة وصلتك خطأً فتجاهلها واستمتع بحياتك!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -354,13 +351,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"أهلًا يا %(username)s،\n"
-"\n"
-"افتح الرابط التالي\n"
-"في متصفحك لتفعيل حسابك في غنو ميدياغوبلن:\n"
-"\n"
-"%(verification_url)s"
+msgstr "أهلًا يا %(username)s،\n\nافتح الرابط التالي\nفي متصفحك لتفعيل حسابك في غنو ميدياغوبلن:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -395,18 +386,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -431,55 +422,43 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-#, python-format
-msgid "%(comment_count)s comment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -488,8 +467,8 @@ msgid "Really delete %(title)s?"
 msgstr "أتود حقًا حذف %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "احذف نهائيًا"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -555,9 +534,7 @@ msgstr "سجّل أحدهم حسابًا بهذا الاسم، ولكننا با
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"إن كنت أنت ذلك الشخص لكنك فقدت رسالة التحقق، يمكنك <a "
-"href=\"%(login_url)s\">الولوج</a> وإعادة إرسالها."
+msgstr "إن كنت أنت ذلك الشخص لكنك فقدت رسالة التحقق، يمكنك <a href=\"%(login_url)s\">الولوج</a> وإعادة إرسالها."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -600,8 +577,13 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -620,22 +602,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -646,24 +624,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr "أنا متأكد من رغبتي بحذف هذا العمل"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "أنت على وشك حذف وسائط مستخدم آخر. كن حذرًا أثناء العملية."
-
-
diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.mo
index 6fdb7cbff06d4d5dfff447e3560c1da46d4abf72..c4b4ee2f6e603633a7c065af91a400d7d6bcada2 100644
GIT binary patch
delta 2969
zcmd7Sdu&rx9Ki9j2e5T)z{VathL^EHx6#Ko#$#;bF|rXd7>|)fP*}I#wS}%-+K%ZI
ziV%qjC}b4_1eFL%fJlIXkr*Us_=A83hzOGe1Olk2NCXy)QNO>ng8G;KXVdm`&b{}%
ze!p|>RmVH7;FZ+)&5F-De#80I#!KzV=fwo222)*$8Q6t4a1UDW)kLMn;4zf@H!%)>
z#bi_lr6{Tt9Ee$%g87)HR8UQ%FrEvwI1|_6EIfmyn3)vmU^Ys}4cHeKV<tAC5j#=(
z*@+|YE9}HaSd4-Gk#@T=mHK`h$oT3+^v3z<jc&~1f$woB_F);)p@tHiDab7~17!m9
zqW4|MSG~gD5PSn=LI<!P-bQJE7t`@RCNaJ;5Rb8#fh(~JFX9O-#H|CAdJ0eC^LP`R
zaVhZ}iJu~&R5vjPAE695e2`LPN#&wM%!IP?aVXE%U{G?ln1T%8L)xk?<g0e_Co4UI
z^4urUdN)c=Z($$&3A6Db%7B9zMa)JQjz(GWCX~p&hceFbRN}vp!dWgz$QqfJOr#TK
z;B82sYBx&5qtWZ<Q98Ve64D3QfWM&Zh577Q**h<wMD`#`Dz9J>KEfs}Oeg;A5A_<o
zNk`kT8sA3A?Jb;xzoB$An=nkkPBh~o)bJYCV=RqUV*^_75=w*;n7toUP$IJiS+iOn
zq@YoF3#Gwvl-%8oKG1_~17#pQRX7A?0?*=P+>C4S9Lio<$TDm2CG5gesN*xkqAA2O
z>fK1!Dma)!FAYs7IeZ$IU<bzHmngaJMw!?Rloj2HdM|pv2P?Q9Lnm8eI3-Aw)g_J&
z!BIcp4U8whve0jEjGX^0E%LxrjN?WFax&CnluhD_+KCd0^+=l4Hk^$6aVCC;Q?X=Z
zB=-T7iSLbi7<r|rkCCjXQ)ra)e~rR;E*LmFa?Yn=CpKa+UPjp)DWf72N<+zAF3Pc*
z5Up3DgmfMfb+rtozn4+k@4^AN2j#h=a-Z?lc?uG$dzg=Xb0ZV7qJ-RmGLRS9hiV1N
zrrm(DDYxKCJc$>vDld}KVWT6bsRm^n2d>83D0|2$@t5PZg92^TA(R0xq3qJHQF8q)
zvR~9)B+V+x7<us+ku<7VC@EQn(%&kS<GTqZ_isk)hfz{;0^{+t#Giel&T=6Ee?(bX
z54tdpaL9^VQ9`yBWlwC!jrcwmU<H4olRpV@2xTHWQQ93rnb7Ab{ar?xz`X+EvXH_<
zE-<F5<tUV5JJPq>7p-4F*&|8By9uXb626Oxco3`cBb3b*Yl^%#hT<&hF091EDDRD*
zkw;Zdkea+W>Tosg!f}{qiR63{%8SE>{qX|I=DUs>K0v-I!y1WTHA*V#Fa?{j3VkU3
zet?tk4z9&u9`8dIr}khCUO;(qWV7{kJb;qJjFQNU!-TwRloO@h8k7|7M>n3qSe(RY
z5}9)Bht(*1X-?Go$o*ush(ZN7>=-_mFg+&6SyDO8ZrAOa*HdnxV$ga&<!zODM!PMb
z=les|nwH5knoVo=wzle?fRb9PZg<&2tF)X@SW63^HoP7i(-v+_o)O>A+iVNCyq?g$
zL0dx$Q%}X1LnG3vf^OaBXP9=6UH54Lr>>RTG^bB*smO5#0&Qg$OGihCxy9dN_WB$a
zx2swA_+6eqOS<1;bF{flC1$JH8EAFqR8FgzTU&0iRhpmllV|jM+kMUYQn$;qJl~&F
zxuCbotnGSv3eRe`6*iaK*5uaB;U#Isu?Y?))Zq#^!yD2I;|jc<zxL(zw=Qk>xuu`F
zHr=xz;M4WMY+IWQ8vZORG2U=}-6n00-l6+cC{e2jT^~L@)8+TK>wa@@Y#iPuCepi{
z(A?~y#U-YqiCR%<S<!ftwbW`g%&jxc*H^gwgvvC7NSA5F)}msQwfDJVYgy5_(Dv+}
z@D~YF{%w{<{5?zc-hf}z-F~gb6?jhf`6XH5u(p>(g&LD{!)r!$JWf`Z@k4S|7`kuV
l@xRPh==c1whYBiUlj?1b$5|^MyZk?8?U*I~pIM7he*jw7;xYgL

delta 2751
zcmbW%e@xVM9LMnwCy5YPpeSYNR}e(y#{r@N>QG3X&R=Dkt7X7_fit;tcSnG$j?`6d
zMd}SVSIqL)Y-&?4lRp}p)@V~}>Jpbu6K!Q~woF}8TlIW-x7lj0tsCs|`Fy_L@8`$+
z{rP;hxxcLsUQCJYF#O)+|1tibi&gF3@4Z3BJVLb-AH~Bs6i?$Y`~k1vA6S5w<Bh4p
zl!VChr8t1P2YF<C7>6(8!^Q;7Itqhn=)e@*fkW^xPQv3j8yycCGY98l32sJpcmg#*
zFAl_WI2`*h2m4X|WF#6h5|`m>Y{4SNH#aHh!|bHU1oDuXnF>_<qG<awm`43YR3z4+
zI^2p1S~t>_`3yCIlhNl_kv|j1Diz68)PxE!j`2+$1$E%TRP-a0HtR7LJMa}eif6In
zA!8<B8nYaQRoIFyti_8s8fPR&BI&{m>Mf|yzl&tcY{#HhxR-)LA4Y|~2bJ4%r~z&u
zeVSxmqG&QuE1igHpN@L}$!NP9m716E0c^u`d>u9Lj;Q-mh<^hOpU|L{k79I%xCGVl
zd{oGmqbAad8h8t8BD+xUcSYMzq58Rqis&s|iv6g)u!x<jy|Wq>+5JO_zjAqjhC;l9
zH8`GL)WO?06E~r9`VG#<8>kK{SoUOW#C+U|7JiM3@iw;M96r|RIF5?Q@94*vAk$Y!
znvfuvSJA?aI06r%a`sj9c`vdJ%#T=!cTf|ULYT@ifNOC-YL850b+hmV+=RQ)#&SAm
zZf4O36v`-cA$^&fs1Fml43x9S@p)W=4m^a)Z5L`{M^P&}7WHH(Id({JUktYbElS=-
z4hf^0JxF*>4{GT1cm;n!#io}GSK&Y_@_a51pk9O840Wgxo1^t0Dij+~q1%e&*&MXk
zRpk_VXqb%-4nqab#S(lAwS=QlPav0!=|%El`cS*2A17f3hle?uWw;t!un2FWHc577
zWP%e=6Pc39uF|<$5N%k3ime+Ji8ZJWJ5e2cikxY41ohsj=<{o+h{caFW*m-0O=vbM
z5<%2BZy+1ew4*ML9eQwgf1_@W3wRcv&59(qI6HElmLqdDL2Sc6QM;*aY~*}(A)lCI
zr~!XQ?bbV}q{k2@_KS%_vTZVvpqXF=1=4A1P&rwHI<T8j2Y5Fsr-x8`p(omY0hO9-
z7>l=1yRaVz;c&vB6<XMUxu}(Qpdz;i={IOTr!by|Gf`Dhh$o;XQjYpy9%@2$sE+)o
zf!E{H*p7^CzQYns;%v~RsYKNqQ7PGuHFyr=71OE2e<lsHP@Ae9b#v^(Id~hVVMSi#
z<_IE9<|EY2aUR>y$+a>O58y!j9(8kE$3(2==xEb<(8AYngmSu#f<o4fO2HR67|&xR
zUPE=9?=+?qYjG`hB8xDixesUIJlupGXk!jrUny%xT^u`6$NUoNyWcRVoMjgqvl6S&
zfd?=iKSph)Zqz2~iFyL{-f7f(XV7Hj)Os5mZBJl%t+&Y&80WX5_4_~Zo2-z-IW&BI
zWNwUO)wEDd`qa>+_%TV1w#!{@rn_90*JFoTt&C)s%T~q8%5hZ(>~a45@Z^LK9We{T
zeTh}Eaqe2%<G0H~xyf6SqJ#RaRy&X%I+FZl=$(|xaLtecN4PU}?0{j7UY~8<9l#1y
z*Vof+vpdib{wXa!Hqq-dmtWst&9|FvUuatTjHhav>izk3UT>|}w<_Ob2MSjCyesV5
zfWP2w5B1)fm2OXg+wX6({Rs;fEY7R++0_BJ*OOPpG|Q|aXJJvEvoNoy)G914D=y4)
zP6~CWk4T8Ll$I5hhOVUlTKqo(7m9JF{v&Qy+G20OZ`mvTR-HT0V*C965yCCjUP2h^
wOB@qkk=cANj915Y{VR+Gq2oF46Uyn~spA_Q;RCrV?i<P{oT;%%e-EYk3+Q&F?EnA(

diff --git a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
index 0c956b9b..08269aed 100644
--- a/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ca/LC_MESSAGES/mediagoblin.po
@@ -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: 2012-01-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Aquest tipus de fitxer no és vàlid."
 
@@ -40,55 +40,52 @@ msgstr "Adreça electrònica"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Ho sentim, el registre està desactivat en aquest cas."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Lamentablement aquest usuari ja existeix."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Ja s'ha verificat la vostra adreça electrònica. Ara podeu entrar, editar el "
-"vostre perfil i penjar imatge!"
+msgstr "Ja s'ha verificat la vostra adreça electrònica. Ara podeu entrar, editar el vostre perfil i penjar imatge!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
-msgstr ""
-"La clau de verificació o la identificació de l'usuari no són correctes."
+msgstr "La clau de verificació o la identificació de l'usuari no són correctes."
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Torna'm a enviar el correu de verificació"
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr ""
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -131,6 +128,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -154,27 +152,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 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:162
+#: mediagoblin/edit/views.py:158
 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:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -194,7 +192,7 @@ msgstr "Fitxer"
 msgid "You must provide a file."
 msgstr "Heu d'escollir un fitxer."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Visca! S'ha enviat!"
 
@@ -214,9 +212,7 @@ msgstr "Sembla que no hi ha cap pàgina en aquesta adreça. Ho sentim."
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-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."
+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:46
 msgid "MediaGoblin logo"
@@ -244,7 +240,15 @@ msgstr "Entra"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
@@ -346,13 +350,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Hi %(username)s,\n"
-"\n"
-"to activate your GNU MediaGoblin account, open the following URL in\n"
-"your web browser:\n"
-"\n"
-"%(verification_url)s"
+msgstr "Hi %(username)s,\n\nto activate your GNU MediaGoblin account, open the following URL in\nyour web browser:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -387,18 +385,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -423,55 +421,43 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: 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."
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -480,7 +466,7 @@ msgid "Really delete %(title)s?"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
+msgid "Delete permanently"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
@@ -540,18 +526,14 @@ msgstr "Torna'm a enviar el correu de verificació"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Algú ja ha registrat un compte amb aquest nom d'usuari, però encara l'ha "
-"d'activar."
+msgstr "Algú ja ha registrat un compte amb aquest nom d'usuari, però encara l'ha d'activar."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Si siu aqeust usuari però heu perdut el correu de verificació, podeu <a "
-"href=\"%(login_url)s\">entrar</a> i tornar-lo a enviar."
+msgstr "Si siu aqeust usuari però heu perdut el correu de verificació, podeu <a href=\"%(login_url)s\">entrar</a> i tornar-lo a enviar."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -594,8 +576,13 @@ msgstr "Icona RSS"
 msgid "Atom feed"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -614,22 +601,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -640,24 +623,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
-
-
diff --git a/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/da/LC_MESSAGES/mediagoblin.mo
new file mode 100644
index 0000000000000000000000000000000000000000..8881ae357a008887787f899563d091f08667636c
GIT binary patch
literal 13022
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
Bmuvt4

literal 0
HcmV?d00001

diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.mo
index e3ba1606fd69140cf2713eda46e467b0b323c550..d15e0fb875cdff34c6a457d701d3dbc3863ad2e5 100644
GIT binary patch
delta 3095
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
Mk51~r+Ht5q0i4JT-T(jq

delta 3076
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

diff --git a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
index e435971a..a48c42e7 100644
--- a/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/de/LC_MESSAGES/mediagoblin.po
@@ -17,10 +17,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-01-29 13:47-0600\n"
-"PO-Revision-Date: 2012-02-05 20:23+0000\n"
-"Last-Translator: Jan-Christoph Borchardt <jan@unhosted.org>\n"
-"Language-Team: German (http://www.transifex.net/projects/p/mediagoblin/team/de/)\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
+"Last-Translator: cwebber <cwebber@dustycloud.org>\n"
+"Language-Team: German (http://www.transifex.net/projects/p/mediagoblin/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +28,7 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Die Datei stimmt nicht mit dem gewählten Medientyp überein."
 
@@ -48,59 +48,52 @@ msgstr "E-Mail-Adresse"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Das Registrieren ist auf dieser Instanz leider deaktiviert."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Leider gibt es bereits einen Benutzer mit diesem Namen."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Leider gibt es bereits einen Benutzer mit dieser E-Mail-Adresse."
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Deine E-Mail-Adresse wurde bestätigt. Du kannst dich nun anmelden, Dein "
-"Profil bearbeiten und Bilder hochladen!"
+msgstr "Deine E-Mail-Adresse wurde bestätigt. Du kannst dich nun anmelden, Dein Profil bearbeiten und Bilder hochladen!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "Der Bestätigungsschlüssel oder die Nutzernummer ist falsch."
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Du musst angemeldet sein, damit wir wissen, wer die Email bekommt."
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Deine E-Mail-Adresse wurde bereits bestätigt."
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Bestätigungs-E-Mail wurde erneut versandt."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
-msgstr ""
-"Es wurde eine Email mit Anweisungen für die Änderung des Passwortes an dich "
-"gesendet."
+msgstr "Es wurde eine Email mit Anweisungen für die Änderung des Passwortes an dich gesendet."
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"E-Mail zur Wiederherstellung des Passworts konnte nicht gesendet werden, "
-"weil dein Benutzername inaktiv oder deine E-Mail-Adresse noch nicht "
-"verifiziert ist."
+msgstr "E-Mail zur Wiederherstellung des Passworts konnte nicht gesendet werden, weil dein Benutzername inaktiv oder deine E-Mail-Adresse noch nicht verifiziert ist."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr "Es konnte niemand mit diesem Nutzernamen oder Email gefunden werden."
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr "Du kannst dich jetzt mit deinem neuen Passwort anmelden."
 
@@ -118,10 +111,7 @@ msgid ""
 "You can use\n"
 "                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
 "                      Markdown</a> for formatting."
-msgstr ""
-"Für Formatierung kannst du\n"
-"                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n"
-"                      Markdown</a> benutzen."
+msgstr "Für Formatierung kannst du\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                      Markdown</a> benutzen."
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
@@ -143,11 +133,10 @@ msgstr "Bitte gib einen Kurztitel ein"
 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."
+msgstr "Der Titelteil der Medienadresse. Normalerweise muss hier nichts geändert werden."
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr "Lizenz"
 
@@ -165,34 +154,33 @@ msgstr "Altes Passwort"
 
 #: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
-msgstr ""
-"Gib dein altes Passwort ein, um zu bestätigen dass du dieses Konto besitzt."
+msgstr "Gib dein altes Passwort ein, um zu bestätigen dass du dieses Konto besitzt."
 
 #: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr "Diesen Kurztitel hast du bereits vergeben."
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 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:162
+#: mediagoblin/edit/views.py:158
 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:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr "Das Profil wurde aktualisiert"
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Falsches Passwort"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr "Kontoeinstellungen gespeichert"
 
@@ -212,7 +200,7 @@ msgstr "Datei"
 msgid "You must provide a file."
 msgstr "Du musst eine Datei angeben."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Yeeeaaah! Geschafft!"
 
@@ -232,9 +220,7 @@ msgstr "Tut uns Leid, aber unter der angegebenen Adresse gibt es keine Seite!"
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"Wenn du sicher bist, dass die Adresse stimmt, wurde die Seite eventuell "
-"verschoben oder gelöscht."
+msgstr "Wenn du sicher bist, dass die Adresse stimmt, wurde die Seite eventuell verschoben oder gelöscht."
 
 #: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
@@ -262,10 +248,16 @@ msgstr "Anmelden"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Läuft mit <a href=\"http://mediagoblin.org/\">MediaGoblin</a>, einem <a "
-"href=\"http://gnu.org/\">GNU</a>-Projekt"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -279,17 +271,13 @@ msgstr "Hallo du, willkommen auf dieser MediaGoblin-Seite!"
 msgid ""
 "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
 "extraordinarily great piece of media hosting software."
-msgstr ""
-"Diese Seite läuft mit <a href=\"http://mediagoblin.org\">MediaGoblin</a>, "
-"einer großartigen Software für Medienhosting."
+msgstr "Diese Seite läuft mit <a href=\"http://mediagoblin.org\">MediaGoblin</a>, einer großartigen Software für Medienhosting."
 
 #: mediagoblin/templates/mediagoblin/root.html:29
 msgid ""
 "To add your own media, place comments, save your favourites and more, you "
 "can log in with your MediaGoblin account."
-msgstr ""
-"Melde dich mit deinem MediaGoblin-Konto an, um eigene Medien hinzuzufügen, "
-"zu kommentieren, Favoriten zu speichern und mehr."
+msgstr "Melde dich mit deinem MediaGoblin-Konto an, um eigene Medien hinzuzufügen, zu kommentieren, Favoriten zu speichern und mehr."
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
@@ -301,10 +289,7 @@ 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>"
-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>"
+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"
@@ -338,14 +323,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Hi %(username)s,\n"
-"\n"
-"um dein GNU MediaGoblin Passwort zu ändern, öffne folgende URL in deinem Webbrowser:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"Wenn du denkst, dass das ein Fehler ist, ignoriere einfach diese E-Mail und bleib ein glücklicher Goblin!"
+msgstr "Hi %(username)s,\n\num dein GNU MediaGoblin Passwort zu ändern, öffne folgende URL in deinem Webbrowser:\n\n%(verification_url)s\n\nWenn du denkst, dass das ein Fehler ist, ignoriere einfach diese E-Mail und bleib ein glücklicher Goblin!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -380,12 +358,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Hallo %(username)s,\n"
-"\n"
-"um dein Konto bei GNU MediaGoblin zu aktivieren, musst du folgende Adresse in deinem Webbrowser öffnen:\n"
-"\n"
-"%(verification_url)s"
+msgstr "Hallo %(username)s,\n\num dein Konto bei GNU MediaGoblin zu aktivieren, musst du folgende Adresse in deinem Webbrowser öffnen:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -406,7 +379,7 @@ msgstr "Änderungen speichern"
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
 #, python-format
 msgid "Changing %(username)s's account settings"
-msgstr "%(username)s's Kontoeinstellungen werden geändert"
+msgstr "%(username)ss Kontoeinstellungen werden geändert"
 
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
 #, python-format
@@ -420,29 +393,23 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "Medien mit Schlagwort: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 msgid ""
 "Sorry, this video will not work because \n"
 "\t    your web browser does not support HTML5 \n"
 "\t    video."
-msgstr ""
-"Entschuldige, dieses Video wird nicht funktionieren weil \n"
-"<span class=\"whitespace other\" title=\"Tab\">»</span>    dein Webbrowser kein HTML5 \n"
-"<span class=\"whitespace other\" title=\"Tab\">»</span>    Video unterstützt."
+msgstr "Entschuldige, dieses Video wird nicht funktionieren weil \n    dein Webbrowser kein HTML5 \n    Video unterstützt."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 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 ""
-"Hol dir einen modernen Webbrowser, der \n"
-"<span class=\"whitespace other\" title=\"Tab\">»</span>    dieses Video abspielen kann, <a href=\"http://getfirefox.com\">\n"
-"<span class=\"whitespace other\" title=\"Tab\">»</span>    Firefox</a>!"
+msgstr "Hol dir einen modernen Webbrowser, der \n    dieses Video abspielen kann, <a href=\"http://getfirefox.com\">\n    Firefox</a>!"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
 msgid "Add your media"
@@ -462,59 +429,44 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
-msgstr "Hinzugefügt am %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Löschen"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-#, python-format
-msgid "%(comment_count)s comment"
-msgstr "%(comment_count)s Kommentar"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
-#, python-format
-msgid "%(comment_count)s comments"
-msgstr "%(comment_count)s Kommentare"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
-msgid "No comments yet."
-msgstr "Bisher keine Kommentare."
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr "Kommentiere etwas"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 msgid ""
 "You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
-msgstr ""
-"Für Formatierung kannst du <a "
-"href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> "
-"benutzen."
+msgstr "Für Formatierung kannst du <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> benutzen."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr "Kommentar absenden"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "bei"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
-msgstr "<p>❖ Medien von <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
@@ -522,8 +474,8 @@ msgid "Really delete %(title)s?"
 msgstr "%(title)s wirklich löschen?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Dauerhaft löschen."
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -532,9 +484,7 @@ msgstr "Medienverarbeitung"
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25
 msgid ""
 "You can track the state of media being processed for your gallery here."
-msgstr ""
-"Du kannst den Status der gerade in Bearbeitung befindlichen Medien hier "
-"betrachten."
+msgstr "Du kannst den Status der gerade in Bearbeitung befindlichen Medien hier betrachten."
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28
 msgid "Media in-processing"
@@ -570,9 +520,7 @@ msgstr "Fast fertig! Dein Konto muss noch freigeschaltet werden."
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:58
 msgid ""
 "An email should arrive in a few moments with instructions on how to do so."
-msgstr ""
-"Gleich solltest du eine E-Mail erhalten, die dir erklärt, was du noch machen"
-" musst."
+msgstr "Gleich solltest du eine E-Mail erhalten, die dir erklärt, was du noch machen musst."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:62
 msgid "In case it doesn't:"
@@ -586,19 +534,14 @@ msgstr "Bestätigung erneut senden"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Jemand hat bereits ein Konto mit diesem Benutzernamen registriert, aber es "
-"muss noch aktiviert werden."
+msgstr "Jemand hat bereits ein Konto mit diesem Benutzernamen registriert, aber es muss noch aktiviert werden."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Wenn dir dieses Konto gehört und die Bestätigungsmail verloren gegangen ist,"
-" kannst du dich <a href=\"%(login_url)s\">anmelden</a> und sie erneut "
-"senden."
+msgstr "Wenn dir dieses Konto gehört und die Bestätigungsmail verloren gegangen ist, kannst du dich <a href=\"%(login_url)s\">anmelden</a> und sie erneut senden."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -641,9 +584,14 @@ msgstr "Feed-Symbol"
 msgid "Atom feed"
 msgstr "Atom-Feed"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
-msgstr "Lizenz:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
@@ -661,23 +609,19 @@ msgstr "Ältere →"
 msgid "Go to page:"
 msgstr "Zu Seite:"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr "neuer"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr "älter"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr "Mehr Medien anschauen mit dem Schlagwort"
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
-msgstr "oder"
+msgid "Tagged with"
+msgstr ""
 
 #: mediagoblin/tools/exif.py:68
 msgid "Could not read the image file."
@@ -687,26 +631,22 @@ msgstr "Die Bilddatei konnte nicht gelesen werden."
 msgid "I am sure I want to delete this"
 msgstr "Ja, wirklich löschen"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Ohh, der Kommentar war leer."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "Dein Kommentar wurde gesendet!"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Du hast das Medium gelöscht."
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
-msgstr ""
-"Das Medium wurde nicht gelöscht. Du musst ankreuzen, dass du es wirklich "
-"löschen möchtest."
+msgstr "Das Medium wurde nicht gelöscht. Du musst ankreuzen, dass du es wirklich löschen möchtest."
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Du versuchst Medien eines anderen Nutzers zu löschen. Sei vorsichtig."
-
-
diff --git a/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/en/LC_MESSAGES/mediagoblin.po
index 7c64c09f..d91bbab6 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-02-26 15:51-0600\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: mediagoblin/processing.py:153
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr ""
 
@@ -125,6 +125,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -148,27 +149,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:89
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:159
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:175
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:201
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:217
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -236,7 +237,15 @@ msgstr ""
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a"
+" href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
@@ -376,18 +385,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -412,55 +421,43 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: 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."
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -469,7 +466,7 @@ msgid "Really delete %(title)s?"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
+msgid "Delete permanently"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
@@ -577,8 +574,13 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -597,22 +599,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -631,15 +629,15 @@ msgstr ""
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:181
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:188
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:196
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
 
diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.mo
index f5a660d901aac2f8571683a96ba3d681af7e704a..bc615a9290d1c6270a31e2e17e9e9a8da4f56d2c 100644
GIT binary patch
delta 3004
zcmd7SYitx%6u|M@2heVzKudW@fw4SFDf?=nU@4WB0)`YQv{<o1nRbVEWp=mOol+@}
ztzs%h6vBcLd=SA1ganZl1rsIJXdq%Dd_YPFMi7j_1W=HG`1qf85kB(K&9=XLXXc)J
z?>Tq&MRT7od_FC4tK!qnUnYO$iPF3OS)HWR0J>{%Aa2HsxEG!HYO+$<_!-LmOPGLn
zu@5SnQZ!X6_QS!LiaD6BR9H=>QNV?Ad;-_uY&?MzaZpNkfH^3EtFb56;2^BSvDk_d
zXBQ5~v)GEaF%PZY-Q#v+8vXs)kNH(c?8d3sjZPfQ1Ha-U*n@3IKn*21k0ZBK8Oj3Y
z$L@QPuUgN)A^1AVf(~FW{268ZRm{K}n8N(ZMn1;lKwN{<@q6sRT-?@IsS)@UuEa}N
zkG16UQT!4~rMiS!cpGKH%>GJIB{d2qV|J9CPe6Ho7KWu}H8f;`ATm~MM!sqn|753!
zP@elD*6&2A>1FJJ*KipAfimF$W)X*>7ssINcoRxy-$$9}Xd3z7NaH&$NXnM7ELlh^
z%Ea4|m})o5z$3Bir%(d^fRfUiSdDj3&cXsttel-yD4G2brIhE<jkmE5b2G?4=R>_l
zGzqjFXW|Z&+Fr)F_%}+RIiz6{wxR<MqJ}?W6~;5D4Xe?KXHYVf#OgzsijtWZkUgtc
z!Zb7*@1P7gic-6)u?KD;$3WRg&vYDuvVg@n1-IflJc)8v7P8G*_&jdL<7nVBLt`bx
zLi(LZXcZp7OD_ZMC^cM!ORxpw@ia=UJ5d&P5oJeLVqTBkzlBq|9!HQj;&@9?COE^Z
zLlV?=yoSltHy`g{w!Hrit$X4pQBJ9aycud0_QjV`0&PR8pbnxe^cYGlFJmbV=2a-i
z8k~lEP|nUTD8CzjqQw6PDZlEOC1-{D52f)K7s_xXuEkc|i3K=}i*h!qP!8oHl-eyr
z3Ai%WZ$q-JA}BlFkCNH1Q8M=%%BjDDY+j{|;#ZLQRW1#w@j_%y<-sz12_*w3Py(Do
z8Tb=Qh7w12AHp=0I3;)sJ5V-sWK8!0en&ZcBgnUb5tMmuV^~s@$vY!8aiG+?4wKM~
z*^H9<wU~}uP!_TWCD1YC1yEN|N)?~ez0;w{xm4p(#?6dfe;O0$FVA7!5-7lhWZZ~J
zxDCCy6E*BTuKOq0j*{AP+=!l7|3>V7Z}Kgr$wk>%G0IPO1xo4zC?#q`S?HU&<gJp%
zM_kCmBwq3&oPzRxKZg=<H<se3cn1H%6g+M3UhoC1pnnCOSj6D@XrjdZ91HO}x^O%X
z(Nv4WG|Fjg!0p(He3ivha=6~ZRk#n6G25*a<yCGZ+o~Gn`8Jg24`6@%1ZCmJQ8siA
zC*TlPGYRM7O$@iwU^8kp2Vep2#T|GTgZLJsB;|c4Dm4SMQBvqb&Xrn^{FbN>umQip
zc+BV3v0(v9NlRkRM#)?ya)|q=S{m}h;lt?3q|&&o#{A+EkH_$60e_K`j!o<O6g3r(
z9_!I9BPSGDU>lXLYxM!2&+uD{r!}A9@#>Lvwyfx3+wS<drs&c>Wr@84^}6K^_#^xJ
zZ;LEUJ09nV3{RgPHVr*Q_-4Py2x?ZNp%v*`W6)SOHLKCGnhKrHmX;RBvd}U|AlTqE
zz4eAa<n`Zc86l_M&}7>49WF<s<ukL2OJ-G+7diD}$Ne~?$A$vU!Fr?C^!k_QgtCe&
zySl8{V-%(GtfsHfy{2Ag8jk3a^t||_1{T!fwHl)vGIA5f1^f@j3WR*M%|TP*%xg0I
zl~&L&tT}p<Od9=maB`yULi;9duF+xyRV2eUHF6;{)R=E~PuAQM3*7~F*F=}gRx!`M
zz*yl8kq&zqSuE7@T<$!(tLwQuSD|}Cu8WVYTn}0Hs-W%<nYtAS7Hah^MqM3=DvC9x
zd74Ak%6c=<?2!aTI))vM9vWW#P<5-+ax*E`1En)P0l!!C1VUaTNTIf9uIO3qaC};s
zVH%d9H5oyl?x)D+%IMCKXA_gk@0GND?BU2$IV&O`r!`X68RKgHZ)JUZ+{O5mD!t*q
k%7*RlCfJP@j`c$qx72+gF;$9NVR|)xV1@o{SApZyzsU3Qx&QzG

delta 2854
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

diff --git a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
index b3088b25..a929d727 100644
--- a/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/eo/LC_MESSAGES/mediagoblin.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-02-09 09:30-0600\n"
-"PO-Revision-Date: 2012-02-26 19:34+0000\n"
-"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+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"
@@ -21,7 +21,7 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:153
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "La provizita dosiero ne konformas al la informtipo."
 
@@ -41,52 +41,52 @@ msgstr "Retpoŝtadreso"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Bedaŭrinde, registrado estas malaktivigita en tiu ĉi instalaĵo."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "BedaÅ­rinde, uzanto kun tiu nomo jam ekzistas."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Ni bedaŭras, sed konto kun tiu retpoŝtadreso jam ekzistas."
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Via retpoŝtadreso estas konfirmita. Vi povas nun ensaluti, redakti vian profilon, kaj alŝuti bildojn!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "La kontrol-kodo aÅ­ la uzantonomo ne estas korekta"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Vi devas esti ensalutita, por ke ni sciu, al kiu sendi la retleteron!"
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Vi jam konfirmis vian retpoŝtadreson!"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Resendi vian kontrol-mesaĝon."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr "Senditas retletero kun instrukcio pri kiel ŝanĝi vian pasvorton."
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr "Ni ne povas sendi pasvortsavan retleteron, ĉar aŭ via konto estas neaktiva, aŭ ĝia retpoŝtadreso ne estis konfirmita."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr "Mi trovis neniun kun tiu salutnomo aŭ retpoŝtadreso."
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr "Nun vi povas ensaluti per via nova pasvorto."
 
@@ -129,6 +129,7 @@ msgid ""
 msgstr "La dosiertitol-bazita parto de la dosieradreso. Ordinare ne necesas ĝin ŝanĝi."
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr "Permesilo"
 
@@ -152,27 +153,27 @@ msgstr "Enigu vian malnovan pasvorton por pruvi, ke ĉi tiu konto estas via."
 msgid "New password"
 msgstr "La nova pasvorto"
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 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:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Vi priredaktas dosieron de alia uzanto. Agu singardeme."
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Vi redaktas profilon de alia uzanto. Agu singardeme."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr "Profilŝanĝoj estis konservitaj"
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Malĝusta pasvorto"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr "Kontagordoj estis konservitaj"
 
@@ -192,7 +193,7 @@ msgstr "Dosiero"
 msgid "You must provide a file."
 msgstr "Vi devas provizi dosieron."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Hura! Alŝutitas!"
 
@@ -240,8 +241,16 @@ msgstr "Ensaluti"
 #: 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"
-msgstr "Funkcias per <a href=\"http://mediagoblin.org\">MediaGoblin</a>, unu el la <a href=\"http://gnu.org/\">projektoj de GNU</a>"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -377,18 +386,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "Dosieroj kun etikedo: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Originalo"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 msgid ""
 "Sorry, this video will not work because \n"
 "\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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -413,56 +422,44 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
-msgstr "Aldonita je %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Ŝanĝi"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Forigi"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-#, python-format
-msgid "%(comment_count)s comment"
-msgstr "%(comment_count)s komento"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
-#, python-format
-msgid "%(comment_count)s comments"
-msgstr "%(comment_count)s komentoj"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
-msgid "No comments yet."
-msgstr "Estas neniom da komentoj."
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr "Komenti"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 msgid ""
 "You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr "Vi povas uzi por markado la lingvon «<a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>»."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr "Aldoni ĉi tiun komenton"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "je"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
-msgstr "<p>❖ Foliumado de dosieraro de <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
@@ -470,8 +467,8 @@ msgid "Really delete %(title)s?"
 msgstr "Ĉu efektive forigi %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Forigi senrevene"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -580,9 +577,14 @@ msgstr "flusimbolo"
 msgid "Atom feed"
 msgstr "Atom-a informfluo"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
-msgstr "Permesilo:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
@@ -600,23 +602,19 @@ msgstr "Malpli novaj →"
 msgid "Go to page:"
 msgstr "Iri al paĝo:"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr "pli nova"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr "malpli nova"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr "Vidi aliajn dosierojn kun la etikedo"
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
-msgstr "aÅ­"
+msgid "Tagged with"
+msgstr ""
 
 #: mediagoblin/tools/exif.py:68
 msgid "Could not read the image file."
@@ -626,22 +624,22 @@ msgstr "Malsukcesis lego de la bildodosiero"
 msgid "I am sure I want to delete this"
 msgstr "Mi estas certa, ke mi volas forigi ĉi tion"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Oj, via komento estis malplena."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "Via komento estis afiŝita!"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Vi forigis la dosieron."
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "La dosiero ne estis forigita, ĉar vi ne konfirmis vian certecon per la markilo."
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Vi estas forigonta dosieron de alia uzanto. Estu singardema."
diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.mo
index 93a849fb5e9401c8d8ffcc4df3cc03cb14d54335..1b63a7ec674dad5cfdb214b9ac0282455bcef0cc 100644
GIT binary patch
delta 3121
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

delta 2913
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

diff --git a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
index 3bb46098..34524efe 100644
--- a/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/es/LC_MESSAGES/mediagoblin.po
@@ -8,17 +8,17 @@
 #   <jacobo@gnu.org>, 2011, 2012.
 # Javier Di Mauro <javierdimauro@gmail.com>, 2011.
 #   <juangsub@gmail.com>, 2011.
-#   <juanma@kde.org.ar>, 2011.
+#   <juanma@kde.org.ar>, 2011, 2012.
 # Mario Rodriguez <msrodriguez00@gmail.com>, 2011.
 #   <mu@member.fsf.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
-"Report-Msgid-Bugs-To: http://bugs.foocorp.net/projects/mediagoblin/issues\n"
-"POT-Creation-Date: 2012-01-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mediagoblin/team/es/)\n"
+"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/mediagoblin/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Archivo inválido para el formato seleccionado."
 
@@ -46,64 +46,52 @@ msgstr "Dirección de correo electrónico"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Lo sentimos, el registro está deshabilitado en este momento."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Lo sentimos, ya existe un usuario con ese nombre."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Lo sentimos, ya existe un usuario con esa dirección de email."
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Tu dirección de correo electrónico ha sido verificada. ¡Ahora puedes "
-"ingresar, editar tu perfil, y enviar imágenes!"
+msgstr "Tu dirección de correo electrónico ha sido verificada. ¡Ahora puedes ingresar, editar tu perfil, y enviar imágenes!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
-msgstr ""
-"La clave de verificación o la identificación de usuario son incorrectas"
+msgstr "La clave de verificación o la identificación de usuario son incorrectas"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
-msgstr ""
-"¡Debes iniciar sesión para que podamos saber a quién le enviamos el correo "
-"electrónico!"
+msgstr "¡Debes iniciar sesión para que podamos saber a quién le enviamos el correo electrónico!"
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "¡Ya has verificado tu dirección de correo!"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Se reenvió tu correo electrónico de verificación."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 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."
+msgstr "Un correo electrónico ha sido enviado con instrucciones sobre cómo cambiar tu contraseña."
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"No se pudo enviar un correo electrónico de recuperación de contraseñas "
-"porque su nombre de usuario está inactivo o la dirección de su cuenta de "
-"correo electrónico no ha sido verificada."
+msgstr "No se pudo enviar un correo electrónico de recuperación de contraseñas porque su nombre de usuario está inactivo o la dirección de su cuenta de correo electrónico no ha sido verificada."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 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."
+msgstr "No se pudo encontrar a alguien con ese nombre de usuario o correo electrónico."
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr "Ahora tu puedes entrar usando tu nueva contraseña."
 
@@ -121,10 +109,7 @@ 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."
+msgstr "Puedes usar\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                      Markdown</a> para el formato."
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
@@ -146,13 +131,12 @@ msgstr "La ficha no puede estar vacía"
 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."
+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
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
-msgstr ""
+msgstr "Licencia"
 
 #: mediagoblin/edit/forms.py:50
 msgid "Bio"
@@ -168,34 +152,33 @@ msgstr "Vieja contraseña"
 
 #: 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."
+msgstr "Escriba la anterior contraseña para demostrar la propiedad de la cuenta."
 
 #: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 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:92
+#: mediagoblin/edit/views.py:88
 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:162
+#: mediagoblin/edit/views.py:158
 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:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr "Los cambios de perfil fueron salvados"
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Contraseña incorrecta"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr "las configuraciones de cuenta fueron salvadas"
 
@@ -215,7 +198,7 @@ msgstr "Archivo"
 msgid "You must provide a file."
 msgstr "Debes proporcionar un archivo."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "¡Yujú! ¡Enviado!"
 
@@ -235,9 +218,7 @@ msgstr "Parece no haber una página en esta dirección. ¡Lo siento!"
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"Si estás seguro que la dirección es correcta, puede ser que la pagina haya "
-"sido movida o borrada."
+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:46
 msgid "MediaGoblin logo"
@@ -265,10 +246,16 @@ msgstr "Conectarse"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Potenciado por <a href=\"http://mediagoblin.org\">MediaGoblin</a>, a <a "
-"href=\"http://gnu.org/\">GNU</a> project"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -282,18 +269,13 @@ msgstr "Hola, ¡bienvenido a este sitio de MediaGoblin!"
 msgid ""
 "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
 "extraordinarily great piece of media hosting software."
-msgstr ""
-"Este sitio está montado con <a "
-"href=\"http://mediagoblin.org\">MediaGoblin</a>, un programa libre buenísimo"
-" para gestionar contenido multimedia."
+msgstr "Este sitio está montado con <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un programa libre buenísimo para gestionar contenido multimedia."
 
 #: mediagoblin/templates/mediagoblin/root.html:29
 msgid ""
 "To add your own media, place comments, save your favourites and more, you "
 "can log in with your MediaGoblin account."
-msgstr ""
-"Para añadir tus propios contenidos, dejar comentarios, guardar tus favoritos"
-" y más, puedes iniciar sesión con tu cuenta de MediaGoblin."
+msgstr "Para añadir tus propios contenidos, dejar comentarios, guardar tus favoritos y más, puedes iniciar sesión con tu cuenta de MediaGoblin."
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
@@ -305,10 +287,7 @@ 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>"
-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>"
+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"
@@ -342,14 +321,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Hola %(username)s,\n"
-"\n"
-"Para cambiar tu contraseña de GNU MediaGoblin, abre la siguiente URL en un navegador:\n"
-"\n"
-"%(verification_url)s \n"
-"\n"
-"Si piensas que esto es un error, simplemente ignora este mensaje y sigue siendo un trasgo feliz."
+msgstr "Hola %(username)s,\n\nPara cambiar tu contraseña de GNU MediaGoblin, abre la siguiente URL en un navegador:\n\n%(verification_url)s \n\nSi piensas que esto es un error, simplemente ignora este mensaje y sigue siendo un trasgo feliz."
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -384,12 +356,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Hola %(username)s,\n"
-"\n"
-"para activar tu cuenta de GNU MediaGoblin, abre la siguiente URL en tu navegador:\n"
-"\n"
-"%(verification_url)s "
+msgstr "Hola %(username)s,\n\npara activar tu cuenta de GNU MediaGoblin, abre la siguiente URL en tu navegador:\n\n%(verification_url)s "
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -424,29 +391,23 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "Contenido etiquetado con: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 msgid ""
 "Sorry, this video will not work because \n"
 "\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."
+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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 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 ""
-"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>!"
+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"
@@ -466,56 +427,44 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
-msgstr "Agregado el %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Editar"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Borrar"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-#, python-format
-msgid "%(comment_count)s comment"
-msgstr "%(comment_count)s comentarios de"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
-#, python-format
-msgid "%(comment_count)s comments"
-msgstr "%(comment_count)s comentarios de"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
-msgid "No comments yet."
-msgstr "No hay comentarios aún. "
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr "Añadir un"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 msgid ""
 "You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
-msgstr ""
+msgstr "Puedes usar <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> para el formato."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr "Añade un comentario "
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "en"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
-msgstr "<p>❖ Buscar contenido por <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
@@ -523,8 +472,8 @@ msgid "Really delete %(title)s?"
 msgstr "¿Realmente deseas eliminar %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Eliminar permanentemente"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -533,9 +482,7 @@ msgstr "Panel de procesamiento de contenido"
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25
 msgid ""
 "You can track the state of media being processed for your gallery here."
-msgstr ""
-"Puedes hacer un seguimiento del estado de tu contenido siendo procesado "
-"aquí."
+msgstr "Puedes hacer un seguimiento del estado de tu contenido siendo procesado aquí."
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28
 msgid "Media in-processing"
@@ -571,9 +518,7 @@ msgstr "¡Casi hemos terminado! Solo falta activar la cuenta."
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:58
 msgid ""
 "An email should arrive in a few moments with instructions on how to do so."
-msgstr ""
-"En unos momentos te debería llegar un correo electrónico con las "
-"instrucciones para hacerlo."
+msgstr "En unos momentos te debería llegar un correo electrónico con las instrucciones para hacerlo."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:62
 msgid "In case it doesn't:"
@@ -587,18 +532,14 @@ msgstr "Reenviar correo electrónico de verificación"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Alguien ya registró una cuenta con ese nombre de usuario, pero todavía no "
-"fue activada."
+msgstr "Alguien ya registró una cuenta con ese nombre de usuario, pero todavía no fue activada."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Si tú eres esa persona, pero has perdido tu correo electrónico de "
-"verificación, puedes <a href=\"%(login_url)s\">acceder</a> y reenviarlo."
+msgstr "Si tú eres esa persona, pero has perdido tu correo electrónico de verificación, puedes <a href=\"%(login_url)s\">acceder</a> y reenviarlo."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -626,8 +567,7 @@ msgstr "Ver todo el contenido de %(username)s"
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr ""
-"Aquí es donde tú contenido estará, pero parece que aún no has agregado nada."
+msgstr "Aquí es donde tú contenido estará, pero parece que aún no has agregado nada."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
@@ -642,13 +582,18 @@ msgstr "ícono feed"
 msgid "Atom feed"
 msgstr "Atom feed"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
-msgstr ""
+msgstr "Todos los derechos reservados"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
@@ -662,52 +607,44 @@ msgstr "Más viejo →"
 msgid "Go to page:"
 msgstr "Ir a la página:"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr "Más nuevo"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr "Más viejo"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr "Ver más contenido etiquetado con"
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
-msgstr "o"
+msgid "Tagged with"
+msgstr ""
 
 #: mediagoblin/tools/exif.py:68
 msgid "Could not read the image file."
-msgstr ""
+msgstr "No se pudo leer el archivo de imagen."
 
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "Estoy seguro de que quiero borrar esto"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Ups, tu comentario estaba vacío."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "¡Tu comentario ha sido publicado!"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Eliminaste el contenido"
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "El contenido no se eliminó porque no marcaste que estabas seguro."
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
-"Estás a punto de eliminar un contenido de otro usuario. Proceder con "
-"precaución."
-
-
+msgstr "Estás a punto de eliminar un contenido de otro usuario. Proceder con precaución."
diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.mo
index c29f7f08bae13a0178f93e966f5e69a461d1975e..b50b30f0279cf5968762c93f5dd21e08a93624c7 100644
GIT binary patch
delta 2972
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

delta 2791
zcmbW%eN0tl9Ki913yL5VTtrbqk0=Ppy}W7)iYSz(h9VZZl?vPgT!VY*zNk3kS~#pf
zoG(XomM$o9>8x2-Q@65|)gPJ7x9N1|Qr3FebSbuJw(9%ip2~mxCkA|;^PK1We$VrJ
zo^$rQ?lc9iStB|XKX35&1b;6^$kl&8yM`z=lFQvV3XkA0Jcq;aN9@BtF$Zr%DOHZv
z=+OOY4CmT~+)^Hl#I+cwR6wn#@faPQXvIC4fJbmLp29h38LHG=oQIQeJ4(QBP!e3k
z!FUBn;C0Nv`zUczW0V?=OK=UY#(eUtej4&%dTeL{He_b16s5n??0*51xPBR>66;X{
zzJpS<<47pgi!y;T=KY_LUlqwJrILv#6UxCz@~e6p62OIt=tU;2-o$L|#8>eoUc%DH
zm70i2%yJBtV=Fqa4zJ-@oE0CcqytmAUX4=vw~^ga?_oezcz}kKK8RBKuTb{(3QB_8
zNK6&aAet%_Wu=8E{WDR<FEaa`C|k1<2jMzQ!48zfdrUvDQvXIeKA}TaK8Ea4;z=lh
zD^N<d3}qs%D2aEXOk^+0_@ie3S(G@}P%3&CtMNX{S*YaX%Gp_iQrUyUsK4yxcXZ_8
zJ*>qnqDX*^_%v=s+0)Bdfwxftl(Ot6u^H{ygBo7I#rPYp!?`>xZ^tQ=iabCsh6R|u
zl*Eq|LA9ZVTQC_vM%lA(&HERTW1xP<GQ5W}foYVf7=74|2T{&QA*-8>%W*5dk2)3;
zoVlsWZW={2jv}#CKgxqKd<<mIrr=V19xZqnWp9t7Ozb4eioP~IW5h=!1P+ApRiH;U
zZ!<3mS=D}&lwX=&#Xhe4F&{6n!{r#Qg~lzwaIWi-{ZlJYGPa={jt-Pk>_92qUX*di
zG)~nt8mH-)gVDSUFJTqRW`2aSgnK9nEW8{Ncrdar>M@kll8%#c0WwF`f!nYLWx_?{
zLLZ1`lnMAuH;m&{Nx--0kP5tuQh`rVDsTz;Rk!#j<E-OD0Y)K3P&Q1*XHiz@L*}a5
zQ6|)ba%iriJpTjA_?svb85T$j4V-}8bS%XOD5LD~2g(BzCooA|gsbo-%1U*XUx@2*
z3LZmAbO(pv?<ntKcxLF(#Gx!S6D4k-j0TfYD^T`o6UyFnp*(oV>_35$@Er2$soNNZ
zgR?@XDh?&iaFoQwD9@K;6ILRxqB@TJstf$%00-1xG}tDU%vqMwm7pBw<tWFz&2$G!
zz=J4(K0`@#9xL%GvRGx$R_ZCN#sb`pxp)@k^|9DOACBo5L4MUmqlz0n$QX4WD=?k<
z&p<y;$HOQA`f(r;pNU4Ut8oK<fs$|z*#_ZS?8MhmK7mPmwlvH_c3I8CWb&(5Xvj)7
zqMYjOC?)<7Yp@q(f@vJ(CD@AXcph1_swV4m*p6HAGV0jG!H`Ox!wUQrHJmXiRFUNv
zkkW6V(Se81g2f!&SS-O9oR6}iC8o<z#_1?$pb=GCMxDF4S$FxC)w%sHU#3?xuOEHK
ztI~pPLrTLeEhR=+%5>xVsPVDQy2DwcW;z_2+oc=pwA6TqLzfFJEyGdc(=)wxqf1K+
z&X3+^30oMv9#b9>>8#UTUcJc3j^7z;CiQBqy3cN$h(B#?vX%vF6LKuU-H8*zhc~-D
zx;BtR^VKvo5PFr<*BHE&6crKU_NW^jo3#pkmF_W0Qf5`v`Ww9VdbhjI?P;;QbYD)3
z$Gt+Y^LcXyA~d*bo1Cs3r`PM(z0nI7EVh+-^ctVj?Xs0K)gmoFH!t6on`g_Ps^t|F
z73A4+CmY98lA}XCQ;YJa8ht5u3;$2)f)_{6eyDI`4VN||{E;OKc4@y@MppS-T0G8X
z-J>~r_tiUHPM>q7E?XAdHLi5fzh&&p_&lz{{m=H9mF&)ZEym++@i%#U_h~IP9wXP9
wH&n~k{4Q;vD8`n81Y@N&j&hGMy0e}Mu9?_j3C7sZKeFUe`IjSNA1=B28~C)bT>t<8

diff --git a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
index 3bffeef8..6171d704 100644
--- a/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/fr/LC_MESSAGES/mediagoblin.po
@@ -13,9 +13,9 @@
 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Le fichier envoyé  ne correspond pas au type de média."
 
@@ -45,57 +45,52 @@ msgstr "Adresse e-mail"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "L'inscription n'est pas activée sur ce serveur, désolé."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Un utilisateur existe déjà avec ce nom, désolé."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 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:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Votre adresse e-mail a bien été vérifiée. Vous pouvez maintenant vous "
-"identifier, modifier votre profil, et soumettre des images !"
+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:186
+#: mediagoblin/auth/views.py:188
 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:204
+#: mediagoblin/auth/views.py:206
 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 !"
+msgstr "Vous devez être authentifié afin que nous sachions à qui envoyer l'e-mail !"
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Votre adresse e-mail a déjà été vérifiée !"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "E-mail de vérification renvoyé."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-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."
+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/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -138,6 +133,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -161,31 +157,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 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:92
+#: mediagoblin/edit/views.py:88
 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."
+msgstr "Vous vous apprêtez à modifier le média d'un autre utilisateur. Veuillez prendre garde."
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 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."
+msgstr "Vous vous apprêtez à modifier le profil d'un utilisateur. Veuillez prendre garde."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Mauvais mot de passe"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -205,7 +197,7 @@ msgstr "Fichier"
 msgid "You must provide a file."
 msgstr "Il vous faut fournir un fichier."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Youhou, c'est envoyé !"
 
@@ -225,9 +217,7 @@ msgstr "Il ne semble pas y avoir de page à cette adresse. Désolé !"
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-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."
+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/base.html:46
 msgid "MediaGoblin logo"
@@ -255,10 +245,16 @@ msgstr "S'identifier"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Propulsé par <a href=\"http://mediagoblin.org\">MediaGoblin</a> , un projet "
-"<a href=\"http://gnu.org/\">GNU</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -272,17 +268,13 @@ msgstr "Bonjour, et bienvenu sur ce site MediaGoblin !"
 msgid ""
 "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
 "extraordinarily great piece of media hosting software."
-msgstr ""
-"Ce site fait tourner <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un "
-"logiciel d'hébergement de média extraordinairement génial."
+msgstr "Ce site fait tourner <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un logiciel d'hébergement de média extraordinairement génial."
 
 #: mediagoblin/templates/mediagoblin/root.html:29
 msgid ""
 "To add your own media, place comments, save your favourites and more, you "
 "can log in with your MediaGoblin account."
-msgstr ""
-"Ajoutez vos propres medias, commentez ceux des autres, sauvegardez vos "
-"préférés et plus encore ! Faites tout cela depuis votre compte MediaGoblin."
+msgstr "Ajoutez vos propres medias, commentez ceux des autres, sauvegardez vos préférés et plus encore ! Faites tout cela depuis votre compte MediaGoblin."
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
@@ -328,16 +320,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Bonjour %(username)s,\n"
-"\n"
-"Pour changer votre mot de passe GNU MediaGoblin, ouvrez l'URL suivante dans \n"
-"votre navigateur internet :\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"Si vous pensez qu'il s'agit d'une erreur, ignorez simplement cet email et restez\n"
-"un goblin heureux !"
+msgstr "Bonjour %(username)s,\n\nPour changer votre mot de passe GNU MediaGoblin, ouvrez l'URL suivante dans \nvotre navigateur internet :\n\n%(verification_url)s\n\nSi vous pensez qu'il s'agit d'une erreur, ignorez simplement cet email et restez\nun goblin heureux !"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -372,12 +355,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Bonjour %(username)s,\n"
-"\n"
-"pour activer votre compte sur GNU MediaGoblin, veuillez vous rendre à l'adresse suivante avec votre navigateur web:\n"
-"\n"
-"%(verification_url)s"
+msgstr "Bonjour %(username)s,\n\npour activer votre compte sur GNU MediaGoblin, veuillez vous rendre à l'adresse suivante avec votre navigateur web:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -412,18 +390,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "Médias taggés avec : %(tag_name)s "
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -448,55 +426,43 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Éditer"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Effacer"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-#, python-format
-msgid "%(comment_count)s comment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "à"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -505,8 +471,8 @@ msgid "Really delete %(title)s?"
 msgstr "Voulez-vous vraiment supprimer %(title)s ?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Supprimer définitivement"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -515,9 +481,7 @@ msgstr "Panneau pour le traitement des médias"
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25
 msgid ""
 "You can track the state of media being processed for your gallery here."
-msgstr ""
-"Vous pouvez suivre l'état des médias en cours de traitement pour votre "
-"galerie ici."
+msgstr "Vous pouvez suivre l'état des médias en cours de traitement pour votre galerie ici."
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28
 msgid "Media in-processing"
@@ -553,9 +517,7 @@ msgstr "Presque fini ! Votre compte a encore besoin d'être activé."
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:58
 msgid ""
 "An email should arrive in a few moments with instructions on how to do so."
-msgstr ""
-"Un e-mail devrait vous parvenir dans quelques instants ; il vous indiquera "
-"comment procéder."
+msgstr "Un e-mail devrait vous parvenir dans quelques instants ; il vous indiquera comment procéder."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:62
 msgid "In case it doesn't:"
@@ -569,19 +531,14 @@ msgstr "Renvoyer l'e-mail de vérification"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Quelqu'un a enregistré un compte avec ce nom, mais il doit encore être "
-"activé."
+msgstr "Quelqu'un a enregistré un compte avec ce nom, mais il doit encore être activé."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Si c'est de vous qu'il s'agit, mais que vous avez perdu l'e-mail de "
-"vérification, vous pouvez vous <a href=\"%(login_url)s\">identifier</a> et "
-"le renvoyer."
+msgstr "Si c'est de vous qu'il s'agit, mais que vous avez perdu l'e-mail de vérification, vous pouvez vous <a href=\"%(login_url)s\">identifier</a> et le renvoyer."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -609,9 +566,7 @@ msgstr "Voir tous les médias de %(username)s"
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr ""
-"C'est là où vos médias apparaîssent, mais vous ne semblez pas avoir encore "
-"ajouté quoi que ce soit."
+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:163
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
@@ -626,8 +581,13 @@ msgstr "icone de flux"
 msgid "Atom feed"
 msgstr "flux Atom"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -646,22 +606,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr "Aller à la page :"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -672,28 +628,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr "Je suis sûr de vouloir supprimer cela"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Oups, votre commentaire était vide."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "Votre commentaire a été posté !"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Vous avez supprimé le media."
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
-msgstr ""
-"Ce media n'a pas été supprimé car vous n'avez pas confirmer que vous étiez "
-"sur."
+msgstr "Ce media n'a pas été supprimé car vous n'avez pas confirmer que vous étiez sur."
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
-"Vous êtes sur le point de supprimer des médias d'un autre utilisateur. "
-"Procédez avec prudence."
-
-
+msgstr "Vous êtes sur le point de supprimer des médias d'un autre utilisateur. Procédez avec prudence."
diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.mo
index 5bf0f220b39dcc59b54751b5eeba6f4e8d22d210..ea4d4ca205a89310b6eac720c10bb276c5d4f5cb 100644
GIT binary patch
delta 2958
zcmdVadu&rx9Ki9@Zm`j@0o!=Ww(A(91NvCUc+71G!)?(GCP;>Wux`6sD_y&^9mUBk
zNI(-5$SMZVpaFCeg8>^gnivG-4-!atMVJy$5YYGl<70wo{QlM|#{W$G$ENM)oO{nb
zkKgZ{`-A>=YxqKX;#S3H1HZBSY7(V(=d(IlsZ6R}I0C!zGVVniK08RM3HUzB{VSM&
zw=or!Nhyjd4Ts_=Ov3`qP%5mZQ<%zy8mz{3ct0M)VjP(g>!22;<9Zy3OK>DMq8U3;
z`q_=y_z8C6O>|&zaO}ArOsD<^4rP3GD1PHq{6;U1qQN&f1_!VV=}<!n&P?Q%nu9Wd
z2jlnM$X7kh-)MXuWkUNg39q3%e;tS8kC?*v%0xUS;|T1+3OtL4a1w4GqErqZ!N>3l
zHsNyOc{hHDgi>9>T)c@g;MieGktLOf5-|(P%BP^Tufnk8YzYM!z>hqux{<Hi&7Z9F
zEtGbL<Mm#YoL<ENcmuQWXOsam8AZ%OH|C?PcneBoUqu<`U^?;NOyL9<BxDUtOD58Z
zGVl(hPt}9+;Jfkbr%*b)h!WDDupV!r?1lO4SlK&|qeS)qN-8g4A>PDBoHU&Hvp>`(
zdXtWJU?skUlH02|7k@|TsFpBH!%no~o2cRE_z)U-Xbsk*4bP!OD4E#@FbyR#Pa<np
z8^aVd3Oi9AIEa$F>+uGC$Tm<W!c&2xQ6}&R-h*3l9iBwlD+^g>6|Ti@Jc>Fly(^wV
zETP_ubgjaf9C~@sf|A3BaT$ith##Zmx))_)mr+*qb=>dc_xrGn>jpa6X5f?{QC8<T
zIs`#|i<fZ#`IUu!g%jlbkJe%{n}rG7ScIGmwG?IGM^QFQ5G4}pku<C4a4Nor)p!x*
zy<z4^6k`D8`MoIpM&tE&P$qN;&2s*GDM&{~&JL4QGq4jEp#x8&9G`*Xlp2DmC=<#;
zxo$<tWid)ftC6THCrW>-QTEmgD4Y6alnLyU`;4!SP>>G3K+>rCP$o1iFBbA@ln&~U
zeW(_qY}yqln=*u5xChT-?)X?rZy`}u`T4Q;MkO{;{{UID%9Hp@C@U$jNVOP~unT3E
zu18t%CX@;8L}`Bj+3@NJ$^hq4B61t$xTbOjWu-YN?Iy?T6(}jGL)k-%CI0La)xd>h
zd;(=<PoWzlC@cOACA1j@v4JMzX6j`q5j&1Dk!vUeCryk^BopPie3a`mQTnUFL~NW$
z{Oc*Sa)B|_L6pt&B}!<sIU1772T)!dE!c?LFa>`_=_rZDl{gqBw+m3-8!M2ndXK+p
zcn#&fkz<J+`?+BX^5XE}8vF?5c-%*;f!Kla;#iFm;u|QbFwjWDOqBM;{3WA~a^H(-
zxE3pL3(5q}pu9H*+hgyIa5V)Mp^jk{{({|jFU!^OG)fL<IASl3I+T!ZM0suxN(xWl
zGW-sWSX&g&H6~GCjFR)lxUSg!ROO{m#*I}NJ()b)kn1WcpVi!~H)}p`sf~(B>;IIt
zmyb6$JA-;bAX25}WjM7aUt62*4Juk|ZF;lY8Cj*}M)zrEL-ezhu))wCZAhJynB;46
z2Hiey<n>|OBMZ}y8my7*jEb;FcLo@v!`rO;wV+GaN}Za^ueX%tx`M&>5}Pd)3RznM
zEmohu)#h<G>E3|b`)5fH*qp8H9!rtcZgmCQJh|nws_JS=ZO(G*oqoof1HKM_lfK;J
z_O2)h<d!e!uQKgsy)=!snscSo?Qu4GbZc~3hQpZL%7jAhpey>!@JR_1ecr$K<qNbe
z@9=x1pLy-NcR|pv>%m%Qy9^pVK59^+>C%QR+FU)P`&GoGl|?R%ojuYW2z2NHYkzQB
zeT__{e>su5tTB!vOW|~_u(+gfs>NPxx0~wbS?232-2p;nnM0UMG>5&=VX^nObJ$A?
zr$k=N>WiF7&WL`RZTSz<)MGTXM;cOlqPNHGO86^FuT0oQmKH_!n}h$4O!<wGMC;*y
Oldbbs(?7FiP=5dutJiD*

delta 2749
zcmbW&e@xVM9LMp`0m%;`13^ti4-^&iIKUqym_uRY)C|g^HiyF9SD@sM?v4~^9UIQF
z=1eYHuAF72HFdLYA%B=to6fQy>Y5}CQ*oASwK;5RHtYHFZspeeM<zTzpU?OE{e0e^
z_veRQ^#fM$Y+78W;pbI;NAtTRPPPAj-c2y(L8@DDB<{m>JcYyXXY9vY=)?<&#*|}P
zQsj9x#!~knkBkrFaSc9TOwg>Qa6b*5n1<VNDDJ}<cpT?p%wS{Y;{u$HZ=pK;8a2Ra
z9E80%9M9t<yn*T`JK2~q_$;o*RanUQW`Ke|oRAU;z=1?&N>S}q(e`I>1oh`pnOKYJ
za4RZl2avAJ7pMSEM4$hH{4?>)Qkl#^1?0qd#y86;r~?mXpdSg^tj8(Xi7(+{?7`9@
z#yo^0h;l5JV=KDRg=aAf=cYz7>Bem8t5B(b2U#ui0R}b0-4vAiFe>#&QES_a8sG}j
zr%B}{iY6O1(`l&oIjHxah_*MPmgYsg58E&k*P#a99(7L|`EQ`1iw4bnETb#M(@`BS
zLZxgeDv(yxz?)Hl>_ENW9c@2}>gOyfqgSySZ=m)<6+2gZXEiFbd(+9k*0PU=0=$lO
zIGJA5!3M0r4%C{S!9{ol)j=uKF2W|v!w=Dp-{WHZ1KV&uAM11+M`h$D`q367e5IrX
zNrHJ9?YId?;isrI`!@RgG_noMWh}$%r~qb>rV<QbJMKm8k!j5CQCx-{_z_xILg&P0
zs@|tiOraa;%M74COy)Asnmvp)_%z1gXQ;L9Mg?{lHKVVho(QGJ4Gr$GaVyZG#oNRo
zVN|mVNv}DIOyB&7{WyTiO%E$vj`8+LXbUlxx(hX8J!-@kP@AI_m5SF;soRXKv)OHD
zSIwYskcN494Rv#rW<^&2bySCkPy-x~*1tmqb_TUuuAurE$>AYJQ-!Os84K}O)bSZJ
z&KQoQ$w37+eH^<=4=QL-WRIb8y9||yR#b;?qIOvrwXM5R0UU`w??Zk67b=rO#zz9m
zMP*_c>iY&{Lz*TWjO{@R+MXLxH^+YL!Q!0A;-*cAoTu5?N_!2u@CRhlX4b?=Dr=BQ
z8Xs!FPSkGQf|~ITRDfNm)PITERlz<AI<Qw!DM=@vI<PsYnHHhi%TXUZ6>VRETAEhW
zu4+f^!u6PdJ5e*-iw(FRHS?U@NQO(0euHK)1*ObF1rkIJycHG5Zq$+-h_?5jI=YB)
z_$OB5-^duIdU9m%w4pNFg<8sf)WvZN>oA|Q6Q}=GLKG@!cpJ5*KcQ}pYp4z?_)~;_
z)XlLA?bwUDIc{PbRyrc5<0KBEZsTR$90{llu0buq2DIaQIEwMjAqolD7k%Lp-cS7o
zmSF;CP5~^$5?qVzco2!vl;=loj%Mtj-i^9B7BF2c*(X?x$55G!EsT6O8iQK1c@%1J
zImX}-OvGatkEc*;+#B^A>b*;-_bwwF#^r5lvOIyME^mt`kn6Wc>vw<RH#wm!XL`6J
zVTvuLd3MN_`AFzo;`o#%%iUOO=D6K<ug3}vPs&bpyDe4hIg{MA0V~&^7cNTrIL1~P
zKA&737vJczJbtS<G$nO&N_0@az10fjg$|{D6WW+o7OorWj0tbam>4^($?LQ1w+FBX
zYU}Iic4cFrA^iJ@#JFUy&s<pdhJBH>((;97XU=`HuBG0ex7_P>d40`!9xLE%_IaPP
zTmirHb`SO5x)qHcXQSWWV)>IQA7AV!^I5flMz6<FPMF2^!u*0lM}C2$aHhRrYVp(p
zNB)e^fy_}!k(Qaog)>9_nb)S?L*hbqXGZw9F^+r4+hkk#^Q@rFRv9{<yfb`p+_u<%
l6S!gGw*Mt?N$8bHfjg7vi3zRBJAAi9x}8aJDR(B)`~w$gqSycc

diff --git a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
index 017cd64d..c2fa2472 100644
--- a/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ia/LC_MESSAGES/mediagoblin.po
@@ -7,9 +7,9 @@
 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr ""
 
@@ -39,52 +39,52 @@ msgstr "Adresse de e-posta"
 msgid "Sorry, registration is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr ""
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr ""
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -127,6 +127,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -150,27 +151,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -190,7 +191,7 @@ msgstr ""
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr ""
 
@@ -238,7 +239,15 @@ msgstr "Initiar session"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
@@ -375,18 +384,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -411,55 +420,43 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: 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"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -468,7 +465,7 @@ msgid "Really delete %(title)s?"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
+msgid "Delete permanently"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
@@ -578,8 +575,13 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -598,22 +600,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -624,24 +622,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
-
-
diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.mo
index 9b94ec7fd76945f5b8540159d2af0d27cc61d630..79ccdca3d8d6bf6dd21537eb99c0d0a635bccb53 100644
GIT binary patch
delta 3887
zcmc)KdvH`&9l-Ik0ZIrEXn3{)Jp?ETVK<uq1w%*+VM=Mkqd=uh6}Z{G*&Mxl@Alri
zi3FH!%UG?bMXsozBb}l^?ToLrRdhNP@iEM(Behjf2S<=rr*%rlQlz7f-{0;gbm||D
zf0;@0IrniMzu)<tyU%>bDV(nxen9c_D1X!V>l!Xs*MD|ZD>aeJ-8dQd<3)T5oAHyQ
zl$wjrp*+8Y!|)$C7FCT>G*vB*$EjG0jW|K6f?7i3Hg0s`UAPDD#-HILoHDvRz#5c+
zH{%WX08YVfY`_7OagN{&{4EaPHEhLjOu64NtmFD?IG*{{$;yKlDi6-#R9<)uZ^jXX
zAp>fZ<lK%tQY%pwaBt<gL4MW8_;(Y27G*)-z>)Y0O8?h!626I}nP1hAkNG$mcVj31
z22WxW9vr9CE%;;HftN6a+sNlkJcXoEUBY_2hBD!_8<k?0)NGWD#Ze+(i1Pj_EXbZc
zKtm?*k-lm_@~e*UPa=H=<-H$PuFs+D>B~3*FXME43uVHI%py)lgSVnYybmR_M^WZ^
zzK;AqPUDx{kd$p_S+bA;l!*@^W2$2)9Zyv5zko8}A5c<y1vlf{D7CPGij~^giIUlG
zqHN`PY{6^TjZKrtKlPzL#b`3nA-oe0qwMX=xEB9~GSC{*uowq0f!{)nf5c5#MW=^w
zGdAN{lnhm~`T%QDGV=%$v)Wsrp=o>xrNi?md-r<fg{w#zs2bAKi8rAv-~+f658xg=
zgHkK^5#}m<82968wDJA#sca#(aeWRMS`{X8=%r&EWe>ODR_w<r{58s6pF>&LMU;qM
zt@uXe`BhxT{TPFMKE^3QvaHT>bV!2wD_+DA?C)~?3(l4E-=xbK*ocyv5IGrYH%cw+
zMOo?7NRaAB70=^)x&AwLVe8Ct<ON*B^-ob2{!bi+BRLupz-XL>6EG>~e=!Z&^Inua
z{W^XW&tp6G@V3;(5tOPuj+{Vs0%gF{D0_JZNrL(ll64iET|S=EPy*{f>Awm!-j7Yp
zuXfOo0l$Lsp?L<Sm|jGgpm9z)k`|N+mZA)FKT6FQ+=B=40#3hGsd*^*C3w|@9<D(L
zpF>_z^EfI6PK>&jhE%tWBXK`g;~~5OkDyHWRpcP3@1rdA3`)&ht~{@8ET{Gsl%nm#
zIBr1c|4_wG;|Q*wY$X4h#&K?p!qZrdze0n*N2!5335VTKJt*IU$MA9d0!l`js9^Cf
zlz?oM33s3@^y8K5r%-C>dpI0ll>Bd@agG~FTtFI@V;ZFvj-o8!C6r@x1-mgxSfepQ
z8R#(HgI`9e_RHvCHG{~wd2Gj{6)z%FDqUa$<;5<P55x(Sa~-Fbq~72F=1?Yl75Ubv
ztGEzr`JB;3b)sZ0sJIKqas3f|A09vn>^0noiPmz>6ds|mfEzdP?+$Fk{kRittYsFN
zFvQik7bT@Hp+xW|%GPMkTn;-ihTq0f_$-daAK)1LMaAFYczN_^8uH<|hQ%}0D`NG%
z3p$pk({@^WZhJEqHM;cEp6i&?khVg*F^IP4nUm9LZRwPk&Dw6L=%BN9+E~#Oy1w|`
znqyV5Tygu@mBUARDJwLd8$EsF!RWra)3HP}V?t-av8{j^@^0Gpb=Yg`c1!pAcF(f<
z-Z0FyH8=P7_a}OSo`mOTnjMp}-N3kmEjwtoGC3!{AdyV;hFPb+WBID}UG2?QN8<W8
za~c9K@2Bi-j&VQK7}R%cEM2nVwB26IyV~lrjAL~>cA~g-LTgoZh6VMTu($Y$NlnA%
zdG0&M@`CKPyzj_3>vFccG4yRaTw~>A(&Epjjv8Kb;n971t=(_?Dw?L3MHi;6m|}t;
zZwHA|UNT-c3n_&Yt)G5#>w<X865X<>t>w0Oa#1o_vwmHCgWYEWQWalGlG}7^vZXbi
zEWOv7Y-?E<eR2Ag;!kF5if#Sx8`R#M>rkt+IWGvU0fsa>Z96*Wdp*YSbYMAsOre%%
zGA8e4OlkLq_A>gguD_@9L_bIXp*OhA-cT2993AH6fg9RxKJ?V4d>9(dM8-GL@=aj-
zOk<)~^wJfZj6QW-vzpM-#_cm=-kob_*#a3vJGM4K=;zC;%~2I8E8A@>-`0-BR93Wo
z<`ad|t<t;iip`m8rBYs=O6-((ym!50OZ-Fc=s68}7Ux=7YFVvi_R88kO~wM#ZCDL)
z`<Bo2vdn-W*_yju2C^JY7Nw!<cS=jf*<C+4&h-%-JCm^)fC$SSWC<plwKB%FqXYGi
zEiLU(Wxmk&`Xt&1^Olp!yQS0)rhjm?ngv=x(C_)_Xx*%2-AdcBLtB%rtmSeHogLBV
zX1&q1+9f&@q>QAl&rYR!jWyI!-e!}slm_t;h9OkmFRhab$@#_(EuR#YQdWF+cK@)^
z1D5I<JjhELo*bKJtwSS5Z#CR8X1zIeqB55kEp6Nt{jIKPW}>_s<j18V{<8#4^mgOo
z0zv#gKL+FE48P-J5H-*1X_NX1txQm^O|oeGjOSR1!9z6^{Ll?j?Mhmrlk?2{HF6Gu
zoUu~&eC<+TK|YuBd`?p3K!qkpf{heLac$G$*wDu(dU*Z^3#&O?CiFO}6lTuy+2hh?
z7*|f$z(8qluAjXGA0CJKsjQ6g{GlF(GZdK8{HeK&)NKMULuD~<<#0J(LUnQSDUiNW
zDfCe|J;kp0$*TY512`-BnONgGpOVOXlv7WS9dcsJCFOXO`(PSN87iJ_Ib7A0lY;SW
ZzU+L7N*Coy^^|-`OXW29R6eLN^>6hnK&k)$

delta 2890
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
ZVa^|s7pg4T89Cf5ZB#zlPCeOK^)Km`*_;3X

diff --git a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
index 2b896572..534e3f71 100644
--- a/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/it/LC_MESSAGES/mediagoblin.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
+# Francesco Apruzzese <cescoap@gmail.com>, 2012.
 #   <pikappa469@alice.it>, 2011.
 #   <robi@nunnisoft.ch>, 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +21,7 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "documento non valido come tipo multimediale."
 
@@ -40,59 +41,54 @@ msgstr "Indirizzo email"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Spiacente, registrazione è disabilitata su questa istanza"
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Spiacente, esiste già un utente con quel nome"
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Siamo spiacenti, un utente con quell'indirizzo email esiste già."
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Il tuo indirizzo email è stato verificato. Puoi ora fare login, modificare "
-"il tuo profilo, e inserire immagini!"
+msgstr "Il tuo indirizzo email è stato verificato. Puoi ora fare login, modificare il tuo profilo, e inserire immagini!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "La chiave di verifica o l'id utente è sbagliato"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
-msgstr ""
-"Devi entrare col tuo profilo così possiamo sapere a chi inviare l'email!"
+msgstr "Devi entrare col tuo profilo così possiamo sapere a chi inviare l'email!"
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Hai già verificato il tuo indirizzo email!"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Rispedisci email di verifica"
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
-msgstr ""
+msgstr "Ti è stata inviata un'email con le istruzioni per cambiare la tua password."
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"Impossibile inviare l'email di recupero password perchè il tuo nome utente è"
-" inattivo o il tuo account email non è stato verificato."
+msgstr "Impossibile inviare l'email di recupero password perchè il tuo nome utente è inattivo o il tuo account email non è stato verificato."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
-msgstr ""
+msgstr "Impossibile trovare qualcuno con questo username o password."
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
-msgstr ""
+msgstr "Ora puoi effettuare il login con la nuova password."
 
 #: mediagoblin/edit/forms.py:25 mediagoblin/submit/forms.py:28
 msgid "Title"
@@ -116,7 +112,7 @@ msgstr "Tags"
 
 #: mediagoblin/edit/forms.py:35 mediagoblin/submit/forms.py:38
 msgid "Separate tags by commas."
-msgstr ""
+msgstr "Separa le tags con la virgola."
 
 #: mediagoblin/edit/forms.py:38
 msgid "Slug"
@@ -130,11 +126,12 @@ msgstr ""
 msgid ""
 "The title part of this media's address. You usually don't need to change "
 "this."
-msgstr ""
+msgstr "Il titolo è parte dell'indirizzo del contenuto. Nella maggior parte dei casi non c'è bisogno di cambiarlo."
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
-msgstr ""
+msgstr "Licenza"
 
 #: mediagoblin/edit/forms.py:50
 msgid "Bio"
@@ -150,45 +147,43 @@ msgstr "Password vecchia"
 
 #: mediagoblin/edit/forms.py:65
 msgid "Enter your old password to prove you own this account."
-msgstr ""
+msgstr "Inserisci la vecchia password per dimostrare di essere il proprietario dell'account."
 
 #: mediagoblin/edit/forms.py:68
 msgid "New password"
-msgstr ""
+msgstr "Nuova password"
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
-msgstr ""
-"Stai modificando documenti multimediale di un altro utente. Procedi con "
-"attenzione."
+msgstr "Stai modificando documenti multimediale di un altro utente. Procedi con attenzione."
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 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:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
-msgstr ""
+msgstr "Cambiamenti del profilo salvati"
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Password errata"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
-msgstr ""
+msgstr "Impostazioni del profilo salvate"
 
 #: mediagoblin/media_types/__init__.py:77
 msgid "Could not extract any file extension from \"{filename}\""
-msgstr ""
+msgstr "Non è stato possibile estrarre un'estensione dal file da \"{filename}\""
 
 #: mediagoblin/media_types/__init__.py:88
 msgid "Sorry, I don't support that file type :("
-msgstr ""
+msgstr "Mi dispiace, non supporto questo tipo di file :("
 
 #: mediagoblin/submit/forms.py:26
 msgid "File"
@@ -198,7 +193,7 @@ msgstr "Documento"
 msgid "You must provide a file."
 msgstr "Devi specificare un documento."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Evviva! "
 
@@ -218,9 +213,7 @@ msgstr "Non sembra esserci una pagina a questo indirizzo. Spiacente!"
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"Se sei sicuro che l'indirizzo è corretto, forse la pagina che stai cercando "
-"è stata spostata o cancellata."
+msgstr "Se sei sicuro che l'indirizzo è corretto, forse la pagina che stai cercando è stata spostata o cancellata."
 
 #: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
@@ -248,10 +241,16 @@ msgstr "Accedi"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Powered by <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un progetto "
-"<a href=\"http://gnu.org/\">GNU</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -265,18 +264,13 @@ msgstr "Ciao, benvenuto a questo sito MediaGoblin!"
 msgid ""
 "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
 "extraordinarily great piece of media hosting software."
-msgstr ""
-"questo sito sta utilizzando <a "
-"href=\"http://mediagoblin.org\">Mediagoblin</a>, un ottimo programma di "
-"media hosting."
+msgstr "questo sito sta utilizzando <a href=\"http://mediagoblin.org\">Mediagoblin</a>, un ottimo programma di media hosting."
 
 #: mediagoblin/templates/mediagoblin/root.html:29
 msgid ""
 "To add your own media, place comments, save your favourites and more, you "
 "can log in with your MediaGoblin account."
-msgstr ""
-"Per aggiungere i tuoi file, scrivere commenti, salvare i tuoi preferiti e "
-"altro, devi entrare col tuo profilo MediaGoblin."
+msgstr "Per aggiungere i tuoi file, scrivere commenti, salvare i tuoi preferiti e altro, devi entrare col tuo profilo MediaGoblin."
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
@@ -296,11 +290,11 @@ msgstr "Documenti multimediali più recenti"
 
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:32
 msgid "Set your new password"
-msgstr ""
+msgstr "Imposta la nuova password"
 
 #: mediagoblin/templates/mediagoblin/auth/change_fp.html:35
 msgid "Set password"
-msgstr ""
+msgstr "Imposta password"
 
 #: mediagoblin/templates/mediagoblin/auth/forgot_password.html:27
 msgid "Recover password"
@@ -322,15 +316,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Ciao %(username)s,\n"
-"per cambiare la tua password MediaGoblin apri il seguente URL\n"
-"nel tuo web browser:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"Se pensi che sia un errore, ignora semplicemente questa email e continua ad essere \n"
-"un goblin felice!"
+msgstr "Ciao %(username)s,\nper cambiare la tua password MediaGoblin apri il seguente URL\nnel tuo web browser:\n\n%(verification_url)s\n\nSe pensi che sia un errore, ignora semplicemente questa email e continua ad essere \nun goblin felice!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -365,12 +351,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Ciao %(username)s,\n"
-"\n"
-"per attivare il tuo account GNU MediaGoblin, apri il seguente URL nel tuo navigatore web.\n"
-"\n"
-"%(verification_url)s"
+msgstr "Ciao %(username)s,\n\nper attivare il tuo account GNU MediaGoblin, apri il seguente URL nel tuo navigatore web.\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -391,7 +372,7 @@ msgstr "Salva i cambiamenti"
 #: mediagoblin/templates/mediagoblin/edit/edit_account.html:34
 #, python-format
 msgid "Changing %(username)s's account settings"
-msgstr ""
+msgstr "Cambio le impostazione dell'account %(username)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit_profile.html:29
 #, python-format
@@ -405,18 +386,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "file taggato con:%(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Originale"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -425,11 +406,11 @@ msgstr ""
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:26
 msgid "Add your media"
-msgstr ""
+msgstr "Aggiungi il tuo contenuto"
 
 #: mediagoblin/templates/mediagoblin/submit/start.html:30
 msgid "Add"
-msgstr ""
+msgstr "Aggiungi"
 
 #: mediagoblin/templates/mediagoblin/user_pages/gallery.html:30
 #, python-format
@@ -441,55 +422,43 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Modifica"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Elimina"
 
-#: 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."
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
-msgstr ""
+msgstr "Aggiungi questo commento"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "a"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -498,8 +467,8 @@ msgid "Really delete %(title)s?"
 msgstr "Vuoi davvero cancellare %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Cancella permanentemente"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -544,8 +513,7 @@ msgstr "Quasi finito! Il tuo account deve ancora essere attivato."
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:58
 msgid ""
 "An email should arrive in a few moments with instructions on how to do so."
-msgstr ""
-"In breve dovresti ricevere un email contenente istruzioni su come fare."
+msgstr "In breve dovresti ricevere un email contenente istruzioni su come fare."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:62
 msgid "In case it doesn't:"
@@ -559,18 +527,14 @@ msgstr "Rispedisci email di verifica"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Qualcuno ha registrato un account con questo nome utente, ma deve ancora "
-"essere attivato."
+msgstr "Qualcuno ha registrato un account con questo nome utente, ma deve ancora essere attivato."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Se sei quella persona ma hai perso l'email di verifica, puoi <a "
-"href=\"%(login_url)s\">accedere</a> e rispedirlo."
+msgstr "Se sei quella persona ma hai perso l'email di verifica, puoi <a href=\"%(login_url)s\">accedere</a> e rispedirlo."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -587,7 +551,7 @@ msgstr "Questo utente non ha (ancora) compilato il proprio profilo."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:125
 msgid "Change account settings"
-msgstr ""
+msgstr "Cambia le impostazioni dell'account"
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:138
 #, python-format
@@ -598,9 +562,7 @@ msgstr "Visualizza tutti i file multimediali di %(username)s"
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr ""
-"Questo è dove i tuoi documenti multimediali appariranno, ma sembra che tu "
-"non abbia ancora aggiunto niente."
+msgstr "Questo è dove i tuoi documenti multimediali appariranno, ma sembra che tu non abbia ancora aggiunto niente."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
@@ -615,73 +577,69 @@ msgstr "feed icon"
 msgid "Atom feed"
 msgstr "Atom feed"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
-msgstr ""
+msgstr "Tutti i diritti riservati"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
-msgstr ""
+msgstr "← Più recente"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:45
 msgid "Older →"
-msgstr ""
+msgstr "Più vecchio →"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:48
 msgid "Go to page:"
 msgstr "Vai alla pagina:"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
-msgstr ""
+msgstr "più recente"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
-msgstr ""
+msgstr "più vecchio"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
 msgid "Could not read the image file."
-msgstr ""
+msgstr "Non è possibile leggere il file dell'immagine"
 
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "Sono sicuro di volerlo cancellare"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Oops, il tuo commento era vuoto."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "Il tuo commento è stato aggiunto!"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Hai cancellato il file"
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
-msgstr ""
-"Il file non è stato eliminato perchè non hai confermato di essere sicuro."
+msgstr "Il file non è stato eliminato perchè non hai confermato di essere sicuro."
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
-"Stai cancellando un documento multimediale di un altro utente. Procedi con "
-"attenzione."
-
-
+msgstr "Stai cancellando un documento multimediale di un altro utente. Procedi con attenzione."
diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.mo
index 3b24dd2da1dd7a0a63b9090ff672f0f4cedaed99..ad117ce9e47a12a281442f79b61b861870f87b6b 100644
GIT binary patch
delta 2960
zcmd7Se@v8h9Ki7}2MV5o@*7R`5kdLk{ot241RUbTHB|gHQcF1C0WRSV?+#JYokcS%
zP36fpt?8UC=1MECmaR3@><>3>X-!2pEt%RzODjz@*Lr`rD_j4y{^@piukZJHp6{>E
z=lgw*Jbiby|4LlMF2!dvzw!L4BBb`{vmr{U1gaY`345>~526jXjZkVTeu{GcI)>vz
zj7DWvilU0aF_?len1%65`PB>x)45QE^ROEq$J1Dd$s>au%tz_C28ZKHOvZZ5#4eP6
z4&Vg5gk5+a^Uyac*sd4js2|2LjIWM|Zk!9<=))8q_yNb^FqR=5YAC^(h1^neP$sY_
zbl-`5)fWE7;%g`qdJiM<CQAETn22|9B;zYH@tB55xDhMx0v^X4+&x;UiTDMs$LrXD
zwZwB0evX7vUB@)Mk22u+Sf$94N=J#91!d(0D9=}-UvjpRf(+n6+NvJps}ArdEBz4V
zxf7v!A4*Pd;4r+6srW0(fC-EurlJ$4psaWYN@U+c8Ru9W@!wA2D=tXL>X?>Hqzh%>
zJxHIb7p39Hq3h>RI=qS!(z{rL4^Z~PVs@<Too7%Y`#wr4uV60T$9l|3B>wCV^$NX7
zM|*HC?nBA#4P1b~qjWT%Fce`ITJZ>K_#G}q6OA@u4chP`N`#`Ay%%FpBJ&)wX7#e4
zf<|F4N`qr4xw{p5;2yFKl$r2U;8>IiJcToH7k1-Wl)bWyWme*|*n_7~$0r{Pr4Wm$
z_aR*?e*%YI8d^|txExnuCz|j)O0N4*Cf1L#qJfY<h3?<OQm%*5$<8oN2@+*>mZLKj
zZ(u*hkl$JOGjiRp^0eU0R$w?c)*vTCb)XE~jj~y`p+sUYl4f-Xr{i&)hl98X%Q+G?
zXrQzoz)^S?IXKG15g{uo4m0KaXH$@lmY|&Tm#_;DVjiYX4j!KxBx-6EO76Ns*SCf0
zucCys7xVEml>Y9Z?5+6pVEdGi1(?tHs+t1(OFfUIQSCvQ&<7|XA3#~bFDTEcjNqnC
z!f8~~@C96m7w`f~O5dFlJWZEzE%o290X@W>V5svFe_7EW1s1CkI6IM8gtAL#p$t3^
zWyQ--Lf?W(xB*F{GEh<!Ksl}_QQDnHd9FWHe}Iyb$gJQVip?Vavgwk!5QT*(IVwXZ
zE<joFQIybri89bl+>V1N3)qq!++=T}415}8B7G?B213^(2#fR=iz9Gq4)K@GlFJ1q
zr(VQDJc1Ic?@`Wm6>+Y^{aBACOE3jG4yV2b=i)k)2^~XuZ(PQin9a+g2%C_v+RLAY
zXZ#dofFE%aR`3$wt4{JKE4hPS46_GQ&=GPA${u+g<@s|MjwW7jqj5OKU=mhf20GD+
zvaqkQ8~sIWaTcjQ!AiV|J!oSK>v#eshnWSz7so8*lIlWfcNiswm(ajLG~rglC?VdC
zvZr?AFx(%qH+Vl<9imXmjgK&JHfnZQT1$Red1IsAsJUGwHY#Rq=u^^OmXX=$@ab7z
zqfSeYcW4dnwl>}6Q#`G;>5Wc@u~SP695wfv!rB9M(Q_gq-3<<()9o_ej@@l6i#ru&
zHLhlr`xoo2y2Hx=9j->*qxo8Nt;C_Vc=V>yv=*PQz1U{!?Ci8Qd7G?mPqVGn*`T|;
zPS>9$-D`6+x3^mIt#)gRudOw$th}<is>J3fvp(u4Bh%~d@HFVPtxnhKEN@!blA$Vd
zZXBb_vzlYA!`bSnZ`G}VRq=VIsAeYA>GZV(wkGC;XS-d0@5}9NtL^Z#N<RzRb=MM~
zN7sGx9qrOl;7rPh2=legJG2FQr|wZkqPf(#Hhy-p)9dZfz1E?~G`s7W$k1|(>eO+0
z`Ig)nT5e%+?sSX2&~7(ZFSIPy*E+of%QA-;7i)R;+&qhY=(#+5ac+U}M(S<jo2ZF_
zZzq)h*Blu~%|>APq!r}JsEbYyT%5e=QLbt;_mQh7jOMI$|JQs?%)Vk8xzy48SIQnv
RYyMX$TW^2opD7Dde*l2a<gNe!

delta 2739
zcmb8wdu&rx0LSsOt*{3hum?E6!DVBx4Z0@}R}cqVgn;2Cagq>VYcE^DwPWpgEJ&L`
zP>J|hoe2t}@=(K!WR1XIAQ&|YDiQ)hgfK8s{{aCp5Y+hn(I%J}{-EjlIrrRq&*OK_
zy}PxtXGQ2@mZQt?d6B<I`CIJJ(f!Z%6k~>PxC4jcLCnEZI2eDyEBFtV;pJ3g>M$!U
zcD^2yIQAi@OdBTSdK_p>$ZVp}pNcNb!rhpS2XP`E$C;Se&zM;_8z<nKs0L4<Iyi%U
z@jO0)y;y{IQ0?TW8#5diVF#|oO8Pf9Dd@)08L<I4k&&4iRQ>#T{j-?M@k&$@n@|nz
zM1^)3Y07+#8o<f;`CpN*NoJNxau8}jWtdF=W;q2l;KM-}Kn87I!g1Jz&*L#Xi!}p`
z8H>4$as<}lI`p6$FXBj?o*7HhgZUh<MMeKMvRY;rhBU)&3W`38ivCN~+MY*sa2;vW
zWO5NjlaHF|cvSr~)b$JE^<LD{tj0bV#ys4N>UekDkF&_XnTi8cXyzm6T@g<}H9Q9u
z*;3R%)}cDyh8oCT)b)qr^*^B6xrj>i53I*KsJ$?sovXdmfl79N4*6>>FHli|x3LjR
zXhjWd#V4^7wWjBA4qit!P{Xt*VGEYx9<=Z@F2q|H##!8~r{g#(k-Hecgb>45B<)BD
zW&>LIIu64g)S7)4KYs?<2Ie=c#oMR>Od+Pp7{raZAGJruGrJkM3_I~dv~e<xGd45-
zJqj)ghmf|+P1KF)ybQEvkKq!01{3j9)Y=|G4eS_dM&HCe8Od~HhxR7$R-i_Uw}pp<
zUd?VKUULM;;Ay;qf8i5&i50Fx%Zd%n#w3o{qk0UZdfbBA9G$2rcA=u{LDt!PVX><w
zQaDG&OdL3pdEz3h$9<><lXxh!n=+6`$_z!;#gw3S%XCybE0Hmp_pt+yVkJ%~h`k{E
zNNQ#^Y9O5j>?%E1d*T({sBDj575<27Fnv^PmyJa=P#*Uw)OF3sMl;({N%o)ybOMz`
zQekWY{ZQBCVm~YmQPB2u;S1P=XYm?palaZJd!BCMYL2s64>xW>!ZBA-0~$ySOxBFU
zWSomBSdU6>8EVEYsOZBu7(;JRU^&e`)LI=!J+MEaZoC?=zl*vdy*O51fLfYz?1L`U
zF08>6T!LDvCTzwvsF`0vCHyDSU&st7iOs-5CS#_cI`*IjvI=#>#(4d9R6`$ODjq@Y
zm9LR8nvujd0cW9-3ZowIpK%#h6L%xNg?;s3<!=glb2yx_fy_p|Iht@X9>7U>1NG)8
z;m5*7sD?W*jNhZ)9P{|m1i~1=t*Gb|%46oB_Qn_-M*n6Bg(U320k{GC<11K;JJ5^0
zs2R=X{kIW6K_+FY*y1yADR$xqXrqgrsU>?C_2M{)e9aAhbl>Rl<gYbbKp}#yn1~MY
zQ?$vb&6J5+;~{ZJpsp)KT~~yru*mIiX|a95rEY(_FIXI~;>Qm@6EKC5Q^T$3J1JH|
zV(ZjMLf+$%OR1wWT5ONE!A$dbEWgi=ylmxXdOWrctimEsL(nb`lt#L(uIP!hoWz8A
z(cbhrN3z##`vSHrGA?slM!e&IwayNfMvi8F8+kRWHrkk7mKfbJXiU=J7Jr*<-Rr~(
zHZ(QS^crulIeIlW)sgORGnY5NX3eqJ*lm%idDEY6Y;OvbF8BN0{<hXqpB*e~ZS$|N
z-N8WFy%w7Mjn8>~W!^xb-43M9o4e3i+h#Wey?&pwj-k4&%JPazXL*IQvf8Ssa#dA0
z%O^$-=M77X)l|DGt0PzPey@D^@S-P&yB{{TXt#BZ$RfSzqoSV`gzv{TqiE;<Vp|-U
eTD+F%rbS;YxsVuL<y`*2=n^Wr9U1?P&io5_jF;{J

diff --git a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
index 35231f66..099ee2e0 100644
--- a/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ja/LC_MESSAGES/mediagoblin.po
@@ -7,9 +7,9 @@
 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr ""
 
@@ -39,52 +39,52 @@ msgstr "メールアドレス"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "申し訳ありませんが、このインスタンスで登録は無効になっています。"
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "申し訳ありませんが、その名前を持つユーザーがすでに存在しています。"
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "メアドが確認されています。これで、ログインしてプロファイルを編集し、画像を提出することができます！"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "検証キーまたはユーザーIDが間違っています"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "検証メールを再送しました。"
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr ""
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -127,6 +127,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -150,27 +151,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr "そのスラグを持つエントリは、このユーザーは既に存在します。"
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "あなたは、他のユーザーのメディアを編集しています。ご注意ください。"
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "あなたは、他のユーザーのプロファイルを編集しています。ご注意ください。"
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -190,7 +191,7 @@ msgstr "ファイル"
 msgid "You must provide a file."
 msgstr "ファイルを提供する必要があります。"
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "投稿終了！"
 
@@ -238,7 +239,15 @@ msgstr "ログイン"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
@@ -340,12 +349,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"%(username)s様へ\n"
-"\n"
-"GNU MediaGoblinアカウントを検証にするには、このURLを開いてください。\n"
-"\n"
-"%(verification_url)s"
+msgstr "%(username)s様へ\n\nGNU MediaGoblinアカウントを検証にするには、このURLを開いてください。\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -380,18 +384,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -416,55 +420,43 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: 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."
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -473,7 +465,7 @@ msgid "Really delete %(title)s?"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
+msgid "Delete permanently"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
@@ -583,8 +575,13 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -603,22 +600,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -629,24 +622,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
-
-
diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.mo
index 0baae15d882404eed566d992ffad9244d271317b..2b8f3953fa57d9a9a5422303b921d4d75305d76c 100644
GIT binary patch
delta 2985
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
W_&?XOqp&P`a9=Imdh`8in$+J2;p}Pv

delta 2878
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
AcK`qY

diff --git a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
index c40671e6..95872485 100644
--- a/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nl/LC_MESSAGES/mediagoblin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-01-29 13:47-0600\n"
-"PO-Revision-Date: 2012-02-05 20:14+0000\n"
-"Last-Translator: schendje <mail@jefvanschendel.nl>\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+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"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Verkeerd bestandsformaat voor mediatype opgegeven."
 
@@ -39,59 +39,52 @@ msgstr "E-mail adres"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Sorry, registratie is uitgeschakeld op deze instantie."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Sorry, er bestaat al een gebruiker met die naam."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Sorry, een gebruiker met dat e-mailadres bestaat al."
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Uw e-mailadres is geverifieerd. U kunt nu inloggen, uw profiel bewerken, en "
-"afbeeldingen toevoegen!"
+msgstr "Uw e-mailadres is geverifieerd. U kunt nu inloggen, uw profiel bewerken, en afbeeldingen toevoegen!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "De verificatie sleutel of gebruikers-ID is onjuist"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 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!"
+msgstr "Je moet ingelogd zijn, anders weten we niet waar we de e-mail naartoe moeten sturen!"
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Je hebt je e-mailadres al geverifieerd!"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Verificatie e-mail opnieuw opgestuurd."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 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."
+msgstr "Een e-mail met instructies om je wachtwoord te veranderen is verstuurd."
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"Email kon niet verstuurd worden omdat je gebruikersnaam inactief is of omdat"
-" je e-mailadres nog niet geverifieerd is."
+msgstr "Email kon niet verstuurd worden omdat je gebruikersnaam inactief is of omdat je e-mailadres nog niet geverifieerd is."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 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
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr "Je kunt nu inloggen met je nieuwe wachtwoord."
 
@@ -109,10 +102,7 @@ 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."
+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"
@@ -134,11 +124,10 @@ msgstr "De slug kan niet leeg zijn"
 msgid ""
 "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."
+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
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr "Licentie"
 
@@ -162,30 +151,27 @@ msgstr "Vul je oude wachtwoord in om te bewijzen dat dit jouw account is"
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 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:92
+#: mediagoblin/edit/views.py:88
 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."
+msgstr "U bent de media van een andere gebruiker aan het aanpassen. Ga voorzichtig te werk."
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
-msgstr ""
-"U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk."
+msgstr "U bent een gebruikersprofiel aan het aanpassen. Ga voorzichtig te werk."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr "Profielaanpassingen opgeslagen"
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Verkeerd wachtwoord"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr "Accountinstellingen opgeslagen"
 
@@ -205,7 +191,7 @@ msgstr "Bestand"
 msgid "You must provide a file."
 msgstr "U moet een bestand aangeven."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Mooizo! Toegevoegd!"
 
@@ -225,9 +211,7 @@ msgstr "Het lijkt erop dat er geen pagina bestaat op dit adres. Sorry!"
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"Als je zeker weet dat het adres klopt is de pagina misschien verplaatst of "
-"verwijderd."
+msgstr "Als je zeker weet dat het adres klopt is de pagina misschien verplaatst of verwijderd."
 
 #: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
@@ -255,11 +239,16 @@ msgstr "Inloggen"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Aangedreven door &lt;a "
-"href=\"http://mediagoblin.org\"&gt;MediaGoblin&lt;/a&gt; , een &lt;a "
-"href=\"http://gnu.org/\"&gt;GNU-project&lt;/a&gt;"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -273,17 +262,13 @@ msgstr "Hoi, welkom op deze MediaGoblin website!"
 msgid ""
 "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
 "extraordinarily great piece of media hosting software."
-msgstr ""
-"Deze website draait <a href=\"http://mediagoblin.org\">MediaGoblin</a>, een "
-"buitengewoon goed stuk software voor mediahosting."
+msgstr "Deze website draait <a href=\"http://mediagoblin.org\">MediaGoblin</a>, een buitengewoon goed stuk software voor mediahosting."
 
 #: mediagoblin/templates/mediagoblin/root.html:29
 msgid ""
 "To add your own media, place comments, save your favourites and more, you "
 "can log in with your MediaGoblin account."
-msgstr ""
-"Om je eigen media toe te voegen, berichten te plaatsen, favorieten op te "
-"slaan en meer, kun je inloggen met je MediaGoblin account."
+msgstr "Om je eigen media toe te voegen, berichten te plaatsen, favorieten op te slaan en meer, kun je inloggen met je MediaGoblin account."
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
@@ -295,10 +280,7 @@ 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>"
-msgstr ""
-"&lt;a class=\"button_action_highlight\" href=\"%(register_url)s\"&gt;Creëer een account op deze website&lt;/a&gt;\n"
-"          of\n"
-"          &lt;a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\"&gt;Gebruik MediaGoblin op je eigen server&lt;/a&gt;"
+msgstr "&lt;a class=\"button_action_highlight\" href=\"%(register_url)s\"&gt;Creëer een account op deze website&lt;/a&gt;\n          of\n          &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:40
 msgid "Most recent media"
@@ -332,14 +314,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Hoi %(username)s,\n"
-"\n"
-"Om je wachtwoord voor GNU MediaGoblin te veranderen, moet je dit adres in je webbrowser openen:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"Als je denkt dat dit niet klopt, kun je deze e-mail gewoon negeren."
+msgstr "Hoi %(username)s,\n\nOm je wachtwoord voor GNU MediaGoblin te veranderen, moet je dit adres in je webbrowser openen:\n\n%(verification_url)s\n\nAls je denkt dat dit niet klopt, kun je deze e-mail gewoon negeren."
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -374,9 +349,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Hallo %(username)s , open de volgende URL in uw webbrowser om uw GNU "
-"MediaGoblin account te activeren: %(verification_url)s "
+msgstr "Hallo %(username)s , open de volgende URL in uw webbrowser om uw GNU MediaGoblin account te activeren: %(verification_url)s "
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -411,27 +384,23 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "Media met het label: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Origineel"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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."
+msgstr "Sorry, deze video werkt niet omdat je webbrowser geen HTML5 video ondersteunt."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 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>!"
+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 "Add your media"
@@ -451,61 +420,44 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
-msgstr "Toegevoegd op %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Pas aan"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 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:124
+msgid "Add a comment"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 msgid ""
 "You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
-msgstr ""
-"Voor opmaak kun je &lt;a "
-"href=\"http://daringfireball.net/projects/markdown/basics\"&gt;Markdown&lt;/a&gt;"
-" gebruiken."
+msgstr "Voor opmaak kun je &lt;a href=\"http://daringfireball.net/projects/markdown/basics\"&gt;Markdown&lt;/a&gt; gebruiken."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr "Voeg dit bericht toe"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "op"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</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
@@ -513,8 +465,8 @@ msgid "Really delete %(title)s?"
 msgstr "Zeker weten dat je %(title)s wil verwijderen?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Permanent verwijderen"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -559,9 +511,7 @@ msgstr "Bijna klaar! Je account moet nog geactiveerd worden."
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:58
 msgid ""
 "An email should arrive in a few moments with instructions on how to do so."
-msgstr ""
-"Een e-mail zou in een paar ogenblikken aan moeten komen met instructies "
-"hiertoe."
+msgstr "Een e-mail zou in een paar ogenblikken aan moeten komen met instructies hiertoe."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:62
 msgid "In case it doesn't:"
@@ -575,18 +525,14 @@ msgstr "Stuur de verificatie e-mail opnieuw op."
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Iemand heeft een account met deze gebruikersnaam gemaakt, maar hij moet nog "
-"geactiveerd worden."
+msgstr "Iemand heeft een account met deze gebruikersnaam gemaakt, maar hij moet nog geactiveerd worden."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Als u die persoon bent, maar de verificatie e-mail verloren hebt, kunt u <a "
-"href=\"%(login_url)s\">inloggen</a> en hem nogmaals verzenden."
+msgstr "Als u die persoon bent, maar de verificatie e-mail verloren hebt, kunt u <a href=\"%(login_url)s\">inloggen</a> en hem nogmaals verzenden."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -614,9 +560,7 @@ msgstr "Bekijk alle media van %(username)s"
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr ""
-"Dit is waar je nieuwe media zal verschijnen, maar het lijkt erop dat je nog "
-"niets heb toegevoegd."
+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:163
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
@@ -631,9 +575,14 @@ msgstr "feed icoon"
 msgid "Atom feed"
 msgstr "Atom feed"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
-msgstr "Licentie:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
@@ -651,23 +600,19 @@ msgstr "Ouder →"
 msgid "Go to page:"
 msgstr "Ga naar pagina:"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr "nieuwer"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr "ouder"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr "Bekijk meer media gelabeld met"
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
-msgstr "of"
+msgid "Tagged with"
+msgstr ""
 
 #: mediagoblin/tools/exif.py:68
 msgid "Could not read the image file."
@@ -677,27 +622,22 @@ msgstr "Kon het afbeeldingsbestand niet lezen."
 msgid "I am sure I want to delete this"
 msgstr "Ik weet zeker dat ik dit wil verwijderen."
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Oeps, je bericht was leeg."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "Je bericht is geplaatst!"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Je hebt deze media verwijderd."
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
-msgstr ""
-"Deze media was niet verwijderd omdat je niet hebt aangegeven dat je het "
-"zeker weet."
+msgstr "Deze media was niet verwijderd omdat je niet hebt aangegeven dat je het zeker weet."
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
-"Je staat op het punt de media van iemand anders te verwijderen. Pas op."
-
-
+msgstr "Je staat op het punt de media van iemand anders te verwijderen. Pas op."
diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.mo
index 01179e474940d8c9d305c597b04c1227e34b94cd..2d085d29e8b488f0b16813348e5bcc451a67df60 100644
GIT binary patch
delta 2985
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
Xsk0*!@{Y&-mn@oXJ@Nm@qDlP??TYK(

delta 2793
zcmb8wYiv|S7{>AG1$v<c+H$oNj-{n7u)R~D2q{nysumCsO^DEL4`rd<ZFaZZf-Dh2
zFj3Ji7>N=>1g(iw;ws=53}}d4Y(Nx4#R_e_V1fiu(<&PO54$Q~h_RvkX6BqT^UnLu
zIepi@;S6-9#_lrwZ0C0bze{7)`}gP7cw>gs-Glex5gde{;t>1}yYWvfz^(*iDls)N
ze0>SV(03!3j2Gi@BMvksV7Aie&%iEB#r>FuN3aaf;2ezZXG|47gcI;3)P!eI3tYs$
z*nvawD&}G@YM#s_V@Bc=xB=H;G3%RKH1yz@<Zu8EBr;Qh8eb3@e;kL=UyaJdR@8)h
zQAs<7Ol3Yq1#m8M{d?q}iDQ?_<X}`l1sKQrW(5sR;Ksq|LxMKX;CS4HPvHst0xJd>
zGY*Fl<tVJg^;m~a?8N(VMoKu7b(l$i9V+#&Ak{LjVL&^4i-uAkLZ$vBs<s`d1#Tj9
zniOuLX);keEk%t_N8SHuWZZ=+%^K{3n=u2op%&gB@n9<XU&+8>2DI~0tgaMKKuuhY
zO4%}0AnQ>J??wgkI_mzTk@54Wc{))U{TY{FFX}8T;N<G;Y(Qo9&>-@!T7Jbq5%yp$
zj%5~2@Ep#@7F10yVKv@FO;EwMCt@S!;{mkrGhBqf;AX7iVZ9w^P#O6heHaxWe5Irr
zNrKsg7QTq-_ztRO?UCyjkz-)4;Y{p71@HiAnu31Zf`?FNq?Fw~h|94BThYcTOipZO
z!9E)0G>#&3nOmp_llT~@W|Qzqd<>)UJydOvq5?aC+R^EV=YlD*X@Nsgd=(f`@pkf(
zu&QZ8(rZp3+c%xqjlZI{&_RVOG1ZEEIWUI48>yf1qE_67IvmfVQn446x;E5($1P5k
zlKnXYbFdFDgQ{PR6L2l+{W^#`P4A;7K8Xsf9d-Y=ScU_5d5F=>#<^%?F}{s@t_u~&
z52#x9W^$_ZUPX`QVN5_JdpIh>Lezwns8i-d1+o%#Uo%?xEGoALQ5g)O0%}Js+$SrX
zp=4ABQcxSq3eX@JQ;1Et5U=1zsNx>T4li&X{q%prYOEg<{v&W0IS1xK#2csu`{jgp
zm=<vasubC%z{`*~!vr3op%>PPif9Y!h24SL=|0qhZOAb(A4JA4qfXZ~)Xs0APGK)9
zwL_^(99rnYT-1UsNVQBWGH<|~rlAGDM5X#VYQm(v@OUcfxM!gPnu?mJ3gdA(PDK~;
zsCff*cFv(b6n)2rcRUF#`tz_Bo3Nk$s$8Hkn}M%U0gNH<O7Sc#!JVi>`Y}$y9vqLQ
z{HI#i;AY&2y6+F{iw;Nl%TbDn^jlH24<S`DCo!G%&2<_Hn2;Y%bsF}kpM_Oef|_^}
zmSP)j!EPiLQ_n^1IEXEH3T<3k7~c5_)Q95|>a`w3TJ&5V22``fG!~-|qwy3*;aOA-
z+fgOC81XXdzAjYY-=N9Pb$S{bZMT1!)6?ws=lQHi|K3-8COfn#z9K5RX<9HUV`}h9
zLRNC4UFWJX)9dOikJ}Dzw=z@e>TGqa?A*E<zn$mH4^2#bGdgO1=xS1BY@Ew!yM1<f
zaD2+{<j8_PYrXBy4<1kXB)B7WW~er;AUd>Xa8AsSMvvFF?kr&WYwGKncCE|5GW6rH
zgxDmH*K}=r!K${`+TP%_j2R1So9lh~D?A>j$J><ew*3W7Ue7Aq>Gu`fnW5fO+u(8+
zxO~25+m|?h-Xh0LuU+GJdEAal!YsFn3yX>!g+-3y$yQNGc}bC@uq=2iBRw%ZGP%5X
za<Dt&x8nbwwBW}0%+T$Td3UAFN`Kg{uebcJhCAD{SGXE%?|&q*)tVbUU}1yp_ghW2
zx3Na03&o7S9rI60`{o1(R(t*~V<f9D=d6ma^t#sAR?V7VVQNW??eYgJax)Vg<j1$l
iUhOC8LxWG}mV{>I^+bi{jvIB)#JA*k#3bLHc=H#~ORTa0

diff --git a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
index 1cc0b878..9ce8914b 100644
--- a/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/nn_NO/LC_MESSAGES/mediagoblin.po
@@ -7,9 +7,9 @@
 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Ugyldig fil for mediatypen."
 
@@ -39,55 +39,52 @@ msgstr "Epost"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Registrering er slege av. Orsak."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Ein konto med dette brukarnamnet finst allereide."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Kontoen din er stadfesta. Du kan no logga inn, endra profilen din og lasta "
-"opp filer."
+msgstr "Kontoen din er stadfesta. Du kan no logga inn, endra profilen din og lasta opp filer."
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "Stadfestingsnykelen eller brukar-ID-en din er feil."
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Send ein ny stadfestingsepost."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"Kunne ikkje senda epost. Brukarnamnet ditt er inaktivt eller uverifisert."
+msgstr "Kunne ikkje senda epost. Brukarnamnet ditt er inaktivt eller uverifisert."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -130,6 +127,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -153,27 +151,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr "Eit innlegg med denne adressetittelen finst allereie."
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sine mediefiler."
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Trå varsamt, du endrar nokon andre sin profil."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -193,7 +191,7 @@ msgstr "Fil"
 msgid "You must provide a file."
 msgstr "Du må velja ei fil."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Johoo! Opplasta!"
 
@@ -213,9 +211,7 @@ msgstr "Det ser ikkje ut til å vera noko her... Orsak."
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"Er du sikker på at adressa er korrekt, so er sida truleg flytta eller "
-"sletta."
+msgstr "Er du sikker på at adressa er korrekt, so er sida truleg flytta eller sletta."
 
 #: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
@@ -243,10 +239,16 @@ msgstr "Logg inn"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Drive av <a href=\"http://mediagoblin.org\">MediaGoblin</a>, eit <a "
-"href=\"http://gnu.org/\">GNU</a>-prosjekt"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -312,14 +314,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Hei %(username)s,\n"
-"\n"
-"for å endra MediaGoblin-passordet ditt, opna fylgjande URL i ein netlesar:\n"
-"\n"
-"    <%(verification_url)s>\n"
-"\n"
-"Dersom du mistenkjer dette er eit misstak, ignorer eposten og hald fram med å vera ein glad goblin!"
+msgstr "Hei %(username)s,\n\nfor å endra MediaGoblin-passordet ditt, opna fylgjande URL i ein netlesar:\n\n    <%(verification_url)s>\n\nDersom du mistenkjer dette er eit misstak, ignorer eposten og hald fram med å vera ein glad goblin!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -354,12 +349,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Hei %(username)s,\n"
-"\n"
-"opna fylgjande netadresse i netlesaren din for å aktivera kontoen din:\n"
-"\n"
-"%(verification_url)s"
+msgstr "Hei %(username)s,\n\nopna fylgjande netadresse i netlesaren din for å aktivera kontoen din:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -394,18 +384,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -430,55 +420,43 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: 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."
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -487,8 +465,8 @@ msgid "Really delete %(title)s?"
 msgstr "Vil du verkeleg sletta %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Slett permament"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -554,9 +532,7 @@ msgstr "Dette brukarnamnet finst allereie, men det er ikkje aktivert."
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Viss dette er deg, kan du <a href=\"%(login_url)s\">logga inn</a> for å få "
-"tilsendt ny epost med stadfestingslenkje."
+msgstr "Viss dette er deg, kan du <a href=\"%(login_url)s\">logga inn</a> for å få tilsendt ny epost med stadfestingslenkje."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -599,8 +575,13 @@ msgstr " "
 msgid "Atom feed"
 msgstr "Atom-kjelde"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -619,22 +600,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -645,25 +622,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr "Eg er sikker eg vil sletta dette"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
-"Du er i ferd med å sletta ein annan brukar sine mediefiler. Trå varsamt."
-
-
+msgstr "Du er i ferd med å sletta ein annan brukar sine mediefiler. Trå varsamt."
diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.mo
index 6d2e6fc6187e47758726a049d3810e3d3b636c12..7644ab3ee74b44e336de4707e283d6264abb96e3 100644
GIT binary patch
delta 2976
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
A*#H0l

delta 2800
zcmb8wYiv|S7{>AGw$cl&rOW+NdMLLR=@kmJfV8DSz*s;~L<yzs9?A;4r|xdKsVoVE
z2x=4-R8T@xAQD8-l}lnm1R@#%!5at$VnGl;s3AxMF~<MXT?1c;v7!CV%$}Wj-*;vX
zZ_T|tCw$(WwBGRZ9KXHzotdQG?VmSNjOk8y6ZXJ;*a^SFF8C8(#J{l!FQgh%gYLB0
z=hHEfz90F>1TYz&!4AfR%?cX#GO!-qxCJ}nJ{*QeaXh-(8#56f#4>yZHQ_PT0;jMY
zp2e=%ig|bwHBWB3F}-mHF2O}u%KGLS4SjJyMl65=Br;Qp8lMs$e+;|PpNFc%3e<#~
zQAIm|Ol1zE0yr7}{0j2VB$K5o*%=j35hk;~nL|Sp_^~qvk)X{g9E|JnSv-WNu`<(`
z`>-2P=3osjMh`aPdF+GLS+PobFqi%!ROw$wcFVktVP*I(4V6BMD*X}E-kwD*a21);
zWbqJ9lZ(o9C~CY4_58!}aW86X7T`U&46|`1YT+$$ce<(nTn6?spv-evT_r9<O<apA
zSsf~n#i)fhpaR*3dVYU={7ck4=TQ~?9jD_>)LEFq$<^6ef~xH9PSjs}d5(b+ynzik
zh*>nji#QI~qW1I**5Xyv1eK&c9DP`bThYRAa2j66WjK*9>vkMPRpb^1F(FL&DoG1c
z1hW(^T!TIF1Js^<5&!%YatzGRI2Lc90vJV^Mq&t;<8IU$8A^5!;A~ur@1Tt%nVi_n
zls9Qq(Aba6Wv-#Vn9j>Udo}`R;iKrnJ*d6ij|%J%Dx=Tio{VHAbqxQOz*~V4ZQj>h
z5>_?8AmueF>?G-%Y`lnNSccuL*qdV#DztT&h&xb+VHaw}kK_H%P^CD7D%}-ipUo|c
zQ>D$!>=S!)RACMM)u>cYpi)TVQpirIJ?M=JY#{2ijKN_z7uzm6uAzSbOL21FSnA7B
z0j@#?w6QOzO806z1IlDKssf)P2gh8%1iXQI?oZSkBB5Vw4>FOWm^@Tw<B>JZ6R3ce
zq5|H7s>lIU=0{NToDI`ZNw44{?A_m(@9|X}fI<E!!;QEa593O#9T;2qTU18ZaS*oS
zVJ%dGTDTnBVKpkD38+Bpkm8zffQB+yhnna^RD_?PF7TQ7_+?aO{)mse^J80*gGr3%
zqb4lG6r7AYZ8OlpI#d8BkmF`9A#ca9aS^rxa3e{WQdA(1qXL<SI__aqK(C=D+KS5b
zBYXr8Be9w8+=&rbjk?HBqh0_za43F<4Vb}Ts{U7LrZJ9zC8$6SVlB4fC@e0BU0@#$
zq5nRzTjmmK;k3fon`1T>({Duu=4N%BogS!!dZBJr0qXnJ*pu~56AgV~IcDJVn2sB8
zG;TxPh97YZ=CI0gtV5D97f}Ica+TKNEVS_|>XuCB3Mdc<mEcpT7seV4YcF=un2*QM
zh2^B#9!H_}c06h?ABsB__1p|h#hGaO=QTP$pY0FTH99T+P=3&g_wW8m(DaWkO{q+9
zHQyge$Q~W}A+=wI&-QrhO_j%EIet6RH7z&G<FVDT`saD-Lw0_!FgiSKyDMRGv^BjZ
zDcRd-`-65xWN_AojQD~<Yq1?Fj2z559(l<<Hrmj!$Q9kxd0=7}pA)dHwgs$EeNz+D
zF7$@xMt|*=nw0JY%!QRNTebE=I}o`)yLxIvOH;6Lj^i{sf#yQL9V%)LI8WM*p<q$l
z3{6hMe6PRA8w|GC!L-SfrWK40*!3Z=<1eTo%nGZtxTLh8xTK)8+$tGTF{GrRcv$2>
zcF(lfNO?tRdE{dD3rQin-WOTedwc2suU<4eXTlw|%kAQAWcm7l<vYCdzl(U;+Ux34
z)m-1i7n<#Wuinqz+1fxm`d;7A?aJooZOe52-OPAxkLP(i)Yw7WzrdNl!0U0WW+xD7
sEgX{8;<MW76mlXScWz{J{<vt%pqZ}dxxs(A?pFWA;?s#4ch=wh0}C9lBLDyZ

diff --git a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
index 14c54fb3..feddf376 100644
--- a/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/pt_BR/LC_MESSAGES/mediagoblin.po
@@ -8,11 +8,11 @@
 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/mediagoblin/team/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/mediagoblin/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Arquivo inválido para esse tipo de mídia"
 
@@ -40,56 +40,52 @@ msgstr "Endereço de email"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Desculpa, o registro está desativado neste momento."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Desculpe, um usuário com este nome já existe."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Desculpe, um usuário com esse email já esta cadastrado"
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"O seu endereço de e-mail foi verificado. Você pode agora fazer login, editar"
-" seu perfil, e enviar imagens!"
+msgstr "O seu endereço de e-mail foi verificado. Você pode agora fazer login, editar seu perfil, e enviar imagens!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "A chave de verificação ou nome usuário estão incorretos."
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr " "
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Você já verifico seu email!"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "O email de verificação foi reenviado."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"Não foi possível enviar o email de recuperação de senha, pois seu nome de "
-"usuário está inativo ou o email da sua conta não foi confirmado."
+msgstr "Não foi possível enviar o email de recuperação de senha, pois seu nome de usuário está inativo ou o email da sua conta não foi confirmado."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -132,6 +128,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -155,27 +152,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 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:92
+#: mediagoblin/edit/views.py:88
 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:162
+#: mediagoblin/edit/views.py:158
 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:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Senha errada"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -195,7 +192,7 @@ msgstr "Arquivo"
 msgid "You must provide a file."
 msgstr "Você deve fornecer um arquivo."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Eba! Enviado!"
 
@@ -215,9 +212,7 @@ msgstr "Aparentemente não existe uma página com esse endereço. Desculpe!"
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-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"
+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:46
 msgid "MediaGoblin logo"
@@ -245,10 +240,16 @@ msgstr "Entrar"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Desenvolvido por <a href=\"http://mediagoblin.org\">MediaGoblin</a>, um "
-"projeto <a href=\"http://gnu.org/\">GNU</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -314,15 +315,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Olá %(username)s,\n"
-"\n"
-"para alterar sua senha do GNU MediaGoblin, abra a seguinte URL\n"
-"no seu navegador web:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"Se você acha que isso é um erro, desconsidere esse email e continue sendo um goblin feliz"
+msgstr "Olá %(username)s,\n\npara alterar sua senha do GNU MediaGoblin, abra a seguinte URL\nno seu navegador web:\n\n%(verification_url)s\n\nSe você acha que isso é um erro, desconsidere esse email e continue sendo um goblin feliz"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -357,12 +350,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Olá %(username)s,\n"
-"\n"
-"Para ativar sua conta GNU MediaGoblin, visite este endereço no seu navegador:\n"
-"\n"
-"%(verification_url)s"
+msgstr "Olá %(username)s,\n\nPara ativar sua conta GNU MediaGoblin, visite este endereço no seu navegador:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -397,18 +385,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -433,55 +421,43 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Editar"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Apagar"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-#, python-format
-msgid "%(comment_count)s comment"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -490,8 +466,8 @@ msgid "Really delete %(title)s?"
 msgstr "Realmente apagar %(title)s ?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Apagar permanentemente"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -500,8 +476,7 @@ msgstr "Painel de processamento de mídia"
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:25
 msgid ""
 "You can track the state of media being processed for your gallery here."
-msgstr ""
-"Você pode verificar como a mídia esta sendo processada para sua galeria aqui"
+msgstr "Você pode verificar como a mídia esta sendo processada para sua galeria aqui"
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:28
 msgid "Media in-processing"
@@ -551,18 +526,14 @@ msgstr "Reenviar email de verificação"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Alguém registrou uma conta com esse nome de usuário, mas ainda precisa ser "
-"ativada."
+msgstr "Alguém registrou uma conta com esse nome de usuário, mas ainda precisa ser ativada."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Se você é essa pessoa, mas você perdeu seu e-mail de verificação, você pode "
-"<a href=\"%(login_url)s\">efetuar login</a> e reenviá-la."
+msgstr "Se você é essa pessoa, mas você perdeu seu e-mail de verificação, você pode <a href=\"%(login_url)s\">efetuar login</a> e reenviá-la."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -590,9 +561,7 @@ msgstr "Ver todas as mídias de %(username)s"
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr ""
-"Aqui é onde sua mídia vai aparecer, mas parece que você não adicionou nada "
-"ainda."
+msgstr "Aqui é onde sua mídia vai aparecer, mas parece que você não adicionou nada ainda."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
@@ -607,8 +576,13 @@ msgstr "ícone feed"
 msgid "Atom feed"
 msgstr "Atom feed"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -627,22 +601,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr "Ir a página:"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -653,24 +623,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr "Eu tenho certeza de que quero pagar isso"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Opa, seu comentáio estava vazio."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "Seu comentário foi postado!"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Você deletou a mídia."
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Você vai apagar uma mídia de outro usuário. Tenha cuidado."
-
-
diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.mo
index 226474af5e2f3145700d1adac3e25ffc0eebb3e1..11924a75692f58f5c2458535ca68648bdbb0c51b 100644
GIT binary patch
delta 3068
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

delta 2892
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
Rm>rB?-`V*=)3BnZ`VS=i+9?14

diff --git a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
index 9139e59d..4cc21d9d 100644
--- a/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ro/LC_MESSAGES/mediagoblin.po
@@ -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: 2012-01-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1))\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Formatul fișierului nu corespunde cu tipul de media selectat."
 
@@ -40,57 +40,52 @@ msgstr "Adresa de e-mail"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Ne pare rău, dar înscrierile sunt dezactivate pe acest server."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Ne pare rău, există deja un utilizator cu același nume."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Există deja un utilizator înregistrat cu această adresă de e-mail."
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Adresa ta de e-mail a fost verificată. Poți să te autentifici, să îți "
-"completezi profilul și să trimiți imagini!"
+msgstr "Adresa ta de e-mail a fost verificată. Poți să te autentifici, să îți completezi profilul și să trimiți imagini!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "Cheie de verificare sau user ID incorect."
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Trebuie să fii autentificat ca să știm cui să trimitem mesajul!"
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Adresa ta de e-mail a fost deja verificată!"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "E-mail-ul de verificare a fost retrimis."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr "S-a trimis un e-mail cu instrucțiuni pentru schimbarea parolei."
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"E-mailul pentru recuperarea parolei nu a putut fi trimis deoarece contul tău"
-" e inactiv sau adresa ta de e-mail nu a fost verificată."
+msgstr "E-mailul pentru recuperarea parolei nu a putut fi trimis deoarece contul tău e inactiv sau adresa ta de e-mail nu a fost verificată."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 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."
+msgstr "Nu s-a găsit nicio persoană cu acel nume de utilizator sau adresă de e-mail."
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr "Acum te poți autentifica cu noua parolă."
 
@@ -108,10 +103,7 @@ 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."
+msgstr "Poți folosi\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                      Markdown</a> pentru formatare."
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
@@ -133,13 +125,12 @@ msgstr "Identificatorul nu poate să lipsească"
 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ă."
+msgstr "Partea corespunzătoare titlului din adresa acestui fișier media. De regulă poate fi lăsată nemodificată."
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
-msgstr ""
+msgstr "Licența"
 
 #: mediagoblin/edit/forms.py:50
 msgid "Bio"
@@ -155,35 +146,33 @@ msgstr "Vechea parolă"
 
 #: 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."
+msgstr "Introdu vechea parolă pentru a demonstra că ești titularul acestui cont."
 
 #: mediagoblin/edit/forms.py:68
 msgid "New password"
 msgstr "Noua parolă"
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
-msgstr ""
-"Există deja un entry cu același identificator pentru acest utilizator."
+msgstr "Există deja un entry cu același identificator pentru acest utilizator."
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 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:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Editezi profilul unui utilizator. Se recomandă prudență."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr "Modificările profilului au fost salvate"
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Parolă incorectă"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr "Setările pentru acest cont au fost salvate"
 
@@ -203,7 +192,7 @@ msgstr "Fișier"
 msgid "You must provide a file."
 msgstr "Trebuie să selectezi un fișier."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Ura! Trimis!"
 
@@ -223,9 +212,7 @@ msgstr "Nu există nicio pagină la această adresă. Ne pare rău!"
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"Dacă ești sigur că adresa e corectă, poate că pagina pe care o cauți a fost "
-"mutată sau ștearsă."
+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:46
 msgid "MediaGoblin logo"
@@ -253,10 +240,16 @@ msgstr "Autentificare"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Construit cu <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un proiect "
-"<a href=\"http://gnu.org/\">GNU</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -270,17 +263,13 @@ msgstr "Salut, bine ai venit pe acest site MediaGoblin!"
 msgid ""
 "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
 "extraordinarily great piece of media hosting software."
-msgstr ""
-"Acest site folosește <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un "
-"software excepțional pentru găzduirea fișierelor media."
+msgstr "Acest site folosește <a href=\"http://mediagoblin.org\">MediaGoblin</a>, un software excepțional pentru găzduirea fișierelor media."
 
 #: mediagoblin/templates/mediagoblin/root.html:29
 msgid ""
 "To add your own media, place comments, save your favourites and more, you "
 "can log in with your MediaGoblin account."
-msgstr ""
-"Ca să adăugi propriile tale fișiere, să scrii comentarii, să salvezi "
-"favoritele tale și multe altele, autentifică-te cu contul tău MediaGoblin."
+msgstr "Ca să adăugi propriile tale fișiere, să scrii comentarii, să salvezi favoritele tale și multe altele, autentifică-te cu contul tău MediaGoblin."
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
@@ -292,10 +281,7 @@ 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>"
-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>"
+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"
@@ -329,14 +315,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Bună, %(username)s\n"
-"\n"
-"Pentru a schimba parola ta la GNU MediaGoblin, accesează adresa următoare:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"Dacă ai primit acest mesaj din greșeală, ignoră-l și fii mai departe un elf fericit!"
+msgstr "Bună, %(username)s\n\nPentru a schimba parola ta la GNU MediaGoblin, accesează adresa următoare:\n\n%(verification_url)s\n\nDacă ai primit acest mesaj din greșeală, ignoră-l și fii mai departe un elf fericit!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -371,12 +350,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Bună, %(username)s,\n"
-"\n"
-"pentru activarea contului tău la GNU MediaGoblin, accesează adresa următoare:\n"
-"\n"
-"%(verification_url)s"
+msgstr "Bună, %(username)s,\n\npentru activarea contului tău la GNU MediaGoblin, accesează adresa următoare:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -411,28 +385,23 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "Fișier etichetat cu tag-urile: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 msgid ""
 "Sorry, this video will not work because \n"
 "\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."
+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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 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 ""
-"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>!"
+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"
@@ -452,57 +421,44 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
-msgstr "Adăugat la data %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Editare"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Șterge"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-#, python-format
-msgid "%(comment_count)s comment"
-msgstr "%(comment_count)s comentariu"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
-#, python-format
-msgid "%(comment_count)s comments"
-msgstr "%(comment_count)s comentarii"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
-msgid "No comments yet."
-msgstr "Deocamdată nu există comentarii."
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr "Trimite unul"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 msgid ""
 "You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
-msgstr ""
+msgstr "Poți folosi <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> pentru formatare."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr "Trimite acest comentariu"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "la"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</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
@@ -510,8 +466,8 @@ msgid "Really delete %(title)s?"
 msgstr "Sigur dorești să ștergi %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Șterge definitiv"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -570,18 +526,14 @@ msgstr "Retrimite mesajul de verificare"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Cineva a înregistrat un cont cu acest nume de utilizator, dar contul nu a "
-"fost încă activat."
+msgstr "Cineva a înregistrat un cont cu acest nume de utilizator, dar contul nu a fost încă activat."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Dacă tu ești persoana respectivă și nu mai ai e-mail-ul de verificare, poți "
-"să te <a href=\"%(login_url)s\">autentifici</a> pentru a-l retrimite."
+msgstr "Dacă tu ești persoana respectivă și nu mai ai e-mail-ul de verificare, poți să te <a href=\"%(login_url)s\">autentifici</a> pentru a-l retrimite."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -609,9 +561,7 @@ msgstr "Vezi toate fișierele media ale lui %(username)s"
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr ""
-"Aici vor apărea fișierele tale media, dar se pare că încă nu ai trimis "
-"nimic."
+msgstr "Aici vor apărea fișierele tale media, dar se pare că încă nu ai trimis nimic."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
@@ -626,13 +576,18 @@ msgstr "icon feed"
 msgid "Atom feed"
 msgstr "feed Atom"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
-msgstr ""
+msgstr "Toate drepturile rezervate"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
@@ -646,52 +601,44 @@ msgstr "Mai vechi →"
 msgid "Go to page:"
 msgstr "Salt la pagina:"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr "mai noi"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr "mai vechi"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr "Vezi și alte fișiere etichetate cu tag-ul"
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
-msgstr "sau"
+msgid "Tagged with"
+msgstr ""
 
 #: mediagoblin/tools/exif.py:68
 msgid "Could not read the image file."
-msgstr ""
+msgstr "Fișierul cu imaginea nu a putut fi citit."
 
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "Sunt sigur că doresc să șterg"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Hopa, ai uitat să scrii comentariul."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "Comentariul tău a fost trimis!"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Ai șters acest fișier"
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Fișierul nu a fost șters deoarece nu ai confirmat că ești sigur."
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
-msgstr ""
-"Urmează să ștergi fișierele media ale unui alt utilizator. Se recomandă "
-"prudență."
-
-
+msgstr "Urmează să ștergi fișierele media ale unui alt utilizator. Se recomandă prudență."
diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.mo
index eb6cc942e1bf118978b2e3521cf849075177e107..3ccb7051d7875d245ec1f9bd3e3c4053f4a2a175 100644
GIT binary patch
delta 2994
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
P+5YB<DPwXasTTDwo>cik

delta 2884
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

diff --git a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
index ea9d1dc3..4985f27e 100644
--- a/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/ru/LC_MESSAGES/mediagoblin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU MediaGoblin\n"
 "Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
-"POT-Creation-Date: 2012-02-09 09:30-0600\n"
-"PO-Revision-Date: 2012-02-26 19:33+0000\n"
-"Last-Translator: aleksejrs <deletesoftware@yandex.ru>\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+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"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: mediagoblin/processing.py:153
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Неправильный формат файла."
 
@@ -39,52 +39,52 @@ msgstr "Адрес электронной почты"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Извините, на этом разделе регистрация запрещена."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Извините, пользователь с этим именем уже зарегистрирован."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Сожалеем, но на этот адрес электронной почты уже зарегистрирована другая учётная запись."
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "Адрес вашей электронной потвержден. Вы теперь можете войти и начать редактировать свой профиль и загружать новые изображения!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "Неверный ключ проверки или идентификатор пользователя"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "Вам надо представиться, чтобы мы знали, кому отправлять сообщение!"
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Вы уже потвердили свой адрес электронной почты!"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Переслать сообщение с подтверждением аккаунта."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr "Вам отправлено электронное письмо с инструкциями по смене пароля."
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr "Мы не можем отправить сообщение для восстановления пароля, потому что ваша учётная запись неактивна, либо указанный в ней адрес электронной почты не был подтверждён."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr "Не найдено никого с таким именем пользователя или адресом электронной почты."
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr "Теперь вы можете войти, используя ваш новый пароль."
 
@@ -127,6 +127,7 @@ msgid ""
 msgstr "Часть адреса этого файла, производная от его названия. Её обычно не требуется изменять."
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr "Лицензия"
 
@@ -150,27 +151,27 @@ msgstr "Введите свой старый пароль в качестве д
 msgid "New password"
 msgstr "Новый пароль"
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr "У этого пользователя уже есть файл с такой отличительной частью адреса."
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Вы редактируете файлы другого пользователя. Будьте осторожны."
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Вы редактируете профиль пользователя. Будьте осторожны."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr "Изменения профиля сохранены"
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Неправильный пароль"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr "Настройки учётной записи записаны"
 
@@ -190,7 +191,7 @@ msgstr "Файл"
 msgid "You must provide a file."
 msgstr "Вы должны загрузить файл."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Ура! Файл загружен!"
 
@@ -238,8 +239,16 @@ msgstr "Войти"
 #: 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"
-msgstr "Работает на <a href=\"http://mediagoblin.org\">MediaGoblin</a>, проекте <a href=\"http://gnu.org/\">GNU</a>"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -375,18 +384,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "Файлы с меткой: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Оригинал"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 msgid ""
 "Sorry, this video will not work because \n"
 "\t    your web browser does not support HTML5 \n"
 "\t    video."
 msgstr "Сожалеем, этот ролик не проиграется, ⏎\n» потому что ваш браузер не поддерживает ⏎\n» видео в соответствии со стандартом HTML5."
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:36
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -411,56 +420,44 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
-msgstr "Добавлено %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Изменить"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 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:124
+msgid "Add a comment"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 msgid ""
 "You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
 msgstr "Для разметки можете использовать язык <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a>."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr "Добавить этот комментарий"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "в"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
-msgstr "<p>❖ Просмотр файлов пользователя <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
@@ -468,8 +465,8 @@ msgid "Really delete %(title)s?"
 msgstr "Действительно удалить %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Удалить безвозвратно"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -578,9 +575,14 @@ msgstr "значок ленты"
 msgid "Atom feed"
 msgstr "лента в формате Atom"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
-msgstr "Лицензия:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
@@ -598,23 +600,19 @@ msgstr "Более старые →"
 msgid "Go to page:"
 msgstr "Перейти к странице:"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr "более новые"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr "более старые"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr "Найти другие файлы с меткой"
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
-msgstr "или"
+msgid "Tagged with"
+msgstr ""
 
 #: mediagoblin/tools/exif.py:68
 msgid "Could not read the image file."
@@ -624,22 +622,22 @@ msgstr "Не удалось прочитать файл с изображени
 msgid "I am sure I want to delete this"
 msgstr "Я уверен, что хочу удалить это"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Ой, ваш комментарий был пуст."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "Ваш комментарий размещён!"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Вы удалили файл."
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Файл не удалён, так как вы не подтвердили свою уверенность галочкой."
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Вы на пороге удаления файла другого пользователя. Будьте осторожны."
diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.mo
index e79b684847604c5d12dc1a846035aed95105fdec..7d897bf9667229400b2fbb5e66fc5be8e5a63abd 100644
GIT binary patch
delta 3121
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
GrTzk98Yyo8

delta 2917
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

diff --git a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
index 8cde8800..6b9e38b9 100644
--- a/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sk/LC_MESSAGES/mediagoblin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
+# Martin Zatroch <zatroch.martin@gmail.com>, 2012.
 #   <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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +20,7 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Odovzdaný nesprávny súbor pre daný typ média."
 
@@ -39,60 +40,52 @@ msgstr "E-mailová adresa"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Prepáč, registrácia na tejto inštancii nie je povolená."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Prepáč, rovnaké prihlasovacie meno už niekto používa."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Prepáč, používateľ s rovnakou e-mailovou adresou už existuje."
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Tvoja e-mailová adresa bola úspešne overená. Môžeš sa hneď prihlásiť, "
-"upraviť  svoj profil a vkladať výtvory!  "
+msgstr "Tvoja e-mailová adresa bola úspešne overená. Môžeš sa hneď prihlásiť, upraviť  svoj profil a vkladať výtvory!  "
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "Nesprávny overovací kľúč alebo používateľský identifikátor"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
-msgstr ""
-"Aby sme ti mohli zaslať e-mailovú správu, je potrebné byť prihláseným!"
+msgstr "Aby sme ti mohli zaslať e-mailovú správu, je potrebné byť prihláseným!"
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Tvoja e-mailová adresa už bola raz overená!"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Opätovne zaslať overovaciu správu na e-mail."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr "E-mailová správa s inštrukciami pre zmenu tvojho hesla bola odoslaná."
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"Nebolo ti možné zaslať e-mailovú správu ohľadom obnovy hesla, nakoľko je "
-"tvoje používateľské  meno buď neaktívne alebo e-mailová adresa účtu "
-"neoverená."
+msgstr "Nebolo ti možné zaslať e-mailovú správu ohľadom obnovy hesla, nakoľko je tvoje používateľské  meno buď neaktívne alebo e-mailová adresa účtu neoverená."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 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."
+msgstr "Nebolo možné nájsť nikoho s týmto používateľským menom alebo e-mailovou adresou."
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr "Teraz sa môžeš prihlásiť so svojim novým heslom."
 
@@ -110,10 +103,7 @@ 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í."
+msgstr "Môžeš využiť\n                      <a href=\"http://daringfireball.net/projects/markdown/basics\">\n                      Markdown</a> pri formátovaní."
 
 #: mediagoblin/edit/forms.py:33 mediagoblin/submit/forms.py:36
 msgid "Tags"
@@ -138,8 +128,9 @@ msgid ""
 msgstr "Titulná časť adresy tohto výtvoru. Väčšinou nie je potrebná zmena."
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
-msgstr ""
+msgstr "Licencia"
 
 #: mediagoblin/edit/forms.py:50
 msgid "Bio"
@@ -161,27 +152,27 @@ msgstr "Potvrď, že vlastníš tento účet zadaním svojho starého hesla."
 msgid "New password"
 msgstr "Nové heslo"
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 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:92
+#: mediagoblin/edit/views.py:88
 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:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Upravuješ používateľský profil. Dbaj na to."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr "Úpravy profilu uložené"
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Nesprávne heslo"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr "Nastavenia účtu uložené"
 
@@ -201,7 +192,7 @@ msgstr "Súbor"
 msgid "You must provide a file."
 msgstr "Musíš poskytnúť súbor."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Juchú! Úspešne vložené!"
 
@@ -221,9 +212,7 @@ msgstr "Na danej adrese sa stránka zrejme nenachádza. Prepáč!"
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"Ak vieš s istotou, že adresa je správna, tak najskôr bola hľadaná stánka "
-"presunutá alebo zmazaná."
+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:46
 msgid "MediaGoblin logo"
@@ -251,10 +240,16 @@ msgstr "Prihlásenie"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Poháňa nás <a href=\"http://mediagoblin.org\">MediaGoblin</a>, súčasť "
-"projektu <a href=\"http://gnu.org/\">GNU</a>"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -268,17 +263,13 @@ msgstr "Ahoj, vitaj na tejto MediaGoblin stránke!"
 msgid ""
 "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
 "extraordinarily great piece of media hosting software."
-msgstr ""
-"Táto stránka používa <a href=\"http://mediagoblin.org\">MediaGoblin</a>, "
-"výnimočne skvelý kus softvéru na hostovanie médií."
+msgstr "Táto stránka používa <a href=\"http://mediagoblin.org\">MediaGoblin</a>, výnimočne skvelý kus softvéru na hostovanie médií."
 
 #: mediagoblin/templates/mediagoblin/root.html:29
 msgid ""
 "To add your own media, place comments, save your favourites and more, you "
 "can log in with your MediaGoblin account."
-msgstr ""
-"Pre pridanie vlastných výtvorov, vloženie komentárov, uloženie svojich "
-"obľúbených položiek a viac, sa musíš prihlásiť so svojim MediaGoblin účtom."
+msgstr "Pre pridanie vlastných výtvorov, vloženie komentárov, uloženie svojich obľúbených položiek a viac, sa musíš prihlásiť so svojim MediaGoblin účtom."
 
 #: mediagoblin/templates/mediagoblin/root.html:31
 msgid "Don't have one yet? It's easy!"
@@ -290,10 +281,7 @@ 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>"
-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>"
+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"
@@ -327,14 +315,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Ahoj %(username)s,\n"
-"\n"
-"pre zmenu svojho hesla k GNU MediaGoblin účtu, otvor nasledujúci odkaz vo svojom prehliadači:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"Pokiaľ si myslíš, že došlo k omylu, tak jednoducho ignoruj túto správu a buď šťastným goblinom!"
+msgstr "Ahoj %(username)s,\n\npre zmenu svojho hesla k GNU MediaGoblin účtu, otvor nasledujúci odkaz vo svojom prehliadači:\n\n%(verification_url)s\n\nPokiaľ si myslíš, že došlo k omylu, tak jednoducho ignoruj túto správu a buď šťastným goblinom!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -369,13 +350,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Ahoj %(username)s,\n"
-"\n"
-"pre aktiváciu tvojho GNU MediaGoblin účtu, otvor nasledujúci odkaz vo\n"
-"svojom prehliadači:\n"
-"\n"
-"%(verification_url)s"
+msgstr "Ahoj %(username)s,\n\npre aktiváciu tvojho GNU MediaGoblin účtu, otvor nasledujúci odkaz vo\nsvojom prehliadači:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -410,29 +385,23 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "Výtvory označené ako: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Originál"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 msgid ""
 "Sorry, this video will not work because \n"
 "\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."
+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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 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 ""
-"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>!"
+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"
@@ -452,57 +421,44 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
-msgstr "Pridané v %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "Upraviť"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:91
-#, python-format
-msgid "%(comment_count)s comment"
-msgstr "%(comment_count)s komentár"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:93
-#, python-format
-msgid "%(comment_count)s comments"
-msgstr "%(comment_count)s komentáre"
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:95
-msgid "No comments yet."
-msgstr "Zatiaľ žiadny komentár."
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr "Pridaj jeden"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 msgid ""
 "You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
-msgstr ""
+msgstr "Môžeš využiť <a href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> pre formátovanie."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr "Pridať tento komentár"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "o"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</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
@@ -510,8 +466,8 @@ msgid "Really delete %(title)s?"
 msgstr "Skutočne odstrániť %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Odstrániť navždy"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -570,18 +526,14 @@ msgstr "Opätovne zaslať overovaciu správu na e-mail"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Účet s týmto prihlasovacím menom je už registrovaný, avšak ešte stále "
-"neaktívny."
+msgstr "Účet s týmto prihlasovacím menom je už registrovaný, avšak ešte stále neaktívny."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Pokiaľ si to ty, ale už nemáš overovaciu e-mailovú správu, tak sa môžeš <a "
-"href=\"%(login_url)s\">prihlásiť</a> a preposlať si ju."
+msgstr "Pokiaľ si to ty, ale už nemáš overovaciu e-mailovú správu, tak sa môžeš <a href=\"%(login_url)s\">prihlásiť</a> a preposlať si ju."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -609,8 +561,7 @@ msgstr "Zhliadnuť všetky výtvory, ktoré vlastní %(username)s"
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr ""
-"Všetky tvoje výtvory sa objavia práve tu, ale zatiaľ nemáš nič pridané."
+msgstr "Všetky tvoje výtvory sa objavia práve tu, ale zatiaľ nemáš nič pridané."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
@@ -625,13 +576,18 @@ msgstr "ikona čítačky"
 msgid "Atom feed"
 msgstr "Čítačka Atom"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
-msgstr ""
+msgstr "Všetky práva vyhradené"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
@@ -645,50 +601,44 @@ msgstr "Staršie →"
 msgid "Go to page:"
 msgstr "Prejsť na stránku:"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr "novšie"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr "staršie"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr "Zobraziť viac výtvorov označených ako"
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
-msgstr "alebo"
+msgid "Tagged with"
+msgstr ""
 
 #: mediagoblin/tools/exif.py:68
 msgid "Could not read the image file."
-msgstr ""
+msgstr "Nebolo možné prečítať obrazový súbor."
 
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "Jednoznačne to chcem odstrániť"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "Ajaj, tvoj komentár bol prázdny."
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "Tvoj komentár bol zaslaný!"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "Výtvor bol tebou odstránený."
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "Výtvor nebol odstránený, nakoľko chýbalo tvoje potvrdenie."
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Chystáš sa odstrániť výtvory niekoho iného. Dbaj na to."
-
-
diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.mo
index daa6b23b80fe8193a4ecb0365ce57a3ce55923ac..b94affff8bfb46a544cb52b0c1ee7f636d87f4d2 100644
GIT binary patch
delta 2972
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

delta 2739
zcmb8we@v8h9Ki7p2MQb@0^*Mhc|uWCjyq1lKxH6gri-LZYc-YQ9^p*x*xli;)YHkF
z)ttpe&B|Q)vxb{>7HpMEo3^E<m80cKLu=JPHAgkg_2d2Vo~Hk}7K6RM&-Zzr@Avcl
zd_UiZftEwfkqg;LUBb^+{_f=O@g%*v`SVJO$S5v%;vLw7!|-z)jz8dK{0p6UDOIEn
zv+eQwi!hOEKXOZgn2hUis7ORQXbhpF3$t+#=3oz&<4K%@wltBsI1kJ41=Imgp-#|;
zgYi6$z<w;kYpCNCq>GHfM{zB#MmO`z01bU{d`3I~2NIc7qxLsg{g2>CuAe~7L<j1C
zyHJyM1Q|*`LJi=ob^k}?SCUz!W-=EwASWg>zbvDn1Nbo)LrBo_6c%F_uE%5eC01vO
zOvaH!nU8h22EEvX7w|5el@-sV7Yn#vjhgzGk=>Hr7||7W)6mq%P*Z;bb#Kq3PH+Vo
zQ?hu7rWByAbSi3p4eIj`TKzuMtyzhKa3kj77SxINSRTwK|1EU9ONXvJpV>9VWvBz!
zqo!;LY9MP+C*FY?$UfBPd#(P@P{+A|n$cfz5ne;Bg$62DYiBKLW)BS`|GJmo&{2w4
z(Sws1MF-f1v#}F(Prt%?yn;GFHOroctyqG4(ZF-K0Dr@cIG308beu%Z$aM^1LWJ-&
zCGAKOWCI%b9FE4fQTOaq>wX_n2J#cu;#JfDW{{@o7{<+b2(?D0vbuY5DR$xkG;unE
z6Pq-=Mx&BOFEW-4puU*S$3XY&Zd{BD(T4A!?rkq>V8>8b^oix!XjW2Aq(6bL0zJBU
z$2la-Di@LT${)z`C6gV!j1y2JNHgMJj@hW8J%fq(I_mk^hdSe7)Z%y_H5I2(Q};Ep
z&+>~wRn4T4$RU`6HCTgBqYF<V9~Jr2GKIsTOUgkFEDyC>%CH<4BQZ-CuEoRXM(5ag
zKpxa;T#g#py0KK1o~vziXk^c$=5{}7gdd^~cn-D722jiTD(Z8C#>Eft7}No)kz3M$
z8c;iGCc06J=P*)`@&W3H<BJFlEw_sp#mvI^mt!~T<~}(-exCN@CayomrFh>25gw5@
zQ3E}Ty3+438Ap&7oiHEux(IcFF3Vb^ek8Jx2HPq@)PXwj#(_m$X)o%^jw59veOCVf
z>Q>0acxLRVRhWq>=s>Nua%{mFs4L%#nz{FoaU*h$28);PkzcV-icdHdHIREyUs!}1
zP#fw%>ruBZijUz-NKEoOmSH~W(}Vu7Wd}OAj-dzpaj^bZsVk0uIp(3Bf=;Z*Zmh!V
zSb>$i&Dat~>QQ!KH6F!{Xk#{-vKck7w=jggs2MC~pLGjnB16i29L@Z)o<;`lz)aka
zL$C*H@dWB8&+g)o;|$!4?Z_hJ8qUT-9_qvuXyV_f$J3-R^w_RLJvBY3@14Pj?%8!3
z%{XdG{L8Tk?Ob=D7SDFny?oJfC)&8)jj6Z~rLd?e(AsMH!%Lb1?f&q@kYQcl{!T~=
zV;fSc6Kri&(S*F2(Qi}7Wwe@JU!&A`y+*)qMn~8Svb<hXFO0$>Z)4b;7%GWPv%g_W
zm>=s;uS-hyHJSd9Ss5+P+L2*R7&6wF;gaaltkco$*|jlGj?)&~nL8nIcxxbN8aE~|
z!i~+%47<t~Zi)RoGBqhZ5R^+>o;B*tRc0_+l{f1lPkVEyWLY546bQDJ_|34hEf`pC
zHibjZ8zVFaJS%*Dr!N$0H$(RM4=ixh2F=E>FW`675oV>~c9psvu2P4)!YG|mIi=L$
zDvut?8*PvGR8+bvVwdwKC%FHA)?#V-^|$2A$gK-_8<!g^L#D^)5Bx{&`iz6*F4~_y
xE_Pt-(wq6qEP8clec<0cvr^bybcPhx#O|N8#1`u<uDWds4Od!H#;qxoe*i?wn4bUu

diff --git a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
index 35fb4841..eacb4e67 100644
--- a/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sl/LC_MESSAGES/mediagoblin.po
@@ -7,9 +7,9 @@
 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Za vrsto vsebine je bila podana napačna datoteka."
 
@@ -39,54 +39,52 @@ msgstr "E-poštni naslov"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Oprostite, prijava za ta izvod ni omogočena."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "Oprostite, uporabnik s tem imenom že obstaja."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Vaš e-poštni naslov je bil potrjen. Sedaj se lahko prijavite, uredite svoj "
-"profil in pošljete slike."
+msgstr "Vaš e-poštni naslov je bil potrjen. Sedaj se lahko prijavite, uredite svoj profil in pošljete slike."
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "Potrditveni ključ ali uporabniška identifikacija je napačna"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Ponovno pošiljanje potrditvene e-pošte."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr ""
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -129,6 +127,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -152,27 +151,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 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:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "Urejate vsebino drugega uporabnika. Nadaljujte pazljivo."
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "Urejate uporabniški profil. Nadaljujte pazljivo."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -192,7 +191,7 @@ msgstr "Datoteka"
 msgid "You must provide a file."
 msgstr "Podati morate datoteko."
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Juhej! Poslano."
 
@@ -212,9 +211,7 @@ msgstr "Oprostite. Videti je, da na tem naslovu ni nobene strani."
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"Če ste v točnost naslova prepričani, je bila iskana stran morda premaknjena "
-"ali pa izbrisana."
+msgstr "Če ste v točnost naslova prepričani, je bila iskana stran morda premaknjena ali pa izbrisana."
 
 #: mediagoblin/templates/mediagoblin/base.html:46
 msgid "MediaGoblin logo"
@@ -242,7 +239,15 @@ msgstr "Prijava"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
@@ -344,13 +349,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Pozdravljeni, %(username)s\n"
-"\n"
-"Za aktivacijo svojega računa GNU MediaGoblin odprite\n"
-"naslednji URL v svojem spletnem brskalniku:\n"
-"\n"
-"%(verification_url)s"
+msgstr "Pozdravljeni, %(username)s\n\nZa aktivacijo svojega računa GNU MediaGoblin odprite\nnaslednji URL v svojem spletnem brskalniku:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -385,18 +384,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -421,55 +420,43 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: 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"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -478,7 +465,7 @@ msgid "Really delete %(title)s?"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
+msgid "Delete permanently"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
@@ -538,18 +525,14 @@ msgstr "Ponovno pošlji potrditveno e-pošto"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Nekdo je s tem uporabniškim imenom že registriral račun, vendar mora biti še"
-" aktiviran."
+msgstr "Nekdo je s tem uporabniškim imenom že registriral račun, vendar mora biti še aktiviran."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Če ste ta oseba vi, a ste izgubili potrditveno e-pošto, se lahko <a "
-"href=\"%(login_url)s\">prijavite</a> in jo ponovno pošljete."
+msgstr "Če ste ta oseba vi, a ste izgubili potrditveno e-pošto, se lahko <a href=\"%(login_url)s\">prijavite</a> in jo ponovno pošljete."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -592,8 +575,13 @@ msgstr "Ikona vira"
 msgid "Atom feed"
 msgstr "Ikona Atom"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -612,22 +600,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -638,24 +622,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
-
-
diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.mo
index 8191444cbe08467e276cb7006ffe0989e8c5fdf0..a94e28339aef8eb593602a0e466b9a38f045aeef 100644
GIT binary patch
delta 2950
zcmeIyS!`5Q7{Kw<1sDdYP<CwbQVVoiXX$jI)-Hh(N(}pwswidJx$TThXPUWFCKSk2
zOVGryq!UOW4H!uvJP7K98smZ#Oe8@Ah{bAz2q`>Zf{iRGQR4rbxdz{TwQ2i1_nv#U
z?>p!G(9-LRUCYkgr}){)Uk-muGv(>Y&o+xvlX={ZQ?Unc;&F81uCYqZ!!J<khcE;G
z#PO)CN>Nl<I02_)7TR!<QZZFQp_~^>aS3+gOLzgxaN4+32g^`8ZotvF9;aaw7GNhz
zKSyvD{)C-4f^LjFm1=hkvw1#&6Bu8eF)J>c6@xgP4}Qa$IErORhZ;(7YLP0n2xS7R
z%z8iatKQ+?4BU@0p$~Bk-bQJE7pLGo9LM;|N<5y&skj~M@G73cB0TW4QqSVoxCMu>
z85@b`Y&?sEQVn4qj-U*fGf^qBr1DWBW=C0hDa!Zt7?Yf>ryv7_k+!M_`Bg{wCo4UL
z@?F3AJcyFhTQ~}T$6S1XGT>xJ5p&Uxb5T~j7bUVsQN}r)P5k#zxX23$*+!-%6X`@5
z_#o1!I)>8lQ}g|0ln$?>g!Dc(;3Jg1u$mn!duJ<3WIsYl<uxqE5p2SuDa4=sp?1@o
zbaW6G<6)HC-ooYh7^S0Sgke5*q60rh4S&V8m`<ZEY(OXeh!P<Svo|mcB{FXzYgX^Z
zC}<Q8p)@#+lDoU+2M>{Lpsa+a4ricD;B|Zv_hC0)LfI?pSY|!Gi9L88b$sm^Glf{m
z^B~f-icRLwOG7(K4qw3y7{zoPK*{wW%EWG>tmuyEuvz~Qt9hSBCo^eSi$qzyN<ImW
z3gJ!MiL%f)wB)@JQwJ%?2mP3VgUHEHzn~0!2W7L|M~TE}wmfN8Q?MLuxCA$%+#AQS
z4DX?|FXTu_zojUrpaRK?s>K31{|ywRqb`(l{t0&C0J?G2bE$?qFqt!y2^})upETe1
zp@j525_NS0rN6&W_Et`QYE#cfnScXlF}_+%K~}6IX;cQvgm$5X{2XTD1!NzpODLQ6
zHp-^_1Gl3#Cv|TeLP_c7xvA6iK5pT;ADgjiUh3X>4`UL_ehMsB4d56YLD{8goFxgF
z6=mfUQNGVdNm&JwPPGChA|aIH+J$m_dr-bRY(Dp)q~t8h9{N_|&puJ#^TL9|rjO9i
zbA~Oo;x?4fcB2f`i*j##fD*Cl!qh|>PzH{oOk@X2yZz?-lPD4V95eB9q2!;!RbDWr
zauPS$JTIe!b~j2cKSQ}V2CxY&RF1<<C>=#{F>XW2?OBw2<7ebo71~qBwgKhd*n=8=
z8KWQ<$93$&QflRRoI(lF5X!}I2PHy{R7xs*sNq(W?|b<tsk?wue+9GfHrC+-oR5{R
z)V&eLZk}T&D6lByW_k6v0ekQ$>iB}&%puCf(T5V!VU%{(lGMFXj&g6T#dJ*ISnNZY
z*jFeE`o{FTRQ-5$g+etI*D!I(vM?>rS5mXU>(#wlC|Kp>!Kx*Hs@iMj6nH%m-Dbqk
zY59{pT63taO%FyCUu$i;*YAnn*YXmDvyY{xwI?=?Uz9l})a;4)L&11%!GZX??DJ`k
z_+DFGETDS~y6*^j^{^K4=~|UX^M&=6>O5a0(q8FwMx#+ji_zi;g<G8gf3qGm{K0=p
zy5aP+wg>Db4wu6hX$$1lET~_(w94tJaXjf~PJt2X2si7E0e^6l&B&`+lYC^xUcD-d
zZ#B<mk3ZmP3h0i+MVmX_(#nLQ{)jK}xTq+jFckcEUm>Hdu_GLiepa;W!8MVvu1A)6
z+GWs0t#fRq^~TP<+HyUrhgJM-tvY@qXW=xzVRYz*BN><0P!khLE+@V+cc#0<UR<FS
zmsJ**+g)WYmv!X|`)Yl&-yl@>MMSt#bGwS&c31K{x2v+aG~S!rWeIqKtsS0LJ+93f
QPF%6n{-3J<oT@bSH$Vj8=>Px#

delta 2732
zcmd7TTWnNC9LMo#yVwgY*p`+GmM(<?Eo?7K%cWdW+6EdRP=tu65!>C<cB#AD>~4h;
zWSc<nk{E>rBN0M~h?j^VT?HPLC>W!l28b5LfIw9c4G~cSAyL0S&L;ZegKsvppP4yx
z=JNl~8FqAh*%m#Q<Je~Sd5YhA`F+@-+TTAr(u}!>>P{Si2XPpl!hF1h1NaA4;Kg)f
z8Zjrse!d)2s0WZoCWNWD4(~Q5YBo|BLc=!9!9AFZ2XP7>$0kf3Y|MOIfHn96YQRrX
z6ZGR<cm{{#1)PAlP~#M58Z!!4;96XRZss@FDd@#<S@r^4$jVF|s(neK{Q)eX-ieCD
zM$~}2P(eG43}ud@7H}f*{4(;-q_RszG7q(&3QT2w(?&r91TYW7$fC{DI0?7m6L<tq
zW8F|=CSn1rEW$?YK`(mn9FE5NY&()(ET+B&75bNuY?+rasvW*bL7|VMLjMsew`Wij
zTtmh**>s|4icveQMzzmD^}jFC?n9;KaU6ubScscY6Yoj5FNgSd&~ShT?YxND72+Dy
zz>82JTZvjo4{GA=sD<oB^*@woKZzRW94ex};c~o%ItxoUxjH**QIXw0jQA^;XKARy
zo7jqFjG_Ua#ksfzmD8_r5ne+LP{+2Xq94og6?EbkxD0>CUYyU%`Z|uIB61tUm=tCC
z3Q0E-1hXEUxEV)cA1Y^`C!Y5s$H4rE4R{l^fSH7821alL?nj-GYIZjdAH^;B8d^Am
z!C9MGvYSFJg+s_#<~r)dOfCcEY#Kg-_hT}?gUan8)WVLSc62P^iCDHHH#(871GFf4
zL&+Sono=aZrV%yu3LL;LRBV<x?VDpG>iH*_g6B~)eutXzD(Z0DK!qZev#!wPBY8HZ
zqd8SmD9oav2_vYR<2|gwG(H9mI2$!V6Y4Wqh~&jAMV*#T)HqvFANp}zi&xN%))@P}
z7f}n?g<4qOn5g~WXyU;!RBX?pB5?yXVD?!1lvSdRbq#6(^{D3$qHc~JR3x87Eoe6?
z5?`SM&m#xYe2=;~ZbvETc&3)vH%B#|rrw82?la@;@96;cQ13?%HjlS&j<->v>_;|h
zu3#!=5tcN}Lq%*9YUd@W{?kyYi!P)<T8#%4k`1U2b}MS9dlT(()C(Ub+P^`i<}wb#
zUs0#<CZ=J2scjK<P@jO>`DRpvUq$ANn)fLvWG7Jz`3W`g;4*t51*jLwQ0)z<ftpbv
zZNuf*iOg+|qR!6GsK^!*Mx}Bw>f%_1t+)dn`d{Tw3Ug_2&|5iOfVw$6r~&%;GZnu@
z-5kSR_J=<gb#t_1FTRWVI%d&H5%HsLjxZ`BmryDA1)Z2e=aI~B#!^tu>QEh;a0otx
z4Y&%mfVXf4{(u{>xY9l&dvPB1Q@903uuTj1p;DIXwl9t{R3t5A&t^SFm9sY}=;rts
zlX3iHJGW)1g;k?=G&5m6s$UbP;{xPld4hhw6^N|#1iJ%~(y%j8|Mw?hQxadFR+p6A
zH9MA6I4gEOeQcKB^7>lL9Iw|I3|O(@8O7ONuceB!WP-OPVwHx=<5M$UPflu%U&w59
zr20HoAZ*pfCS`BWN=z7b_E?ef*az94#h%M)h_~ieB*%B=jZew<2Sb+g&IHa#OM5%R
zuJ%Pb;#UjO9ht$9xwz?h=OSyh6^hL+tY6yN-5xG)3kE&GP*-`tid1xkf~zb~BwTT4
zg!W+TW4=IzFC6Z+!Wqqrm$@23R!hVe47eIuX06j*S><+BR=M2MomG=-Cs(;Dr^F5y
pj?A!Irq{Zs#|8>}9TBU=AL|@-&Hdk_7hjiF|9^;G)<0us{sLjKkp=(&

diff --git a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
index e0f59766..7a53adfd 100644
--- a/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sr/LC_MESSAGES/mediagoblin.po
@@ -6,11 +6,11 @@
 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Serbian (http://www.transifex.net/projects/p/mediagoblin/team/sr/)\n"
+"Language-Team: Serbian (http://www.transifex.net/projects/p/mediagoblin/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr ""
 
@@ -38,52 +38,52 @@ msgstr ""
 msgid "Sorry, registration is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr ""
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr ""
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -126,6 +126,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -149,27 +150,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -189,7 +190,7 @@ msgstr ""
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr ""
 
@@ -237,7 +238,15 @@ msgstr ""
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
@@ -374,18 +383,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -410,55 +419,43 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: 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"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -467,7 +464,7 @@ msgid "Really delete %(title)s?"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
+msgid "Delete permanently"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
@@ -577,8 +574,13 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -597,22 +599,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -623,24 +621,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
-
-
diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.mo
index 095deaa2fb0ff55f92f9c6976e9589729c621f9a..acba5cdb1643c629031fa72e0f655a343544dc1c 100644
GIT binary patch
delta 2995
zcmc)KYfO_@7{Kwv#R({gfTB*=D~fWl7YcYmU{jeohl;ll=Tr)PZ97YgZIOsGMO}=}
zYv@>lnJ$@&ZgF91v&AJE;@CbocTux!VlvGjYBHDU5~stt%l|1gxP96_tttG@c`xTY
z=XuWQ3C9Cx;A%>2o8q&bzp?yP#!7GC^KzV0X>>Q^NNmMkd>2i)Ctj&Zcn0PEb&SD>
zn20JtDViz?lW`O#VJ@aB6;RV?OyNQ$&ckguA3w)pOdrxezyg$ktMLh3iRoC2IoOOc
z&SA{NE7**EXhHwb{`Zbz3jGdDW`1=xa^q6uMmLV)fgf=U4q_QHpoWs1r;%H#0wsXO
zk^4^Mt9I~jG`@}!&~Y4$H&NcdjU(_b4q<+kKt3kpNZgFG@moBL`Pe>8si*K$+=$n)
z4%d*+aoB~VQeDR^>_eGw>~N*1lA3^$F$2oVi%_1Qivg+GN*XeO7kO8;B42fwf3ngK
zP@elZ((gv8=?xr&cQ6C*p-h;@EMf*aaU#l!_oHO?2+BO2Ddc}2jSF0ml+_TH1k#K$
z@d0E^brj{rk0RGEp$vEpC8fV$H9kPu3rpCsvUfJ2WcCC~DX(Gy_F*mNk0Af-54D%k
zWS|2$2j4`g?G0Rrf1nJsfHX|SW;EhS)bM*;hS9v#g4Jlk%P1L&BYGbup=4$&vSzg_
zKtrQ(2<3%Nl-k{nJa8Y`1}cH{%*N3u0j$Cq*oNEiBFbJ_&NAoX7Hq|HsN;)IMoNe!
z^t+LvRUnN+FE1KUYPbSdV-rT>Hz>94MhUDJWkt6l{v5e~AIrEN#UK}=I3-9mR5JA>
z+iC*#;&hbEWoY5wjex48LH3j%V{jL8GSohlO>!_|2TCS7Q3n1JrItN757Rgb^1HDL
zi|`$kz`sM;OE*zY!Cj;(>Nm`h^PkF@nZkuqlymOGz1WHt95=py#mi6vdI5*wI+Ou7
zq119KvQ1PQ$^^$y7S@Hbx2~YPcMYkQx{aC4ui_{4N0@_TM-`(4v>au#?8X>uLm99g
zWz!x<N#$vjfN$YFY|d87jO!=%Z`!x;4E?Y0CEPPfDax;Y#Q<eeX`C6#rz|KnUW77n
zb;KH!&EiA}U@OW>+fg$1K88zzQo0_Ll;1%a_ji;GjmhmVi2-E~P0c0$5<nRj;&5f;
z0UJ8$yHO^(jATpw6zQkru|MeNpoXWAMXPR<68(v?>5|#m5_mRBK;<aoJ&zKoHJ|*~
z(C~19Ak_sd#y*tVn>h4jN!8*r_$t=oc^ra9L;oHq!8!D2BHKpoz=e1Wr4$d4uga%h
zCR~A3OYIEMSWKe>TTt%KfGsE~I)n1V(S?aPmC-oT>RFV%QiI%5Ehwcsj`E9n3g!9F
zunaHbbR5Z%Da0z=hJjaTuvitxax1V1TX7@mIFzTQ=3bnSJ5f^jHBt@r1BUkyXKodJ
z3r6F9jK?5KX%C_-=t#u(`tK*IlQbm4(-^uKH!CX3QCL3HX47q&$6acolc0q^r48lT
zIX0_b&-Dd2Xj(eYXjZMxQ(v#U{YrZEy3J_~c4%3_UM)3rKH;_KsD@BYVnys=Po358
z^tgk^hPMZor<{v21~XG<2VA<<$25&@o9@;84qYp?Y7Vcywk*rx_cxT7OifKq#<jk+
zMvvESayjdCx6kQ*)Y5$>tG&TxC^VXl4u8EXt9<6%s>)K6wcI!`PIivZ)99_!*SMVS
zb-BK*@}=P}QQP#=B%al*8>~*3wbrE@L#tCQ(Q$SHYI6D=q1_|$WAZ%i$H(&c>en=S
zT{6z12Hm~X@6~nx0&9az8v0^Xd~8C`_WjyIy-D|~;B>7l*fVxky3^-t)P2TqZtR{~
z0tqiCSd}rxQfMfcrWF*I6ihLgi_PYQszrt+`Ua<uR2eGBbctp$7g!AD@N*V(NkLKY
zjf|E!m(^`=wA%HcmU%SvFmuMgEm`K@OIF$Sw%xAzoi5iv<wCt$C_1G=cj<mzYtX&*
zRyWmkZ44b5|H(iZ*XJAxYPsu!AEr3MrA!Yd=amGO@YerW&}3ce@OVL=%i9z^_)$GO
RCs+QbdX6*4{Ii}>>Mz}L?F9e;

delta 2801
zcmb8weN0tl9KiACUQk{FdGU=x<OrfbUf#h#WhhLI8iBd2rs;)yge!6{-E;5-i_4}%
zTQ4R@-CU)sNNVcTZYF=EQ|x8SG;3wcO%!cbtGO}F`BJU#k9(W`<5~>-JkN8^d7j_%
z`#tA)+kLRfKad!{P4TmdzX|*;4wv5DpEo0wdXVm0_z)h(G59Tx!=Ldo{*AeKDN3m-
zOpFd*UxZ=wJ;){H!w7r<<CXHO4KzkEuniNj2S?*!EWwjFAMFn)RgI5fF>Xhh@GF!B
z&f-WshvRV&Gw~M6JZUjXO~hxg9oJw1>#J)t<iRPi!2ldcWU2yXye>5UG$zq+M#;nm
zlnHmCB<(0Nl{$eEz?snXUyxrF!7e3}V^IRi#R%3{%W2329vq7X60~{=r{Oky5&Q86
ztcX+UVN4>*RII|a=)wjZz)3hKA(%-QrqN%6lKMB0YN>b8FFV{zLsB0=N&V+2wLOQj
zzz{O0O5i4%Dh*|)MJVI5QSM(58h4|VW)+UWPE5frl!bdj?n@;9O$>a@fb2Y#)g{Hn
zC==J9q--flAZt+;-hmRxZj}4`LgU|{%rk(J(d)PfZ=sxpI!>;fopzMW9vDOZrIzOz
z$j6&lkJ-#36TFIZu^XkPKVl6Ip-fQ0wx?qY=HPp%;di(Y|G-YH=3#j|PNHPw4jO3l
z6TYOR4M~FPKn=HGGJc3sv(usLXOUx|e#J_>i4wp}(li52T#pA(&PWlvn}^G=8{bDA
zXD~Ujsk*mml+oxz=2F*C9*p5*AT@ggpTnonj)zcc+lLZZKgy2240*;%2p{bqwDDD7
zM2hzrFA1xv3rHQ*Z6wWV6cxRU=_t92(1Kr%5|q%^VHkF!9ER;EEB1!^`%zMH3?+46
zqs)Iv<5Wp8Z!j<)GbaVV9M5AB{ZCM~FobfN?x4H|k-Q}1F%IRlOvMtcMPgPP@ip9y
z1z4OO+<FsAfF9)4RQ_~Ml}xxfbYVMkU{o*40!L7G_&v%g`yJ)MA(V{SCI=TxMhUPC
zNs^j}5>O+`q1lOH*o!jX9+VG9zn?}9jngO*|Aja3l?<iwaQ&3v@%;#o&>zGVxNB<g
z)J3y>DgG3simD1F^-hdLcSs+~p;?C#z*dxv`uEU~lpRN@$wicJ;B}N8*|UNvi$hsJ
zL#g2`jKW%!Q}rxLAj>ckJ1`12ViRsbS@1TJJQbfk-1n;@8X5!D$fi{@N{zOl9KLr@
zB0r20&>578&Z7i+4VR&fcY&ByJr?83D78P1Buib#3Y;)4_~BTBBjtaUV>IS+;S1!v
zs8NpKmm?pg1f9sQI><lrWw?M;NySmOIxNCY?7|rs!A+8pN;L3MjKw1;Z`VnbGjau!
zSznE06{%So%C|Bb<$;+v3#+jdH(??6<9fV-Y)ZBB3RU55?8e_v#}2kHwf+gK@eWGn
z<}wLYP>azoHS40W1bfhqcHX@x9D!2HIFubFg`9|T-(-~grlQKoZ1A?U=pJ)vgSX9N
zW*J(jfB!3n$_R8sR@m&V<(4gFmUS^|a%_w4ay!**mrL_{bZeiMmf&*f($O+9T~1Ta
zGI9dbqd&0QY6F8YRpAlt2Hj)mW!AKW9kHPW4Q;J%=2*uQPFb51D+BeTbL}?6s&LE?
zTp2rHAJ^jb>Durzn(1t8Wb)N+vng;jDJne1>r<DyUe{{$)w<6rPnq*%eOsfEv)t=#
z@cLSFJi3|N>hrG98%!g2c!oxA{Ytkd*KHVWx)ELb#6m}<Pj{Mbug6hEuw`07UVeci
zFW*s6s^u4!73MqgO01(P$<e`)(z1e5>vBqGxT!l^tmcWm1^+*Xfw<K2dorjcJ$|C6
zu~9SKD^~`0`5(zVr5&=zFL1hapHpkqeJxH8H4JP`|MYHdmuBvaukrp{&ro{*%=AT8
z`P{1v&AH0TODqi2P1D+&l@{q3PEoT-^2b|Ov&sT}+3of~xno|~{ZhX_FDyLv-qfpq
E08TftWB>pF

diff --git a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
index 91791796..f820de8a 100644
--- a/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/sv/LC_MESSAGES/mediagoblin.po
@@ -8,11 +8,11 @@
 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/mediagoblin/team/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.net/projects/p/mediagoblin/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "Ogiltig fil för mediatypen."
 
@@ -40,57 +40,52 @@ msgstr "E-postadress"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "Vi beklagar, registreringen är avtängd på den här instansen."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "En användare med det användarnamnet finns redan."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "Det finns redan en användare med den e-postadressen."
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
-msgstr ""
-"Din e-postadress är verifierad. Du kan nu logga in, redigera din profil och "
-"ladda upp filer!"
+msgstr "Din e-postadress är verifierad. Du kan nu logga in, redigera din profil och ladda upp filer!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "Verifieringsnyckeln eller användar-IDt är fel."
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 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."
+msgstr "Du måste vara inloggad för att vi ska kunna skicka meddelandet till dig."
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "Du har redan verifierat din e-postadress!"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "Skickade ett nytt verifierings-email."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
-msgstr ""
-"Kunde inte skicka e-poståterställning av lösenord eftersom ditt användarnamn"
-" är inaktivt eller kontots e-postadress har inte verifierats."
+msgstr "Kunde inte skicka e-poståterställning av lösenord eftersom ditt användarnamn är inaktivt eller kontots e-postadress har inte verifierats."
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -133,6 +128,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -156,27 +152,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 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:92
+#: mediagoblin/edit/views.py:88
 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:162
+#: mediagoblin/edit/views.py:158
 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:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "Fel lösenord"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -196,7 +192,7 @@ msgstr "Fil"
 msgid "You must provide a file."
 msgstr "Du måste ange en fil"
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "Tjohoo! Upladdat!"
 
@@ -216,9 +212,7 @@ msgstr "Ledsen, det verkar inte vara någonting här."
 msgid ""
 "If you're sure the address is correct, maybe the page you're looking for has"
 " been moved or deleted."
-msgstr ""
-"Om du är säker på att adressen stämmer så kanske sidan du letar efter har "
-"flyttats eller tagits bort."
+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:46
 msgid "MediaGoblin logo"
@@ -246,10 +240,16 @@ msgstr "Logga in"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"Drivs av <a href=\"http://mediagoblin.org\">MediaGoblin</a>, ett <a "
-"href=\"http://gnu.org/\">GNU</a>-projekt"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -315,15 +315,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"Hej %(username)s,\n"
-"\n"
-"för att ändra ditt GNU MediaGoblin-lösenord, öppna följande länk i\n"
-"din webbläsare:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"Om du misstänker att du fått detta epostmeddelanade av misstag, ignorera det och fortsätt vara ett glatt troll!"
+msgstr "Hej %(username)s,\n\nför att ändra ditt GNU MediaGoblin-lösenord, öppna följande länk i\ndin webbläsare:\n\n%(verification_url)s\n\nOm du misstänker att du fått detta epostmeddelanade av misstag, ignorera det och fortsätt vara ett glatt troll!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -358,12 +350,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"Hej %(username)s,\n"
-"\n"
-"öppna den följande webbadressen i din webbläsare för att aktivera ditt konto på GNU MediaGoblin:\n"
-"\n"
-"%(verification_url)s"
+msgstr "Hej %(username)s,\n\nöppna den följande webbadressen i din webbläsare för att aktivera ditt konto på GNU MediaGoblin:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -398,18 +385,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "Media taggat med: %(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "Original"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -434,55 +421,43 @@ msgstr "%(username)ss media"
 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: 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."
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:103
-msgid "Add one"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -491,8 +466,8 @@ msgid "Really delete %(title)s?"
 msgstr "Vill du verkligen radera %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "Radera permanent"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -537,8 +512,7 @@ msgstr "Nästan klar! Ditt konto behöver bara aktiveras."
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:58
 msgid ""
 "An email should arrive in a few moments with instructions on how to do so."
-msgstr ""
-"Ett e-postmeddelande med instruktioner kommer att hamna hos dig inom kort."
+msgstr "Ett e-postmeddelande med instruktioner kommer att hamna hos dig inom kort."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:62
 msgid "In case it doesn't:"
@@ -552,19 +526,14 @@ msgstr "Skicka ett nytt e-postmeddelande"
 msgid ""
 "Someone has registered an account with this username, but it still has to be"
 " activated."
-msgstr ""
-"Någon har redan registrerat ett konto med det här användarnamnet men det har"
-" inte aktiverats."
+msgstr "Någon har redan registrerat ett konto med det här användarnamnet men det har inte aktiverats."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:79
 #, python-format
 msgid ""
 "If you are that person but you've lost your verification email, you can <a "
 "href=\"%(login_url)s\">log in</a> and resend it."
-msgstr ""
-"Om det är du som är den personen och har förlorat ditt e-postmeddelande med "
-"detaljer om hur du verifierar ditt konto så kan du <a "
-"href=\"%(login_url)s\">logga in</a> och begära ett nytt."
+msgstr "Om det är du som är den personen och har förlorat ditt e-postmeddelande med detaljer om hur du verifierar ditt konto så kan du <a href=\"%(login_url)s\">logga in</a> och begära ett nytt."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:96
 msgid "Here's a spot to tell others about yourself."
@@ -592,9 +561,7 @@ msgstr "Se all media från %(username)s"
 msgid ""
 "This is where your media will appear, but you don't seem to have added "
 "anything yet."
-msgstr ""
-"Här kommer din media att dyka upp, du verkar inte ha lagt till någonting "
-"ännu."
+msgstr "Här kommer din media att dyka upp, du verkar inte ha lagt till någonting ännu."
 
 #: mediagoblin/templates/mediagoblin/user_pages/user.html:163
 #: mediagoblin/templates/mediagoblin/utils/object_gallery.html:72
@@ -609,8 +576,13 @@ msgstr "feed-ikon"
 msgid "Atom feed"
 msgstr "Atom-feed"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -629,22 +601,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -655,24 +623,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr "Jag är säker på att jag vill radera detta"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "Du tänker radera en annan användares media. Var försiktig."
-
-
diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.mo
index 9467a3f125fc1e1019ae5b5775e94c653e603e8f..513efb7d195ee801ce781d0747460c6f62080022 100644
GIT binary patch
delta 2958
zcmd7Sdu&rx9Ki9@t;im3!Uk+0gG(9gWnUWuGPdy;vPl>qk4znob=}=|W7jrq$HH_e
zI3*;Cl2t?qkw1t|d=R8jW1>Mo6BqFT8eymqc}yc97?cH~#P4sdLI2i2T(*7Ax#!&T
z`2Ehg7hCrk;nNxBZHk{w{7vL<iCJp5e;!LxY7EtG9EZJl4)>xRw<If-hwr1bU%*8C
z9n(;yC`D1F<0#C=bS%J3rNU}9g_%59f;HHKi}5IyVpeKwfLfG+>+lY&$1H5ZeC$FQ
zXAe%oQ`m(!uoy#k#@_404C?!E6!WV?@rL8^h5^i`!zG-6BiM!vsG$UBF4CkHqAcM4
zc)Nl8s?GcxkI$nlXg`j`A5h-Ef@ASlOl5wRLOkxlaoCMjcmfY$5$?E4smb^euEz`L
z#<j$A3LZg1sV<-eZ=g&#akNroN#&wM%!;z}87Td$F)TT&ryvsqkatxt@~ignPj>ni
zO25PL`T$B!2XO>m#T>kjGT|6z5p&SM=_otiiW1qEQRX?ALHwVk@C6SfWQ{CK7Se?>
z@lIq+)ra!pyYc78Q3gDN64KwW4sW8Ig%zAwIXjP{MD|UTRGvmB-oPd-8cX~+AL<!K
zlYw^PBHWFV+d*84w@?PEB@DB$3vGA+HT)h|VFE90z&f<!Nt6gBvHBpUqeSL$WY6lU
zFa?dmizqJ~M9JNic!we67^oD&Q-$ME7Vt36!EM-s$5777YPMO88?hJrQO7lR$5V)9
z)CZ8ERd@`SUS71K<nTdkz)noSuTgS6fU>Z2C_B0s_m_D45LWQq#2_!2xFtxG)k&@n
z!BLm-9Gc0mZ1hLWllz~o#X8KxL>lUlo1yAaCN@wGOAsXzPatVl5uAyASc9igz8iT{
zV!02Xy#ETyxCf9;tGAJ?sN<L~_x~pfGEgRWNACGz>_P*J@jS})$(kC=*(8(&IZ>W3
zh(Es%C8TR`26mu~_bSTS>PI=$pP?+^8);{Lb&Y}?ri|R!Etrq8pn8;$_o5kh;!@m=
za%g`>Ig~fC8}p{cz8f#0q_lf_>^AMi_0;>(ja9^*J*z&6zl5@%0-IFd;YgG_B&Re9
zWrw424rZhDUxnka4N0R4qeNsk%5~k3veUyT{XUP^2T@XT4do2|A@S#&sKkQUgi}yL
zScnEzAvaIG5r2LJWuk9Uz8ja3gRi;^V++}i68d*g7IFz?yjv&>$|5W>UM`xktcdv6
zQJBjE7NxdhDSm(w+Uv*-Qd6nOhocgk(2uG3CCWf&a1owI$!(D}mZ~b`k?O@+cn~Gk
zL#W~OFg5vbRO1HRg>pS|_$Mo^Mfq^JQBrgQGw>#AnC6J}x1pr20j0eK({Vjk;bxQt
z97Rc`ncehYcpe2dsXoMNyo$Xzo1?GeCnz~|mc%|BH7FtNL3wW%N(w*51{}l$yq7#A
zV-3o}R-okkp}38)_B7Q(p@IfKMvo;eFj?A4D(5#h>&=?aTW+V4q7DC)`zxpAH@iZ5
zK`^pN%guCYZeM%5?hPq=Ywdco;fi!>mgwu6#S}f2`lQL^k2a<)G>`PTT_MBgjl4E`
zM`U$IzsVMvlvx$_=&m4hba<QffEH@gwQ`r%7SLNNEN!8Xzszp$?Ci9)1Y2yrK&#zj
zxOH#P@cvcOgLYS|-(xMYIc#mAc8{fUe)aMt<#t!4?e;j+@`JvPfLmYdF}#ly1TB>-
zhpQ~RSuangujX3kGCZy(k8X=LWELkRwX&d2Bh(gsdTdc*q0jsGv3$YywH*PEjI+$I
zdsl`6x*n=^`DN1Rr`gHol(U<*YD@J_J)k1VT1DjS#06PKFxa67ZNtH7^)<1O;q640
z=S(Oru{vjK&eAgHOsk{R;YeA&%(_BfX9NkAbs=Fc(~2F=Vyk1gU$LXiIU}+wXDIqr
z(%k<bMeik;{E^1A+~}66&)v>Ye*R%H^gv`~!N&h(mLd(AbE3-%C;uZ;zJ$ntZSY@a
H%cTAU5ue^o

delta 2740
zcmbW&4@}f$9LMp8^OQe=3iyXo@<cH}-~bgBO;MPdZYt?g%W2%*Pq>sj#vLinJe<yD
zo0Z<M?9W=uT4t8>may_KZLVpVSz+2@p<7mNH8V?RYrQ|-Z?mn{Rt)xfe$Vs!J<s>~
zK7V-If2A(co#AXV{5-+mF#eV~^>pXw#Ux|y;_)TC8{2Upp2fj<886`<=*El5##CcQ
zO1ynB_To8!G?^w$#PvA9n26a-p&u1(n1Q=76Wg&IPvLBI^fhJ<&c*S#6V>5Ir~$gL
z4_?3_*n@d^6V*>nsxkNAQe1~?v5fJ}H46H0bXq)sA|x_XiK?%$>z7~_&#O?G*o^A%
zWmM9RAYGXcPyw8=+rLA8O(L^YCI_Jca$_Rno0SyQK>!C~2npJ3#X@Yu$FUR7VP$_~
z#$Xmv4##S2K_7at8%N-b^mrzHn8Wj0RO(+qR?EDK5zX)|3QBzpmHHE?wY`8E;40Fm
zN#`YsCI>asaj5#~sP`YR>;0&uc?^4FD`w*s)WExK_hpd(dMXZ5p_vb7bftJas^fX6
zl&wGo(t;Xz7b=j~QSW!y^`D~p=|*Mr7hH@tQG20=ovXdG4wc#c1IfSE@@pze@dkRZ
zfL_$WHk^q&P-}V~=iyaU2bD~F0ybbVzJ@OR92enrY{fZztkZD{m62N*!h{InD<#cH
z63hm4;dUH~2T*Hv+HUVcwt@K`tMCRYfGMPDGKO&z?nmvBam;QOK7u>&4YY7FofDg>
zd4)m+g$|@Ia}D)jDwl!QY$7hl2hoA=qSm$p6<8-~Mkj60MAMy_k$nl=3e;%vwsS}r
z)$B#mYfhks{t7SQ&#2sVvBK5Z#}#j%i@kXEphjGY8nF?zIo6_5u@#lN=a6+adtL0R
zatcSOn2o=pZjNajit+d)s>5Tb0Zt;bHm8wwF+ZSoi-SX>e#Rg%8V|0+jaY`iqmGYz
zWITX!RABdyWLK%-A-ka#mD@0m!)>SzJ5jr=2eqxgMFnupZtpuPzN-pQnOuqrD1^$y
zo9M&?s9o8Px;Xkoa^u@G19fvu!*h5TwYY7g<LBu(w(#78UVQl8_|0(?mC7DulIA)l
zVisvhLKkX+`8XL%Q17osEp4Qgf)4DnsFbv$4(x}hnO?B#FQY!VVb}N1k1x$I>`nb>
z)GjQ<B%FiF<U*{+)yPpaU)c3mkntkMSzuqbs6gDP)Xzr+vKiIUPE<hepgKB)O6gf#
zjOUQpjGMG+?<_$b{HIWx`hC>J(S;sNqS2}UDyt~Wq@oeErtPRT`ULqk_Y}ns?p!S9
zc@w(u0P5!W3|ldeMxBm5r~uESZjPT&OXH<cyMGJ1a2F0`eDfX!ty!1-LO1r~`6^bS
zDTxPAjatL?xCuLu$(SijYZlg{ZjSwEVHI0nOST7faU4Ts@)qj5fn&+P)~u4ka$JrM
zJdDYB3>DZ()Eb|){Sx(FH|o6}G`V@+U_*ly2(R!4n*-tekjsAl=a!JkjcrJ(OmH+#
zjV5H@7yTxAR9b`O^Vgc`KA$TXu%bg!a?*W1OAoHxJYQ|t$`2LCCZz0fBrJ&aq*gl<
z{az~&vMQp5>ATYG0Yk19D_k5sp8j$4>5QtFC)4eST`XMXh$dwn8r%?UvRt<ZafNH^
z>galnKU^RCF)P`b8f-Ebw>;yTXRWcCqEoYHEc7(jg^E`OgWh0MV{yO=yBnK=k6PYv
z$bGwqx}ayZKj8L<Ld{kvWx@PKMO95!ZP*_S6jc*yg{!Qjw5+J4w5V*7t8{F|*wUhs
z^5~K5p(*j2Nfl+2qL;FNEBo(>i>*(Z@jucwDj{}o#PbQ{u4ZJ%o!kw`>-<~pmPHHl
bH!6QoPv*o}d%<w!u%_3)<uC28`7?h4^(CIi

diff --git a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
index 24155bff..57b5f82d 100644
--- a/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/te/LC_MESSAGES/mediagoblin.po
@@ -7,9 +7,9 @@
 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-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr ""
 
@@ -39,52 +39,52 @@ msgstr "ఈమెయిలు చిరునామా"
 msgid "Sorry, registration is disabled on this instance."
 msgstr ""
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr ""
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr ""
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr ""
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr ""
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr ""
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr ""
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr ""
 
@@ -127,6 +127,7 @@ msgid ""
 msgstr ""
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
 msgstr ""
 
@@ -150,27 +151,27 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr ""
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr ""
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr ""
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr ""
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr ""
 
@@ -190,7 +191,7 @@ msgstr ""
 msgid "You must provide a file."
 msgstr ""
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr ""
 
@@ -238,7 +239,15 @@ msgstr ""
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/root.html:24
@@ -375,18 +384,18 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 msgid ""
 "You can get a modern web browser that \n"
 "\t    can play this video at <a href=\"http://getfirefox.com\">\n"
@@ -411,55 +420,43 @@ msgstr ""
 msgid "<a href=\"%(user_url)s\">%(username)s</a>'s media"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 msgid "Delete"
 msgstr ""
 
-#: 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"
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:124
+msgid "Add a comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 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
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, python-format
-msgid "<p>❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a></p>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
@@ -468,7 +465,7 @@ msgid "Really delete %(title)s?"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
+msgid "Delete permanently"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
@@ -578,8 +575,13 @@ msgstr ""
 msgid "Atom feed"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
@@ -598,22 +600,18 @@ msgstr ""
 msgid "Go to page:"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr ""
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr ""
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
+msgid "Tagged with"
 msgstr ""
 
 #: mediagoblin/tools/exif.py:68
@@ -624,24 +622,22 @@ msgstr ""
 msgid "I am sure I want to delete this"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr ""
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr ""
-
-
diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.mo
index e907562ed72a669e0e07f4d11bb4a1e6079f284b..cb7422bc614d56c1c78b57201990530f39854c92 100644
GIT binary patch
delta 3081
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
N*rUDVBz{_w)L(pyB$EID

delta 2888
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

diff --git a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
index 03571c01..809b214f 100644
--- a/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
+++ b/mediagoblin/i18n/zh_TW/LC_MESSAGES/mediagoblin.po
@@ -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: 2012-01-29 13:31-0600\n"
-"PO-Revision-Date: 2012-01-29 19:29+0000\n"
+"Report-Msgid-Bugs-To: http://issues.mediagoblin.org/\n"
+"POT-Creation-Date: 2012-03-18 15:16-0500\n"
+"PO-Revision-Date: 2012-03-18 20:14+0000\n"
 "Last-Translator: cwebber <cwebber@dustycloud.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: mediagoblin/processing.py:143
+#: mediagoblin/processing.py:154
 msgid "Invalid file given for media type."
 msgstr "指定錯誤的媒體類別！"
 
@@ -40,52 +40,52 @@ msgstr "電子郵件位置"
 msgid "Sorry, registration is disabled on this instance."
 msgstr "抱歉, 這個項目已經被暫停註冊."
 
-#: mediagoblin/auth/views.py:73
+#: mediagoblin/auth/views.py:75
 msgid "Sorry, a user with that name already exists."
 msgstr "抱歉, 這個使用者名稱已經存在."
 
-#: mediagoblin/auth/views.py:77
+#: mediagoblin/auth/views.py:79
 msgid "Sorry, a user with that email address already exists."
 msgstr "抱歉，此電子郵件已被註冊了。"
 
-#: mediagoblin/auth/views.py:180
+#: mediagoblin/auth/views.py:182
 msgid ""
 "Your email address has been verified. You may now login, edit your profile, "
 "and submit images!"
 msgstr "你的電子郵件位址已被認證. 你現在就可以登入, 編輯你的個人檔案而且遞交照片!"
 
-#: mediagoblin/auth/views.py:186
+#: mediagoblin/auth/views.py:188
 msgid "The verification key or user id is incorrect"
 msgstr "認證碼或是使用者帳號錯誤"
 
-#: mediagoblin/auth/views.py:204
+#: mediagoblin/auth/views.py:206
 msgid "You must be logged in so we know who to send the email to!"
 msgstr "你必須登入，我們才知道信要送給誰！"
 
-#: mediagoblin/auth/views.py:212
+#: mediagoblin/auth/views.py:214
 msgid "You've already verified your email address!"
 msgstr "你的電子郵件已經確認了！"
 
-#: mediagoblin/auth/views.py:225
+#: mediagoblin/auth/views.py:227
 msgid "Resent your verification email."
 msgstr "重送認證信."
 
-#: mediagoblin/auth/views.py:260
+#: mediagoblin/auth/views.py:262
 msgid ""
 "An email has been sent with instructions on how to change your password."
 msgstr "修改密碼的指示已經由電子郵件寄送到你的信箱。"
 
-#: mediagoblin/auth/views.py:270
+#: mediagoblin/auth/views.py:272
 msgid ""
 "Could not send password recovery email as your username is inactive or your "
 "account's email address has not been verified."
 msgstr "無法傳送密碼回復信件，因為你的使用者名稱已失效或是帳號尚未認證。"
 
-#: mediagoblin/auth/views.py:282
+#: mediagoblin/auth/views.py:284
 msgid "Couldn't find someone with that username or email."
 msgstr "找不到相關的使用者名稱或是電子郵件。"
 
-#: mediagoblin/auth/views.py:330
+#: mediagoblin/auth/views.py:332
 msgid "You can now log in using your new password."
 msgstr "你現在可以用新的密碼登入了！"
 
@@ -103,10 +103,7 @@ 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> 來排版."
+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"
@@ -131,8 +128,9 @@ msgid ""
 msgstr "此媒體網址的名稱。你通常不需要變動這個的。"
 
 #: mediagoblin/edit/forms.py:44 mediagoblin/submit/forms.py:41
+#: mediagoblin/templates/mediagoblin/utils/license.html:20
 msgid "License"
-msgstr ""
+msgstr "授權"
 
 #: mediagoblin/edit/forms.py:50
 msgid "Bio"
@@ -154,27 +152,27 @@ msgstr "輸入你的舊密碼來證明你擁有這個帳號。"
 msgid "New password"
 msgstr "新密碼"
 
-#: mediagoblin/edit/views.py:68
+#: mediagoblin/edit/views.py:67
 msgid "An entry with that slug already exists for this user."
 msgstr "這個自訂字串已經被其他人用了"
 
-#: mediagoblin/edit/views.py:92
+#: mediagoblin/edit/views.py:88
 msgid "You are editing another user's media. Proceed with caution."
 msgstr "你正在編輯他人的媒體檔案. 請謹慎處理."
 
-#: mediagoblin/edit/views.py:162
+#: mediagoblin/edit/views.py:158
 msgid "You are editing a user's profile. Proceed with caution."
 msgstr "你正在編輯一位用戶的檔案. 請謹慎處理."
 
-#: mediagoblin/edit/views.py:180
+#: mediagoblin/edit/views.py:174
 msgid "Profile changes saved"
 msgstr "修改的檔案已存檔"
 
-#: mediagoblin/edit/views.py:206
+#: mediagoblin/edit/views.py:200
 msgid "Wrong password"
 msgstr "密碼錯誤"
 
-#: mediagoblin/edit/views.py:222
+#: mediagoblin/edit/views.py:216
 msgid "Account settings saved"
 msgstr "帳號設定已存檔"
 
@@ -194,7 +192,7 @@ msgstr "檔案"
 msgid "You must provide a file."
 msgstr "你必須提供一個檔案"
 
-#: mediagoblin/submit/views.py:158
+#: mediagoblin/submit/views.py:156
 msgid "Woohoo! Submitted!"
 msgstr "呼呼! 送出去嚕!"
 
@@ -242,10 +240,16 @@ msgstr "登入"
 #: 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"
+"href=\"http://gnu.org/\">GNU</a> project."
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/base.html:87
+#, python-format
+msgid ""
+"Released under the <a "
+"href=\"http://www.fsf.org/licensing/licenses/agpl-3.0.html\">AGPL</a>. <a "
+"href=\"%(source_link)s\">Source code</a> available."
 msgstr ""
-"由 <a href=\"http://mediagoblin.org\">MediaGoblin</a>製作, 它是一個 <a "
-"href=\"http://gnu.org/\">GNU</a> 專案"
 
 #: mediagoblin/templates/mediagoblin/root.html:24
 msgid "Explore"
@@ -259,9 +263,7 @@ msgstr "嘿！歡迎來到 媒體怪獸(MediaGoblin) 網站"
 msgid ""
 "This site is running <a href=\"http://mediagoblin.org\">MediaGoblin</a>, an "
 "extraordinarily great piece of media hosting software."
-msgstr ""
-"此網站正運行 <a href=\"http://mediagoblin.org\">媒體怪獸(MediaGoblin)</a>, "
-"他是一個超讚的媒體分享架站軟體."
+msgstr "此網站正運行 <a href=\"http://mediagoblin.org\">媒體怪獸(MediaGoblin)</a>, 他是一個超讚的媒體分享架站軟體."
 
 #: mediagoblin/templates/mediagoblin/root.html:29
 msgid ""
@@ -279,10 +281,7 @@ 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>"
-msgstr ""
-"&lt;a class=\"button_action_highlight\" href=\"%(register_url)s\"&gt;在這網站建立帳號&lt;/a&gt;\n"
-"          或是\n"
-"          &lt;a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\"&gt;建立一個自己的媒體怪獸(MedaiGoblin)&lt;/a&gt;"
+msgstr "&lt;a class=\"button_action_highlight\" href=\"%(register_url)s\"&gt;在這網站建立帳號&lt;/a&gt;\n          或是\n          &lt;a class=\"button_action\" href=\"http://wiki.mediagoblin.org/HackingHowto\"&gt;建立一個自己的媒體怪獸(MedaiGoblin)&lt;/a&gt;"
 
 #: mediagoblin/templates/mediagoblin/root.html:40
 msgid "Most recent media"
@@ -316,14 +315,7 @@ msgid ""
 "\n"
 "If you think this is an error, just ignore this email and continue being\n"
 "a happy goblin!"
-msgstr ""
-"嗨 %(username)s,\n"
-"\n"
-"要更改 GNU MediaGoblin的密碼，在瀏覽器中打開下面的網址:\n"
-"\n"
-"%(verification_url)s\n"
-"\n"
-"如果你認為這個是個誤會，請忽略此封信件，繼續當個快樂的goblin!"
+msgstr "嗨 %(username)s,\n\n要更改 GNU MediaGoblin的密碼，在瀏覽器中打開下面的網址:\n\n%(verification_url)s\n\n如果你認為這個是個誤會，請忽略此封信件，繼續當個快樂的goblin!"
 
 #: mediagoblin/templates/mediagoblin/auth/login.html:30
 msgid "Logging in failed!"
@@ -358,12 +350,7 @@ msgid ""
 "your web browser:\n"
 "\n"
 "%(verification_url)s"
-msgstr ""
-"嗨 %(username)s,\n"
-"\n"
-"啟動 GNU MediaGoblin 帳號, 在你的瀏覽器中打開下面的網址:\n"
-"\n"
-"%(verification_url)s"
+msgstr "嗨 %(username)s,\n\n啟動 GNU MediaGoblin 帳號, 在你的瀏覽器中打開下面的網址:\n\n%(verification_url)s"
 
 #: mediagoblin/templates/mediagoblin/edit/edit.html:29
 #, python-format
@@ -398,29 +385,23 @@ msgid "Media tagged with: %(tag_name)s"
 msgstr "此媒體被標識為：%(tag_name)s"
 
 #: mediagoblin/templates/mediagoblin/media_displays/ascii.html:34
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:46
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:53
 msgid "Original"
 msgstr "原始的"
 
-#: mediagoblin/templates/mediagoblin/media_displays/video.html:33
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:40
 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>    的影片."
+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
+#: mediagoblin/templates/mediagoblin/media_displays/video.html:43
 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>!"
+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"
@@ -440,56 +421,44 @@ 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:72
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:46
 #, python-format
-msgid "Added on %(date)s."
-msgstr "%(date)s. 加入"
+msgid "❖ Browsing media by <a href=\"%(user_url)s\">%(username)s</a>"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:81
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
 msgid "Edit"
 msgstr "編輯"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:85
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:89
 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:124
+msgid "Add a comment"
+msgstr ""
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:112
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:133
 msgid ""
 "You can use <a "
 "href=\"http://daringfireball.net/projects/markdown/basics\">Markdown</a> for"
 " formatting."
-msgstr ""
+msgstr "你可以用 <a href=\"http://daringfireball.net/projects/markdown/basics\"> Markdown</a> 來排版."
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:116
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:137
 msgid "Add this comment"
 msgstr "增加此評論"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:138
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:159
 msgid "at"
 msgstr "在"
 
-#: mediagoblin/templates/mediagoblin/user_pages/media.html:153
+#: mediagoblin/templates/mediagoblin/user_pages/media.html:174
 #, 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>"
+msgid ""
+"<h3>Added on</h3>\n"
+"      <p>%(date)s</p>"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:30
 #, python-format
@@ -497,8 +466,8 @@ msgid "Really delete %(title)s?"
 msgstr "真的要刪除 %(title)s?"
 
 #: mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html:50
-msgid "Delete Permanently"
-msgstr "永遠刪除"
+msgid "Delete permanently"
+msgstr ""
 
 #: mediagoblin/templates/mediagoblin/user_pages/processing_panel.html:22
 msgid "Media processing panel"
@@ -607,13 +576,18 @@ msgstr "feed圖示"
 msgid "Atom feed"
 msgstr "Atom feed"
 
-#: mediagoblin/templates/mediagoblin/utils/license.html:21
-msgid "License:"
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:25
+msgid "Location"
+msgstr ""
+
+#: mediagoblin/templates/mediagoblin/utils/geolocation_map.html:38
+#, python-format
+msgid "View on <a href=\"%(osm_url)s\">OpenStreetMap</a>"
 msgstr ""
 
 #: mediagoblin/templates/mediagoblin/utils/license.html:25
 msgid "All rights reserved"
-msgstr ""
+msgstr "版權所有"
 
 #: mediagoblin/templates/mediagoblin/utils/pagination.html:39
 msgid "← Newer"
@@ -627,50 +601,44 @@ msgstr "更舊 →"
 msgid "Go to page:"
 msgstr "跳到頁數："
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:27
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:32
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:28
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:33
 msgid "newer"
 msgstr "更新"
 
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:38
-#: mediagoblin/templates/mediagoblin/utils/prev_next.html:43
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:39
+#: mediagoblin/templates/mediagoblin/utils/prev_next.html:44
 msgid "older"
 msgstr "更舊"
 
 #: mediagoblin/templates/mediagoblin/utils/tags.html:20
-msgid "View more media tagged with"
-msgstr "看更多被標籤的媒體"
-
-#: mediagoblin/templates/mediagoblin/utils/tags.html:25
-msgid "or"
-msgstr "或是"
+msgid "Tagged with"
+msgstr ""
 
 #: mediagoblin/tools/exif.py:68
 msgid "Could not read the image file."
-msgstr ""
+msgstr "無法讀取影像檔案。"
 
 #: mediagoblin/user_pages/forms.py:30
 msgid "I am sure I want to delete this"
 msgstr "我確定我想要刪除"
 
-#: mediagoblin/user_pages/views.py:155
+#: mediagoblin/user_pages/views.py:153
 msgid "Oops, your comment was empty."
 msgstr "啊，你的留言是空的。"
 
-#: mediagoblin/user_pages/views.py:161
+#: mediagoblin/user_pages/views.py:159
 msgid "Your comment has been posted!"
 msgstr "你的留言已經刊登！"
 
-#: mediagoblin/user_pages/views.py:183
+#: mediagoblin/user_pages/views.py:185
 msgid "You deleted the media."
 msgstr "你已刪除此媒體檔案。"
 
-#: mediagoblin/user_pages/views.py:190
+#: mediagoblin/user_pages/views.py:192
 msgid "The media was not deleted because you didn't check that you were sure."
 msgstr "此媒體檔案尚未被刪除因為你還沒有確認你真的要刪除。"
 
-#: mediagoblin/user_pages/views.py:198
+#: mediagoblin/user_pages/views.py:200
 msgid "You are about to delete another user's media. Proceed with caution."
 msgstr "你在刪除其他人的媒體檔案。請小心處理喔。"
-
-
-- 
2.25.1