Merge branch 'master' of github.com:gogits/gogs into dev

This commit is contained in:
Unknown 2014-07-04 01:25:19 -04:00
commit 0820b24f0b

View file

@ -71,7 +71,7 @@
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="active" {{if .User.IsActive}}checked{{end}}> <input type="checkbox" name="active" {{if .User.IsActive}}checked{{end}}>
<strong>This account has activated</strong> <strong>This account is activated</strong>
</label> </label>
</div> </div>
</div> </div>
@ -82,7 +82,7 @@
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input type="checkbox" name="admin" {{if .User.IsAdmin}}checked{{end}}> <input type="checkbox" name="admin" {{if .User.IsAdmin}}checked{{end}}>
<strong>This account has administor permisson</strong> <strong>This account has administrator permissions</strong>
</label> </label>
</div> </div>
</div> </div>
@ -100,4 +100,4 @@
</div> </div>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}