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

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" .}}
+{{template "base/footer" .}}