From dab819e75a82aea184b6651523f9be4ad10f71ff Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 1 Aug 2013 14:14:04 +0200
Subject: [PATCH 1/1] Mise en forme du mail avec une page template (ne marche
 pas, on va contourner).

---
 RegistrationTool.py                           |   8 +++---
 locales/en/LC_MESSAGES/plinn.mo               | Bin 2313 -> 2313 bytes
 locales/en/LC_MESSAGES/plinn.po               |  20 ++++++++++++---
 locales/fr/LC_MESSAGES/plinn.mo               | Bin 38216 -> 38768 bytes
 locales/fr/LC_MESSAGES/plinn.po               |  24 +++++++++++++++---
 locales/plinn.pot                             |  18 ++++++++++---
 skins/generic/password_reset_mail_temlate.pt  |   5 ----
 skins/generic/password_reset_mail_template.pt |  10 ++++++++
 8 files changed, 66 insertions(+), 19 deletions(-)
 delete mode 100644 skins/generic/password_reset_mail_temlate.pt
 create mode 100644 skins/generic/password_reset_mail_template.pt

diff --git a/RegistrationTool.py b/RegistrationTool.py
index 5072095..021b714 100644
--- a/RegistrationTool.py
+++ b/RegistrationTool.py
@@ -216,10 +216,10 @@ class RegistrationTool(BaseRegistrationTool) :
             to = encodeQuopriEmail(member.getMemberFullName(nameBefore=0), member.getProperty('email'))
             subject = translate(_('How to reset your password on the %s website')) % ptool.getProperty('title')
             subject = "=?utf-8?q?%s?=" % encodestring(subject)
