1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 16:36:15 +00:00

Merge branch '1.4'

Conflicts:
	locale/zh_CN/LC_MESSAGES/django.po
This commit is contained in:
zhengxie
2013-02-01 11:02:09 +08:00
6 changed files with 30 additions and 22 deletions

View File

@@ -14,7 +14,7 @@
{% endif %}
<div class="repo-create-encryption">
<input type="checkbox" name="encryption" id="encrypt-switch" /><label>{% trans "Encrypt"%}</label><br />
<label>{% trans "Password"%}</label><span class="tip">{% trans "(at lease 3 characters)"%}</span><br />
<label>{% trans "Password"%}</label><span class="tip">{% trans "(at least 3 characters)"%}</span><br />
<input type="password" name="passwd" disabled="disabled" class="passwd input-disabled" /><br />
<label>{% trans "Password again"%}</label><br />
<input type="password" name="passwd_again" disabled="disabled" class="passwd input-disabled" />