merge 0f0aed455cf6 and update translation (transplanted from ae5849f94636a870a40fe1bd46dba1e1d083bf85) (transplanted from f4a1486174e9167307cc741cf74631f6d36e4596)
merge 0f0aed455cf6 and update translation
(transplanted from ae5849f94636a870a40fe1bd46dba1e1d083bf85)
(transplanted from f4a1486174e9167307cc741cf74631f6d36e4596)

--HG--
branch : 0.9.7.x
extra : transplant_source : %F4%A1Hat%E9%16s%07%CCt%1C%F7F1%F6%D3nE%96

moreati/pylons,moreati/pylons,Pylons/pylons,moreati/pylons,Pylons/pylons,Pylons/pylons