From bb801f2bbd9f26bebca846b71e8947a1951f86a5 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:11:34 -0400
Subject: english translation

---
 templates/authopenid/sendpw.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'templates/authopenid/sendpw.html')

diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index 237a5cf6..a9488c4c 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -1,17 +1,18 @@
 {% extends "base.html" %}
-{% block title %}{% spaceless %}发送新密码{% endspaceless %}{% endblock %}
+{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
 
 {% block content %}
 <div id="main-bar" class="">
-    <h3 >发送新密码</h3>
+    <h3>{% trans "Send new password" %}</h3>
 
 </div>
 <div class="paragraph">
-丢失了您的密码？ 你可以在这里重设密码。<br>
-请输入用户名，新的密码会发送到你注册时候填写的电子邮件。
+{% trans "Lost your password? No problem - here you can reset it." %}<br>
+{% trans "Please enter your username below and new password will be sent to your registered e-mail" %}
 </div>
 {% if form.errors %}
-<p class="errors"><span class="big">请注意以下错误：</span><br>
+<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br>
 	{% if form.username.errors %} 
 		<span class="error">{{ form.username.errors|join:", " }}</span>
 	{% endif %}
@@ -23,11 +24,11 @@
 
 <div class="aligned">
 	<form action="." method="post" accept-charset="utf-8">
-		<div id="form-row"><label for="id_username">用户名： </label>{{ form.username }}</div>
+		<div id="form-row"><label for="id_username">{% trans "User name" %}:</label>{{ form.username }}</div>
 
-        <p style="padding-top:10px"><input type="submit" value="重设密码"> <a href="{% url user_signin %}">返回登录</a></p>
+        <p style="padding-top:10px"><input type="submit" value="{% trans "Reset password" %}"> <a href="{% url user_signin %}">{% trans "return to login" %}</a></p>
 
 	</form>
-    <span class="darkred">注意: 新的密码只有您在激活邮件中的链接后才会被激活。</span>
+    <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
 </div>
 {% endblock %}
-- 
cgit v1.2.3-1-g7c22


From 5b45e526c74faf55110ff0afdcba19797d7e0f4d Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:14:09 -0400
Subject: deleted all

---
 templates/authopenid/sendpw.html | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 templates/authopenid/sendpw.html

(limited to 'templates/authopenid/sendpw.html')

diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
deleted file mode 100644
index a9488c4c..00000000
--- a/templates/authopenid/sendpw.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
-
-{% block content %}
-<div id="main-bar" class="">
-    <h3>{% trans "Send new password" %}</h3>
-
-</div>
-<div class="paragraph">
-{% trans "Lost your password? No problem - here you can reset it." %}<br>
-{% trans "Please enter your username below and new password will be sent to your registered e-mail" %}
-</div>
-{% if form.errors %}
-<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br>
-	{% if form.username.errors %} 
-		<span class="error">{{ form.username.errors|join:", " }}</span>
-	{% endif %}
-</p>
-{% endif %}
-{% if msg %}
-    <div class="paragraph error">{{ msg }}</div>
-{% endif %}
-
-<div class="aligned">
-	<form action="." method="post" accept-charset="utf-8">
-		<div id="form-row"><label for="id_username">{% trans "User name" %}:</label>{{ form.username }}</div>
-
-        <p style="padding-top:10px"><input type="submit" value="{% trans "Reset password" %}"> <a href="{% url user_signin %}">{% trans "return to login" %}</a></p>
-
-	</form>
-    <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
-</div>
-{% endblock %}
-- 
cgit v1.2.3-1-g7c22


From 35b666224a05fbd249b1c51a0a48fb95b246fe9a Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Fri, 10 Jul 2009 19:15:28 -0400
Subject: adding all files again

---
 templates/authopenid/sendpw.html | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 templates/authopenid/sendpw.html

(limited to 'templates/authopenid/sendpw.html')

diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
new file mode 100644
index 00000000..a9488c4c
--- /dev/null
+++ b/templates/authopenid/sendpw.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
+
+{% block content %}
+<div id="main-bar" class="">
+    <h3>{% trans "Send new password" %}</h3>
+
+</div>
+<div class="paragraph">
+{% trans "Lost your password? No problem - here you can reset it." %}<br>
+{% trans "Please enter your username below and new password will be sent to your registered e-mail" %}
+</div>
+{% if form.errors %}
+<p class="errors"><span class="big">{% "Sorry, looks like we have some errors:" %}</span><br>
+	{% if form.username.errors %} 
+		<span class="error">{{ form.username.errors|join:", " }}</span>
+	{% endif %}
+</p>
+{% endif %}
+{% if msg %}
+    <div class="paragraph error">{{ msg }}</div>
+{% endif %}
+
+<div class="aligned">
+	<form action="." method="post" accept-charset="utf-8">
+		<div id="form-row"><label for="id_username">{% trans "User name" %}:</label>{{ form.username }}</div>
+
+        <p style="padding-top:10px"><input type="submit" value="{% trans "Reset password" %}"> <a href="{% url user_signin %}">{% trans "return to login" %}</a></p>
+
+	</form>
+    <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
+</div>
+{% endblock %}
-- 
cgit v1.2.3-1-g7c22


From ef8f66ba6c7a22c277c6315df8040365b5684e6c Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Wed, 5 Aug 2009 22:50:08 -0400
Subject: added anonymous posting, per-question subscription and fixes by
 Pothers and some more, see development.log

---
 templates/authopenid/sendpw.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'templates/authopenid/sendpw.html')

diff --git a/templates/authopenid/sendpw.html b/templates/authopenid/sendpw.html
index a9488c4c..ba81dba4 100644
--- a/templates/authopenid/sendpw.html
+++ b/templates/authopenid/sendpw.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+<!-- sendpw.html -->
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Send new password" %}{% endspaceless %}{% endblock %}
 
@@ -32,3 +33,4 @@
     <span class="darkred">{% trans "Note: your new password will be activated only after you click the activation link in the email message" %}</span>
 </div>
 {% endblock %}
+<!-- end sendpw.html -->
-- 
cgit v1.2.3-1-g7c22