Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2

conf/locale/TRANSLATORS

@@ -14,3 +14,4 @@ Luc Stepniewski <luc@stepniewski.fr>
 Miguel de la Cruz <miguel@mcrx.me>
 Natan Albuquerque <natanalbuquerque5@gmail.com>
 Marc Schiller <marc@schiller.im>
+Gregor Santner <gdev@live.de>

routers/repo/download.go

@@ -21,12 +21,7 @@ func ServeData(ctx *middleware.Context, name string, reader io.Reader) error {
 	}
 
 	_, isTextFile := base.IsTextFile(buf)
-	if isTextFile {
-		charset, _ := base.DetectEncoding(buf)
-		if charset != "UTF-8" {
-			ctx.Resp.Header().Set("Content-Type", "text/plain; charset="+charset)
-		}
-	} else {
+	if ! isTextFile {
 		_, isImageFile := base.IsImageFile(buf)
 		if !isImageFile {
 			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))