diff options
author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
---|---|---|
committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-08 21:44:10 -0300 |
commit | 0161159eb5b84d11908c16c6c86f93e1a8ac3c18 (patch) | |
tree | 871b0856af5e2dd5b816ee419857a38f80cd6b87 /templates/user_preferences.html | |
parent | 0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5 (diff) | |
parent | 46da3fdbe80ea1f6b9278d2671757d5fdb8abcfb (diff) | |
download | askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.gz askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.bz2 askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.zip |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
* Merge of Spanish translation, still missing some texts.
* Custom colors for preguntalo project
Conflicts:
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
templates/content/style/style.css
Diffstat (limited to 'templates/user_preferences.html')
-rw-r--r-- | templates/user_preferences.html | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/templates/user_preferences.html b/templates/user_preferences.html index 3a760a25..eb7c4761 100644 --- a/templates/user_preferences.html +++ b/templates/user_preferences.html @@ -1,20 +1,23 @@ {% extends "user.html" %} +<!-- user_preferences.html --> +{% load i18n %} {% load extra_tags %} {% load humanize %} {% block usercontent %} <div style="padding:5px;"> <fieldset> - <legend><b>同步Twitter消息</b></legend> + <legend><b>{% trans "Connect with Twitter" %}</b></legend> <form> - <label for="name">账号:</label> + <label for="name">{% trans "Twitter account name:" %}</label> <input id="name" /><br> - <label for="password">密码:</label> + <label for="password">{% trans "Twitter password:" %}</label> <input id="password" type="password"/><br> - <input id="cbMessage" type="checkbox" />发布我的提问到我的Twitter<br> - <input id="cbReply" type="checkbox" />发布我的回答到我的Twitter<br> - <input type="submit" value="保存" /> + <input id="cbMessage" type="checkbox" />{% trans "Send my Questions to Twitter" %}<br> + <input id="cbReply" type="checkbox" />{% trans "Send my Answers to Twitter" %}<br> + <input type="submit" value="{% trans "Save" %}" /> </form> </fieldset> </div> {% endblock %} +<!-- end user_preferences.html --> |