better wording

3 files changed, 7 insertions, 6 deletions

diff --git a/models/models.go b/models/models.go
index 44fd563135..7bed39c451 100644
--- a/models/models.go
+++ b/models/models.go
@@ -122,7 +122,7 @@ func getEngine() (*xorm.Engine, error) {
 func NewTestEngine(x *xorm.Engine) (err error) {
 	x, err = getEngine()
 	if err != nil {
-		return fmt.Errorf("connect to database: %v", err)
+		return fmt.Errorf("Connect to database: %v", err)
 	}
 
 	x.SetMapper(core.GonicMapper{})
@@ -132,7 +132,7 @@ func NewTestEngine(x *xorm.Engine) (err error) {
 func SetEngine() (err error) {
 	x, err = getEngine()
 	if err != nil {
-		return fmt.Errorf("connect to database: %v", err)
+		return fmt.Errorf("Connect to database: %v", err)
 	}
 
 	x.SetMapper(core.GonicMapper{})
@@ -144,7 +144,7 @@ func SetEngine() (err error) {
 
 	f, err := os.Create(logPath)
 	if err != nil {
-		return fmt.Errorf("models.init(fail to create xorm.log): %v", err)
+		return fmt.Errorf("Fail to create xorm.log: %v", err)
 	}
 	x.SetLogger(xorm.NewSimpleLogger(f))
 
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 6b8eb5ecd7..c39fab4328 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -460,10 +460,10 @@ func newLogService() {
 func newCacheService() {
 	CacheAdapter = Cfg.Section("cache").Key("ADAPTER").In("memory", []string{"memory", "redis", "memcache"})
 	if EnableRedis {
-		log.Info("Redis Enabled")
+		log.Info("Redis Supported")
 	}
 	if EnableMemcache {
-		log.Info("Memcache Enabled")
+		log.Info("Memcache Supported")
 	}
 
 	switch CacheAdapter {
diff --git a/routers/install.go b/routers/install.go
index f9b5aa106c..3d3e899763 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -72,7 +72,7 @@ func GlobalInit() {
 		log.NewGitLogger(path.Join(setting.LogRootPath, "http.log"))
 	}
 	if models.EnableSQLite3 {
-		log.Info("SQLite3 Enabled")
+		log.Info("SQLite3 Supported")
 	}
 	checkRunMode()
 }
@@ -213,6 +213,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
 
 	// Check admin password.
 	if form.AdminPasswd != form.AdminConfirmPasswd {
+		ctx.Data["Err_Admin"] = true
 		ctx.Data["Err_AdminPasswd"] = true
 		ctx.RenderWithErr(ctx.Tr("form.password_not_match"), INSTALL, form)
 		return