diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
commit | 8de2b9131ddcef647799cf8e1e79921284523073 (patch) | |
tree | 81e17d84530990e35a0accba3a7886266a601482 /templates/authopenid/sendpw_email.txt | |
parent | 7e95e6481d1e81e43d4b442cbcf3fe37f20d89cc (diff) | |
parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
download | askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.gz askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.bz2 askbot-8de2b9131ddcef647799cf8e1e79921284523073.zip |
Merge branch 'evgenyfadeev/master'
Conflicts:
.gitignore
INSTALL
TODO
cnprog.wsgi
django_authopenid/urls.py
django_authopenid/views.py
drop-all-tables.sh
forum/auth.py
forum/managers.py
forum/models.py
forum/templatetags/extra_tags.py
forum/views.py
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
settings.py
settings_local.py.dist
sql_scripts/update_2009_01_25_001.sql
sql_scripts/update_2009_02_26_001.sql
sql_scripts/update_2009_04_10_001.sql
templates/authopenid/confirm_email.txt
templates/authopenid/sendpw_email.txt
templates/content/js/compress.bat
templates/content/js/flot-build.bat
templates/content/style/style.css
templates/footer.html
templates/question.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
templates/users_questions.html
urls.py
Diffstat (limited to 'templates/authopenid/sendpw_email.txt')
-rw-r--r-- | templates/authopenid/sendpw_email.txt | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/templates/authopenid/sendpw_email.txt b/templates/authopenid/sendpw_email.txt index 06653d4f..c4910d12 100644 --- a/templates/authopenid/sendpw_email.txt +++ b/templates/authopenid/sendpw_email.txt @@ -1,13 +1,9 @@ -Alguien ha solicitado restablecer su contraseña en {{ site_url }}. -Si no fué usted, ignore este correo +{% load i18n %} +{% blocktrans%}Someone has requested to reset your password on {{site_url}}. +If it were not you, it is safe to ignore this email.{% endblocktrans %} -Sus nuevo datos son: - -Nombre de usuario: {{ username }} -Contraseña: {{ password }} - -Para hacer efectivo el cambio por favor visita: -{{ site_url }}{{ url_confirm }}?key={{ confirm_key }} +{% blocktrans %}email explanation how to use new {{password}} for {{username}} +with the {{key_link}}{% endblocktrans %} Saludos, El Equipo administrador de Hasked.com |