-            lines = []
-            pr = lines.append
-            pr('%s/password_reset_form/%s' % (utool(), uuid))
-            body = '\n'.join(lines)
+            body = self.password_reset_mail_template(fullName=member.getMemberFullName(nameBefore=0),
+                                                     siteName=ptool.getProperty('title'),
+                                                     resetPasswordUrl='%s/password_reset_form/%s' % (utool(), uuid)
+                                                     )
             message = self.echange_mail_template(From=sender,
                                                  To=to,
                                                  Subject=subject,
diff --git a/locales/en/LC_MESSAGES/plinn.mo b/locales/en/LC_MESSAGES/plinn.mo
index 8c755e50580365108e1fa85b1a40280261ae21e6..4cd15ff104fda230bdf474decb2d026b06494bb4 100644
GIT binary patch
delta 32
ncmeAa>J-|b&L$j^QL5lrny#Q=s9<PlWnyk+Y`WQs?K~3zkje;?

delta 32
ncmeAa>J-|b&L$k5nxf!UnxkNBs9<PjWol|=V6fSW?K~3zk(LOb

diff --git a/locales/en/LC_MESSAGES/plinn.po b/locales/en/LC_MESSAGES/plinn.po
index b729ee6..7e6bac9 100644
--- a/locales/en/LC_MESSAGES/plinn.po
+++ b/locales/en/LC_MESSAGES/plinn.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Wed Jul 31 16:55:00 2013\n"
+"POT-Creation-Date: Thu Aug  1 11:47:35 2013\n"
 "PO-Revision-Date: 2007-10-17 14:43+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
@@ -1007,8 +1007,22 @@ msgstr ""
 msgid "You have asked to change your password."
 msgstr ""
 
-#: n/skins/generic/password_reset_mail_temlate.pt:5
-msgid "Please"
+#: n/skins/generic/password_reset_mail_temlate.pt:6
+msgid ""
+"To get back into your account on the ${siteName} website, you'll need to "
+"create a new password."
+msgstr ""
+
+#: n/skins/generic/password_reset_mail_temlate.pt:7
+msgid "It's easy:"
+msgstr ""
+
+#: n/skins/generic/password_reset_mail_temlate.pt:8
+msgid "— Click the link below to open a browser window."
+msgstr ""
+
+#: n/skins/generic/password_reset_mail_temlate.pt:9
+msgid "— Fill the form with your new password."
 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:13
diff --git a/locales/fr/LC_MESSAGES/plinn.mo b/locales/fr/LC_MESSAGES/plinn.mo
index b8ca134672be11ae4b4b33925442c68b433e78ab..f1517706dbf99fa4e928dd0cf75e105564d2c4dd 100644
GIT binary patch
delta 12987
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
BOHBX(

delta 12518
zcmZA72YgT0|Htv05Ru3fBqEVPgd|9e2vUi?H&I(kh!J}i-%@+kUNx#Qev}%al%i%S
zEv;R%YP7aiX;th0dVlZ9|JTRwJ|3Sw&pG$pv+w<;ee~(4uE#gJI<6PYyU^lFakZ=v
zEL704T=H0!S4ovxmS4POEkS?GhZ`{nw;@%nudy6n!?)2Z!Ln*#2C9iQ7>6fN^<Q8h
zdQ`BiXv=a~5hN(H8e%NIizRS9df-X)#q$`6chC>>SF|ioEQ+dE61}k;s(v#1U=!5D
zI-(nnM0XsA`RL!8>`YkJEaL)G;X`9K=I4P=%>5lEzZW%-Bc}Yk$zR0)${(Qy;8Mx%
z*biA)s|fmIFczeLD~^OloPwG`bJT;KQ62X)_lKdDeiCZtE3p7>z#_O4wMD1U3(umK
z`X=hRKT!4kE88m&iViJF6bUsLi(2ADV|&zq#-JLUj_P1Bs-czWf*Vm=unEKPGu(_9
zO!>q_%gRfBHtPBLsQ#8Evi>SqOF=>0glhPJsdy4KfbTIBZ(>#a2a8}*74{#SqxQHr
zY9NzQ6Ptrt!9}P&UuE*^QT4V~Vf}Su4+Rl;$W*+I>i8jQ=C4fNJ;~mx!l;2pq3$Q3
zW>f<;(}t+C(F}Pptgfhu&cPsDjB0<YgM<dKA2rfrs3km&Is;FzIR1lbIF#wD;YieB
zs)%~73aY_WRC~>^5T>EFv@dD^vr#i&h(YLBMM5*#jq31-$)82d=mu)(@1tJJ{MGD%
z#2FJ%r#TTdfCi|oNkg@lh1!ZS=KciZ9Asr2)=CoE`_ot&Zy5_zw`W)hM^K)G8qikM
z4ECD*QPkUW2G!wBRC`ZQGj>h3?|Y!`7ex)UG<xa%Pb8rwtBq>7F=|QMqAGSlEqy=K
z00v=E9D`c9MW_LMj8V89)$t`PgEz1+dc0+~7lzupvY3zltppN*n1ouY7O0NWP$Nz^
z`GKgVeiyaGvrva`4XVR!rhGSQz^73YI)|!v9W~Jhr~&_m4t11=54LXjpdKuOaaas{
zV*}I!+mW9M>k#U>qc{!EpjM(oiap?-Sd9EI)WGIqFfKvW%P}5EVf{6-lN4yrE}>@l
z09F3C$$O^SZ$$`dOOjD5(+D;2_Ne;ls0s8p4neKJNRyvn@>5U~nVagc_j&;Z8o&zF
zOt+%8<V#eCmrz@C7d7*Tr~$l0%_v_@`}u;X8AqXh1L9EkQ&DHC396m8sCGL#Orkex
zL?ci$8I4-PDdv8*Dc^>AulJ+Qz**yc)PP-T*(*{M)lmd$z|p3>0_yNpLk-AL!`!Hk
z8hLZn2PO@*6}`;;Q6@hg)zN&^Tkr|$Lvj=~qwA=KAELJAcjMov_T6gR1Mouf4$F^(
zMjD9Pt59P!YUBy1hLTZxTL)FYA!-Ynqn_(x?q`~OmdTGm4R{P{D;8h^euUNa{(nz`
zSJd*UW51`3F_L^bs^N)P9%rKlv>)^03FHUP`WAI|^47IiE)cZ>rBN%AfO#;*<ZGh_
z-V)vE-|9v}d!C7^I1F8J6zan<1~rg*s57w~)$nd~!(*rpPoWw<j~dWz48xb`hJp3$
zEe%CYq&zw_lWHXR>RKrnfum7Nv>df$-=aGH0oBn9R0D5J-m|{FMFAL2c`=huMjg^R
zn1LNJA09-td%QmDuLjRipcS}gD%?kH!86nf6l!2U7=wB}6HxVQntU_V%)4NI%t9t@
z4ae^I1y;cDh8%2cjhgVrhOB=H5_c$2M;?vrnS`N69*vrL4b+l%F!@YW{fVd!m!aO4
zY}CwlqI0Im$I&{D?&#jwJ|n)ULmBQMp*>GRHI$6nlDeqZs}X8uJx~n}G5OJ0fc!Mn
z*;t4g;3_PGn^7O2i^wmx^#J2As)_x&w!#qdj=m(+;Z#%uv(OViL^Zq)HGr*H01ue*
zlc+;=9`!-Gf*RmcR68$G?YK3y+wntfT`;OV2EFwDS0+)4f?BAKdfPXwk;X}=2j-dk
zD^LU8gc{&B)CX%Xs)JLgrM`+<(c7qjJwmnf9CgUwpoiZ7h-UT{#G)#eM^#M3IIM~M
z<!trGD9pwbJb^Lj(VV{>uoBXyH4;1EF)WD@E$sH|p$60lwQ{Y|`Tn;jp^np04P~Ov
z#3tib)B`(^CA0RRFMeh67f}PgjXG3MFc{ri+AA7~I-CipPjzk73Uoq;IvPhpOE$q&
zn2u^F8~t!EYRONb2J#(-<3-dK{DJylxwf(=;)bg4h3e2Bb#`J<E0Bm9U`i|2Ullu0
zpqX_=b=VJe`p2RMwix^1D%5~ITiYG`pq>vxtzal>WlEazO6WtrDtcoB)E6<$IJ`Cc
zA5Fm`3e@3#T!@!&DfVx}pVFAWt-a^%Py<+un#qT#4%VPnA_oiNKGgT)3~FWWp`N>s
zh4C?}US0>Eqv9k2Q3FUsy_YRe6|*n^-$#8B7n|}us4Y5U@;{?q!+%iq1KQb39F0ZD
z*FtsJ9@S4jbKfzUgqD6aYDS-${4P|3M@;@QYHRMImiQ%VN!{PJXI>apKMXa1N~lBD
zz?AnvogD{it0p05!ePxMq0_s>F0itVTTmVBMJ@3O)BrD`2JoZFKSQ07S4P+N_JlmK
zB;|pqfh402T^Cb63f=YouOy*Ev<@}GPtYH?q4w@DYQ)D({u|>NRL5sg1G<7*p$De?
zHEQ5_`535P0P64+L!FiCSe*W?x+JtWJy0EwKvkTELAU{RNDpCoypLM3;EwiyqcD_w
zENaCXqRv!1)EOF%Is-FNuVJ>izXcr{*|#LL0vFIZ6Vz#afF<w=YJdTq>;_BW85fom
z7f|lq#h%f}sE#+G>Yv1Ncpcdt%e$-nYuFRZkYC%C^-myingSgfmu~hUDvS-t$6yT{
zf~mM28{u!LLt7)=uHP7A$#+9_JQH<)6>6n6p$_LR)JmK(_kT)v*h~DB0`0NKJGOqP
zJqkpvOayABN}(DohdL`&QO~8A`}It|83t0`*5tELD?1b;a3ZSxbq-TuE2@KCs1Y8(
zaJ+!p!<VST<lWsi1a;VAQ8P})V%Xf2_ce||t?VpR`>Rp)H(+sed|?t-P>16cYGnC(
z*faFQJmia@wkjB_U=!3zOhncH0JS1ZjjPaw{94q^*JCv9!rgcSSviNbB*T7i6>5ZQ
zQG2!7<PV`{_BHBs-!<jWQE$s@RKq?!?O)GCj3hrA%is!(!>>@!KgWFN+Dijx|2>=u
zmI-xeLQzW{gZki9#VD+0?q{Mp9)_wn1vSG(=-g9OJ6lm5?nAY664miJbiQR+mHw><
z=0;Se{q2uKb<hyiU`JyHRwh3H)xcWRd%qL&;#t(nT{8JcsONt*`PZl|cIj;&dT(@;
zpr8~9RcwUX(>7QdyP_VLite}oJ#aZ{X6vvN?!b7wf;uZ+ee4<gVL17sSQM+Fwx$j0
zP><-t`fEvMQJ|$<fSP$W*2kR~jDMpJT~J^CQpOgjj;7&koP}-}($8LjNc1FM1vT(m
z#zv@9-wF%hpnj~sIvh)Z`~bDIt5GxDh8}nT)zAsdkKds>{K1spH2#d*lBcMN`DEFz
zTVd3|OQXuuQ7fG3AfX55qV{eJYGy}J9UVu#zu%$u_zr3y_fhZvuNZ`R`rB_w2x?1{
zP!s8ds^1TzaVV;t<){^MtR|s`Hlb#^4>gdlP%Cm3Rq-*Zp+8YGaT&mW55{V!=Z~V6
z^n&pg?jZjdwNlvw?e;ccIQhNE1Rd5@5;{b8Pz`tuvS%EG`clQAzKAL4k7=lZWTH0?
z#6%p2TB)6=!*v2x?*?kd_fQjgXv$wY%h~@orb6Dqc0~_#rJ@gNul!L12tsvG9<_J1
zO?f|5NAIIQ&Okq0Ve+4%w&+XLmR?4+cMHAs{{KlrBXl2PFO?UnLP0EuWl#f3M$I?{
zW3j2ZKgu{0wRNj70C%7UavaspW%R*^sQ&&!=fD43L+u&3p$?z7(H}M9!l;!fj%p|h
zHNYg)%$uX$?{*lCgHW&8Qq-^DZq##UP!sqG_1v?e?7tF!QlO4phS>w~L>(F*)JO}V
z4rfsez!JtPsDU*`4ZIcVxinOVolr9#fI3^_P-kE|s^5jfSbzPvtf0UbKga5L0&Ah$
zaN7nLL4F2m?>D2C_5$j|bPv^W*a+JwtVuo=btbZm4%9^Fq6WN71sc&x)R%4pY9L2Y
zBRq$ycoj8+o2L9Bs{V8ILf?`0l82z`RYxs#eboK7s0qAdoQP$}JJylV5}v_AcoChi
z32Fc@u{FNIa@cy5{cl1OP%Cf<!|^Pt{&UofU!w-%Gum!H7)y|kK-H^@QF{NIlK6sx
zA?8N>yY>nsp_ZxvYCtVf4|c+m*aK<6nr6zkU@`K$P-o;U2I4)Fe}h_yfHC$2!cqVJ
zX>}u^26HeGFJVXY9cwR9Uo1*~A!-0yP#y0wUPCpUXPo`(=7)vJS46EqL(~M?qE@CG
zYQ+a*d%gdoNNA>KQK$AQ7Q-i~y)Qr|J>ZLKun5LrB!*y9R0n-97<H)C&K%U~&qi(4
zc6<vDV=TJ7$NJYJQI<qJ4n^(JTGWc1K+X6uYUD3ahco|p`*jRLy`GV%2}GloKHlW(
zU@7uVO@1h9AY)MjoIRfPSHr6*kU6OL{3vS1r!fgHpgQ)QU^ftk>M$NvuPSN<Qcb=w
zYUNsC5llmMoP};U4mGif6Icp$IFkbH;UZLr*(QG#)zB}f4j-W!c!4SS8mnUR`}W&0
z9P5)`i^cH~wn49n{9s`^F2k=e4l^8+><;Fk8eU{vjvC>|sE#+H4rLB%$$cl=_Y0v`
zAOy8SB~UZ1h?-Cx)XKC(ot;h?iJ7Raa?BtRMPe0d#7D6--o`xWJ;ffFKL(KxM13dX
zQ4Q8b4X7pN!!#_9oz4AO=KfN2r+lR;Ux%!K!`e<lU#c7Ej*l=De@8VOFx5UAL8z68
z!Emf-@@<e$ht(N1;7g|bDyqFZs4aekT9KEgJnuBUrtH5L2_3#jjKNA+0lT8Uc=J#L
zI*8lw2F}8{)0s7f&9MI?^B{C3e;z&X5^7?%O!-sPss9aiDD%x^!1Qm0l5oQa)PvEe
znJ1u@IuQ$CW7HnEL)GtP%)$urLr@c0i24AnH~D?2GjST#&P~+79->1XydvR+zD!FU
zgrE*b9I9d}YGBP!AC$LIE7J?TaS>`}YfuB*g*prSP>1gbdgE!#kJs=z-krtz>l=M^
zw!K%^P$Rs98pt!$j9fmjI}SjVN1~pqfcjE4LM?qy^ugY!voO+>k1;w>1DSyRan1*<
zKR?~p8w#|9!{_jqFfKtgSa+`7Py^JAnxOWswJGm|no)mL{Sn5|sF{yN4Rk8%H{>H!
zJ9|(odeA{ar}QMU3)WfGUUi#C;2_lf?~OlTI{90u*R{@k`*rJ%<;c%R&F~OvU}rD`
zFQYn4SzvE<LsZ_8W(vBYmOcv`<0w?eM@{)R=u7@GYH5GL68H$U1^x@|AD^=5LVkz-
zVXm%Nizq<Z4b;l$iq`v|pLJ7%nZzwB+}9nhaisqtc9YJBvxxxG**I7g%oS;Dfb634
zKi6)eP8HfcPd=V-BdtrH>fCE0b++pL*Z#L48s^@?F2n#rOZhpWODFbIXNnWg!#zj`
z;V|NVuiq%}ro1l3(fJC}=SUwm73-0IO!|rAUk{%n-JNJ;%I;%V;%h3#)5vnt(}?P%
zOA@7s+T;W9BI?o>aWt&8Cg01bd)0{H<ln^##8c7^o%UD~`e0Niju5%mM3ZQnTY%c@
z4ulV#HsQJAcmVTZ808g6@4}rpinv0A6ZI(5b&2?#{3U{m_2;Tjl%>F%Mm&iP<SSvS
zT}f4}Sn~Rhj=Cmb9ij>8s+501`nB`UfB*5Jsr!-fDo!W<q)I_k=BEDrXh7F@#6Qjy
zUpOl0HLO9rFqL&{22qK8IiA^$)rsP|!Bv1VPx3+75Oc4Gq&pG(S!uPv4B`Rl?=i2#
zbgs(j6cjaiFY;}OA9TZ9|KYy=-b=#u#Mgu_51tuGT7TQ+UV3#0nENW5O}s-qAqG>v
z6cc&Q@i&<gBwm@yy}0p<NrzJ2ll)8aZB1Db{D`vLt33HF#8nFV<`&{)$|8B*pV&?M
z4$+usP2^tu$k~7Y6{D~prJK#ov83CZT6-wlM?5FOXsinkC3Jmd97uYZvxKiEWvQe)
z6P1aD<iEtTrfweE$h{_M|HCP0MadkZwz=~j{=oxT#4=(%`McQK+!qN%GG*oQEsRhh
z*AJw1mBNjvSNt?iG390GPrnJ1$XC?<pCZwhC{5_odx2O?x*wry7V1Z17mmgyL^k1T
zX7U^5e-gzB7h(nX@}n2`N0R=Q$h}5W&KKLti)#qSSu$Hm==y{3Cw<46<KNRwIX~A{
zG>si2Ul_B<KQ(p4fq$hxrcNR9O^IKKYUIlhDLhw}{ClL|5En^vIjoyxa!7e#?lsCJ
zPEzJY_z{;WtBghQ9tIG7NY|j@C8Tq&ZX~7=YjO*W_plUkmv~J5a?W!5`(s5>aLZZn
z-+%l~@-rfZIAMwtO-BRq8F7vBqeOqA9ihJs22s8RbsabLm7YubloDJgNEads>u~5Q
zVf4iuBF5x@#_@I)>jvp`(i(Fd>FrpA+2>v#P_~oIYIG%H%)S1k-=@48`5L4nh}*=6
zlsV`BC7Gr~h<TtE>2^d1BKNvt5{EFJat}<vg{C|M_Y%iUeu(kkEGIL9XIf$~u~z-}
zpx}2hm585+3JjtdWvfa5htTyG`A0aE*hbVPABC>eZAm)!8bjKLxSd;on~4b~{}+Z5
zbEvZz6I{*ycOsKX;dNpGp{pv+C)SbfNCc98O*A6?F`;W55#&s9I2nwtAF1;zmL~S7
zfU6{B-{3}kKs+K!tG@alPbQ4Wz4DW&LcC7|QfcqM?!BSxck(MS1Sg~OFHe}SG*^4d
zj}YaEXyUnDY@NYx$m=p=we<g=I{!Ou1SJohw-`N@z91b;*(+>7{uAs@3^5JNFjD0F
z-!nfWzet(?xu%j&Bg)d&RO%EUU4ke`{%6hqD1|W;%)<-BOrke=U9mRSek?;AH+eCI
zaHp;=AEKg3HzyrQx+WeZbS2vS|33$r)HWB^f2nz}K3*ew6VIq{9&h5i*oxRs=;~?w
z&ZsgMX7fJzlcZM>X{0-v`=8=r;tL|hl(|#C59!N#|3itIL>v!(MZ6?*9ir@oowTZu
z)-~70`LA2+C@X5pHyCyMEgIKV9`jJ%nMfw>hQ+WAt|V3wI)Bzd5@U%UNzWv{Ckj!q
zBvvGb5y?anWv8iEhx9%oiu^m|gNbj6+^e}shf^>;w@|9wv;BZ!;hE{fGs54=$mpLl
zAU@15XKCs{zntDJM-`Z#+PPjpyNn*;jfV9Lub2>?kXWs9<!bTq^Otrm?pdX*DM`vX
v*x9>q&Yi&>3gv8?66PB`c~1D?!yAV89@2Y2|L}n%yC2@rBcuP&4D0^@^^>Ir

diff --git a/locales/fr/LC_MESSAGES/plinn.po b/locales/fr/LC_MESSAGES/plinn.po
index e31e9c9..58520fd 100755
--- a/locales/fr/LC_MESSAGES/plinn.po
+++ b/locales/fr/LC_MESSAGES/plinn.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Wed Jul 31 16:55:00 2013\n"
-"PO-Revision-Date: 2013-07-31 16:58+0200\n"
+"POT-Creation-Date: Thu Aug  1 11:47:35 2013\n"
+"PO-Revision-Date: 2013-08-01 11:49+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
@@ -1043,9 +1043,25 @@ msgstr "Bonjour ${fullname},"
 msgid "You have asked to change your password."
 msgstr "Vous avez demandé de changer de mot de passe."
 
-#: n/skins/generic/password_reset_mail_temlate.pt:5
-msgid "Please"
+#: n/skins/generic/password_reset_mail_temlate.pt:6
+msgid ""
+"To get back into your account on the ${siteName} website, you'll need to "
+"create a new password."
 msgstr ""
+"Pour accéder à nouveau à votre compte sur le site ${siteName}, vous devez "
+"créer un nouveau mot de passe."
+
+#: n/skins/generic/password_reset_mail_temlate.pt:7
+msgid "It's easy:"
+msgstr "Rien de plus simple :"
+
+#: n/skins/generic/password_reset_mail_temlate.pt:8
+msgid "— Click the link below to open a browser window."
+msgstr "— Cliquez sur le lien ci-dessous pour ouvrir une fenêtre de navigateur."
+
+#: n/skins/generic/password_reset_mail_temlate.pt:9
+msgid "— Fill the form with your new password."
+msgstr "— Remplissez le formulaire avec votre nouveau mot de passe."
 
 #: n/skins/generic/password_reset_template.pt:13
 msgid "Password resetting"
diff --git a/locales/plinn.pot b/locales/plinn.pot
index 3822b03..886a0fd 100644
--- a/locales/plinn.pot
+++ b/locales/plinn.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
-"POT-Creation-Date: Wed Jul 31 16:55:00 2013\n"
+"POT-Creation-Date: Thu Aug  1 11:47:35 2013\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -1029,8 +1029,20 @@ msgstr ""
 msgid "You have asked to change your password."
 msgstr ""
 
-#: n/skins/generic/password_reset_mail_temlate.pt:5
-msgid "Please"
+#: n/skins/generic/password_reset_mail_temlate.pt:6
+msgid "To get back into your account on the ${siteName} website, you'll need to create a new password."
+msgstr ""
+
+#: n/skins/generic/password_reset_mail_temlate.pt:7
+msgid "It's easy:"
+msgstr ""
+
+#: n/skins/generic/password_reset_mail_temlate.pt:8
+msgid "\342\200\224\302\240Click the link below to open a browser window."
+msgstr ""
+
+#: n/skins/generic/password_reset_mail_temlate.pt:9
+msgid "\342\200\224 Fill the form with your new password."
 msgstr ""
 
 #: n/skins/generic/password_reset_template.pt:13
diff --git a/skins/generic/password_reset_mail_temlate.pt b/skins/generic/password_reset_mail_temlate.pt
deleted file mode 100644
index a871ed5..0000000
--- a/skins/generic/password_reset_mail_temlate.pt
+++ /dev/null
@@ -1,5 +0,0 @@
-<tal:element i18n:translate="">Hi <span tal:replace="options/fullName" i18n:name="fullname"/>,</tal:element>
-
-
-<tal:element i18n:translate="">You have asked to change your password.</tal:element>
-<tal:element i18n:translate="">Please </tal:element>
diff --git a/skins/generic/password_reset_mail_template.pt b/skins/generic/password_reset_mail_template.pt
new file mode 100644
index 0000000..261abd3
--- /dev/null
+++ b/skins/generic/password_reset_mail_template.pt
@@ -0,0 +1,10 @@
+<tal:element i18n:translate="">Hi <span tal:replace="options/fullName" i18n:name="fullname"/>,</tal:element>
+
+<tal:element i18n:translate="">You have asked to change your password.</tal:element>
+
+<tal:element i18n:translate="">To get back into your account on the <tal:name tal:replace="options/siteName" i18n:name="siteName"/> website, you'll need to create a new password.</tal:element>
+<tal:element i18n:translate="">It's easy:</tal:element>
+<tal:element i18n:translate="">— Click the link below to open a browser window.</tal:element>
+<tal:element i18n:translate="">— Fill the form with your new password.</tal:element>
+
+<tal:element tal:replace="options/resetPasswordUrl">http://portal.bla/password_reset_form/uuid</tal:element>
-- 
2.20.1