summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-07-04 01:25:19 -0400
committerUnknown <joe2010xtmf@163.com>2014-07-04 01:25:19 -0400
commit0820b24f0bea6a0ce2f9c035a581bcf829ad0e13 (patch)
tree6b14e0e0223d5cee46ae6d01afff2980a204217e
parent36292060d603452deaad03e5e686fae3f7c3f8a8 (diff)
parent3f42cb7c23ee3bc5b44315f9b3798147b5973945 (diff)
downloadgitea-0820b24f0bea6a0ce2f9c035a581bcf829ad0e13.tar.gz
gitea-0820b24f0bea6a0ce2f9c035a581bcf829ad0e13.zip
Merge branch 'master' of github.com:gogits/gogs into dev
-rw-r--r--templates/admin/user/edit.tmpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index b1fffb69c3..329c667318 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -71,7 +71,7 @@
<div class="checkbox">
<label>
<input type="checkbox" name="active" {{if .User.IsActive}}checked{{end}}>
- <strong>This account has activated</strong>
+ <strong>This account is activated</strong>
</label>
</div>
</div>
@@ -82,7 +82,7 @@
<div class="checkbox">
<label>
<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>
</div>
</div>
@@ -100,4 +100,4 @@
</div>
</div>
-{{template "base/footer" .}} \ No newline at end of file
+{{template "base/footer" .}}