locale: sync from Crowdin

* Modified repository keyword search to include description for #4287

* Replacing Where with And for #4548

.bra.toml

@@ -7,7 +7,7 @@ watch_all = true
 watch_dirs = [
 	"$WORKDIR/cmd",
 	"$WORKDIR/models",
-	"$WORKDIR/modules",
+	"$WORKDIR/pkg",
 	"$WORKDIR/routers"
 ]
 watch_exts = [".go"]

.dockerignore

@@ -14,6 +14,4 @@ config.codekit
 .editorconfig
 .gitignore
 Dockerfile*
-vendor
-vendor/**
 gogs

.editorconfig

@@ -21,5 +21,5 @@ indent_style = space
 indent_size = 2
 
 [*.js]
-indent_style = space
+indent_style = tab
 indent_size = 4

.gitattributes

@@ -1,11 +1,10 @@
-public/conf/gitignore/* linguist-vendored
-public/conf/license/* linguist-vendored
+conf/gitignore/* linguist-vendored
+conf/license/* linguist-vendored
 public/assets/* linguist-vendored
 public/plugins/* linguist-vendored
-public/plugins/* linguist-vendored
 public/css/themes/* linguist-vendored
 public/css/github.min.css linguist-vendored
-public/css/semantic-2.2.7.min.css linguist-vendored
+public/css/semantic-2.2.10.min.css linguist-vendored
 public/js/libs/* linguist-vendored
 public/js/jquery-1.11.3.min.js linguist-vendored
-public/js/semantic-2.2.7.min.js linguist-vendored
+public/js/semantic-2.2.10.min.js linguist-vendored

.travis.yml

@@ -1,8 +1,8 @@
 language: go
 go:
-  - 1.5.x
-  - 1.6.x
-  - 1.7.x
+  - 1.6
+  - 1.7
+  - 1.8
   - master
 
 before_install:

Makefile

@@ -1,9 +1,9 @@
-LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
-LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"
+LDFLAGS += -X "github.com/gogits/gogs/pkg/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
+LDFLAGS += -X "github.com/gogits/gogs/pkg/setting.BuildGitHash=$(shell git rev-parse HEAD)"
 
 DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
 LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)
-GENERATED  := modules/bindata/bindata.go public/css/gogs.css
+GENERATED  := pkg/bindata/bindata.go public/css/gogs.css
 
 OS := $(shell uname)
 
@@ -25,9 +25,12 @@ check: test
 
 dist: release
 
+web: build
+	./gogs web
+
 govet:
 	$(GOVET) gogs.go
-	$(GOVET) models modules routers
+	$(GOVET) models pkg routers
 
 build: $(GENERATED)
 	go install $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(TAGS)'
@@ -50,9 +53,9 @@ pack:
 
 release: build pack
 
-bindata: modules/bindata/bindata.go
+bindata: pkg/bindata/bindata.go
 
-modules/bindata/bindata.go: $(DATA_FILES)
+pkg/bindata/bindata.go: $(DATA_FILES)
 	go-bindata -o=$@ -ignore="\\.DS_Store|README.md|TRANSLATORS" -pkg=bindata conf/...
 
 less: public/css/gogs.css
@@ -70,11 +73,11 @@ test:
 	go test -cover -race ./...
 
 fixme:
-	grep -rnw "FIXME" cmd routers models modules
+	grep -rnw "FIXME" cmd routers models pkg
 
 todo:
-	grep -rnw "TODO" cmd routers models modules
+	grep -rnw "TODO" cmd routers models pkg
 
 # Legacy code should be remove by the time of release
 legacy:
-	grep -rnw "LEGACY" cmd routers models modules
+	grep -rnw "LEGACY" cmd routers models pkg

README.md

@@ -7,16 +7,16 @@ Gogs [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](http
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|
-|![Dashboard](https://gogs.io/img/screenshots/1.png)|![Repository](https://gogs.io/img/screenshots/2.png)|![Commits History](https://gogs.io/img/screenshots/3.png)|
-|![Profile](https://gogs.io/img/screenshots/4.png)|![Admin Dashboard](https://gogs.io/img/screenshots/5.png)|![Diff](https://gogs.io/img/screenshots/6.png)|
-|![Issues](https://gogs.io/img/screenshots/7.png)|![Releases](https://gogs.io/img/screenshots/8.png)|![Organization](https://gogs.io/img/screenshots/9.png)|
+|![Dashboard](https://gogs.io/img/screenshots/1.png)|![Repository](https://gogs.io/img/screenshots/2.png)|![Editor](https://gogs.io/img/screenshots/3.png)|
+|![Profile](https://gogs.io/img/screenshots/4.png)|![Diff](https://gogs.io/img/screenshots/5.png)|![Repository Settings](https://gogs.io/img/screenshots/6.png?ts=20170322)|
+|![Webhook](https://gogs.io/img/screenshots/7.png)|![Organization](https://gogs.io/img/screenshots/8.png)|![Admin Dashboard](https://gogs.io/img/screenshots/9.png)|
 
 ### Important Notes
 
 1. **YOU MUST READ [Contributing Code](https://github.com/gogits/gogs/wiki/Contributing-Code) BEFORE STARTING TO WORK ON A PULL REQUEST**.
 2. Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) was reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site.
 3. The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch.
-4. If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks!
+4. If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**, and the name you want to be credited as. Thanks!
 5. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki).
 6. If your team/company is using Gogs and would like to put your logo on [our website](https://gogs.io), contact us by any means.
 
@@ -47,11 +47,12 @@ The goal of this project is to make the easiest, fastest, and most painless way
 - Migrate and mirror repository and its wiki
 - Web editor for repository files and wiki
 - Jupyter Notebook
+- Two-factor authentication
 - Gravatar and Federated avatar with custom source
 - Mail service
 - Administration panel
-- Supports MySQL, PostgreSQL, SQLite3, MSSQL and [TiDB](https://github.com/pingcap/tidb) (experimental)
-- Multi-language support ([23 languages](https://crowdin.com/project/gogs))
+- Supports MySQL, PostgreSQL, SQLite3, MSSQL and [TiDB](https://github.com/pingcap/tidb) (via MySQL protocol)
+- Multi-language support ([25 languages](https://crowdin.com/project/gogs))
 
 ## Hardware Requirements
 
@@ -113,6 +114,7 @@ There are 5 ways to install Gogs:
 - [Kanboard](http://kanboard.net/plugin/gogs-webhook) (Project Management)
 - [BearyChat](https://bearychat.com/) (Team Communication)
 - [HiWork](http://www.hiwork.cc/) (Team Communication)
+- [GitPitch](https://gitpitch.com/) (Markdown Presentations)
 
 ### Product Support
 

README_ZH.md

@@ -9,7 +9,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 
 ## 项目概览
 
-- 有关基本用法和变更日志，请通过 [使用手册](https://gogs.io/docs/intro/) 查看。
+- 有关基本用法和变更日志，请通过 [使用手册](https://gogs.io/docs/intro) 查看。
 - 想要先睹为快？直接去 [在线体验](https://try.gogs.io/gogs/gogs) 。
 - 使用过程中遇到问题？尝试从 [故障排查](https://gogs.io/docs/intro/troubleshooting.html) 页面或 [用户论坛](https://discuss.gogs.io/) 获取帮助。
 - 希望帮助多国语言界面的翻译吗？请立即访问 [详情页面](https://gogs.io/docs/features/i18n.html)！
@@ -29,10 +29,11 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - 支持在线编辑仓库文件和 Wiki
 - 支持自定义源的 Gravatar 和 Federated Avatar
 - 支持 Jupyter Notebook
+- 支持两步验证登录
 - 支持邮件服务
 - 支持后台管理面板
-- 支持 MySQL、PostgreSQL、SQLite3、MSSQL 和 [TiDB](https://github.com/pingcap/tidb)（实验性支持） 数据库
-- 支持多语言本地化（[23 种语言]([more](https://crowdin.com/project/gogs))）
+- 支持 MySQL、PostgreSQL、SQLite3、MSSQL 和 [TiDB](https://github.com/pingcap/tidb)（通过 MySQL 协议）数据库
+- 支持多语言本地化（[25 种语言]([more](https://crowdin.com/project/gogs))）
 
 ## 硬件要求
 
@@ -82,6 +83,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - [Kanboard](http://kanboard.net/plugin/gogs-webhook)（项目管理）
 - [BearyChat](https://bearychat.com/)（团队交流）
 - [HiWork](http://www.hiwork.cc/)（团队交流）
+- [GitPitch](https://gitpitch.com/)（Markdown 演示）
 
 ### 产品支持
 

cmd/admin.go

@@ -10,13 +10,13 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 var (
 	Admin = cli.Command{
 		Name:  "admin",
-		Usage: "Preform admin operations on command line",
+		Usage: "Perform admin operations on command line",
 		Description: `Allow using internal logic of Gogs without hacking into the source code
 to make automatic initialization process more smoothly`,
 		Subcommands: []cli.Command{

cmd/backup.go

@@ -18,7 +18,7 @@ import (
 	"gopkg.in/ini.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 var Backup = cli.Command{
@@ -33,6 +33,7 @@ portable among all supported database engines.`,
 		boolFlag("verbose, v", "Show process details"),
 		stringFlag("tempdir, t", os.TempDir(), "Temporary directory path"),
 		stringFlag("target", "./", "Target directory path to save backup archive"),
+		stringFlag("archive-name", fmt.Sprintf("gogs-backup-%s.zip", time.Now().Format("20060102150405")), "Name of backup archive"),
 		boolFlag("database-only", "Only dump database"),
 		boolFlag("exclude-repos", "Exclude repositories"),
 	},
@@ -69,7 +70,7 @@ func runBackup(c *cli.Context) error {
 		log.Fatal(0, "Fail to save metadata '%s': %v", metaFile, err)
 	}
 
-	archiveName := path.Join(c.String("target"), fmt.Sprintf("gogs-backup-%d.zip", time.Now().Unix()))
+	archiveName := path.Join(c.String("target"), c.String("archive-name"))
 	log.Info("Packing backup files to: %s", archiveName)
 
 	z, err := zip.Create(archiveName)

cmd/hook.go

@@ -21,8 +21,8 @@ import (
 	"github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/httplib"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/httplib"
+	"github.com/gogits/gogs/pkg/setting"
 	http "github.com/gogits/gogs/routers/repo"
 )
 
@@ -100,14 +100,21 @@ func runHookPreReceive(c *cli.Context) error {
 			continue
 		}
 
-		// Check if whitelist is enabled
+		// Whitelist users can bypass require pull request check
+		bypassRequirePullRequest := false
+
+		// Check if user is in whitelist when enabled
 		userID := com.StrTo(os.Getenv(http.ENV_AUTH_USER_ID)).MustInt64()
-		if protectBranch.EnableWhitelist && !models.IsUserInProtectBranchWhitelist(repoID, userID, branchName) {
-			fail(fmt.Sprintf("Branch '%s' is protected and you are not in the push whitelist", branchName), "")
+		if protectBranch.EnableWhitelist {
+			if !models.IsUserInProtectBranchWhitelist(repoID, userID, branchName) {
+				fail(fmt.Sprintf("Branch '%s' is protected and you are not in the push whitelist", branchName), "")
+			}
+
+			bypassRequirePullRequest = true
 		}
 
 		// Check if branch allows direct push
-		if protectBranch.RequirePullRequest {
+		if !bypassRequirePullRequest && protectBranch.RequirePullRequest {
 			fail(fmt.Sprintf("Branch '%s' is protected and commits must be merged through pull request", branchName), "")
 		}
 

cmd/import.go

@@ -15,7 +15,7 @@ import (
 	"github.com/Unknwon/com"
 	"github.com/urfave/cli"
 
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 var (

cmd/restore.go

@@ -16,7 +16,7 @@ import (
 	"gopkg.in/ini.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 var Restore = cli.Command{
@@ -24,10 +24,10 @@ var Restore = cli.Command{
 	Usage: "Restore files and database from backup",
 	Description: `Restore imports all related files and database from a backup archive.
 The backup version must lower or equal to current Gogs version. You can also import
-backup from other database engines, which is useful for database migrating. 
+backup from other database engines, which is useful for database migrating.
 
-If corresponding files or database tables are not presented in the archive, they will 
-be skipped and remian unchanged.`,
+If corresponding files or database tables are not presented in the archive, they will
+be skipped and remain unchanged.`,
 	Action: runRestore,
 	Flags: []cli.Flag{
 		stringFlag("config, c", "custom/conf/app.ini", "Custom configuration file path"),
@@ -83,7 +83,7 @@ func runRestore(c *cli.Context) error {
 
 	// Database
 	dbDir := path.Join(archivePath, "db")
-	if err = models.ImportDatabase(dbDir); err != nil {
+	if err = models.ImportDatabase(dbDir, c.Bool("verbose")); err != nil {
 		log.Fatal(0, "Fail to import database: %v", err)
 	}
 
@@ -101,6 +101,7 @@ func runRestore(c *cli.Context) error {
 
 	// Data files
 	if !c.Bool("database-only") {
+		os.MkdirAll(setting.AppDataPath, os.ModePerm)
 		for _, dir := range []string{"attachments", "avatars"} {
 			dirPath := path.Join(setting.AppDataPath, dir)
 			if com.IsExist(dirPath) {

cmd/serv.go

@@ -17,7 +17,8 @@ import (
 	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/setting"
 	http "github.com/gogits/gogs/routers/repo"
 )
 
@@ -153,7 +154,7 @@ func runServ(c *cli.Context) error {
 
 	owner, err := models.GetUserByName(ownerName)
 	if err != nil {
-		if models.IsErrUserNotExist(err) {
+		if errors.IsUserNotExist(err) {
 			fail("Repository owner does not exist", "Unregistered owner: %s", ownerName)
 		}
 		fail("Internal error", "Fail to get repository owner '%s': %v", ownerName, err)
@@ -161,7 +162,7 @@ func runServ(c *cli.Context) error {
 
 	repo, err := models.GetRepositoryByName(owner.ID, repoName)
 	if err != nil {
-		if models.IsErrRepoNotExist(err) {
+		if errors.IsRepoNotExist(err) {
 			fail(_ACCESS_DENIED_MESSAGE, "Repository does not exist: %s/%s", owner.Name, repoName)
 		}
 		fail("Internal error", "Fail to get repository: %v", err)

cmd/web.go

@@ -15,6 +15,7 @@ import (
 	"path"
 	"strings"
 
+	"github.com/Unknwon/com"
 	"github.com/go-macaron/binding"
 	"github.com/go-macaron/cache"
 	"github.com/go-macaron/captcha"
@@ -23,23 +24,18 @@ import (
 	"github.com/go-macaron/i18n"
 	"github.com/go-macaron/session"
 	"github.com/go-macaron/toolbox"
-	"github.com/go-xorm/xorm"
 	"github.com/mcuadros/go-version"
 	"github.com/urfave/cli"
 	log "gopkg.in/clog.v1"
-	"gopkg.in/ini.v1"
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/git-module"
-	"github.com/gogits/go-gogs-client"
-
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/bindata"
-	"github.com/gogits/gogs/modules/context"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/mailer"
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/template"
+	"github.com/gogits/gogs/pkg/bindata"
+	"github.com/gogits/gogs/pkg/context"
+	"github.com/gogits/gogs/pkg/form"
+	"github.com/gogits/gogs/pkg/mailer"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/template"
 	"github.com/gogits/gogs/routers"
 	"github.com/gogits/gogs/routers/admin"
 	apiv1 "github.com/gogits/gogs/routers/api/v1"
@@ -61,49 +57,19 @@ and it takes care of all the other things for you`,
 	},
 }
 
-type VerChecker struct {
-	ImportPath string
-	Version    func() string
-	Expected   string
-}
-
 // checkVersion checks if binary matches the version of templates files.
 func checkVersion() {
 	// Templates.
 	data, err := ioutil.ReadFile(setting.StaticRootPath + "/templates/.VERSION")
 	if err != nil {
-		log.Fatal(4, "Fail to read 'templates/.VERSION': %v", err)
+		log.Fatal(2, "Fail to read 'templates/.VERSION': %v", err)
 	}
 	tplVer := string(data)
 	if tplVer != setting.AppVer {
 		if version.Compare(tplVer, setting.AppVer, ">") {
-			log.Fatal(4, "Binary version is lower than template file version, did you forget to recompile Gogs?")
+			log.Fatal(2, "Binary version is lower than template file version, did you forget to recompile Gogs?")
 		} else {
-			log.Fatal(4, "Binary version is higher than template file version, did you forget to update template files?")
-		}
-	}
-
-	// Check dependency version.
-	// LEGACY [0.11]: no need to check version as we check in vendor into version control
-	checkers := []VerChecker{
-		{"github.com/go-xorm/xorm", func() string { return xorm.Version }, "0.6.0"},
-		{"github.com/go-macaron/binding", binding.Version, "0.3.2"},
-		{"github.com/go-macaron/cache", cache.Version, "0.1.2"},
-		{"github.com/go-macaron/csrf", csrf.Version, "0.1.0"},
-		{"github.com/go-macaron/i18n", i18n.Version, "0.3.0"},
-		{"github.com/go-macaron/session", session.Version, "0.1.6"},
-		{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.3"},
-		{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
-		{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
-		{"github.com/gogits/git-module", git.Version, "0.4.12"},
-		{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"},
-	}
-	for _, c := range checkers {
-		if !version.Compare(c.Version(), c.Expected, ">=") {
-			log.Fatal(4, `Dependency outdated!
-Package '%s' current version (%s) is below requirement (%s),
-please use following command to update this package and recompile Gogs:
-go get -u %[1]s`, c.ImportPath, c.Version(), c.Expected)
+			log.Fatal(2, "Binary version is higher than template file version, did you forget to update template files?")
 		}
 	}
 }
@@ -119,7 +85,7 @@ func newMacaron() *macaron.Macaron {
 		m.Use(gzip.Gziper())
 	}
 	if setting.Protocol == setting.SCHEME_FCGI {
-		m.SetURLPrefix(setting.AppSubUrl)
+		m.SetURLPrefix(setting.AppSubURL)
 	}
 	m.Use(macaron.Static(
 		path.Join(setting.StaticRootPath, "public"),
@@ -154,7 +120,7 @@ func newMacaron() *macaron.Macaron {
 		localFiles[name] = bindata.MustAsset("conf/locale/" + name)
 	}
 	m.Use(i18n.I18n(i18n.Options{
-		SubURL:          setting.AppSubUrl,
+		SubURL:          setting.AppSubURL,
 		Files:           localFiles,
 		CustomDirectory: path.Join(setting.CustomPath, "conf/locale"),
 		Langs:           setting.Langs,
@@ -168,7 +134,7 @@ func newMacaron() *macaron.Macaron {
 		Interval:      setting.CacheInterval,
 	}))
 	m.Use(captcha.Captchaer(captcha.Options{
-		SubURL: setting.AppSubUrl,
+		SubURL: setting.AppSubURL,
 	}))
 	m.Use(session.Sessioner(setting.SessionConfig))
 	m.Use(csrf.Csrfer(csrf.Options{
@@ -176,7 +142,7 @@ func newMacaron() *macaron.Macaron {
 		Cookie:     setting.CSRFCookieName,
 		SetCookie:  true,
 		Header:     "X-Csrf-Token",
-		CookiePath: setting.AppSubUrl,
+		CookiePath: setting.AppSubURL,
 	}))
 	m.Use(toolbox.Toolboxer(m, toolbox.Options{
 		HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{
@@ -190,9 +156,9 @@ func newMacaron() *macaron.Macaron {
 	return m
 }
 
-func runWeb(ctx *cli.Context) error {
-	if ctx.IsSet("config") {
-		setting.CustomConf = ctx.String("config")
+func runWeb(c *cli.Context) error {
+	if c.IsSet("config") {
+		setting.CustomConf = c.String("config")
 	}
 	routers.GlobalInit()
 	checkVersion()
@@ -211,8 +177,8 @@ func runWeb(ctx *cli.Context) error {
 	// Routers.
 	m.Get("/", ignSignIn, routers.Home)
 	m.Group("/explore", func() {
-		m.Get("", func(ctx *context.Context) {
-			ctx.Redirect(setting.AppSubUrl + "/explore/repos")
+		m.Get("", func(c *context.Context) {
+			c.Redirect(setting.AppSubURL + "/explore/repos")
 		})
 		m.Get("/repos", routers.ExploreRepos)
 		m.Get("/users", routers.ExploreUsers)
@@ -224,8 +190,13 @@ func runWeb(ctx *cli.Context) error {
 
 	// ***** START: User *****
 	m.Group("/user", func() {
-		m.Get("/login", user.SignIn)
-		m.Post("/login", bindIgnErr(form.SignIn{}), user.SignInPost)
+		m.Group("/login", func() {
+			m.Combo("").Get(user.Login).
+				Post(bindIgnErr(form.SignIn{}), user.LoginPost)
+			m.Combo("/two_factor").Get(user.LoginTwoFactor).Post(user.LoginTwoFactorPost)
+			m.Combo("/two_factor_recovery_code").Get(user.LoginTwoFactorRecoveryCode).Post(user.LoginTwoFactorRecoveryCodePost)
+		})
+
 		m.Get("/sign_up", user.SignUp)
 		m.Post("/sign_up", bindIgnErr(form.Register{}), user.SignUpPost)
 		m.Get("/reset_password", user.ResetPasswd)
@@ -246,22 +217,31 @@ func runWeb(ctx *cli.Context) error {
 		m.Combo("/ssh").Get(user.SettingsSSHKeys).
 			Post(bindIgnErr(form.AddSSHKey{}), user.SettingsSSHKeysPost)
 		m.Post("/ssh/delete", user.DeleteSSHKey)
-		m.Combo("/applications").Get(user.SettingsApplications).
-			Post(bindIgnErr(form.NewAccessToken{}), user.SettingsApplicationsPost)
-		m.Post("/applications/delete", user.SettingsDeleteApplication)
-
+		m.Group("/security", func() {
+			m.Get("", user.SettingsSecurity)
+			m.Combo("/two_factor_enable").Get(user.SettingsTwoFactorEnable).
+				Post(user.SettingsTwoFactorEnablePost)
+			m.Combo("/two_factor_recovery_codes").Get(user.SettingsTwoFactorRecoveryCodes).
+				Post(user.SettingsTwoFactorRecoveryCodesPost)
+			m.Post("/two_factor_disable", user.SettingsTwoFactorDisable)
+		})
+		m.Group("/repositories", func() {
+			m.Get("", user.SettingsRepos)
+			m.Post("/leave", user.SettingsLeaveRepo)
+		})
 		m.Group("/organizations", func() {
 			m.Get("", user.SettingsOrganizations)
 			m.Post("/leave", user.SettingsLeaveOrganization)
 		})
-
+		m.Combo("/applications").Get(user.SettingsApplications).
+			Post(bindIgnErr(form.NewAccessToken{}), user.SettingsApplicationsPost)
+		m.Post("/applications/delete", user.SettingsDeleteApplication)
 		m.Route("/delete", "GET,POST", user.SettingsDelete)
-	}, reqSignIn, func(ctx *context.Context) {
-		ctx.Data["PageIsUserSettings"] = true
+	}, reqSignIn, func(c *context.Context) {
+		c.Data["PageIsUserSettings"] = true
 	})
 
 	m.Group("/user", func() {
-		// r.Get("/feeds", binding.Bind(form.Feeds{}), user.Feeds)
 		m.Any("/activate", user.Activate)
 		m.Any("/activate_email", user.ActivateEmail)
 		m.Get("/email2user", user.Email2User)
@@ -320,34 +300,33 @@ func runWeb(ctx *cli.Context) error {
 			m.Get("/stars", user.Stars)
 		})
 
-		m.Get("/attachments/:uuid", func(ctx *context.Context) {
-			attach, err := models.GetAttachmentByUUID(ctx.Params(":uuid"))
+		m.Get("/attachments/:uuid", func(c *context.Context) {
+			attach, err := models.GetAttachmentByUUID(c.Params(":uuid"))
 			if err != nil {
-				if models.IsErrAttachmentNotExist(err) {
-					ctx.Error(404)
-				} else {
-					ctx.Handle(500, "GetAttachmentByUUID", err)
-				}
+				c.NotFoundOrServerError("GetAttachmentByUUID", models.IsErrAttachmentNotExist, err)
+				return
+			} else if !com.IsFile(attach.LocalPath()) {
+				c.NotFound()
 				return
 			}
 
 			fr, err := os.Open(attach.LocalPath())
 			if err != nil {
-				ctx.Handle(500, "Open", err)
+				c.Handle(500, "Open", err)
 				return
 			}
 			defer fr.Close()
 
-			ctx.Header().Set("Cache-Control", "public,max-age=86400")
-			ctx.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, attach.Name))
-			// Fix #312. Attachments with , in their name are not handled correctly by Google Chrome.
-			// We must put the name in " manually.
-			if err = repo.ServeData(ctx, "\""+attach.Name+"\"", fr); err != nil {
-				ctx.Handle(500, "ServeData", err)
+			c.Header().Set("Cache-Control", "public,max-age=86400")
+			fmt.Println("attach.Name:", attach.Name)
+			c.Header().Set("Content-Disposition", fmt.Sprintf(`inline; filename="%s"`, attach.Name))
+			if err = repo.ServeData(c, attach.Name, fr); err != nil {
+				c.Handle(500, "ServeData", err)
 				return
 			}
 		})
 		m.Post("/issues/attachments", repo.UploadIssueAttachment)
+		m.Post("/releases/attachments", repo.UploadReleaseAttachment)
 	}, ignSignIn)
 
 	m.Group("/:username", func() {
@@ -366,9 +345,9 @@ func runWeb(ctx *cli.Context) error {
 		m.Group("", func() {
 			m.Get("/create", org.Create)
 			m.Post("/create", bindIgnErr(form.CreateOrg{}), org.CreatePost)
-		}, func(ctx *context.Context) {
-			if !ctx.User.CanCreateOrganization() {
-				ctx.NotFound()
+		}, func(c *context.Context) {
+			if !c.User.CanCreateOrganization() {
+				c.NotFound()
 			}
 		})
 
@@ -446,9 +425,9 @@ func runWeb(ctx *cli.Context) error {
 				m.Post("/default_branch", repo.UpdateDefaultBranch)
 				m.Combo("/*").Get(repo.SettingsProtectedBranch).
 					Post(bindIgnErr(form.ProtectBranch{}), repo.SettingsProtectedBranchPost)
-			}, func(ctx *context.Context) {
-				if ctx.Repo.Repository.IsMirror {
-					ctx.NotFound()
+			}, func(c *context.Context) {
+				if c.Repo.Repository.IsMirror {
+					c.NotFound()
 					return
 				}
 			})
@@ -460,12 +439,16 @@ func runWeb(ctx *cli.Context) error {
 				m.Post("/gogs/new", bindIgnErr(form.NewWebhook{}), repo.WebHooksNewPost)
 				m.Post("/slack/new", bindIgnErr(form.NewSlackHook{}), repo.SlackHooksNewPost)
 				m.Post("/discord/new", bindIgnErr(form.NewDiscordHook{}), repo.DiscordHooksNewPost)
-				m.Get("/:id", repo.WebHooksEdit)
-				m.Post("/:id/test", repo.TestWebhook)
 				m.Post("/gogs/:id", bindIgnErr(form.NewWebhook{}), repo.WebHooksEditPost)
 				m.Post("/slack/:id", bindIgnErr(form.NewSlackHook{}), repo.SlackHooksEditPost)
 				m.Post("/discord/:id", bindIgnErr(form.NewDiscordHook{}), repo.DiscordHooksEditPost)
 
+				m.Group("/:id", func() {
+					m.Get("", repo.WebHooksEdit)
+					m.Post("/test", repo.TestWebhook)
+					m.Post("/redelivery", repo.RedeliveryWebhook)
+				})
+
 				m.Group("/git", func() {
 					m.Get("", repo.SettingsGitHooks)
 					m.Combo("/:name").Get(repo.SettingsGitHooksEdit).
@@ -479,24 +462,24 @@ func runWeb(ctx *cli.Context) error {
 				m.Post("/delete", repo.DeleteDeployKey)
 			})
 
-		}, func(ctx *context.Context) {
-			ctx.Data["PageIsSettings"] = true
+		}, func(c *context.Context) {
+			c.Data["PageIsSettings"] = true
 		})
 	}, reqSignIn, context.RepoAssignment(), reqRepoAdmin, context.RepoRef())
 
 	m.Get("/:username/:reponame/action/:action", reqSignIn, context.RepoAssignment(), repo.Action)
+	m.Group("/:username/:reponame", func() {
+		m.Get("/issues", repo.RetrieveLabels, repo.Issues)
+		m.Get("/issues/:index", repo.ViewIssue)
+		m.Get("/labels/", repo.RetrieveLabels, repo.Labels)
+		m.Get("/milestones", repo.Milestones)
+	}, ignSignIn, context.RepoAssignment(true))
 	m.Group("/:username/:reponame", func() {
 		// FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest.
 		// So they can apply their own enable/disable logic on routers.
 		m.Group("/issues", func() {
 			m.Combo("/new", repo.MustEnableIssues).Get(context.RepoRef(), repo.NewIssue).
-				Post(bindIgnErr(form.CreateIssue{}), repo.NewIssuePost)
-
-			m.Group("/:index", func() {
-				m.Post("/label", repo.UpdateIssueLabel)
-				m.Post("/milestone", repo.UpdateIssueMilestone)
-				m.Post("/assignee", repo.UpdateIssueAssignee)
-			}, reqRepoWriter)
+				Post(bindIgnErr(form.NewIssue{}), repo.NewIssuePost)
 
 			m.Group("/:index", func() {
 				m.Post("/title", repo.UpdateIssueTitle)
@@ -508,6 +491,24 @@ func runWeb(ctx *cli.Context) error {
 			m.Post("", repo.UpdateCommentContent)
 			m.Post("/delete", repo.DeleteComment)
 		})
+	}, reqSignIn, context.RepoAssignment(true))
+	m.Group("/:username/:reponame", func() {
+		m.Group("/wiki", func() {
+			m.Get("/?:page", repo.Wiki)
+			m.Get("/_pages", repo.WikiPages)
+		}, repo.MustEnableWiki, context.RepoRef())
+	}, ignSignIn, context.RepoAssignment(false, true))
+
+	m.Group("/:username/:reponame", func() {
+		// FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest.
+		// So they can apply their own enable/disable logic on routers.
+		m.Group("/issues", func() {
+			m.Group("/:index", func() {
+				m.Post("/label", repo.UpdateIssueLabel)
+				m.Post("/milestone", repo.UpdateIssueMilestone)
+				m.Post("/assignee", repo.UpdateIssueAssignee)
+			}, reqRepoWriter)
+		})
 		m.Group("/labels", func() {
 			m.Post("/new", bindIgnErr(form.CreateLabel{}), repo.NewLabel)
 			m.Post("/edit", bindIgnErr(form.CreateLabel{}), repo.UpdateLabel)
@@ -529,14 +530,16 @@ func runWeb(ctx *cli.Context) error {
 			m.Post("/delete", repo.DeleteRelease)
 			m.Get("/edit/*", repo.EditRelease)
 			m.Post("/edit/*", bindIgnErr(form.EditRelease{}), repo.EditReleasePost)
-		}, reqRepoWriter, context.RepoRef())
+		}, repo.MustBeNotBare, reqRepoWriter, func(c *context.Context) {
+			c.Data["PageIsViewFiles"] = true
+		})
 
-		// FIXME: Should use ctx.Repo.PullRequest to unify template, currently we have inconsistent URL
+		// FIXME: Should use c.Repo.PullRequest to unify template, currently we have inconsistent URL
 		// for PR in same repository. After select branch on the page, the URL contains redundant head user name.
 		// e.g. /org1/test-repo/compare/master...org1:develop
 		// which should be /org1/test-repo/compare/master...develop
 		m.Combo("/compare/*", repo.MustAllowPulls).Get(repo.CompareAndPullRequest).
-			Post(bindIgnErr(form.CreateIssue{}), repo.CompareAndPullRequestPost)
+			Post(bindIgnErr(form.NewIssue{}), repo.CompareAndPullRequestPost)
 
 		m.Group("", func() {
 			m.Combo("/_edit/*").Get(repo.EditFile).
@@ -552,36 +555,38 @@ func runWeb(ctx *cli.Context) error {
 					Post(bindIgnErr(form.UploadRepoFile{}), repo.UploadFilePost)
 				m.Post("/upload-file", repo.UploadFileToServer)
 				m.Post("/upload-remove", bindIgnErr(form.RemoveUploadFile{}), repo.RemoveUploadFileFromServer)
-			}, func(ctx *context.Context) {
+			}, func(c *context.Context) {
 				if !setting.Repository.Upload.Enabled {
-					ctx.NotFound()
+					c.NotFound()
 					return
 				}
 			})
-		}, reqRepoWriter, context.RepoRef(), func(ctx *context.Context) {
-			if !ctx.Repo.CanEnableEditor() {
-				ctx.NotFound()
+		}, repo.MustBeNotBare, reqRepoWriter, context.RepoRef(), func(c *context.Context) {
+			if !c.Repo.CanEnableEditor() {
+				c.NotFound()
 				return
 			}
+
+			c.Data["PageIsViewFiles"] = true
 		})
-	}, reqSignIn, context.RepoAssignment(), repo.MustBeNotBare)
+	}, reqSignIn, context.RepoAssignment())
 
 	m.Group("/:username/:reponame", func() {
 		m.Group("", func() {
-			m.Get("/releases", repo.Releases)
-			m.Get("/^:type(issues|pulls)$", repo.RetrieveLabels, repo.Issues)
-			m.Get("/^:type(issues|pulls)$/:index", repo.ViewIssue)
-			m.Get("/labels/", repo.RetrieveLabels, repo.Labels)
-			m.Get("/milestones", repo.Milestones)
+			m.Get("/releases", repo.MustBeNotBare, repo.Releases)
+			m.Get("/pulls", repo.RetrieveLabels, repo.Pulls)
+			m.Get("/pulls/:index", repo.ViewPull)
 		}, context.RepoRef())
 
-		// m.Get("/branches", repo.Branches)
-		m.Post("/branches/delete/*", reqSignIn, reqRepoWriter, repo.DeleteBranchPost)
+		m.Group("/branches", func() {
+			m.Get("", repo.Branches)
+			m.Get("/all", repo.AllBranches)
+			m.Post("/delete/*", reqSignIn, reqRepoWriter, repo.DeleteBranchPost)
+		}, repo.MustBeNotBare, func(c *context.Context) {
+			c.Data["PageIsViewFiles"] = true
+		})
 
 		m.Group("/wiki", func() {
-			m.Get("/?:page", repo.Wiki)
-			m.Get("/_pages", repo.WikiPages)
-
 			m.Group("", func() {
 				m.Combo("/_new").Get(repo.NewWiki).
 					Post(bindIgnErr(form.NewWiki{}), repo.NewWikiPost)
@@ -591,7 +596,7 @@ func runWeb(ctx *cli.Context) error {
 			}, reqSignIn, reqRepoWriter)
 		}, repo.MustEnableWiki, context.RepoRef())
 
-		m.Get("/archive/*", repo.Download)
+		m.Get("/archive/*", repo.MustBeNotBare, repo.Download)
 
 		m.Group("/pulls/:index", func() {
 			m.Get("/commits", context.RepoRef(), repo.ViewPullCommits)
@@ -605,20 +610,18 @@ func runWeb(ctx *cli.Context) error {
 			m.Get("/commits/*", repo.RefCommits)
 			m.Get("/commit/:sha([a-f0-9]{7,40})$", repo.Diff)
 			m.Get("/forks", repo.Forks)
-		}, context.RepoRef())
-		m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.RawDiff)
+		}, repo.MustBeNotBare, context.RepoRef())
+		m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.MustBeNotBare, repo.RawDiff)
 
-		m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", context.RepoRef(), repo.CompareDiff)
-	}, ignSignIn, context.RepoAssignment(), repo.MustBeNotBare)
+		m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.MustBeNotBare, context.RepoRef(), repo.CompareDiff)
+	}, ignSignIn, context.RepoAssignment())
 	m.Group("/:username/:reponame", func() {
 		m.Get("/stars", repo.Stars)
 		m.Get("/watchers", repo.Watchers)
 	}, ignSignIn, context.RepoAssignment(), context.RepoRef())
 
 	m.Group("/:username", func() {
-		m.Group("", func() {
-			m.Get("/:reponame", repo.Home)
-		}, ignSignIn, context.RepoAssignment(true), context.RepoRef())
+		m.Get("/:reponame", ignSignIn, context.RepoAssignment(), context.RepoRef(), repo.Home)
 
 		m.Group("/:reponame", func() {
 			m.Head("/tasks/trigger", repo.TriggerTask)
@@ -627,7 +630,7 @@ func runWeb(ctx *cli.Context) error {
 		// Duplicated routes to enable different ways of accessing same set of URLs,
 		// e.g. with or without ".git" suffix.
 		m.Group("/:reponame([\\d\\w-_\\.]+\\.git$)", func() {
-			m.Get("", ignSignIn, context.RepoAssignment(true), context.RepoRef(), repo.Home)
+			m.Get("", ignSignIn, context.RepoAssignment(), context.RepoRef(), repo.Home)
 			m.Route("/*", "GET,POST", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP)
 		})
 		m.Route("/:reponame/*", "GET,POST", ignSignInAndCsrf, repo.HTTPContexter(), repo.HTTP)
@@ -639,11 +642,11 @@ func runWeb(ctx *cli.Context) error {
 	}, ignSignIn)
 
 	// robots.txt
-	m.Get("/robots.txt", func(ctx *context.Context) {
+	m.Get("/robots.txt", func(c *context.Context) {
 		if setting.HasRobotsTxt {
-			ctx.ServeFileContent(path.Join(setting.CustomPath, "robots.txt"))
+			c.ServeFileContent(path.Join(setting.CustomPath, "robots.txt"))
 		} else {
-			ctx.Error(404)
+			c.NotFound()
 		}
 	})
 
@@ -651,9 +654,9 @@ func runWeb(ctx *cli.Context) error {
 	m.NotFound(routers.NotFound)
 
 	// Flag for port number in case first time run conflict.
-	if ctx.IsSet("port") {
-		setting.AppUrl = strings.Replace(setting.AppUrl, setting.HTTPPort, ctx.String("port"), 1)
-		setting.HTTPPort = ctx.String("port")
+	if c.IsSet("port") {
+		setting.AppURL = strings.Replace(setting.AppURL, setting.HTTPPort, c.String("port"), 1)
+		setting.HTTPPort = c.String("port")
 	}
 
 	var listenAddr string
@@ -662,15 +665,28 @@ func runWeb(ctx *cli.Context) error {
 	} else {
 		listenAddr = fmt.Sprintf("%s:%s", setting.HTTPAddr, setting.HTTPPort)
 	}
-	log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubUrl)
+	log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubURL)
 
 	var err error
 	switch setting.Protocol {
 	case setting.SCHEME_HTTP:
 		err = http.ListenAndServe(listenAddr, m)
 	case setting.SCHEME_HTTPS:
+		var tlsMinVersion uint16
+		switch setting.TLSMinVersion {
+		case "SSL30":
+			tlsMinVersion = tls.VersionSSL30
+		case "TLS12":
+			tlsMinVersion = tls.VersionTLS12
+		case "TLS11":
+			tlsMinVersion = tls.VersionTLS11
+		case "TLS10":
+			fallthrough
+		default:
+			tlsMinVersion = tls.VersionTLS10
+		}
 		server := &http.Server{Addr: listenAddr, TLSConfig: &tls.Config{
-			MinVersion:               tls.VersionTLS10,
+			MinVersion:               tlsMinVersion,
 			CurvePreferences:         []tls.CurveID{tls.CurveP521, tls.CurveP384, tls.CurveP256},
 			PreferServerCipherSuites: true,
 			CipherSuites: []uint16{

conf/app.ini

@@ -56,6 +56,9 @@ DISABLE_ROUTER_LOG = false
 ; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes
 CERT_FILE = custom/https/cert.pem
 KEY_FILE = custom/https/key.pem
+; Allowed TLS version values: SSL30, TLS10, TLS11, TLS12
+TLS_MIN_VERSION = TLS10
+
 ; Upper level of template and static file path
 ; default is the path where Gogs is executed
 STATIC_ROOT_PATH =
@@ -93,6 +96,8 @@ ENABLE_LOCAL_PATH_MIGRATION = false
 ; value depend of how many CPUs (cores) you have. If the value is set to zero
 ; or under, GOGS will automatically detect the number of CPUs your system have
 COMMITS_FETCH_CONCURRENCY = 0
+; Enable render mode for raw file
+ENABLE_RAW_FILE_RENDER_MODE = false
 
 [repository.editor]
 ; List of file extensions that should have line wraps in the CodeMirror editor.
@@ -114,6 +119,19 @@ FILE_MAX_SIZE = 3
 ; Maximum number of files per upload
 MAX_FILES = 5
 
+; Attachment settings for releases
+[release.attachment]
+; Whether attachments are enabled. Defaults to `true`
+ENABLED = true
+; Path for attachments. Defaults to `data/attachments`
+PATH = data/attachments
+; One or more allowed types, e.g. image/jpeg|image/png
+ALLOWED_TYPES = */*
+; Max size of each file. Defaults to 32MB
+MAX_SIZE = 32
+; Max number of files per upload. Defaults to 10
+MAX_FILES = 10
+
 [markdown]
 ; Enable hard line break extension
 ENABLE_HARD_LINE_BREAK = false
@@ -124,9 +142,16 @@ CUSTOM_URL_SCHEMES =
 ; Separate extensions with a comma. To render files w/o extension as markdown, just put a comma
 FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
 
+[smartypants]
+ENABLED = false
+FRACTIONS = true
+DASHES = true
+LATEX_DASHES = true
+ANGLED_QUOTES = true
+
 [http]
 ; Value for Access-Control-Allow-Origin header, default is not to present
-ACCESS_CONTROL_ALLOW_ORIGIN = 
+ACCESS_CONTROL_ALLOW_ORIGIN =
 
 ; Define allowed algorithms and their minimum key length (use -1 to disable a type)
 [ssh.minimum_key_sizes]
@@ -162,6 +187,9 @@ COOKIE_REMEMBER_NAME = gogs_incredible
 COOKIE_SECURE = false
 ; Reverse proxy authentication header name of user name
 REVERSE_PROXY_AUTHENTICATION_USER = X-WEBAUTH-USER
+; Enable to set cookie to indicate user login status
+ENABLE_LOGIN_STATUS_COOKIE = false
+LOGIN_STATUS_COOKIE_NAME = login_status
 
 [service]
 ACTIVE_CODE_LIVE_MINUTES = 180
@@ -186,7 +214,7 @@ TYPES = gogs, slack, discord
 ; Hook task queue length, increase if webhook shooting starts hanging
 QUEUE_LENGTH = 1000
 ; Deliver timeout in seconds
-DELIVER_TIMEOUT = 5
+DELIVER_TIMEOUT = 15
 ; Allow insecure certification
 SKIP_TLS_VERIFY = false
 ; Number of history information in each page
@@ -246,8 +274,8 @@ COOKIE_NAME = i_like_gogits
 COOKIE_SECURE = false
 ; Enable set cookie, default is true
 ENABLE_SET_COOKIE = true
-; Session GC time interval, default is 86400
-GC_INTERVAL_TIME = 86400
+; Session GC time interval, default is 3600
+GC_INTERVAL_TIME = 3600
 ; Session life time, default is 86400
 SESSION_LIFE_TIME = 86400
 ; Cookie name for CSRF
@@ -266,16 +294,17 @@ DISABLE_GRAVATAR = false
 ; This value will be forced to be false in offline mode or Gravatar is disbaled.
 ENABLE_FEDERATED_AVATAR = true
 
+; Attachment settings for issues
 [attachment]
 ; Whether attachments are enabled. Defaults to `true`
-ENABLE = true
+ENABLED = true
 ; Path for attachments. Defaults to `data/attachments`
 PATH = data/attachments
 ; One or more allowed types, e.g. image/jpeg|image/png
 ALLOWED_TYPES = image/jpeg|image/png
-; Max size of each file. Defaults to 32MB
+; Max size of each file. Defaults to 4MB
 MAX_SIZE = 4
-; Max number of files per upload. Defaults to 10
+; Max number of files per upload. Defaults to 5
 MAX_FILES = 5
 
 [time]
@@ -320,7 +349,17 @@ MAX_DAYS = 7
 ; leave empty to inherit
 LEVEL =
 ; Webhook URL
-URL = 
+URL =
+
+[log.xorm]
+; Enable file rotation
+ROTATE = true
+; Rotate every day
+ROTATE_DAILY = true
+; Rotate once file size excesses x MB
+MAX_SIZE = 100
+; Maximum days to keep logger files
+MAX_DAYS = 3
 
 [cron]
 ; Enable running cron tasks periodically.
@@ -408,10 +447,14 @@ ORG_PAGING_NUM = 50
 [ui.user]
 ; Number of repos that are showed in one page
 REPO_PAGING_NUM = 15
+; Number of news feeds that are showed in one page
+NEWS_FEED_PAGING_NUM = 20
+; Number of commits that are showed in one page
+COMMITS_PAGING_NUM = 30
 
 [i18n]
-LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR,gl-ES,uk-UA
-NAMES = English,简体中文,繁體中文（香港）,繁體中文（台湾）,Deutsch,Français,Nederlands,Latviešu,Русский,日本語,Español,Português do Brasil,Polski,български,Italiano,Suomalainen,Türkçe,čeština,Српски,Svenska,한국어,Galego,Українська
+LANGS = en-US,zh-CN,zh-HK,zh-TW,de-DE,fr-FR,nl-NL,lv-LV,ru-RU,ja-JP,es-ES,pt-BR,pl-PL,bg-BG,it-IT,fi-FI,tr-TR,cs-CZ,sr-SP,sv-SE,ko-KR,gl-ES,uk-UA,en-GB,hu-HU
+NAMES = English,简体中文,繁體中文（香港）,繁體中文（台湾）,Deutsch,français,Nederlands,latviešu,русский,日本語,español,português do Brasil,polski,български,italiano,suomi,Türkçe,čeština,српски,svenska,한국어,galego,українська,English (United Kingdom),Magyar
 
 ; Used for datetimepicker
 [i18n.datelang]

conf/locale/TRANSLATORS

@@ -42,6 +42,7 @@ Ilya Makarov
 Jamie Mansfield <dev AT jamierocks DOT uk>
 Javier Ortiz Bultron <javier DOT ortiz DOT 78 AT gmail DOT com>
 Jean THOMAS <contact AT tibounise DOT com>
+John Behm <jxsl13 AT googlemail DOT com>
 Jonas De Kegel <jonasgithub [AT] gmail [DOT] com>
 Joubert RedRat <me+github AT redrat DOT com DOT br>
 Juraj Bubniak <contact AT jbub DOT eu>

conf/locale/locale_bg-BG.ini

@@ -82,6 +82,8 @@ app_url=URL адрес на приложението
 app_url_helper=Този настройка променя HTTP/HTTPS адреса за клониране, а понякога и адреса на ел. поща.
 log_root_path=Път към журналите
 log_root_path_helper=Директория в която се записват журналите.
+enable_console_mode=Enable Console Mode
+enable_console_mode_popup=In addition to file mode, also print logs to console.
 
 optional_title=Опционални настройки
 email_title=Настройки на пощенска услуга
@@ -117,6 +119,7 @@ sqlite3_not_available=Вашата версия не поддържа SQLite3,
 invalid_db_setting=Настройките на базата данни са некоректни: %v
 invalid_repo_path=Основният път към хранилищата е невалиден: %v
 run_user_not_match=Потребителският контекст на приложението не е на текущия потребител: %s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=Невалидно поле От: %v
 save_config_failed=Неуспешно запазване на конфигурация: %v
 invalid_admin_setting=Настройките на профил на администратора са невалидни: %v
@@ -166,6 +169,14 @@ reset_password_helper=Щракнете тук, за да нулирате пар
 password_too_short=Размерът на паролата не може да бъде по-малък от 6 знака.
 non_local_account=Нелокални потребители не могат да сменят паролата си през Gogs.
 
+login_two_factor=Two-factor Authentication
+login_two_factor_passcode=Authentication Passcode
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Recovery Code
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+
 [mail]
 activate_account=Моля активирайте Вашия профил
 activate_email=Провери адрес на ел. поща
@@ -201,6 +212,7 @@ Content=Съдържание
 require_error=` не може да бъде празен.`
 alpha_dash_error=` трябва да e валидна буква, число или тире(-_).`
 alpha_dash_dot_error=` трябва да e валидна буква, число, тире(-_) или точка.`
+alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
 size_error=` трябва да е с размер %s.`
 min_size_error=` трябва да съдържа поне %s знака.`
 max_size_error=` трябва да съдържа най-много %s знака.`
@@ -252,11 +264,11 @@ profile=Профил
 password=Парола
 avatar=Аватар
 ssh_keys=SSH ключове
-social=Социални профили
-applications=Приложения
+security=Security
+repos=Repositories
 orgs=Организации
+applications=Приложения
 delete=Изтрий профил
-uid=UID
 
 public_profile=Публичен профил
 profile_desc=Вашият адрес на ел. поща е публичен и ще бъде използван за всички свързани с профила Ви уведомления и всички уеб базирани операции, направени чрез сайта.
@@ -322,10 +334,30 @@ no_activity=Няма скорошна дейност
 key_state_desc=Този ключ е използван през последните 7 дни
 token_state_desc=Този API ключ е използван през последните 7 дни
 
-manage_social=Управление на свързани профили в социалните мрежи
-social_desc=Това е списък на свързани профили в социалните мрежи. Премахнете всички, които не разпознавате.
-unbind=Освобождаване
-unbind_success=Социалния профил е освободен.
+two_factor=Two-factor Authentication
+two_factor_status=Status:
+two_factor_on=On
+two_factor_off=Off
+two_factor_enable=Enable
+two_factor_disable=Disable
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=Управление на индивидуални API ключове за достъп
 generate_new_token=Генериране на нов API ключ
@@ -343,6 +375,11 @@ orgs.none=Не сте член на никоя организация.
 orgs.leave_title=Напусни организация
 orgs.leave_desc=Ще загубите достъп до всички хранилища и екипи, след като напуснете организацията. Желаете ли да продължите?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=Изтриване на собствения профил
 delete_prompt=Тази операция ще изтрие Вашия профил завинаги и тя <strong>НЕ МОЖЕ</strong> да бъде отменена в последствие!
 confirm_delete_account=Потвърди изтриването
@@ -413,7 +450,7 @@ quick_guide=Бърз справочник
 clone_this_repo=Клонирай хранилището
 create_new_repo_command=Създай ново хранилище чрез командния ред
 push_exist_repo=Предай съществуващо хранилище през командния ред
-repo_is_empty=Това хранилище е празно. Моля проверете по-късно пак!
+bare_message=This repository does not have any content yet.
 
 files=Файлове
 branch=Клон
@@ -426,6 +463,7 @@ pulls=Заявки за сливане
 labels=Етикети
 milestones=Етапи
 commits=Ревизии
+git_branches=Branches
 releases=Версии
 file_raw=Директен файл
 file_history=История
@@ -434,6 +472,13 @@ file_permalink=Постоянна връзка
 file_too_large=Този файл е твърде голям за да се визуализира
 video_not_supported_in_browser=Вашият браузър не поддържа HTML5 видео тагове.
 
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=All Branches
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=Нов файл
 editor.upload_file=Качи файл
 editor.edit_file=Редактирай файл
@@ -641,9 +686,11 @@ settings.collaboration.write=За писане
 settings.collaboration.read=За четене
 settings.collaboration.undefined=Недефинирано
 settings.branches=Branches
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch=Default Branch
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=Update
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
 settings.protected_branches=Protected Branches
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Disable force pushes and prevent from deletion
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
 settings.protect_whitelist_search_users=Search users
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Тази промяна ще засегне вр
 settings.advanced_settings=Разширени настройки
 settings.wiki_desc=Включи система за уики
 settings.use_internal_wiki=Използвай вградено уики
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Използвай външно уики
 settings.external_wiki_url=URL адрес на външно уики
 settings.external_wiki_url_desc=Посетителите ще бъдат пренасочени към този URL адрес от връзката за раздел уики.
 settings.issues_desc=Включи система за проследяване на задачи
 settings.use_internal_issue_tracker=Изполвай вградена система за проследяване на задачи
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Използвай външна система за проследяване на задачи
 settings.external_tracker_url=URL адрес на външна система за проследяване на задачи
 settings.external_tracker_url_desc=Посетителите ще бъдат пренасочени към този URL адрес от връзката на раздела.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Уеб-куката е изтрита успе
 settings.webhook.test_delivery=Тестово изпращане
 settings.webhook.test_delivery_desc=Симулира тестово изпращане за тест на настройките на уеб-куката
 settings.webhook.test_delivery_success=Тестовата уеб-кука е добавена в опашката за изпращане. Може да отнеме няколко секунди преди да се появи в историята с доставени.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=Заявка
 settings.webhook.response=Отговор
 settings.webhook.headers=Заглавки
@@ -755,10 +806,20 @@ settings.event_send_everything=При <strong>всички</strong> събити
 settings.event_choose=Нека избера от какво имам нужда.
 settings.event_create=Създаване
 settings.event_create_desc=Създаване на клон или маркер
-settings.event_pull_request=Заявка за сливане
-settings.event_pull_request_desc=Заявка за сливане е отворена, затворена, отворена повторно, редактирана, възложена, отменена, при модифициран етикет, при премахнат етикет или е синхронизирана.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=Предаване
 settings.event_push_desc=Git предаване към хранилището
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=Заявка за сливане
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Release
+settings.event_release_desc=Release published in a repository.
 settings.active=Активна
 settings.active_helper=Подробности относно събитието, което е задействало куката, също ще бъдат изпратени.
 settings.add_hook_success=Новата уеб-кука е добавена успешно.
@@ -803,7 +864,6 @@ release.releases=Версии
 release.new_release=Нова версия
 release.draft=Чернови
 release.prerelease=Предварителни
-release.stable=Стабилни
 release.edit=редактиране
 release.ahead=<strong>%d</strong> ревизии на %s след тази версия
 release.source_code=Изходен код
@@ -1019,6 +1079,7 @@ repos.private=Частно
 repos.watches=Наблюдавания
 repos.stars=Харесвания
 repos.issues=Задачи
+repos.size=Size
 
 auths.auth_manage_panel=Управление на удостоверявания
 auths.new=Добави нов начин на удостоверяване
@@ -1039,9 +1100,14 @@ auths.user_base=Базов OU за търсене
 auths.user_dn=Име (DN) на потребител
 auths.attribute_username=Атрибут за име
 auths.attribute_username_placeholder=Оставете празно за да използва потребителското име от форма за вписване.
-auths.attribute_name=Атрибут за име
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Атрибут за фамилия
 auths.attribute_mail=Атрибут за ел. поща
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Извличане на атрибути от контекста на име (DN) за свръзка
 auths.filter=Филтър за потребител
 auths.admin_filter=Филтър за администратор
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Време за отказ при сливане
 config.git_gc_timeout=Време за отказ при GC
 
 config.log_config=Конфигурация на журнал
-config.log_mode=Режим на журнал
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Cron задачи
 monitor.name=Име
@@ -1205,19 +1272,23 @@ notices.delete_success=Системните съобщения са изтрит
 
 [action]
 create_repo=създаде хранилище <a href="%s"> %s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=преименува хранилище от <code>%[1]s</code> на <a href="%[2]s">%[3]s</a>
 commit_repo=предаде към <a href="%[1]s/src/%[2]s">%[3]s</a> в <a href="%[1]s">%[4]s</a>
+compare_commits=Сравнение между тези %d ревизии
+transfer_repo=прехвърли хранилище <code>%s</code> към <a href="%s">%s</a>
 create_issue=`отвори задача <a href="%s/issues/%s">%s#%[2]s"</a>`
 close_issue=`затвори <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`повторно отвори <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`коментира задача <a href="%s/issues/%s">%s#%[2]s"</a>`
 create_pull_request=`създаде заявка за сливане <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`затвори заявка за сливане <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`повторно отвори заявка за сливане <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`коментира задача <a href="%s/issues/%s">%s#%[2]s"</a>`
 merge_pull_request=`обедини заявка за сливане <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=прехвърли хранилище <code>%s</code> към <a href="%s">%s</a>
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=предаде маркер <a href="%s/src/%s">%[2]s</a> към <a href="%[1]s">[3]s</a>
-compare_commits=Сравнение между тези %d ревизии
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=преди

conf/locale/locale_de-DE.ini

@@ -82,6 +82,8 @@ app_url=Anwendungs-URL
 app_url_helper=Dies hat Auswirkung auf die HTTP/HTTPS Klon-URLs und den Inhalt der E-Mails.
 log_root_path=Logdateipfad
 log_root_path_helper=Verzeichnis in das Logdateien geschrieben werden.
+enable_console_mode=Konsolen-Modus einschalten
+enable_console_mode_popup=Zusätzlich zum Datei-Modus, zeige Logs auch in der Konsole.
 
 optional_title=Optionale Einstellungen
 email_title=E-Mail-Service Einstellungen
@@ -117,6 +119,7 @@ sqlite3_not_available=Ihre Gogs-Version unterstützt SQLite3 nicht. Bitte laden
 invalid_db_setting=Datenbankeinstellungen sind nicht korrekt: %v
 invalid_repo_path=Repository Verzeichnis ist ungültig: %v
 run_user_not_match=Der ausführende Benutzer ist nicht der aktuelle Benutzer: %s -> %s
+smtp_host_missing_port=In der Adresse des SMTP Host fehlt die Portnummer.
 invalid_smtp_from=SMTP Absender Feld ist nicht gültig: %v
 save_config_failed=Fehler beim Speichern der Konfiguration: %v
 invalid_admin_setting=Admin-Konto Einstellungen sind ungültig: %v
@@ -166,6 +169,14 @@ reset_password_helper=Hier klicken, um das Passwort zurückzusetzen
 password_too_short=Das Passwort muss mindenstens 6 Zeichen lang sein.
 non_local_account=Nicht-lokale Konten können Passwörter nicht via Gogs ändern.
 
+login_two_factor=Zwei-Faktor-Authentifizierung
+login_two_factor_passcode=PIN
+login_two_factor_enter_recovery_code=Geben Sie einen Wiederherstellungscode für die Zwei-Faktor-Authentifizierung ein
+login_two_factor_recovery=Zwei-Faktor-Wiederherstellung
+login_two_factor_recovery_code=Wiederherstellungscode
+login_two_factor_enter_passcode=Geben Sie die Zwei-Faktor-Authentifizierungs PIN ein
+login_two_factor_invalid_recovery_code=Der Wiederherstellungscode wurde schon benutzt oder ist nicht gültig.
+
 [mail]
 activate_account=Bitte aktivieren Sie Ihr Konto
 activate_email=Bestätigen Sie Ihre E-Mail-Adresse
@@ -201,6 +212,7 @@ Content=Inhalt
 require_error=` darf nicht leer sein.`
 alpha_dash_error=` kann ausschließlich alphanumerische Zeichen und "-_" enthalten.`
 alpha_dash_dot_error=` kann ausschließlich alphanumerische Zeichen und ".-_" enthalten.`
+alpha_dash_dot_slash_error=` kann ausschließlich alphanumerische Zeichen und ".-_/" enthalten.`
 size_error=` muss die Größe %s haben.`
 min_size_error=` muss mindestens %s Zeichen enthalten.`
 max_size_error=` darf höchstens %s Zeichen enthalten.`
@@ -252,11 +264,11 @@ profile=Profil
 password=Passwort
 avatar=Profilbild
 ssh_keys=SSH-Schlüssel
-social=Soziale Konten
-applications=Anwendungen
+security=Sicherheit
+repos=Repositories
 orgs=Organisationen
+applications=Anwendungen
 delete=Konto löschen
-uid=Uid
 
 public_profile=Öffentliches Profil
 profile_desc=Ihre E-Mail-Adresse ist öffentlich einsehbar und dient dazu, Ihnen Benachrichtigungen bezüglich Ihres Kontos und Aktivitäten auf der Webseite zu schicken.
@@ -322,10 +334,30 @@ no_activity=Keine neuen Aktivitäten
 key_state_desc=Dieser Schlüssel wurde in den letzten 7 Tagen verwendet
 token_state_desc=Dieses Token wurde in den letzten 7 Tagen benutzt
 
-manage_social=Verknüpfte soziale Konten verwalten
-social_desc=Dies ist eine Liste verknüpfter sozialer Konten. Bitte entfernen Sie alle Verknüpfungen, die Ihnen nicht bekannt sind.
-unbind=Verknüpfung entfernen
-unbind_success=Die Verknüpfung zum sozialen Konto wurde entfernt.
+two_factor=Zwei-Faktor-Authentifizierung
+two_factor_status=Status:
+two_factor_on=Ein
+two_factor_off=Aus
+two_factor_enable=Aktivieren
+two_factor_disable=Deaktivieren
+two_factor_view_recovery_codes=Betrachten und verwahren Sie <a href="%s%s">Ihre Wiederherstellungscodes</a> an einem sicheren Ort. Sie können diese als Passwort-Code nutzen, auch wenn Sie den Zugriff zu Ihrer Authentifizierungsanwendung verloren haben.
+two_factor_http=Für HTTP/HTTPS-Operationen können Sie keine schlichten Benutzernamen und Passwörter mehr nutzen. Bitte erstellen und benutzen Sie ein <a href="%[1]s%[2]s">Persönliches Zugriffs-Token</a> als Ihre Anmeldeinformation, z.B. <code>%[3]s</code>.
+two_factor_enable_title=Zwei-Faktor-Authentifizierung aktivieren
+two_factor_scan_qr=Bitte benutzen Sie Ihre Authentifizierungsanwendung, um das Bild zu scannen:
+two_factor_or_enter_secret=Oder geben Sie Ihren Geheim-Code ein:
+two_factor_then_enter_passcode=Geben Sie die PIN ein:
+two_factor_verify=Bestätigen
+two_factor_invalid_passcode=Die eingegebene PIN ist ungültig. Bitte versuchen Sie es erneut!
+two_factor_enable_error=Einschalten der Zwei-Faktor-Authentifizierung ist fehlgeschlagen: %v
+two_factor_enable_success=Die Zwei-Faktor-Authentifizierung wurde für Ihr Konto erfolgreich aktiviert!
+two_factor_recovery_codes_title=Zwei-Faktor-Authentifizierung-Wiederherstellungscodes
+two_factor_recovery_codes_desc=Wiederherstellungscodes sind dazu gedacht, verwendet zu werden, wenn Sie vorübergehend keinen Zugriff zu Ihrer Authentifizierungsanwendung haben. Jeder Wiederherstellungscode kann nur einmal verwendet werden. <b>Bitte bewahren Sie diese Codes an einem sicheren Ort auf</b>.
+two_factor_regenerate_recovery_codes=Wiederherstellungscodes neu generieren
+two_factor_regenerate_recovery_codes_error=Das erneute Generieren der Wiederherstellungscodes ist fehlgeschlagen: %v
+two_factor_regenerate_recovery_codes_success=Die neuen Wiederherstellungscodes wurden erfolgreich generiert!
+two_factor_disable_title=Zwei-Faktor-Authentifizierung deaktivieren
+two_factor_disable_desc=Das Sicherheitsniveau Ihres Kontos wird deutlich reduziert sein, nachdem die Zwei-Faktor-Authentifizierung deaktiviert wurde. Möchten Sie fortfahren?
+two_factor_disable_success=Die Zwei-Faktor-Authentifizierung wurde erfolgreich deaktiviert!
 
 manage_access_token=Verwaltung persönlicher Zugangs-Token
 generate_new_token=Neues Token erzeugen
@@ -343,6 +375,11 @@ orgs.none=Sie sind kein Mitglied einer Organisation.
 orgs.leave_title=Organisation verlassen
 orgs.leave_desc=Sie verlieren den Zugriff auf alle Repositories und Teams nach dem Verlassen der Organisation. Möchten Sie fortfahren?
 
+repos.leave=Verlassen
+repos.leave_title=Repository verlassen
+repos.leave_desc=Der Zugang zum Repository wird verloren gehen, wenn Sie es verlassen. Möchten Sie fortfahren?
+repos.leave_success=Sie haben das Repository '%s' erfolgreich verlassen!
+
 delete_account=Konto löschen
 delete_prompt=Diese Aktion wird Ihr Konto dauerhaft löschen und kann <strong>NICHT</strong> rückgängig gemacht werden!
 confirm_delete_account=Löschvorgang bestätigen
@@ -391,7 +428,7 @@ migrate_type_helper=Dieses Repository wird ein <span class="text blue">Mirror</s
 migrate_repo=Repository migrieren
 migrate.clone_address=Adresse kopieren
 migrate.clone_address_desc=Dies kann eine HTTP/HTTPS/GIT-URL sein.
-migrate.clone_address_desc_import_local=Sie dürfen auch eine Repository vom lokalen Serverpfad migrieren.
+migrate.clone_address_desc_import_local=Sie dürfen auch ein Repository vom lokalen Serverpfad migrieren.
 migrate.permission_denied=Ihnen fehlen die Rechte zum Importieren lokaler Repositories.
 migrate.invalid_local_path=Der lokale Pfad ist ungültig, existiert nicht oder ist kein Ordner.
 migrate.failed=Fehler bei Migration: %v
@@ -413,7 +450,7 @@ quick_guide=Kurzanleitung
 clone_this_repo=Dieses Repository klonen
 create_new_repo_command=Erstellen Sie ein neues Repository mittels der Kommandozeile
 push_exist_repo=Bestehendes Repository von der Kommandozeile pushen
-repo_is_empty=Dieses Repository ist leer. Bitte kommen Sie später wieder!
+bare_message=Dies Repository hat noch keinen Inhalt.
 
 files=Dateien
 branch=Branch
@@ -426,6 +463,7 @@ pulls=Pull-Requests
 labels=Label
 milestones=Meilensteine
 commits=Commits
+git_branches=Branches
 releases=Releases
 file_raw=Originalformat
 file_history=Verlauf
@@ -434,6 +472,13 @@ file_permalink=Permalink
 file_too_large=Diese Datei ist zu groß zum Anzeigen
 video_not_supported_in_browser=Ihr Browser unterstützt HTML5 Video-Tags nicht.
 
+branches.overview=Übersicht
+branches.active_branches=Aktive Branches
+branches.stale_branches=Alte Branches
+branches.all=Alle Branches
+branches.updated_by=Aktualisiert %[1]s von %[2]s
+branches.change_default_branch=Ändere Standard-Branch
+
 editor.new_file=Neue Datei
 editor.upload_file=Datei hochladen
 editor.edit_file=Datei bearbeiten
@@ -641,9 +686,11 @@ settings.collaboration.write=Schreibrechte
 settings.collaboration.read=Leserechte
 settings.collaboration.undefined=Nicht definiert
 settings.branches=Branches
+settings.branches_bare=Branches leerer Repositories können nicht verwaltet werden. Bitte erst Datei(en) pushen.
 settings.default_branch=Standard-Branch
 settings.default_branch_desc=Der Standard-Branch gilt als Basis für Commits, Pull-Requests und Online-Bearbeitung.
 settings.update=Aktualisieren
+settings.update_default_branch_unsupported=Die Änderung des Standard-Branch wird von der Git-Version auf dem Server nicht unterstützt.
 settings.update_default_branch_success=Standard-Branch dieses Repositories wurde erfolgreich aktualisiert!
 settings.protected_branches=Protected Branches
 settings.protected_branches_desc=Schützt Branches vor forcierten Pushes und versehentlichem Löschen. Comitter können freigeschaltet werden.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Verhindere forcierte Pushes sowie Löschungen.
 settings.protect_require_pull_request=Verlange Pull-Request an Stelle von direkten Pushes
 settings.protect_require_pull_request_desc=Aktivieren Sie diese Option, um direktes Pushen in diesen Branch zu verhindern. Commits müssen in einen anderen, ungeschützten Branch gepusht werden und dann per Pull-Request in diesen Branch überführt werden.
 settings.protect_whitelist_committers=Hinzufügen von Benutzern oder Teams zur Whitelist, die in diesen Branch pushen dürfen
-settings.protect_whitelist_committers_desc=Benutzer oder Teams zur Whitelist hinzufügen.
+settings.protect_whitelist_committers_desc=Fügt Benutzer oder Teams zur Push-Whitelist dieses Branches hinzu. Auf der Whitelist geführte Benutze können können ohne Prüfung von Pull-Requests pushen.
 settings.protect_whitelist_users=Benutzer, die in diesen Branch pushen können
 settings.protect_whitelist_search_users=Benutzer suchen
 settings.protect_whitelist_teams=Teams, deren Mitglieder in diesen Branch pushen können
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Diese Änderung wirkt sich darauf aus, wie sich
 settings.advanced_settings=Erweiterte Einstellungen
 settings.wiki_desc=Wiki einschalten
 settings.use_internal_wiki=Eingebautes Wiki verwenden
+settings.allow_public_wiki_desc=Erlaube öffentlichen Zugang zum Wiki, auch wenn das Repository privat ist
 settings.use_external_wiki=Externes Wiki verwenden
 settings.external_wiki_url=Externe Wiki URL
 settings.external_wiki_url_desc=Besucher werden auf diese URL umgeleitet, wenn sie auf den Tab klicken.
 settings.issues_desc=Issue-Tracker einschalten
 settings.use_internal_issue_tracker=Eingebauten Issue-Tracker verwenden
+settings.allow_public_issues_desc=Erlaube öffentlichen Zugriff auf Issues, auch wenn das Repository privat ist
 settings.use_external_issue_tracker=Externes Issue-System verwenden
 settings.external_tracker_url=URL eines externen Issue Trackers
 settings.external_tracker_url_desc=Besucher werden auf diese URL umgeleitet, wenn sie auf den Tab klicken.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webhook wurde erfolgreich entfernt!
 settings.webhook.test_delivery=Senden testen
 settings.webhook.test_delivery_desc=Sendet ein simuliertes Push-Ereignis, um die Webhook-Einstellungen zu testen
 settings.webhook.test_delivery_success=Test-Webhook wurde zur Auslieferungswarteschlange hinzugefügt. Es kann einige Sekunden dauern, bevor es in der Auslieferungshistorie erscheint.
+settings.webhook.redelivery=Erneuter Versand
+settings.webhook.redelivery_success=Hook-Task '%s' wurde wieder zur Auslieferungswarteschlange hinzugefügt. Es kann einige Sekunden, bis sich der Auslieferungsstatus in der History aktualisiert hat.
 settings.webhook.request=Anfrage
 settings.webhook.response=Antwort
 settings.webhook.headers=Kopfzeilen
@@ -755,10 +806,20 @@ settings.event_send_everything=Ich brauche <strong>alles</strong>.
 settings.event_choose=Lass mich auswählen, was ich brauche.
 settings.event_create=Erstellen
 settings.event_create_desc=Branch/Tag erstellt
-settings.event_pull_request=Pull-Request
-settings.event_pull_request_desc=Pull-Request geöffnet, geschlossen, wieder geöffnet, bearbeitet, zugewiesen, nicht zugewiesen, Label aktualisiert, Label gelöscht oder synchronisiert.
+settings.event_delete=Löschen
+settings.event_delete_desc=Branch/Tag gelöscht
+settings.event_fork=Fork
+settings.event_fork_desc=Repository geforkt
 settings.event_push=Push
 settings.event_push_desc=Git push auf ein Repository
+settings.event_issues=Issues
+settings.event_issues_desc=Issue geöffnet, geschlossen, wieder geöffnet, bearbeitet, zugewiesen, nicht zugewiesen, Label aktualisiert, Label gelöscht, einem Meilenstein zugewiesen oder davon entfernt.
+settings.event_issue_comment=Issue-Kommentar
+settings.event_issue_comment_desc=Issue-Kommentar angelegt, geändert oder gelöscht.
+settings.event_pull_request=Pull-Request
+settings.event_pull_request_desc=Pull-Request geöffnet, geschlossen, wieder geöffnet, bearbeitet, zugewiesen, nicht zugewiesen, Label aktualisiert, Label gelöscht, einem Meilenstein zugewiesen, davon entfernt oder synchronisiert.
+settings.event_release=Release
+settings.event_release_desc=Release in Repository veröffentlicht.
 settings.active=Aktiv
 settings.active_helper=Details über das auslösende Ereignis des Webhooks werden ebenfalls mit gesendet
 settings.add_hook_success=Webhook hinzugefügt
@@ -803,7 +864,6 @@ release.releases=Releases
 release.new_release=Neues Release
 release.draft=Entwurf
 release.prerelease=Pre-Release
-release.stable=Stabil
 release.edit=bearbeiten
 release.ahead=<strong>%d</strong> Commits zu %s seit diesem Release
 release.source_code=Quelltext
@@ -1019,6 +1079,7 @@ repos.private=Privat
 repos.watches=Beobachtungen
 repos.stars=Favoriten
 repos.issues=Issues
+repos.size=Größe
 
 auths.auth_manage_panel=Authentifizierung
 auths.new=Neue Quelle hinzufügen
@@ -1039,9 +1100,14 @@ auths.user_base=Basis für Benutzersuche
 auths.user_dn=Benutzer-DN
 auths.attribute_username=Attribut Benutzername
 auths.attribute_username_placeholder=Leer lassen, um den Wert aus dem Anmeldeformular als Benutzernamen zu verwenden.
-auths.attribute_name=Attribut Vorname
+auths.attribute_name=Vornamenattribut
 auths.attribute_surname=Attribut Nachname
 auths.attribute_mail=Attribut E-Mail
+auths.verify_group_membership=Überprüfen der Gruppenmitgliedschaft
+auths.group_search_base_dn=Gruppensuche Basisdomainname
+auths.group_filter=Gruppenfilter
+auths.group_attribute_contain_user_list=Gruppenattribut, beinhaltet die Benutzerliste
+auths.user_attribute_listed_in_group=Benutzerattribut in der Gruppenliste
 auths.attributes_in_bind=Hole Attribute im Bind-Kontext
 auths.filter=Benutzerfilter
 auths.admin_filter=Admin Filter
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Zeitlimit für Pull
 config.git_gc_timeout=Zeitlimit für GC
 
 config.log_config=Konfiguration des Loggings
-config.log_mode=Log-Modus
+config.log_mode=Modus
+config.log_options=Optionen
 
 monitor.cron=Cron-Tasks
 monitor.name=Name
@@ -1205,19 +1272,23 @@ notices.delete_success=Systemmitteilungen wurden erfolgreich gelöscht.
 
 [action]
 create_repo=hat das Repository <a href="%s">%s</a> erstellt
+fork_repo=hat das Repository nach <a href="%s">%s</a> geforkt
 rename_repo=hat das Repository von <code>%[1]s</code> zu <a href="%[2]s">%[3]s</a> umbenannt
 commit_repo=hat auf <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a> gepusht
+compare_commits=Zeige Vergleich für diese %d Commits
+transfer_repo=hat Repository <code>%s</code> transferiert an <a href="%s">%s</a>
 create_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> geöffnet`
 close_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> geschlossen`
 reopen_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> wieder geöffnet`
+comment_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> kommentiert`
 create_pull_request=`hat Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> erstellt`
 close_pull_request=`hat Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> geschlossen`
 reopen_pull_request=`hat den Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> wieder geöffnet`
-comment_issue=`hat Issue <a href="%s/issues/%s">%s#%[2]s</a> kommentiert`
 merge_pull_request=`hat Pull-Request <a href="%s/pulls/%s">%s#%[2]s</a> zuammengeführt`
-transfer_repo=hat Repository <code>%s</code> transferiert an <a href="%s">%s</a>
+create_branch=hat neuen Branch <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a> angelegt
+delete_branch=hat Branch <code>%[2]s</code> in <a href="%[1]s">%[3]s</a> gelöscht
 push_tag=hat Tag <a href="%s/src/%s">%[2]s</a> auf <a href="%[1]s">%[3]s</a> gepusht
-compare_commits=Zeige Vergleich für diese %d Commits
+delete_tag=hat Tag <code>%[2]s</code> in <a href="%[1]s">%[3]s</a> gelöscht
 
 [tool]
 ago=vor

conf/locale/locale_en-US.ini

@@ -82,6 +82,8 @@ app_url = Application URL
 app_url_helper = This affects HTTP/HTTPS clone URL and somewhere in email.
 log_root_path = Log Path
 log_root_path_helper = Directory to write log files to.
+enable_console_mode = Enable Console Mode
+enable_console_mode_popup = In addition to file mode, also print logs to console.
 
 optional_title = Optional Settings
 email_title = Email Service Settings
@@ -117,6 +119,7 @@ sqlite3_not_available = Your release version does not support SQLite3, please do
 invalid_db_setting = Database setting is not correct: %v
 invalid_repo_path = Repository root path is invalid: %v
 run_user_not_match = Run user isn't the current user: %s -> %s
+smtp_host_missing_port = SMTP Host is missing port in address.
 invalid_smtp_from = SMTP From field is not valid: %v
 save_config_failed = Fail to save configuration: %v
 invalid_admin_setting = Admin account setting is invalid: %v
@@ -166,6 +169,14 @@ reset_password_helper = Click here to reset your password
 password_too_short = Password length cannot be less then 6.
 non_local_account = Non-local accounts cannot change passwords through Gogs.
 
+login_two_factor = Two-factor Authentication
+login_two_factor_passcode = Authentication Passcode
+login_two_factor_enter_recovery_code = Enter a two-factor recovery code
+login_two_factor_recovery = Two-factor Recovery
+login_two_factor_recovery_code = Recovery Code
+login_two_factor_enter_passcode = Enter a two-factor passcode
+login_two_factor_invalid_recovery_code = Recovery code has been used or does not valid.
+
 [mail]
 activate_account = Please activate your account
 activate_email = Verify your email address
@@ -253,11 +264,11 @@ profile = Profile
 password = Password
 avatar = Avatar
 ssh_keys = SSH Keys
-social = Social Accounts
-applications = Applications
+security = Security
+repos = Repositories
 orgs = Organizations
+applications = Applications
 delete = Delete Account
-uid = Uid
 
 public_profile = Public Profile
 profile_desc = Your email address is public and will be used for any account related notifications, and any web based operations made via the site.
@@ -299,7 +310,7 @@ email_deletion = Email Deletion
 email_deletion_desc = Deleting this email address will remove related information from your account. Do you want to continue?
 email_deletion_success = Email has been deleted successfully!
 add_new_email = Add new email address
-add_email = Add email
+add_email = Add Email
 add_email_confirmation_sent = A new confirmation email has been sent to '%s', please check your inbox within the next %d hours to complete the confirmation process.
 add_email_success = Your new email address was successfully added.
 
@@ -323,10 +334,30 @@ no_activity = No recent activity
 key_state_desc = This key is used in last 7 days
 token_state_desc = This token is used in last 7 days
 
-manage_social = Manage Associated Social Accounts
-social_desc = This is a list of associated social accounts. Remove any binding that you do not recognize.
-unbind = Unbind
-unbind_success = Social account has been unbound.
+two_factor = Two-factor Authentication
+two_factor_status = Status:
+two_factor_on = On
+two_factor_off = Off
+two_factor_enable = Enable
+two_factor_disable = Disable
+two_factor_view_recovery_codes = View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http = For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title = Enable Two-factor Authentication
+two_factor_scan_qr = Please use your authentication application to scan the image:
+two_factor_or_enter_secret = Or enter the secret:
+two_factor_then_enter_passcode = Then enter passcode:
+two_factor_verify = Verify
+two_factor_invalid_passcode = The passcode you entered is not valid, please try again!
+two_factor_enable_error = Enable Two-factor authentication failed: %v
+two_factor_enable_success = Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title = Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc = Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes = Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error = Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success = New recovery codes has been generated successfully!
+two_factor_disable_title = Disable Two-factor Authentication
+two_factor_disable_desc = Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success = Two-factor authentication has disabled successfully!
 
 manage_access_token = Manage Personal Access Tokens
 generate_new_token = Generate New Token
@@ -341,9 +372,14 @@ access_token_deletion_desc = Delete this personal access token will remove all r
 delete_token_success = Personal access token has been removed successfully! Don't forget to update your application as well.
 
 orgs.none = You are not a member of any organizations.
-orgs.leave_title = Leave an organization
+orgs.leave_title = Leave organization
 orgs.leave_desc = You will lose access to all repositories and teams after you left the organization. Do you want to continue?
 
+repos.leave = Leave
+repos.leave_title = Leave repository
+repos.leave_desc = You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success = You have left repository '%s' successfully!
+
 delete_account = Delete Your Account
 delete_prompt = The operation will delete your account permanently, and <strong>CANNOT</strong> be undone!
 confirm_delete_account = Confirm Deletion
@@ -414,7 +450,7 @@ quick_guide = Quick Guide
 clone_this_repo = Clone this repository
 create_new_repo_command = Create a new repository on the command line
 push_exist_repo = Push an existing repository from the command line
-repo_is_empty = This repository is empty, please come back later!
+bare_message = This repository does not have any content yet.
 
 files = Files
 branch = Branch
@@ -427,6 +463,7 @@ pulls = Pull Requests
 labels = Labels
 milestones = Milestones
 commits = Commits
+git_branches = Branches
 releases = Releases
 file_raw = Raw
 file_history = History
@@ -435,6 +472,13 @@ file_permalink = Permalink
 file_too_large = This file is too large to be shown
 video_not_supported_in_browser = Your browser doesn't support HTML5 video tag.
 
+branches.overview = Overview
+branches.active_branches = Active Branches
+branches.stale_branches = Stale Branches
+branches.all = All Branches
+branches.updated_by = Updated %[1]s by %[2]s
+branches.change_default_branch = Change Default Branch
+
 editor.new_file = New file
 editor.upload_file = Upload file
 editor.edit_file = Edit file
@@ -572,6 +616,7 @@ pulls.compare_compare = compare
 pulls.filter_branch = Filter branch
 pulls.no_results = No results found.
 pulls.nothing_to_compare = There is nothing to compare because base and head branches are even.
+pulls.nothing_merge_base = There is nothing to compare because two branches have completely different history.
 pulls.has_pull_request = `There is already a pull request between these two targets: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create = Create Pull Request
 pulls.title_desc = wants to merge %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code>
@@ -642,9 +687,11 @@ settings.collaboration.write = Write
 settings.collaboration.read = Read
 settings.collaboration.undefined = Undefined
 settings.branches = Branches
+settings.branches_bare = You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch = Default Branch
 settings.default_branch_desc = The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update = Update
+settings.update_default_branch_unsupported = Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success = Default branch of this repository has been updated successfully!
 settings.protected_branches = Protected Branches
 settings.protected_branches_desc = Protect branches from force pushing, accidental deletion and whitelist code committers.
@@ -656,7 +703,7 @@ settings.protect_this_branch_desc = Disable force pushes and prevent from deleti
 settings.protect_require_pull_request = Require pull request instead direct pushing
 settings.protect_require_pull_request_desc = Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers = Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc = Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc = Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users = Users who can push to this branch
 settings.protect_whitelist_search_users = Search users
 settings.protect_whitelist_teams = Teams for which members of them can push to this branch
@@ -674,11 +721,13 @@ settings.change_reponame_prompt = This change will affect how links relate to th
 settings.advanced_settings = Advanced Settings
 settings.wiki_desc = Enable wiki system
 settings.use_internal_wiki = Use builtin wiki
+settings.allow_public_wiki_desc = Allow public access to wiki when repository is private
 settings.use_external_wiki = Use external wiki
 settings.external_wiki_url = External Wiki URL
 settings.external_wiki_url_desc = Visitors will be redirected to URL when they click on the tab.
 settings.issues_desc = Enable issue tracker
 settings.use_internal_issue_tracker = Use builtin lightweight issue tracker
+settings.allow_public_issues_desc = Allow public access to issues when repository is private
 settings.use_external_issue_tracker = Use external issue tracker
 settings.external_tracker_url = External Issue Tracker URL
 settings.external_tracker_url_desc = Visitors will be redirected to URL when they click on the tab.
@@ -732,6 +781,8 @@ settings.webhook_deletion_success = Webhook has been deleted successfully!
 settings.webhook.test_delivery = Test Delivery
 settings.webhook.test_delivery_desc = Send a fake push event delivery to test your webhook settings
 settings.webhook.test_delivery_success = Test webhook has been added to delivery queue. It may take few seconds before it shows up in the delivery history.
+settings.webhook.redelivery = Redelivery
+settings.webhook.redelivery_success = Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request = Request
 settings.webhook.response = Response
 settings.webhook.headers = Headers
@@ -742,7 +793,7 @@ settings.githook_edit_desc = If the hook is inactive, sample content will be pre
 settings.githook_name = Hook Name
 settings.githook_content = Hook Content
 settings.update_githook = Update Hook
-settings.add_webhook_desc = Gogs will send a <code>POST</code> request to the URL you specify, along with regarding the event that occured. You can also specify what kind of data format you'd like to get upon triggering the hook (JSON, x-www-form-urlencoded, XML, etc). More information can be found in our <a target="_blank" href="%s">Webhooks Guide</a>.
+settings.add_webhook_desc = Gogs will send a <code>POST</code> request to the URL you specify, along with details regarding the event that occurred. You can also specify what kind of data format you'd like to get upon triggering the hook (JSON, x-www-form-urlencoded, XML, etc). More information can be found in our <a target="_blank" href="%s">Webhooks Guide</a>.
 settings.payload_url = Payload URL
 settings.content_type = Content Type
 settings.secret = Secret
@@ -760,10 +811,16 @@ settings.event_delete = Delete
 settings.event_delete_desc = Branch or tag deleted
 settings.event_fork = Fork
 settings.event_fork_desc = Repository forked
-settings.event_pull_request = Pull Request
-settings.event_pull_request_desc = Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
 settings.event_push = Push
 settings.event_push_desc = Git push to a repository
+settings.event_issues = Issues
+settings.event_issues_desc = Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment = Issue Comment
+settings.event_issue_comment_desc = Issue comment created, edited, or deleted.
+settings.event_pull_request = Pull Request
+settings.event_pull_request_desc = Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release = Release
+settings.event_release_desc = Release published in a repository.
 settings.active = Active
 settings.active_helper = Details regarding the event which triggered the hook will be delivered as well.
 settings.add_hook_success = New webhook has been added.
@@ -808,7 +865,6 @@ release.releases = Releases
 release.new_release = New Release
 release.draft = Draft
 release.prerelease = Pre-Release
-release.stable = Stable
 release.edit = edit
 release.ahead = <strong>%d</strong> commits to %s since this release
 release.source_code = Source Code
@@ -907,9 +963,9 @@ teams.add_team_member = Add Team Member
 teams.delete_team_title = Team Deletion
 teams.delete_team_desc = As this team will be deleted, members of this team may lose access to some repositories. Do you want to continue?
 teams.delete_team_success = Given team has been deleted successfully.
-teams.read_permission_desc = This team grants <strong>Read</strong> access: members can view and clone the team's repositories.
-teams.write_permission_desc = This team grants <strong>Write</strong> access: members can read from and push to the team's repositories.
-teams.admin_permission_desc = This team grants <strong>Admin</strong> access: members can read from, push to, and add collaborators to the team's repositories.
+teams.read_permission_desc = Membership in this team grants <strong>Read</strong> access: members can view and clone the team's repositories.
+teams.write_permission_desc = Membership in this team grants <strong>Write</strong> access: members can read from and push to the team's repositories.
+teams.admin_permission_desc = Membership in this team grants <strong>Admin</strong> access: members can read from, push to, and add collaborators to the team's repositories.
 teams.repositories = Team Repositories
 teams.search_repo_placeholder = Search repository...
 teams.add_team_repository = Add Team Repository
@@ -1024,6 +1080,7 @@ repos.private = Private
 repos.watches = Watches
 repos.stars = Stars
 repos.issues = Issues
+repos.size = Size
 
 auths.auth_manage_panel = Authentication Manage Panel
 auths.new = Add New Source
@@ -1042,11 +1099,16 @@ auths.bind_password = Bind Password
 auths.bind_password_helper = Warning: This password is stored in plain text. Do not use a high privileged account.
 auths.user_base = User Search Base
 auths.user_dn = User DN
-auths.attribute_username = Username attribute
+auths.attribute_username = Username Attribute
 auths.attribute_username_placeholder = Leave empty to use sign-in form field value for user name.
-auths.attribute_name = First name attribute
-auths.attribute_surname = Surname attribute
-auths.attribute_mail = Email attribute
+auths.attribute_name = First Name Attribute
+auths.attribute_surname = Surname Attribute
+auths.attribute_mail = Email Attribute
+auths.verify_group_membership = Verify group membership
+auths.group_search_base_dn = Group Search Base DN
+auths.group_filter = Group Filter
+auths.group_attribute_contain_user_list = Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group = User Attribute Listed in Group
 auths.attributes_in_bind = Fetch attributes in Bind DN context
 auths.filter = User Filter
 auths.admin_filter = Admin Filter

conf/locale/locale_es-ES.ini

@@ -75,13 +75,15 @@ domain_helper=Esto afecta a las URLs para clonar por SSH.
 ssh_port=Puerto SSH
 ssh_port_helper=Número de puerto de su servidor SSH, déjelo en blanco para desactivar SSH.
 use_builtin_ssh_server=Usar Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server_popup=Iniciar servidor SSH integrado para operaciones con Git para distinguirlo del demonio SSH del sistema.
 http_port=Puerto HTTP
 http_port_helper=Puerto en el que escuchará la aplicación.
 app_url=URL de la aplicación
 app_url_helper=Esto afecta a las URLs para clonar por HTTP/HTTPS y a algunos correos electrónicos.
 log_root_path=Ruta del registro
 log_root_path_helper=Directorio donde almacenar los registros.
+enable_console_mode=Activar Modo Consola
+enable_console_mode_popup=Además del modo archivo, también imprime los registros en consola.
 
 optional_title=Configuración opcional
 email_title=Configuración del servicio de correo
@@ -117,6 +119,7 @@ sqlite3_not_available=Tu versión no soporta SQLite3, por favor descarga el bina
 invalid_db_setting=La configuración de la base de datos no es correcta: %v
 invalid_repo_path=La ruta de la raíz del repositorio es inválida: %v
 run_user_not_match=El usuario que está ejecutando la aplicación no es el usuario actual: %s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=El campo SMTP no es válido: %v
 save_config_failed=Error al guardar la configuración: %v
 invalid_admin_setting=La configuración de la cuenta de administración es inválida: %v
@@ -166,6 +169,14 @@ reset_password_helper=Haga Clic aquí para restablecer su contraseña
 password_too_short=La longitud de la contraseña no puede ser menor a 6.
 non_local_account=Cuentas que no son locales no pueden cambiar las contraseñas a través de Gogs.
 
+login_two_factor=Autenticación en dos pasos
+login_two_factor_passcode=Authentication Passcode
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Recovery Code
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+
 [mail]
 activate_account=Por favor, active su cuenta
 activate_email=Verifique su correo electrónico
@@ -201,6 +212,7 @@ Content=Contenido
 require_error=` no puede estar vacío.`
 alpha_dash_error=` los caracteres deben ser Alfanumericos o dash(-_).`
 alpha_dash_dot_error=` debe ser un caracter alfanumérivo válido, un guión alto o bajo (-_) o un signo de puntuación.`
+alpha_dash_dot_slash_error=` deben ser caracteres alfanuméricos, guiones(-_), puntos o barras.`
 size_error=` debe ser de tamaño %s.`
 min_size_error=` debe contener al menos %s caracteres.`
 max_size_error=` debe contener como máximo %s caracteres.`
@@ -252,11 +264,11 @@ profile=Perfil
 password=Contraseña
 avatar=Avatar
 ssh_keys=Claves SSH
-social=Redes Sociales
-applications=Aplicaciones
+security=Seguridad
+repos=Repositorios
 orgs=Organizaciones
+applications=Aplicaciones
 delete=Eliminar cuenta
-uid=UUID
 
 public_profile=Perfil público
 profile_desc=Tu correo electrónico es público y será usado para todas las notificaciones relacionadas con cualquier cuenta y cualquier operación hecha a través de la web.
@@ -322,10 +334,30 @@ no_activity=No hay actividad reciente
 key_state_desc=Esta clave ha sido usada en los últimos 7 días
 token_state_desc=Token usado en los últimos 7 días
 
-manage_social=Gestionar Redes Sociales asociadas
-social_desc=Esta es una lista de las Redes Sociales asociadas. Elimina cualquier vínculo que no reconozcas.
-unbind=Desvincular
-unbind_success=La Red Social ha sido desvinculada.
+two_factor=Autenticación en dos pasos
+two_factor_status=Estado:
+two_factor_on=Activado
+two_factor_off=Desactivado
+two_factor_enable=Activar
+two_factor_disable=Desactivar
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=Para las operaciones sobre HTTP/HTTPS, no puedes usar un usuario y contraseña. Por favor, cree y utilice <a href="%[1]s%[2]s"> un token de acceso personal</a> como su credencial de acceso, por ejemplo, <code>%[3]s</code>.
+two_factor_enable_title=Habilitar autenticaciñon en dos pasos
+two_factor_scan_qr=Por favor, use su aplicación de autenticación para escanear la imagen:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verificar
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Deshabilitar autenticación en dos pasos
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=¡La autenticación en dos pasos ha sido deshabilitada satisfactoriamente!
 
 manage_access_token=Gestionar los Tokens de Acceso personales
 generate_new_token=Generar nuevo Token
@@ -343,6 +375,11 @@ orgs.none=No eres un miembro de ninguna organización.
 orgs.leave_title=Salir de una organización
 orgs.leave_desc=Perderá el acceso a todos los repositorios y equipos después dejar la organización. ¿Desea continuar?
 
+repos.leave=Salir
+repos.leave_title=Dejar repositorio
+repos.leave_desc=Perderás acceso al repositorio cuando salgas. ¿Quieres continuar?
+repos.leave_success=¡Has dejado el repositorio '%s' con éxito!
+
 delete_account=Elimina tu cuenta
 delete_prompt=La operación eliminará tu cuenta de forma permanente y ¡<strong>NO</strong> se puede deshacer!
 confirm_delete_account=Confirmar Eliminación
@@ -413,7 +450,7 @@ quick_guide=Guía Rápida
 clone_this_repo=Clonar este repositorio
 create_new_repo_command=Crear un nuevo repositorio desde línea de comandos
 push_exist_repo=Hacer Push de un repositorio existente desde línea de comandos
-repo_is_empty=Este repositorio está vacío, por favor, ¡vuelva más tarde!
+bare_message=Este repositorio aun no tiene contenido alguno.
 
 files=Archivos
 branch=Rama
@@ -426,6 +463,7 @@ pulls=Pull Requests
 labels=Etiquetas
 milestones=Milestones
 commits=Commits
+git_branches=Ramas
 releases=Releases
 file_raw=Raw
 file_history=Histórico
@@ -434,6 +472,13 @@ file_permalink=Permalink
 file_too_large=Este archivo es demasiado grande para ser mostrado
 video_not_supported_in_browser=Su navegador no soporta el tag video de HTML5.
 
+branches.overview=Resumen
+branches.active_branches=Ramas activas
+branches.stale_branches=Ramas Viejas
+branches.all=Todas las Ramas
+branches.updated_by=%[1]s actualizado por %[2]s
+branches.change_default_branch=Cambiar la Rama por Defecto
+
 editor.new_file=Nuevo archivo
 editor.upload_file=Subir archivo
 editor.edit_file=Editar archivo
@@ -473,7 +518,7 @@ editor.add_subdir=Añadir subdirectorio...
 editor.unable_to_upload_files=Error al subir archivos a '%s', error: %v
 editor.upload_files_to_dir=Subir archivos a '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=Historial de Commits
 commits.commits=Commits
 commits.search=Buscar commits
 commits.find=Buscar
@@ -641,9 +686,11 @@ settings.collaboration.write=Escritura
 settings.collaboration.read=Lectura
 settings.collaboration.undefined=Indefinido
 settings.branches=Ramas
+settings.branches_bare=No puedes gestionar ramas en un repositorio vacío. Por favor sube algún contenido primero.
 settings.default_branch=Rama predeterminada
 settings.default_branch_desc=Se considera la rama «base» como la rama por defecto para commits de código, las solicitudes pull y edición en línea.
 settings.update=Actualizar
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=¡La Rama por defecto de este repositorio ha sido actualizado con éxito!
 settings.protected_branches=Ramas protegidas
 settings.protected_branches_desc=Proteger ramas force pushing, de eliminación accidental y lista blanca de committers de código.
@@ -655,11 +702,11 @@ settings.protect_this_branch_desc=Desactivar force pushes y evite la eliminació
 settings.protect_require_pull_request=Requiere una solicitud pull, en lugar de un push directo
 settings.protect_require_pull_request_desc=Active esta opción para deshabilitar un push directo a esta rama. Los commits tienen que ser empujados a otra rama no protegida y fusionados a esta rama a través de la solicitud pull.
 settings.protect_whitelist_committers=Lista blanca de quienes pueden empujar a esta rama
-settings.protect_whitelist_committers_desc=Añadir personas o equipos a la lista blanca de empuje directo a esta rama.
-settings.protect_whitelist_users=Users who can push to this branch
-settings.protect_whitelist_search_users=Search users
-settings.protect_whitelist_teams=Teams for which members of them can push to this branch
-settings.protect_whitelist_search_teams=Search teams
+settings.protect_whitelist_committers_desc=Añadir personas o equipos a la lista blanca de push directo a esta rama. Los usuarios en esta lista se saltan la comprobación de pull request.
+settings.protect_whitelist_users=Usuarios que pueden hacer push a esta rama
+settings.protect_whitelist_search_users=Buscar usuarios
+settings.protect_whitelist_teams=Equipos cuyos miembros pueden hacer push a esta rama
+settings.protect_whitelist_search_teams=Buscar equipos
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Webhooks
 settings.githooks=Git Hooks
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Este cambio afectará a los enlaces al repositor
 settings.advanced_settings=Ajustes avanzados
 settings.wiki_desc=Activar sistema de wiki
 settings.use_internal_wiki=Usar wiki integrada
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Usar Wiki externa
 settings.external_wiki_url=URL externa de la Wiki
 settings.external_wiki_url_desc=Los visitantes serán redireccionados a la URL cuando hagan click en la barra.
 settings.issues_desc=Habilitar rastreo de incidencias
 settings.use_internal_issue_tracker=Usar rastreo de incidencias ligero incluido
+settings.allow_public_issues_desc=Permitir acceso público a las incidencias cuando el repositorio es privado
 settings.use_external_issue_tracker=Usar tracker externo de incidencias
 settings.external_tracker_url=URL de seguimiento de problemas externos
 settings.external_tracker_url_desc=Los visitantes serán redirigidos a la URL cuando hagan click en la barra.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=¡Webhook eliminado con éxito!
 settings.webhook.test_delivery=Test de entrega
 settings.webhook.test_delivery_desc=Enviar un falso evento Push de entrega para probar tus ajustes de webhook
 settings.webhook.test_delivery_success=Probar que los webhook han sido añadidos a la cola de entrega. Esto puede tomar algunos segundos antes de aparecer en el historial de entregas.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=Petición
 settings.webhook.response=Respuesta
 settings.webhook.headers=Encabezado
@@ -755,10 +806,20 @@ settings.event_send_everything=Necesito <strong>todo</strong>.
 settings.event_choose=Déjeme elegir lo que necesito.
 settings.event_create=Crear
 settings.event_create_desc=Rama o etiqueta creada
-settings.event_pull_request=Pull Request
-settings.event_pull_request_desc=Pull request, abierta, cerrada, reabierta, editada, asignada, desasignada, con etiqueta actualizada, con etiqueta eliminada, o sincronizada.
+settings.event_delete=Borrar
+settings.event_delete_desc=Rama o etiqueta borrada
+settings.event_fork=Fork
+settings.event_fork_desc=Repositorio forked
 settings.event_push=Push
 settings.event_push_desc=Git push a un repositorio
+settings.event_issues=Incidencias
+settings.event_issues_desc=Incidencia abierta, cerrada, reabierta, editada, asignada, desasignada, etiqueta actualizada, etiqueta limpiada, hito marcado, o desmarcado,.
+settings.event_issue_comment=Comentario de incidencia
+settings.event_issue_comment_desc=Comentario de incidencias creado, editado o borrado.
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request abierto, cerrado, reabierto, editado, asignado, desasignado, etiqueta actualizada, etiqueta limpiada, hito marcado, hito desmarcado, o sincronizado.
+settings.event_release=Lanzamiento
+settings.event_release_desc=Lanzamiento publicado en un repositorio.
 settings.active=Activo
 settings.active_helper=Enviaremos detalles del evento cuando este hook se dispare.
 settings.add_hook_success=Se ha añadido un nuevo webhook.
@@ -803,7 +864,6 @@ release.releases=Releases
 release.new_release=Nueva Release
 release.draft=Borrador
 release.prerelease=Pre-Release
-release.stable=Estable
 release.edit=editar
 release.ahead=<strong>%d</strong> commits en %s desde esta release
 release.source_code=Código Fuente
@@ -1019,6 +1079,7 @@ repos.private=Privado
 repos.watches=Vigilantes
 repos.stars=Estrellas
 repos.issues=Incidencias
+repos.size=Tamaño
 
 auths.auth_manage_panel=Panel de administración de autenticación
 auths.new=Añadir nuevo origen
@@ -1039,9 +1100,14 @@ auths.user_base=Base de búsqueda de usuarios
 auths.user_dn=DN de Usuario
 auths.attribute_username=Atributo de nombre de usuario
 auths.attribute_username_placeholder=Dejar vacío para usar el campo de inicio de sesión como nombre de usuario.
-auths.attribute_name=Atributo nombre
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Atributo apellido
 auths.attribute_mail=Atributo correo electrónico
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Buscar atributos en el contexto del Bind DN
 auths.filter=Filtro de usuario
 auths.admin_filter=Filtro de aministrador
@@ -1097,9 +1163,9 @@ config.ssh_minimum_key_sizes=Tamaños de clave mínimos
 config.repo_config=Configuración del repositorio
 config.repo_root_path=Ruta del Repositorio
 config.script_type=Tipo de Script
-config.repo_force_private=Force Private
+config.repo_force_private=Forzar Privado
 config.max_creation_limit=Limite máximo de creación
-config.preferred_licenses=Preferred Licenses
+config.preferred_licenses=Licencias Preferidas
 config.disable_http_git=Desactivar HTTP Git
 config.enable_local_path_migration=Activar la migración de la ruta de acceso Local
 config.commits_fetch_concurrency=Commits Fetch Concurrency
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Tiempo de espera de operación de pull
 config.git_gc_timeout=Tiempo de espera de operación de GC
 
 config.log_config=Configuración del Log
-config.log_mode=Modo del Log
+config.log_mode=Modo
+config.log_options=Opciones
 
 monitor.cron=Tareas de Cron
 monitor.name=Nombre
@@ -1205,19 +1272,23 @@ notices.delete_success=Las notificaciones del sistema han sido eliminadas satisf
 
 [action]
 create_repo=creó el repositorio <a href="%s">%s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=repositorio renombrado de <code>%[1]s</code> a <a href="%[2]s">%[3]s</a>
 commit_repo=hizo push a <a href="%[1]s/src/%[2]s">%[3]s</a> en <a href="%[1]s">%[4]s</a>
+compare_commits=Ver comparación de estos %d commits
+transfer_repo=transfirió el repositorio <code>%s</code> a <a href="%s">%s</a>
 create_issue=`incidencia abierta <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`cerró la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`reabrió la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`comentó en la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`creado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`cerró el pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`reabrió el pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`comentó en la incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`fusionado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=transfirió el repositorio <code>%s</code> a <a href="%s">%s</a>
+create_branch=nueva rama <a href="%[1]s/src/%[2]s">%[3]s</a> creada en <a href="%[1]s">%[4]s</a>
+delete_branch=borrada rama <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=hizo push del tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>
-compare_commits=Ver comparación de estos %d commits
+delete_tag=borrada etiqueta <code>%[2]s</code> en <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=hace

conf/locale/locale_fi-FI.ini

@@ -64,7 +64,7 @@ no_admin_and_disable_registration=Et voi poistaa käytöstä rekisteröintiä lu
 err_empty_admin_password=Ylläpito salasana ei voi olla tyhjä.
 
 general_title=Sovellus yleiset asetukset
-app_name=Sovellus nimi
+app_name=Sovelluksen nimi
 app_name_helper=Laita organisaatiosi nimi tähän isolla ja kovaäänisesti!
 repo_path=Repon juuren polku
 repo_path_helper=Kaikki Git etä repot tullaan tallentamaan tähän hakemistoon.
@@ -82,6 +82,8 @@ app_url=Sovellus URL
 app_url_helper=Tämä vaikuttaa HTTP/HTTPS klooni URLeihin ja joihinkin sähköposteihin.
 log_root_path=Lokin polku
 log_root_path_helper=Lokien tallennushakemisto.
+enable_console_mode=Ota käyttöön konsoli tila
+enable_console_mode_popup=Tiedosto tilan lisäksi tulosta logit konsoliin.
 
 optional_title=Valinnaiset asetukset
 email_title=Sähköposti palvelu asetukset
@@ -117,6 +119,7 @@ sqlite3_not_available=Julkaisu versiosi ei tue SQLite3, ole hyvä ja lataa viral
 invalid_db_setting=Tietokanta asetus ei ole oikea: %v
 invalid_repo_path=Repo juuri polku on virheellinen: %v
 run_user_not_match=Suoritus käyttäjä ei ole nykyinen käyttäjä: %s -> %s
+smtp_host_missing_port=SMTP-isännältä puuttuu portin osoite.
 invalid_smtp_from=SMTP From kenttä ei ole kelvollinen: %v
 save_config_failed=Asetuksien tallennus epäonnistui: %v
 invalid_admin_setting=Ylläpito tili asetus virheellinen: %v
@@ -166,6 +169,14 @@ reset_password_helper=Klikkaa tästä nollataksesi salasanasi
 password_too_short=Salasanan pituus ei voi olla vähemmän kuin 6 merkkiä.
 non_local_account=Vain paikallisten käyttäjätilien salasanan vaihto onnistuu Gogsin kautta.
 
+login_two_factor=Kaksivaiheinen todennus
+login_two_factor_passcode=Todennuksen salasana
+login_two_factor_enter_recovery_code=Kirjoita kaksivaiheisen todennuksen palautuskoodi
+login_two_factor_recovery=Kaksivaiheisen todennuksen palautus
+login_two_factor_recovery_code=Palautuskoodi
+login_two_factor_enter_passcode=Kirjoita kaksivaiheisen todennuksen salasana
+login_two_factor_invalid_recovery_code=Palautuskoodi on käytetty tai ei ole kelvollinen.
+
 [mail]
 activate_account=Ole hyvä ja aktivoi tilisi
 activate_email=Vahvista sähköpostiosoitteesi
@@ -201,6 +212,7 @@ Content=Sisältö
 require_error=` ei voi olla tyhjä.`
 alpha_dash_error=` täytyy olla kirjaimia tai numeroita tai väliviiva(-_) merkkejä.`
 alpha_dash_dot_error=` täytyy olla kirjaimia tai numeroita tai väliviiva(-_) tai piste merkkejä.`
+alpha_dash_dot_slash_error=` täytyy olla kirjaimia tai numeroita tai väliviiva(-_) tai piste merkkejä.`
 size_error=` täytyy olla kokoa %s.`
 min_size_error=` täytyy sisältää vähintään %s merkkiä.`
 max_size_error=` täytyy sisältää enintään %s merkkiä.`
@@ -252,11 +264,11 @@ profile=Profiili
 password=Salasana
 avatar=Profiilikuva
 ssh_keys=SSH avaimet
-social=Sosiaaliset tilit
-applications=Sovellukset
+security=Turvallisuus
+repos=Repot
 orgs=Organisaatiot
+applications=Sovellukset
 delete=Poista tili
-uid=Käyttäjä ID
 
 public_profile=Julkinen profiili
 profile_desc=Sähköposti osoitteesi on julkinen ja käytetään tiliin liittyviin ilmoituksiin, ja nettipohjaisiin toimintoihin joita on tehty sivujen kautta.
@@ -288,7 +300,7 @@ password_incorrect=Nykyinen salasana ei ole oikea.
 change_password_success=Salasanasi on onnistuneesti vaihdettu. Voit nyt kirjautua sisään käyttäen tätä uutta salasanaa.
 password_change_disabled=Ei-paikallinen tyyppisten käyttäjien ei sallita vaihtavan salasanaa.
 
-emails=Sähköposti osoitteet
+emails=Sähköposti osoite
 manage_emails=Hallitse sähköposti osoitteita
 email_desc=Ensisijaista sähköpostiosoitettasi käytetään ilmoituksiin ja muihin toimintoihin.
 primary=Ensisijainen
@@ -322,10 +334,30 @@ no_activity=Ei viimeaikaista toimintaa
 key_state_desc=Tätä avainta on käytetty 7 päivän sisällä
 token_state_desc=Tätä pääsymerkkiä on käytetty 7 päivän sisällä
 
-manage_social=Hallitse liitettyjä sosiaalisia tilejä
-social_desc=Tämä on luettelo liitetyistä sosiaalisista tileistä. Poista kaikki liitokset joita et tunnista.
-unbind=Poista liitos
-unbind_success=Sosiaalisen tilin liitos on poistettu.
+two_factor=Kaksivaiheinen todennus
+two_factor_status=Tila:
+two_factor_on=Käytössä
+two_factor_off=Pois käytöstä
+two_factor_enable=Ota käyttöön
+two_factor_disable=Poista käytöstä
+two_factor_view_recovery_codes=Katso ja tallenna <a href="%s%s">palautuskoodejasi</a> turvallisessa paikassa. Voit käyttää niitä salasanoina, jos menetän pääsyn todennussovellukseen.
+two_factor_http=HTTP/HTTPS toimintoihin et voi enää käyttää pelkkää käyttäjänimeä ja salasanaa. Luo ja käytä <a href="%[1]s%[2]s">henkilökohtaisia pääsymerkkejä</a> tunnuksinasi, esimerkiksi <code>%[3]s</code>.
+two_factor_enable_title=Ota käyttöön kaksivaiheinen todennus
+two_factor_scan_qr=Käytä todennus sovellustasi lukeaksesi kuvan:
+two_factor_or_enter_secret=Tai kirjoita salaisuus:
+two_factor_then_enter_passcode=Sitten kirjoita salasana:
+two_factor_verify=Vahvista
+two_factor_invalid_passcode=Kirjoittamasi salasana ei kelpaa, yritä uudelleen!
+two_factor_enable_error=Ota käyttöön kaksivaiheinen todennus epäonnistui: %v
+two_factor_enable_success=Kaksivaiheinen todennus on otettu käyttöön tilissäsi menestyksekkäästi!
+two_factor_recovery_codes_title=Kaksivaiheinen todennus palautuskoodit
+two_factor_recovery_codes_desc=Palautuskoodeja käytetään kun väliaikaisesti menetät pääsyb todennus sovellukseesi. Kukin palautuskoodi voidaan käyttää vain kerran, <b>pidä näitä koodeja turvallisessa paikassa</b>.
+two_factor_regenerate_recovery_codes=Uudista palautuskoodit
+two_factor_regenerate_recovery_codes_error=Uudista palautuskoodit epäonnistui: %v
+two_factor_regenerate_recovery_codes_success=Uusien palautuskoodien luonti onnistui!
+two_factor_disable_title=Poista kaksivaiheinen todennus käytöstä
+two_factor_disable_desc=Käyttäjätilisi turvallisuustaso vähenee kun poistat käytöstä kaksivaiheisen todennuksen. Haluatko jatkaa?
+two_factor_disable_success=Kaksivaiheinen todennus on poistettu käytöstä onnistuneesti!
 
 manage_access_token=Hallitse henkilökohtaisia pääsymerkkejä
 generate_new_token=Luo uusi pääsymerkki
@@ -343,6 +375,11 @@ orgs.none=Et ole yhdenkään organisaation jäsen.
 orgs.leave_title=Poistu organisaatiosta
 orgs.leave_desc=Menetät oikeudet kaikkiin niihin repoihin ja tiimeihin joihin organisaatio on sinulle oikeudet antanut. Haluatko varmasti jatkaa?
 
+repos.leave=Poistu
+repos.leave_title=Poistu reposta
+repos.leave_desc=Menetät pääsyn repoon kun poistut. Haluatko jatkaa?
+repos.leave_success=Olet poistunut reposta '%s' onnistuneesti!
+
 delete_account=Poista tilisi
 delete_prompt=Toiminto poistaa tilisi pysyvästi ja tätä <strong>EI VOI</strong> peruuttaa myöhemmin!
 confirm_delete_account=Varmista poisto
@@ -413,7 +450,7 @@ quick_guide=Pikaopas
 clone_this_repo=Kloonaa tämä repo
 create_new_repo_command=Luo uusi repo komentoriviltä
 push_exist_repo=Työnnä olemassaoleva repo komentoriviltä
-repo_is_empty=Tämä repo on tyhjä, ole hyvä ja tule takaisin myöhemmin!
+bare_message=Tässä repossa ei ole mitään sisältöä vielä.
 
 files=Tiedostot
 branch=Branch
@@ -426,6 +463,7 @@ pulls=Pull-pyynnöt
 labels=Tunnisteet
 milestones=Merkkipaalut
 commits=Commitit
+git_branches=Haarat
 releases=Julkaisut
 file_raw=Raaka
 file_history=Historia
@@ -434,6 +472,13 @@ file_permalink=Pysyvä linkki
 file_too_large=Tämä tiedosto on liian suuri näytettäväksi
 video_not_supported_in_browser=Selaimesi ei tue HTML5 video-tagia.
 
+branches.overview=Yleiskatsaus
+branches.active_branches=Aktiiviset haarat
+branches.stale_branches=Vanhentuneet haarat
+branches.all=Kaikki haarat
+branches.updated_by=Päivitetty %[1]s %[2]s
+branches.change_default_branch=Muuta oletushaaraa
+
 editor.new_file=Uusi tiedosto
 editor.upload_file=Liitä tiedosto
 editor.edit_file=Muokkaa tiedostoa
@@ -473,7 +518,7 @@ editor.add_subdir=Lisää alikansio...
 editor.unable_to_upload_files=Tiedostojen lataus epäonnistui kansioon '%s' virheellä: %v
 editor.upload_files_to_dir=Lataa tiedostoja kansioon '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=Commitin historia
 commits.commits=Commitit
 commits.search=Etsi commiteista
 commits.find=Etsi
@@ -641,9 +686,11 @@ settings.collaboration.write=Kirjoita
 settings.collaboration.read=Lue
 settings.collaboration.undefined=Määrittelemätön
 settings.branches=Haarat
+settings.branches_bare=Et voi hallita haaroja tyhjässä repossa. Lisää jotain sisältöä ensin.
 settings.default_branch=Oletushaara
 settings.default_branch_desc=Oletushaaraa käytetään "pohjahaarana" commiteille, pull-pyynnöille ja sivustolla toteutetuille muokkauksille.
 settings.update=Päivitä
+settings.update_default_branch_unsupported=Palvelimella oleva Git versio ei tue oletushaaran vaihtamista.
 settings.update_default_branch_success=Repositoryn oletushaara päivitetty!
 settings.protected_branches=Suojatut haarat
 settings.protected_branches_desc=Suojaa haaroja pakotetulta push-operaatiolta, vahinkopoistamisilta ja sallitun listan committereilta.
@@ -655,12 +702,12 @@ settings.protect_this_branch_desc=Kiellä pakoteut push-operaatiot ja estä pois
 settings.protect_require_pull_request=Vaadi pull-pyyntö suoran push-operaation sijaan
 settings.protect_require_pull_request_desc=Estä suorat push-operaatiot tähän haaraan. Commitit täytyy pushata ei-suojattuun haaraan ja yhdistää tähän haaraan pull-pyynnön kautta.
 settings.protect_whitelist_committers=Lista sallituista, jotka voivat pushata tähän haaraan
-settings.protect_whitelist_committers_desc=Lisää ihmisiä tai tiimejä sallittujen listaan, jotka voivat pushata suoraan tähän haaraan.
-settings.protect_whitelist_users=Users who can push to this branch
-settings.protect_whitelist_search_users=Search users
-settings.protect_whitelist_teams=Teams for which members of them can push to this branch
-settings.protect_whitelist_search_teams=Search teams
-settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
+settings.protect_whitelist_committers_desc=Lisää käyttäjiä tai tiimejä sallittuihin jotka saavat pushata tähän haaraan. Sallitut käyttäjät voivat ohittaa vaatimuksen pull requestien tekemisestä.
+settings.protect_whitelist_users=Käyttäjät jotka voivat pushata tähän haaraan
+settings.protect_whitelist_search_users=Etsi käyttäjiä
+settings.protect_whitelist_teams=Tiimit joiden jäsenet voivat pushata tähän haaraan
+settings.protect_whitelist_search_teams=Etsi tiimejä
+settings.update_protect_branch_success=Tämän haaran suojausasetukset on päivitetty!
 settings.hooks=Webkoukut
 settings.githooks=Git koukut
 settings.basic_settings=Perusasetukset
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Tämä muutos vaikuttaa siihen miten linkit liit
 settings.advanced_settings=Lisäasetukset
 settings.wiki_desc=Ota wiki käyttöön
 settings.use_internal_wiki=Käytä sisäänrakennettua wikiä
+settings.allow_public_wiki_desc=Salli julkinen pääsy wikiin kun repo on yksityinen
 settings.use_external_wiki=Käytä ulkoista wikiä
 settings.external_wiki_url=Ulkoinen Wiki URL
 settings.external_wiki_url_desc=Vierailijat uudelleenohjataan URL-osoitteeseen kun he klikkaavat välilehteä.
 settings.issues_desc=Ota virheenseuranta käyttöön
 settings.use_internal_issue_tracker=Käytä sisäänrakennettua kevyttä virheenseurantaa
+settings.allow_public_issues_desc=Salli julkinen pääsy ongelmiin kun repo on yksityinen
 settings.use_external_issue_tracker=Käytä ulkoista vikaseurantaa
 settings.external_tracker_url=Ulkoisen virheenseurannan URL
 settings.external_tracker_url_desc=Vierailijat ohjataan URL-osoitteeseen kun he klikkaavat välilehteä.
@@ -688,7 +737,7 @@ settings.tracker_issue_style.alphanumeric=Aakkosnumeerinen
 settings.tracker_url_format_desc=Voit käyttää paikkamerkkiä <code>{user} {repo} {index}</code> käyttäjänimelle, reponimelle ja vikanumerolle.
 settings.pulls_desc=Ota käyttöön pull-pyynnöt salliaksesi julkiset koodilahjoitukset
 settings.danger_zone=Vaaravyöhyke
-settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
+settings.cannot_fork_to_same_owner=Et voi forkata repoa alkuperäiselle omistajalleen.
 settings.new_owner_has_same_repo=Uudella omistajalla on jo samanniminen repo. Ole hyvä ja valitse toinen nimi.
 settings.convert=Muunna tavalliseksi repoksi
 settings.convert_desc=Voit muuntaa tämän peilin tavalliseksi repoksi. Tätä ei voi peruuttaa.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webkoukku on poistettu onnistuneesti!
 settings.webhook.test_delivery=Testitoimitus
 settings.webhook.test_delivery_desc=Lähetä väärennetty push toimitusjakelu testataksesi webkoukku asetuksia
 settings.webhook.test_delivery_success=Testi webkoukku on lisätty toimitusjonoon. Muutama sekunti voi mennä ennenkuin se näkyy toimitushistoriassa.
+settings.webhook.redelivery=Uudelleentoimitus
+settings.webhook.redelivery_success=Koukku tehtävä "%s" on lisätty uudelleen toimitusjonoon. Toimitustilan päivittäminen toimitushistoriaan voi kestää muutaman sekunnin.
 settings.webhook.request=Pyyntö
 settings.webhook.response=Vastaus
 settings.webhook.headers=Otsikot
@@ -745,7 +796,7 @@ settings.add_webhook_desc=Gogs lähettää <code>POST</code> requestin määritt
 settings.payload_url=Payload URL
 settings.content_type=Sisältötyyppi
 settings.secret=Salaus
-settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
+settings.secret_desc=Salaisuus lähetetään SHA256 HMAC hex digest payloadina <code>X-Gogs-Signature</code> headerilla.
 settings.slack_username=Käyttäjätunnus
 settings.slack_icon_url=Kuvakkeen URL
 settings.slack_color=Väri
@@ -755,10 +806,20 @@ settings.event_send_everything=Tarvitsen <strong>kaiken</strong>.
 settings.event_choose=Haluan valita, mitä tarvitsen.
 settings.event_create=Luo
 settings.event_create_desc=Branch, tai tagi luotu
-settings.event_pull_request=Pull-pyyntö
-settings.event_pull_request_desc=Pull-pyyntö avattu, suljettu, uudelleenavattu, muokattu, annettu, anto vedottu, tarra päivitetty, tarra poistettu tai synkronoitu.
+settings.event_delete=Poista
+settings.event_delete_desc=Branch, tai tagi luotu
+settings.event_fork=Fork
+settings.event_fork_desc=Repo forkattu
 settings.event_push=Push
 settings.event_push_desc=Git push repoon
+settings.event_issues=Ongelmat
+settings.event_issues_desc=Ongelma avattu, suljettu, uudelleenavattu, muokattu, annettu, anto vedottu, tarra päivitetty, tarra poistettu, merkkipaalutettu, tai poistettu merkkipaalu.
+settings.event_issue_comment=Ongelman kommentti
+settings.event_issue_comment_desc=Ongelman kommentti luotu, muokattu, tai poistettu.
+settings.event_pull_request=Pull-pyyntö
+settings.event_pull_request_desc=Pull-pyyntö avattu, suljettu, uudelleenavattu, muokattu, annettu, anto vedottu, tarra päivitetty, tarra poistettu, merkkipaalutettu, poistettu merkkipaalu, tai synkronoitu.
+settings.event_release=Julkaisu
+settings.event_release_desc=Julkaisu julkaistu repoon.
 settings.active=Aktiivinen
 settings.active_helper=Yksityiskohdat koskien tapahtumaa joka laukaisi koukun toimitetaan myös.
 settings.add_hook_success=Uusi webkoukku on lisätty.
@@ -803,7 +864,6 @@ release.releases=Julkaisut
 release.new_release=Uusi julkaisu
 release.draft=Työversio
 release.prerelease=Esiversio
-release.stable=Vakaa
 release.edit=muokkaa
 release.ahead=<strong>%d</strong> committia kohteeseen %s version jälkeen
 release.source_code=Lähdekoodi
@@ -1019,6 +1079,7 @@ repos.private=Yksityinen
 repos.watches=Tarkkailijat
 repos.stars=Äänet
 repos.issues=Ongelmat
+repos.size=Koko
 
 auths.auth_manage_panel=Todennus hallintapaneeli
 auths.new=Lisää uusi lähde
@@ -1042,6 +1103,11 @@ auths.attribute_username_placeholder=Jätä tyhjäksi käyttääksesi kirjautumi
 auths.attribute_name=Etunimen määrite
 auths.attribute_surname=Sukunimen määrite
 auths.attribute_mail=Sähköposti määrite
+auths.verify_group_membership=Varmista ryhmäjäsenyys
+auths.group_search_base_dn=Ryhmähaun perusosoite DN
+auths.group_filter=Ryhmäsuodatus
+auths.group_attribute_contain_user_list=Ryhmän määrite joka sisältää listan käyttäjistä
+auths.user_attribute_listed_in_group=Käyttäjän määrite listattuna ryhmässä
 auths.attributes_in_bind=Nouda määritteet liitä DN sisällöstä
 auths.filter=Käyttäjäsuodatin
 auths.admin_filter=Ylläpitosuodatin
@@ -1099,10 +1165,10 @@ config.repo_root_path=Repon juuren polku
 config.script_type=Komentosarjan tyyppi
 config.repo_force_private=Pakota yksityiseksi
 config.max_creation_limit=Enimmäis-luontiraja
-config.preferred_licenses=Preferred Licenses
-config.disable_http_git=Disable HTTP Git
-config.enable_local_path_migration=Enable Local Path Migration
-config.commits_fetch_concurrency=Commits Fetch Concurrency
+config.preferred_licenses=Ensisijaiset lisenssit
+config.disable_http_git=Poista käytöstä HTTP Git
+config.enable_local_path_migration=Ota käyttöön paikallisen polun migraatio
+config.commits_fetch_concurrency=Committien noudon samanaikaisuus
 
 config.db_config=Tietokannan asetukset
 config.db_type=Tyyppi
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Pull-operaatio aikakatkaistiin
 config.git_gc_timeout=Roskienkeruu aikakatkaistiin
 
 config.log_config=Loki asetukset
-config.log_mode=Loki tila
+config.log_mode=Tila
+config.log_options=Valinnaiset
 
 monitor.cron=Cron tehtävät
 monitor.name=Nimi
@@ -1205,19 +1272,23 @@ notices.delete_success=Järjestelmän ilmoitukset on poistettu onnistuneesti.
 
 [action]
 create_repo=luotu repo <a href="%s">%s</a>
+fork_repo=forkattu repo kohteeseen <a href="%s"> %s</a>
 rename_repo=uudelleennimetty repo <code>%[1]s</code> nimelle <a href="%[2]s">%[3]s</a>
 commit_repo=pushattu kohteeseen <a href="%[1]s/src/%[2]s">%[3]s</a> paikassa <a href="%[1]s">%[4]s</a>
+compare_commits=Näytä vertailu näille %d commiteille
+transfer_repo=siirretty repo <code>%s</code> kohteeseen <a href="%s">%s</a>
 create_issue=`avasi ongelman <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`sulki ongelman <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`avasi uudelleen ongelman <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`kommentoi ongelmaa <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`luotu pull-pyyntö <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`sulki pull-pyynnön <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`avasi uudelleen pull-pyynnön <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`kommentoi ongelmaa <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`yhdistetty pull-pyyntö <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=siirretty repo <code>%s</code> kohteeseen <a href="%s">%s</a>
+create_branch=luotu uusi haara <a href="%[1]s/src/%[2]s">%[3]s</a> kohteeseen <a href="%[1]s">%[4]s</a>
+delete_branch=poistettu haara <code>%[2]s</code> kohteesta <a href="%[1]s">%[3]s</a>
 push_tag=pushattu tagi <a href="%s/src/%s">%[2]s</a> kohteeseen <a href="%[1]s">%[3]s</a>
-compare_commits=Näytä vertailu näille %d commiteille
+delete_tag=poistettu tagi <code>%[2]s</code> kohteesta <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=sitten

conf/locale/locale_fr-FR.ini

@@ -82,6 +82,8 @@ app_url=URL de l'application
 app_url_helper=Cela affecte les doublons d'URL HTTP/HTTPS et le contenu d'e-mail.
 log_root_path=Chemin des fichiers log
 log_root_path_helper=Répertoire d'écriture des fichiers de log.
+enable_console_mode=Activer le mode Console
+enable_console_mode_popup=En plus du mode fichier, également imprimer des journaux à la console.
 
 optional_title=Paramètres facultatifs
 email_title=Paramètres du service de messagerie
@@ -117,6 +119,7 @@ sqlite3_not_available=Votre version publiée ne prend pas en charge SQLite3. Veu
 invalid_db_setting=Paramètres de base de données incorrects : %v
 invalid_repo_path=Chemin vers la racine du dépôt invalide : %v
 run_user_not_match=L'utilisateur d'exécution saisi n'est pas l'utilisateur d'exécution actuel : %s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=Le champ SMTP Provenant de n'est pas valide: %v
 save_config_failed=La sauvegarde de la configuration a échoué : %v
 invalid_admin_setting=Paramètres du compte administrateur invalides : %v
@@ -147,7 +150,7 @@ create_new_account=Créer un nouveau compte
 register_hepler_msg=Déjà enregistré ? Connectez-vous !
 social_register_hepler_msg=Déjà enregistré ? Associez-le !
 disable_register_prompt=Désolé, les enregistrements ont été désactivés. Veuillez contacter l'administrateur du site.
-disable_register_mail=Désolé, la confirmation par e-mail des enregistrements a été désactivée.
+disable_register_mail=Désolé, la confirmation par courriel des enregistrements a été désactivée.
 remember_me=Se souvenir de moi
 forgot_password=Mot de passe oublié
 forget_password=Mot de passe oublié ?
@@ -166,6 +169,14 @@ reset_password_helper=Cliquez ici pour réinitialiser votre mot de passe
 password_too_short=Le mot de passe doit contenir 6 caractères minimum.
 non_local_account=Les comptes non locaux ne peuvent pas changer leur mot de passe via Gogs.
 
+login_two_factor=Authentification en deux étapes
+login_two_factor_passcode=Mot de passe d’authentification
+login_two_factor_enter_recovery_code=Entrez un code de récupération en deux étapes
+login_two_factor_recovery=Récupération en deux étapes
+login_two_factor_recovery_code=Code de récupération
+login_two_factor_enter_passcode=Entrez un code d'authentification en deux étapes
+login_two_factor_invalid_recovery_code=Code de récupération a été utilisé ou n’est pas valide.
+
 [mail]
 activate_account=Veuillez activer votre compte
 activate_email=Veuillez vérifier votre adresse e-mail
@@ -201,6 +212,7 @@ Content=Contenu
 require_error=` ne peut pas être vide.`
 alpha_dash_error=` doivent être des caractères alpha, numériques ou tirets (-_) valides.`
 alpha_dash_dot_error=` doivent être des caractères alpha, numériques, tirets (-_) valides ou des points.`
+alpha_dash_dot_slash_error=doit contenir uniquement des caractères alphanumériques, des tirets (-), des points (.) ou des slash (/)
 size_error=` doit être à la taille de %s.`
 min_size_error=` %s caractères minimum `
 max_size_error=` %s caractères maximum `
@@ -252,11 +264,11 @@ profile=Profil
 password=Mot de Passe
 avatar=Avatar
 ssh_keys=Clés SSH
-social=Réseaux Sociaux
-applications=Applications
+security=Sécurité
+repos=Dépôts
 orgs=Organisations
+applications=Applications
 delete=Supprimer le compte
-uid=ID d'Utilisateur
 
 public_profile=Profil public
 profile_desc=Votre adresse e-mail est publique et sera utilisée pour les notifications relatives au compte, ainsi que pour toute opération Web effectuée via le site.
@@ -322,10 +334,30 @@ no_activity=Aucune activité récente
 key_state_desc=Cette clé a été utilisée durant les 7 derniers jours
 token_state_desc=Ce jeton a été utilisé durant les 7 derniers jours
 
-manage_social=Gérer les réseaux sociaux associés
-social_desc=Ceci est la liste des comptes de réseaux sociaux associés. Supprimez ceux que vous ne reconnaissez pas.
-unbind=Dissocier
-unbind_success=Compte de réseau social dissocié.
+two_factor=Authentification en deux étapes
+two_factor_status=État :
+two_factor_on=Activé
+two_factor_off=Désactivé
+two_factor_enable=Activer
+two_factor_disable=Désactiver
+two_factor_view_recovery_codes=Voir et sauvegarder <a href="%s%s">vos codes de récupération</a> dans un endroit sécurisé. Vois pouvez les utiliser comme mot de passe si vous perdez l'accès à l'application d'authentification.
+two_factor_http=Vous ne pouvez plus utiliser un nom d'utilisateur et mot de passe en clair pour les opérations en HTTP/HTTPS. Merci de créer et d'utiliser un <a href="%[1]s%[2]s">jeton d'accès personnel</a> comme moyen d'identification, par exemple <code>%[3]s</code>.
+two_factor_enable_title=Activer l'authentification en deux étapes
+two_factor_scan_qr=Veuillez utiliser votre application d’authentification pour numériser l’image :
+two_factor_or_enter_secret=Ou entrez la phrase secrète :
+two_factor_then_enter_passcode=Puis entrez le mot de passe :
+two_factor_verify=Vérifier
+two_factor_invalid_passcode=Le mot de passe que vous avez entré n'est pas valide, veuillez réessayer.
+two_factor_enable_error=L'activation de l'authentification en deux étapes a échoué : %v
+two_factor_enable_success=L'authentification en deux étapes a été bien été activée pour votre compte.
+two_factor_recovery_codes_title=Codes de secours pour l'authentification en deux étapes
+two_factor_recovery_codes_desc=Les codes de récupération sont utilisés quand vous perdez temporairement l'accès à votre application d'authentification. Chaque code de récupération ne peut être utilisé qu'une fois, <b>merci de les garder dans un endroit sécurisé</b>.
+two_factor_regenerate_recovery_codes=Regénérer les codes de récupération
+two_factor_regenerate_recovery_codes_error=La regénération des codes de récupération a échouée : %v
+two_factor_regenerate_recovery_codes_success=Les nouveaux codes de récupération ont été générés avec succès !
+two_factor_disable_title=Désactiver l'authentification à deux facteurs
+two_factor_disable_desc=Le niveau de sécurité de votre compte va baisser après avoir désactiver l'authentification à deux facteurs. Voulez-vous continuer ?
+two_factor_disable_success=L'authentification à deux facteurs a été désactivée avec succès !
 
 manage_access_token=Gérer les jetons d'accès personnels
 generate_new_token=Générer le nouveau jeton
@@ -343,6 +375,11 @@ orgs.none=Vous n'êtes membre d'aucune organisation.
 orgs.leave_title=Quitter une organisation
 orgs.leave_desc=Vous perdrez accès à tous les dépôts et équipes après que vous ayez quitté l'organisation. Voulez-vous continuer ?
 
+repos.leave=Quitter
+repos.leave_title=Quitter le dépôt
+repos.leave_desc=Vous perdrez l'accès à ce dépôt après l'avoir quitté. Voulez-vous continuer ?
+repos.leave_success=Vous avez quitté le dépôt '%s' avec succès !
+
 delete_account=Supprimer votre compte
 delete_prompt=Votre compte sera définitivement supprimé et cette opération est <strong>irréversible</strong> !
 confirm_delete_account=Confirmer la suppression
@@ -413,7 +450,7 @@ quick_guide=Introduction rapide
 clone_this_repo=Cloner ce dépôt
 create_new_repo_command=Créer un nouveau dépôt en ligne de commande
 push_exist_repo=Soumettre un dépôt existant par ligne de commande
-repo_is_empty=Ce dépôt est vide, veuillez revenir plus tard !
+bare_message=Ce dépôt n'a pas de contenu pour l'instant.
 
 files=Fichiers
 branch=Branche
@@ -426,6 +463,7 @@ pulls=Pull Requests
 labels=Étiquettes
 milestones=Jalons
 commits=Commits
+git_branches=Branches
 releases=Publications
 file_raw=Raw
 file_history=Historique
@@ -434,6 +472,13 @@ file_permalink=Lien permanent
 file_too_large=Ce fichier est trop gros pour être afficher
 video_not_supported_in_browser=Votre navigateur ne supporte pas la balise video HTML5.
 
+branches.overview=Résumé
+branches.active_branches=Branches Actives
+branches.stale_branches=Branches stagnantes
+branches.all=Toutes les Branches
+branches.updated_by=Mise à jour %[1]s par %[2]s
+branches.change_default_branch=Changer la Branche par Défaut
+
 editor.new_file=Nouveau fichier
 editor.upload_file=Téléverser un fichier
 editor.edit_file=Modifier fichier
@@ -641,9 +686,11 @@ settings.collaboration.write=Écrire
 settings.collaboration.read=Lire
 settings.collaboration.undefined=Indéfini
 settings.branches=Branches
+settings.branches_bare=Vous ne pouvez pas gérer les branches d'un dépôt vide. Merci de publier du contenu dans un premier temps.
 settings.default_branch=Branche par défaut
 settings.default_branch_desc=La branche par défaut est considérée comme la branche « originale » pour les commits de code, les requêtes de fusion et l'édition en ligne.
 settings.update=Actualiser
+settings.update_default_branch_unsupported=Le changement de branche par défaut n'est pas supporté par la version de Git sur ce serveur.
 settings.update_default_branch_success=La branche par défaut de ce dépôt a bien été mise à jour.
 settings.protected_branches=Branches protégées
 settings.protected_branches_desc=Protéger les branches du push forcé, de la suppression accidentelle et des publicateurs de code en liste blanche.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Interdire les push forcés et empêcher la sup
 settings.protect_require_pull_request=Exiger une requête de fusion plutôt qu'un push immédiat
 settings.protect_require_pull_request_desc=Activez cette option pour empêcher la publication immédiate vers cette branche. Les commits devront être publiés vers une autre branche (non protégée) et fusionnée dans cette branche avec une requête de fusion.
 settings.protect_whitelist_committers=Liste blanche de personnes pouvant publier sur cette branche
-settings.protect_whitelist_committers_desc=Ajouter des personnes ou des équipes à la liste blanche de publication directe vers cette branche.
+settings.protect_whitelist_committers_desc=Ajouter des personnes ou des équipes à la liste blanche des fusions directes de cette branche. Les utilisateurs dans cette liste blanche passeront outre la nécessité de valider leurs requêtes de fusion.
 settings.protect_whitelist_users=Utilisateurs qui peuvent pousser sur cette branche
 settings.protect_whitelist_search_users=Rechercher des utilisateurs
 settings.protect_whitelist_teams=Les équipes pour lesquelles les membres peuvent pousser sur cette branche
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Ce changement affectera comment les liens sont r
 settings.advanced_settings=Paramètres avancés
 settings.wiki_desc=Activer le wiki
 settings.use_internal_wiki=Utiliser le wiki interne
+settings.allow_public_wiki_desc=Autoriser l'accès public au wiki quand le dépôt est privé
 settings.use_external_wiki=Utiliser un wiki externe
 settings.external_wiki_url=URL Wiki externe
 settings.external_wiki_url_desc=Les visiteurs seront redirigés vers cette URL lorsqu'ils cliqueront sur l'onglet.
 settings.issues_desc=Activer le système de tickets
 settings.use_internal_issue_tracker=Utiliser le système simplifié de tickets interne
+settings.allow_public_issues_desc=Permettre l’accès du public aux tickets lorsque le dépôt est privé
 settings.use_external_issue_tracker=Utiliser un bug-tracker externe
 settings.external_tracker_url=Adresse de l'issue tracker externe
 settings.external_tracker_url_desc=Les visiteurs seront redirigés vers cette URL lorsqu'ils cliqueront sur l'onglet.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Le webhook a été supprimé avec succès !
 settings.webhook.test_delivery=Tester la version
 settings.webhook.test_delivery_desc=Envoyer un faux push pour tester la configuration des webhooks
 settings.webhook.test_delivery_success=Le webhook de test a été ajouté à la file d'attente de livraison. L'affichage dans l'historique de livraison peut prendre quelques secondes.
+settings.webhook.redelivery=Redistribution
+settings.webhook.redelivery_success=La tâche crochet '%s' a été réajoutée à la liste de livraison. La mise à jour de l'état de livraison dans l'historique peut prendre quelques secondes.
 settings.webhook.request=Requête
 settings.webhook.response=Réponse
 settings.webhook.headers=Entêtes 
@@ -749,16 +800,26 @@ settings.secret_desc=Le secret sera envoyé comme digest de payload SHA256 HMAC
 settings.slack_username=Nom d'utilisateur
 settings.slack_icon_url=URL de l'icône
 settings.slack_color=Couleur
-settings.event_desc=Quel évènement ce Webhook doit-il déclencher ?
+settings.event_desc=Quand ce webhook doit-il être déclenché ?
 settings.event_push_only=Uniquement les <code>push</code> (soumissions).
 settings.event_send_everything=J'ai besoin de <strong>tout</strong>.
 settings.event_choose=Permettez-moi de choisir ce dont j'ai besoin.
 settings.event_create=Créer
 settings.event_create_desc=Branche, ou Tag créé
-settings.event_pull_request=Pull Request
-settings.event_pull_request_desc=Pull request ouvert, fermé, rouvert, édité, attribuée, non attribuées, étiquette mise à jour, étiquette désactivée ou synchronisé.
+settings.event_delete=Supprimer
+settings.event_delete_desc=Branche ou tag supprimé
+settings.event_fork=Fork
+settings.event_fork_desc=Dépôt dédoublé
 settings.event_push=Push
 settings.event_push_desc=Git push vers un dépôt
+settings.event_issues=Tickets
+settings.event_issues_desc=Ticket ouvert, fermé, réouvert, modifié, assigné, non-assigné, étiquette mise à jour, étiquette nettoyée, jalonnée, ou déjalonnée.
+settings.event_issue_comment=Commentaire du ticket
+settings.event_issue_comment_desc=Commentaire du ticket créé, modifié, ou supprimé.
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Requête de fusion ouverte, fermée, réouverte, modifiée, assignée, non-assignée, étiquette mise à jour, étiquette nettoyée, jalonnée, déjalonnée, ou synchronisée.
+settings.event_release=Version publiée
+settings.event_release_desc=Version publiée dans un dépôt.
 settings.active=Actif
 settings.active_helper=Les détails seront délivrés lorsque ce Hook sera déclenché.
 settings.add_hook_success=Nouveau Webhook ajouté.
@@ -803,7 +864,6 @@ release.releases=Versions
 release.new_release=Nouvelle version
 release.draft=Brouillon
 release.prerelease=Pré-publication
-release.stable=Stable
 release.edit=Éditer
 release.ahead=<strong>%d</strong> commits jusqu'à %s depuis cette publication
 release.source_code=Code source
@@ -1019,6 +1079,7 @@ repos.private=Privé
 repos.watches=Suivi par
 repos.stars=Votes
 repos.issues=Tickets
+repos.size=Taille
 
 auths.auth_manage_panel=Panel d'administration des authentifications
 auths.new=Ajouter une nouvelle source d'authentification
@@ -1039,9 +1100,14 @@ auths.user_base=Utilisateur Search Base
 auths.user_dn=Utilisateur DN
 auths.attribute_username=Attribut nom d'utilisateur
 auths.attribute_username_placeholder=Laisser vide pour utiliser la valeur du formulaire d'authentification comme nom d'utilisateur.
-auths.attribute_name=Attribut du prénom
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Attribut du nom de famille
 auths.attribute_mail=Attribut de l'e-mail
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Aller chercher les attributs dans le contexte de liaison DN
 auths.filter=Filtre utilisateur
 auths.admin_filter=Filtre administrateur
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Délai imparti pour l'opération "Pull"
 config.git_gc_timeout=Délai imparti pour l'opération "GC"
 
 config.log_config=Configuration du Journal
-config.log_mode=Mode du journal
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Tâches Cron
 monitor.name=Nom
@@ -1205,19 +1272,23 @@ notices.delete_success=Notifications système supprimées avec succès.
 
 [action]
 create_repo=a créé le dépôt <a href="%s">%s</a>
+fork_repo=a créé sa branche du dépôt vers <a href="%s">%s</a>
 rename_repo=a rebaptisé le dépôt de <code>%[1]s</code> vers <a href="%[2]s">%[3]s</a>
 commit_repo=a commité dans <a href="%[1]s/src/%[2]s">%[3]s</a> sur <a href="%[1]s">%[4]s</a>
+compare_commits=Comparer ces %d commits
+transfer_repo=a transféré le dépôt <code>%s</code> à <a href="%s">%s</a>
 create_issue=`a ouvert un problème <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`tickets clos <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`tickets ré-ouverts <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`a commenté le problème <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`pull request créée le <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`pull request fermé <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`pull request ré-ouverte <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`a commenté le problème <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`pull request fusionné le <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=a transféré le dépôt <code>%s</code> à <a href="%s">%s</a>
+create_branch=nouvelle branche créée <a href="%[1]s/src/%[2]s">%[3]s</a> sur <a href="%[1]s">%[4]s</a>
+delete_branch=branche supprimée <code>%[2]s</code> sur <a href="%[1]s">%[3]s</a>
 push_tag=a soumis le tag <a href="%s/src/%s">%[2]s</a> sur <a href="%[1]s">%[3]s</a>
-compare_commits=Comparer ces %d commits
+delete_tag=étiquette supprimée <code>%[2]s</code> sur <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=il y a

conf/locale/locale_gl-ES.ini

@@ -82,6 +82,8 @@ app_url=URL da aplicación
 app_url_helper=Isto afecta ás URLs para clonar por HTTP/HTTPS e a algúns correos electrónicos.
 log_root_path=Ruta do rexistro
 log_root_path_helper=Directorio onde almacenar os rexistros.
+enable_console_mode=Enable Console Mode
+enable_console_mode_popup=In addition to file mode, also print logs to console.
 
 optional_title=Configuración opcional
 email_title=Configuración do servizo de correo
@@ -117,6 +119,7 @@ sqlite3_not_available=A túa versión non soporta SQLite3, por favor, descarga o
 invalid_db_setting=A configuración da base de datos non é correcta: %v
 invalid_repo_path=A ruta da raíz do repositorio é inválida: %v
 run_user_not_match=A persoa usuaria que está executando a aplicación non é a persoa usuaria actual: %s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=O campo From do SMTP non é valido: %v
 save_config_failed=Erro ao gardar a configuración: %v
 invalid_admin_setting=A configuración da conta de administración é inválida: %v
@@ -166,6 +169,14 @@ reset_password_helper=Prema aquí para restablecer o seu contrasinal
 password_too_short=A lonxitude do contrasinal non pode ser menor de 6.
 non_local_account=Contas que non son locais non poden cambiar os contrasinais a través de Gogs.
 
+login_two_factor=Two-factor Authentication
+login_two_factor_passcode=Authentication Passcode
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Recovery Code
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+
 [mail]
 activate_account=Por favor, activa a túa conta
 activate_email=Verifica o teu correo electrónico
@@ -201,6 +212,7 @@ Content=Contido
 require_error=` non pode estar baleiro.`
 alpha_dash_error=` os caracteres deben ser alfanuméricos ou dash(-_).`
 alpha_dash_dot_error=` debe ser un carácter alfanumérivo válido, un guión alto ou baixo (-_) ou un signo de puntuación.`
+alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
 size_error=` debe ser de tamaño %s.`
 min_size_error=` debe conter polo menos %s caracteres.`
 max_size_error=` debe conter como máximo %s caracteres.`
@@ -252,11 +264,11 @@ profile=Perfil
 password=Contrasinal
 avatar=Avatar
 ssh_keys=Claves SSH
-social=Redes sociais
-applications=Aplicacións
+security=Security
+repos=Repositories
 orgs=Organizacións
+applications=Aplicacións
 delete=Eliminar conta
-uid=UUID
 
 public_profile=Perfil público
 profile_desc=O teu correo electrónico é público e será usado para todas as notificacións relacionadas con calquera conta e calquera operación feita a través da web.
@@ -322,10 +334,30 @@ no_activity=Non hai actividade recente
 key_state_desc=Esta clave foi usada nos últimos 7 días
 token_state_desc=Token usado nos últimos 7 días
 
-manage_social=Xestionar redes sociais asociadas
-social_desc=Esta é unha lista das redes sociais asociadas. Elimina calquera vínculo que non recoñezas.
-unbind=Desvincular
-unbind_success=A rede social foi desvinculada.
+two_factor=Two-factor Authentication
+two_factor_status=Status:
+two_factor_on=On
+two_factor_off=Off
+two_factor_enable=Enable
+two_factor_disable=Disable
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=Xestionar os tokens de acceso persoais
 generate_new_token=Xerar novo token
@@ -343,6 +375,11 @@ orgs.none=Non es membro de nengunha organización.
 orgs.leave_title=Deixar unha organización
 orgs.leave_desc=Deixarás de ter aceso ao tódolos repositorios e equipos despois de deixar a organización. Desexas abandonala?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=Elimina a túa conta
 delete_prompt=A operación eliminará a túa conta de forma permanente e <strong>NON</strong> se pode desfacer!
 confirm_delete_account=Confirmar eliminación
@@ -413,7 +450,7 @@ quick_guide=Guía rápida
 clone_this_repo=Clonar este repositorio
 create_new_repo_command=Crear un novo repositorio desde liña de comandos
 push_exist_repo=Facer Push dun repositorio existente desde liña de comandos
-repo_is_empty=Este repositorio está baleiro, por favor, volva máis tarde!
+bare_message=This repository does not have any content yet.
 
 files=Ficheiros
 branch=Rama
@@ -426,6 +463,7 @@ pulls=Pull Requests
 labels=Etiquetas
 milestones=Fitos
 commits=Achegas
+git_branches=Branches
 releases=Lanzamentos
 file_raw=Raw
 file_history=Histórico
@@ -434,6 +472,13 @@ file_permalink=Permalink
 file_too_large=Este arquivo é demasiado grande para ser mostrado
 video_not_supported_in_browser=O teu navegador non soporte a etiqueta video de HTML5.
 
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=All Branches
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=Novo arquivo
 editor.upload_file=Subir arquivo
 editor.edit_file=Editar arquivo
@@ -641,9 +686,11 @@ settings.collaboration.write=Escritura
 settings.collaboration.read=Lectura
 settings.collaboration.undefined=Indefinido
 settings.branches=Branches
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch=Default Branch
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=Update
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
 settings.protected_branches=Protected Branches
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Disable force pushes and prevent from deletion
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
 settings.protect_whitelist_search_users=Search users
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Este cambio afectaralles ás ligazóns ao reposi
 settings.advanced_settings=Axustes avanzados
 settings.wiki_desc=Activar sistema de wiki
 settings.use_internal_wiki=Usar wiki integrada
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Usar Wiki externa
 settings.external_wiki_url=URL externa da Wiki
 settings.external_wiki_url_desc=Os visitantes serán redireccionados á URL cando preman na barra.
 settings.issues_desc=Habilitar rastrexo de incidencias
 settings.use_internal_issue_tracker=Usar rastrexo de incidencias lixeiro incluído
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Usar tracker externo de incidencias
 settings.external_tracker_url=URL de seguimento de problemas externos
 settings.external_tracker_url_desc=Os visitantes serán redireccionados á URL cando preman na barra.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webhook eliminado con éxito!
 settings.webhook.test_delivery=Test de entrega
 settings.webhook.test_delivery_desc=Enviar un falso evento Push de entrega para probar os teus axustes de webhook
 settings.webhook.test_delivery_success=Probar que os webhook foron engadidos á cola de entrega. Isto pode levar algúns segundos antes de aparecer no historial de entregas.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=Petición
 settings.webhook.response=Resposta
 settings.webhook.headers=Encabezado
@@ -755,10 +806,20 @@ settings.event_send_everything=Necesito <strong>todo</strong>.
 settings.event_choose=Déixeme elixir o que necesito.
 settings.event_create=Crear
 settings.event_create_desc=Rama ou etiqueta creada
-settings.event_pull_request=Pull Request
-settings.event_pull_request_desc=Pull request aberto, cerrado, reaberto, editado, asignado, desasignado, etiqueta actualizada, etiqueta borrada, ou sincronizado.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=Push
 settings.event_push_desc=Git push a un repositorio
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Release
+settings.event_release_desc=Release published in a repository.
 settings.active=Activo
 settings.active_helper=Enviaremos detalles do evento cando este hook se dispare.
 settings.add_hook_success=Engadiuse un novo webhook.
@@ -803,7 +864,6 @@ release.releases=Lanzamentos
 release.new_release=Novo lanzamento
 release.draft=Borrador=Borrador
 release.prerelease=Pre-Release=Pre-Lanzamento
-release.stable=Estable=Estable
 release.edit=editar=editar
 release.ahead=<strong>%d</strong> achegas en %s desde este release
 release.source_code=Código fonte
@@ -1019,6 +1079,7 @@ repos.private=Privado
 repos.watches=Vixilantes
 repos.stars=Estrelas
 repos.issues=Incidencias
+repos.size=Size
 
 auths.auth_manage_panel=Panel de administración de autenticación
 auths.new=Engadir nova orixe
@@ -1039,9 +1100,14 @@ auths.user_base=Base de busca de usuarios
 auths.user_dn=DN de persoas usuarias
 auths.attribute_username=Atributo de nome de usuario
 auths.attribute_username_placeholder=Deixar baleiro para usar o campo de inicio de sesión como nome de usuario.
-auths.attribute_name=Atributo nome
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Atributo apelido
 auths.attribute_mail=Atributo correo electrónico
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Buscar atributos no contexto do Bind DN
 auths.filter=Filtro de usuario
 auths.admin_filter=Filtro de aministrador
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Tempo de espera de operación de pull
 config.git_gc_timeout=Tempo de espera de operación de GC
 
 config.log_config=Configuración do log
-config.log_mode=Modo do log
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Tarefas de cron
 monitor.name=Nome
@@ -1205,19 +1272,23 @@ notices.delete_success=As notificacións do sistema foron eliminadas satisfactor
 
 [action]
 create_repo=creou o repositorio <a href="%s">%s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=repositorio renomeado de <code>%[1]s</code> a <a href="%[2]s">%[3]s</a>
 commit_repo=fixo push a <a href="%[1]s/src/%[2]s">%[3]s</a> en <a href="%[1]s">%[4]s</a>
+compare_commits=Ver comparación destas %d achegas
+transfer_repo=transferiu o repositorio <code>%s</code> a <a href="%s">%s</a>
 create_issue=`incidencia aberta <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`cerrou a incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`reabriu a incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`comentou na incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`creado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`cerrou o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`reabriu o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`comentou na incidencia <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`fusionado pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=transferiu o repositorio <code>%s</code> a <a href="%s">%s</a>
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=fixo push do tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>
-compare_commits=Ver comparación destas %d achegas
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=hai

conf/locale/locale_it-IT.ini

@@ -48,7 +48,7 @@ cancel=Annulla
 install=Installazione
 title=Passi d'installazione per il primo avvio
 docker_helper=Se stai utilizzando Gogs su Docker, per favore leggi le <a target="_blank" href="%s">Linee guida</a> con attenzione prima di cambiare qualcosa su questa pagina!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs richiede MySQL, PostgreSQL, SQLite3, MSSQL o TiDB.
 db_title=Impostazioni Database
 db_type=Tipo di database
 host=Host
@@ -58,8 +58,8 @@ db_name=Nome del database
 db_helper=Utilizza il motore INNODB con codifica utf8_general_ci per MySQL.
 ssl_mode=Modalità SSL
 path=Percorso
-sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=Il percorso del file di database di SQLite3. <br>Si prega di utilizzare il percorso assoluto quando si avvia come servizio.
+err_empty_db_path=Il percorso del database SQLite3 non può essere vuoto.
 no_admin_and_disable_registration=Non puoi disabilitare la registrazione senza aver creato un amministratore.
 err_empty_admin_password=La password dell'amministratore non puo' essere vuota.
 
@@ -74,14 +74,16 @@ domain=Dominio
 domain_helper=Questo influisce sugli URL per il clonaggio via SSH.
 ssh_port=Porta SSH
 ssh_port_helper=Numero di porta utilizzato dal server SSH, lasciare vuoto per disabilitare l'integrazione SSH.
-use_builtin_ssh_server=Use Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server=Usa il server SSH integrato
+use_builtin_ssh_server_popup=Avvia il server SSH integrato per le operazioni Git per distinguerle dal demone SSH di sistema.
 http_port=Porta HTTP
 http_port_helper=Porta di ascolto dell'applicazione.
 app_url=URL Applicazione
 app_url_helper=Questo influisce sugli URL per il clonaggio via HTTP/HTTPS e da qualche parte nella posta elettronica.
 log_root_path=Percorso dei log
 log_root_path_helper=Directory in cui scrivere i file di log.
+enable_console_mode=Abilita modalità Terminale
+enable_console_mode_popup=In aggiunta alla modalità file, invia i log anche al terminale.
 
 optional_title=Impostazioni Facoltative
 email_title=Impostazioni E-mail
@@ -117,6 +119,7 @@ sqlite3_not_available=Questa versione non supporta SQLite3, si prega di scaricar
 invalid_db_setting=La configurazione del database non è corretta: %v
 invalid_repo_path=Percorso root del repository invalido: %v
 run_user_not_match=Run user non è l'utente corrente:  %s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=Campo SMTP From non valido: %v
 save_config_failed=Fallito il salvataggio della configurazione: %v
 invalid_admin_setting=Impostazioni account Admin non valide: %v
@@ -166,6 +169,14 @@ reset_password_helper=Clicca qui per reimpostare la password
 password_too_short=La lunghezza della password non può essere meno 6 caratteri.
 non_local_account=Gli account non locali non possono modificare le password tramite Gogs.
 
+login_two_factor=Two-factor Authentication
+login_two_factor_passcode=Authentication Passcode
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Recovery Code
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+
 [mail]
 activate_account=Per favore attiva il tuo account
 activate_email=Verifica il tuo indirizzo e-mail
@@ -201,6 +212,7 @@ Content=Contenuto
 require_error=` non può essere vuoto.`
 alpha_dash_error=` ammessi solo caratteri alfanumerici o trattini(-_).`
 alpha_dash_dot_error=` ammessi solo caratteri alfanumerici o trattini(-_) o punti.`
+alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
 size_error='deve essere %s.'
 min_size_error=` deve contenere almeno %s caratteri.`
 max_size_error=` deve contenere massimo %s caratteri.`
@@ -252,11 +264,11 @@ profile=Profilo
 password=Password
 avatar=Avatar
 ssh_keys=Chiavi SSH
-social=Account Sociali
-applications=Applicazioni
+security=Security
+repos=Repositories
 orgs=Organizzazioni
+applications=Applicazioni
 delete=Elimina account
-uid=Uid
 
 public_profile=Profilo pubblico
 profile_desc=Il tuo indirizzo e-mail è pubblico e sarà usato per ogni notifica inerente al tuo account, e per qualsiasi operazione web effettuata attraverso il sito.
@@ -322,10 +334,30 @@ no_activity=Nessuna attività recente
 key_state_desc=Hai utilizzato questa chiave negli ultimi 7 giorni
 token_state_desc=Questo token e' satato utilizzato negli ultimi 7 giorni
 
-manage_social=Gestisci gli Account Sociali Associati
-social_desc=Questa è un elenco degli account sociali associati. Rimuovere qualsiasi account che non si riconosce.
-unbind=Disassocia
-unbind_success=Account sociale disassociato.
+two_factor=Two-factor Authentication
+two_factor_status=Status:
+two_factor_on=On
+two_factor_off=Off
+two_factor_enable=Enable
+two_factor_disable=Disable
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=Gestisci i Token di Accesso Personale
 generate_new_token=Genera Nuovo Token
@@ -343,6 +375,11 @@ orgs.none=Non sei membro di alcuna organizzazione.
 orgs.leave_title=Abbandona una organizzazione
 orgs.leave_desc=Abbandonando l'organizzazione perderai l'accesso a tutti i repository e i gruppi. Confermi?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=Elimina Account
 delete_prompt=L'operazione eliminerà permanentemente l'account e <strong>NON POTRÀ</strong> essere annullata!
 confirm_delete_account=Conferma Eliminazione
@@ -413,7 +450,7 @@ quick_guide=Guida rapida
 clone_this_repo=Clona questo repository
 create_new_repo_command=Crea nuovo repository da riga di comando
 push_exist_repo=Push un repo esistente dalla riga di comando
-repo_is_empty=Questo repository è vuoto, si prega di tornare più tardi!
+bare_message=This repository does not have any content yet.
 
 files=File
 branch=Ramo (Branch)
@@ -426,6 +463,7 @@ pulls=Pull Requests
 labels=Etichette
 milestones=Traguardi
 commits=Commit
+git_branches=Branches
 releases=Rilasci
 file_raw=Originale
 file_history=Cronologia
@@ -434,6 +472,13 @@ file_permalink=Permalink
 file_too_large=Questo file è troppo grande per essere mostrato
 video_not_supported_in_browser=Il tuo browser non supporta i tag "video" di HTML5.
 
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=All Branches
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=Nuovo file
 editor.upload_file=Carica File
 editor.edit_file=Modifica file
@@ -473,7 +518,7 @@ editor.add_subdir=Aggiungi sottocartella...
 editor.unable_to_upload_files=È fallito il caricamento dei file su '%s': %v
 editor.upload_files_to_dir=Carica file su '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=Cronologia Commit
 commits.commits=Commits
 commits.search=Ricerca una versione
 commits.find=Cerca
@@ -641,9 +686,11 @@ settings.collaboration.write=Write
 settings.collaboration.read=Read
 settings.collaboration.undefined=Undefined
 settings.branches=Branches
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch=Default Branch
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=Update
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
 settings.protected_branches=Protected Branches
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Disable force pushes and prevent from deletion
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
 settings.protect_whitelist_search_users=Search users
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Questa modifica influirà i link al repository.
 settings.advanced_settings=Opzioni avanzate
 settings.wiki_desc=Enable wiki system
 settings.use_internal_wiki=Use builtin wiki
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Usa Wiki esterno
 settings.external_wiki_url=URL Wiki esterno
 settings.external_wiki_url_desc=I visitatori verranno reindirizzati all'URL quando cliccano sulla scheda.
 settings.issues_desc=Enable issue tracker
 settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Utilizza gestore di problemi esterno
 settings.external_tracker_url=External Issue Tracker URL
 settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Il Webhook è stato eliminato con successo!
 settings.webhook.test_delivery=Test di consegna
 settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
 settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may take few seconds before it shows up in the delivery history.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=Richiesta
 settings.webhook.response=Risposta
 settings.webhook.headers=Headers
@@ -755,10 +806,20 @@ settings.event_send_everything=Ho bisogno di <strong>tutto</strong>.
 settings.event_choose=Lasciami scegliere ciò di cui ho bisogno.
 settings.event_create=Crea
 settings.event_create_desc=Branch, o tag creato
-settings.event_pull_request=Pull request
-settings.event_pull_request_desc=Pull request aperta, chiusa, riaperta, modificata, assegnata, riassegnata, etichettata o sincronizzata.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=Push
 settings.event_push_desc=Git push in un repository
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=Pull request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Release
+settings.event_release_desc=Release published in a repository.
 settings.active=Attivo
 settings.active_helper=Anche i dettagli riguardanti l'evento che ha innescato l'hook saranno inviati.
 settings.add_hook_success=Il nuovo webhook è stato aggiunto.
@@ -803,7 +864,6 @@ release.releases=Rilasci
 release.new_release=Nuovo Rilascio
 release.draft=Bozza
 release.prerelease=Pre-Rilascio
-release.stable=Stabile
 release.edit=modifica
 release.ahead=<strong>%d</strong> commits da %s da questo rilascio
 release.source_code=Codice Sorgente
@@ -1019,6 +1079,7 @@ repos.private=Privati
 repos.watches=Segue
 repos.stars=Voti
 repos.issues=Problemi
+repos.size=Size
 
 auths.auth_manage_panel=Pannello di configurazione dei meccanismi di autenticazione
 auths.new=Aggiungi Nuova Origine
@@ -1039,9 +1100,14 @@ auths.user_base=User Search Base
 auths.user_dn=DN dell'utente
 auths.attribute_username=Attributo username
 auths.attribute_username_placeholder=Se vuoto, verrà usato il nome di login dell'accesso.
-auths.attribute_name=Attributo Nome
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Attributo Cognome
 auths.attribute_mail=Attributo Email
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=Fitro utente
 auths.admin_filter=Filtro Amministratore
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Timeout per il pull
 config.git_gc_timeout=Timeout per le operazioni di GC
 
 config.log_config=Configurazione Log
-config.log_mode=Modalità Log
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Incarici di cron
 monitor.name=Nome
@@ -1205,19 +1272,23 @@ notices.delete_success=Gli avvisi di sistema sono stati successivamente eliminat
 
 [action]
 create_repo=ha creato il repository <a href="%s">%s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=repository rinominato da <code>%[1]s</code> a <a href="%[2]s">[3]s</a>
 commit_repo=ha pushato nel <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a>
+compare_commits=Visualizza comparazione tra questi %d commit
+transfer_repo=ha trasferito il repository <code>%s</code> a <a href="%s">%s</a>
 create_issue=`ha aperto il problema <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`ha commentato il problema <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`creata pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`ha commentato il problema <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=ha trasferito il repository <code>%s</code> a <a href="%s">%s</a>
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=ha pushato il tag <a href="%s/src/%s">%[2]s</a> a <a href="%[1]s">%[3]s</a>
-compare_commits=Visualizza comparazione tra questi %d commit
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=fa

conf/locale/locale_ja-JP.ini

@@ -18,7 +18,7 @@ user_profile_and_more=ユーザープロファイルなど
 signed_in_as=サインイン済み
 
 username=ユーザ名
-email=E-mail
+email=メールアドレス
 password=パスワード
 re_type=再入力
 captcha=CAPTCHA
@@ -48,7 +48,7 @@ cancel=キャンセル
 install=インストール
 title=インストールをする前に必要な準備をしましょう
 docker_helper=DockerでGogsを稼動する場合は、このページに変更を加える前に、 <a target="_blank" href="%s">ガイドライン</a>をよく読んでください！
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs は、MySQL、PostgreSQL、SQLite3 または TiDB が必要です。
 db_title=データベース設定
 db_type=データベースの種類
 host=ホスト
@@ -58,8 +58,8 @@ db_name=データベース名
 db_helper=MySQLではエンジンがINNODB、文字セットがutf8_general_ciである必要があります。
 ssl_mode=SSL モード
 path=パス
-sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=SQLite3データベースのファイルパスです。<br>serviceとして起動する場合は、絶対パスを使用してください。
+err_empty_db_path=SQLite3 データベースのPATHを空にすることはできません。
 no_admin_and_disable_registration=管理者アカウントを作成せずに登録を無効にすることはできません。
 err_empty_admin_password=管理者パスワードは空白にできません。
 
@@ -74,14 +74,16 @@ domain=ドメイン
 domain_helper=これはSSH用クローンURLに影響します。
 ssh_port=SSH ポート
 ssh_port_helper=SSHサーバーを使用する場合はポート番号を入力してください。 空白にした場合は無効化されます。
-use_builtin_ssh_server=Use Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server=内蔵SSHサーバーを使用
+use_builtin_ssh_server_popup=システムのSSHデーモンとは別に、Git操作用の内蔵SSHサーバーを起動します。
 http_port=HTTP ポート
 http_port_helper=アプリケーションが待ち受けするポート番号。
 app_url=アプリケーションの URL
 app_url_helper=この設定は、HTTP / HTTPSのクローンURLおよび、一部のメールボックスへのリンクに影響を与えます。
 log_root_path=ログのパス
 log_root_path_helper=ログファイルを書き込むディレクトリ。
+enable_console_mode=コンソールモードの有効化
+enable_console_mode_popup=In addition to file mode, also print logs to console.
 
 optional_title=オプション設定
 email_title=メールサービス設定
@@ -117,7 +119,8 @@ sqlite3_not_available=このリリース バージョンは SQLite3 をサポー
 invalid_db_setting=データベースの設定が正しくありません: %v
 invalid_repo_path=リポジトリのルート パスが無効です: %v
 run_user_not_match=実行ユーザーは、現在のユーザーではない: %s-> %s
-invalid_smtp_from=SMTP From field is not valid: %v
+smtp_host_missing_port=SMTP Host is missing port in address.
+invalid_smtp_from=SMTP From フィールドの値が有効ではありません: %v
 save_config_failed=構成の保存に失敗した: %v
 invalid_admin_setting=管理者アカウントの設定が無効です: %v
 install_success=ようこそ！我々はあなたが Gogs を選んでくれて嬉しいです！楽しみましょう！
@@ -166,6 +169,14 @@ reset_password_helper=パスワードをリセットするにはここをクリ
 password_too_short=６文字未満のパスワードは設定できません。
 non_local_account=Non-local accounts cannot change passwords through Gogs.
 
+login_two_factor=2段階認証
+login_two_factor_passcode=認証用パスコード
+login_two_factor_enter_recovery_code=2段階認証用リカバリーコードを入力
+login_two_factor_recovery=2段階認証のリカバリー
+login_two_factor_recovery_code=リカバリーコード
+login_two_factor_enter_passcode=2段階認証用パスコードを入力
+login_two_factor_invalid_recovery_code=このリカバリーコードは使用済みか、正しくありません。
+
 [mail]
 activate_account=あなたのアカウントを有効にしてください。
 activate_email=電子メール アドレスを確認します。
@@ -192,19 +203,20 @@ AuthName=承認名
 AdminEmail=管理者の電子メール
 
 NewBranchName=新しいブランチ名
-CommitSummary=Commit summary
-CommitMessage=Commit message
-CommitChoice=Commit choice
-TreeName=File path
+CommitSummary=コミットの概要
+CommitMessage=コミットメッセージ
+CommitChoice=コミットを選択
+TreeName=ファイルのパス
 Content=コンテンツ
 
 require_error=空にできません
 alpha_dash_error=アルファベット、数字、ハイフン"-"、アンダースコア"_"のいずれかの必要があります
 alpha_dash_dot_error=' アルファベット、数値、ダッシュ(-)、アンダースコア(_) 、ドット(.)のいずれかを入力する必要があります。 '
+alpha_dash_dot_slash_error=` アルファベット、数字、ハイフン(-)、アンダースコア(_)、ドット(.)、スラッシュ(/) のみ利用できます。`
 size_error=`サイズは %s である必要があります`
 min_size_error=' 少なくとも %s 文字の必要があります '
 max_size_error=' %s 文字以下の必要があります '
-email_error=' は有効な電子メール アドレスではない '
+email_error=' は有効なメールアドレスではありません '
 url_error=' は有効な URL はありません。 '
 include_error=' 文字列 '%s' を含める必要があります。 '
 unknown_error=不明なエラー:
@@ -252,11 +264,11 @@ profile=プロフィール
 password=パスワード
 avatar=アバター
 ssh_keys=SSH キー
-social=SNSアカウント
-applications=アプリケーション
+security=セキュリティ
+repos=リポジトリ一覧
 orgs=組織
+applications=アプリケーション
 delete=アカウントを削除
-uid=Uid
 
 public_profile=パブリック プロフィール
 profile_desc=あなたのメールアドレスは公開され、任意のアカウント関連の通知に使用されます。また、Webベースの操作はサイトを介して行います。
@@ -264,7 +276,7 @@ password_username_disabled=ローカルユーザ以外はユーザ名を変更
 full_name=フルネーム
 website=WEBサイト
 location=ロケーション
-update_profile=プロファイル更新
+update_profile=プロフィールを更新
 update_profile_success=あなたのプロフィールが更新されました。
 change_username=ユーザー名が変更されました
 change_username_prompt=この変更はリンクをアカウントに関連付ける方法に影響します。
@@ -288,8 +300,8 @@ password_incorrect=現在のパスワードが正しくありません。
 change_password_success=パスワードが正常に変更されました。今すぐ新しいパスワード経由でサインインすることができます。
 password_change_disabled=ローカルユーザ以外はパスワードを変更できません。
 
-emails=E-mail アドレス
-manage_emails=E-mail アドレスを管理
+emails=メールアドレス
+manage_emails=メールアドレスを管理
 email_desc=あなたのプライマリメールアドレスは、通知やその他の操作に使用されます。
 primary=プライマリー
 primary_email=プライマリに設定
@@ -297,15 +309,15 @@ delete_email=削除
 email_deletion=電子メールの削除
 email_deletion_desc=この電子メール アドレスを削除すると、あなたのアカウントの関連情報も削除されます。続行しますか。
 email_deletion_success=電子メールが正常に削除されました。
-add_new_email=新しいe-mailアドレスを追加
+add_new_email=新しいメールアドレスを追加
 add_email=電子メールを追加します。
 add_email_confirmation_sent='%s' に新しい確認メールを送信しました、次の %d 時間以内に受信トレイを確認し、確認プロセスを完了してください。
-add_email_success=新しいe-mail アドレスが追加されました。
+add_email_success=新しいメールアドレスが追加されました。
 
 manage_ssh_keys=SSH キーを管理
 add_key=キーを追加
 ssh_desc=これはあなたのアカウントに関連付けられている SSH キーの一覧です。あなたが認識していないキーを削除します。
-ssh_helper=<strong>ヘルプが必要ですか？</strong> 我々のガイドをご覧ください。 <a href="%s"> SSH キーを生成</a>  <a href="%s"> SSH の一般的な問題</a>
+ssh_helper=<strong>やり方がわかりませんか？</strong> GitHubのガイドをご覧ください。 <a href="%s"> SSHキーの作成</a> <a href="%s">SSH使用に際してよくある問題</a>
 add_new_key=SSH キーを追加
 ssh_key_been_used=公開鍵は使用されています。
 ssh_key_name_used=同じ名前の公開鍵は既に存在しています。
@@ -322,10 +334,30 @@ no_activity=最近の活動なし
 key_state_desc=この鍵は７日間以内に使われています。
 token_state_desc=この鍵は７日間以内に使われています。
 
-manage_social=関連付けられているSNSアカウントを管理
-social_desc=これは関連付けられたソーシャルアカウントのリストです。あなたが認識していない結び付けを削除します。
-unbind=バインド解除
-unbind_success=SNSアカウントがバインドされていない。
+two_factor=2段階認証
+two_factor_status=状態：
+two_factor_on=ON
+two_factor_off=OFF
+two_factor_enable=有効化
+two_factor_disable=無効にする
+two_factor_view_recovery_codes=<a href="%s%s">リカバリーコード</a>を確認し、安全な場所に保管してください。認証済みアプリケーションにアクセスできなくなったとき、パスコードとしてそれを使用できます。
+two_factor_http=HTTP/HTTPS 通信において、平文のユーザー名・パスワードは使用できなくなりました。個人証明には<a href="%[1]s%[2]s">パーソナル・アクセストークン</a>を作成し利用してください。例：<code>%[3]s</code>
+two_factor_enable_title=2段階認証を有効にする
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=パスコードを入力してください:
+two_factor_verify=Verify
+two_factor_invalid_passcode=入力されたパスコードは使用できません。もう一度お試しください。
+two_factor_enable_error=2段階認証の有効化に失敗しました: %v
+two_factor_enable_success=2段階認証があなたのアカウントで有効化されました！
+two_factor_recovery_codes_title=2段階認証のリカバリーコード
+two_factor_recovery_codes_desc=リカバリーコードは、認証済みアプリケーションへのアクセスを一時的に失ったときに使用します。リカバリーコードはいずれも一度だけ使用できます。<b>必ず安全な場所に保管してください。</b>
+two_factor_regenerate_recovery_codes=リカバリーコードの再発行
+two_factor_regenerate_recovery_codes_error=リカバリーコードの再発行に失敗しました: %v
+two_factor_regenerate_recovery_codes_success=新しいリカバリーコードが正常に作成されました！
+two_factor_disable_title=2段階認証を無効にする
+two_factor_disable_desc=2段階認証を無効にすると、あなたのアカウントのセキュリティは低下します。よろしいですか？
+two_factor_disable_success=2段階認証があなたのアカウントで無効になりました！
 
 manage_access_token=パーソナルアクセス トークンを管理
 generate_new_token=新しいトークンを生成
@@ -339,15 +371,20 @@ access_token_deletion=パーソナルアクセストークンの削除
 access_token_deletion_desc=パーソナルアクセストークンを削除すると、関連するアプリケーションのすべてのアクセスが削除されます。続行しますか？
 delete_token_success=パーソナルアクセストークンは正常に削除されました！同時にあなたのアプリケーションを更新することを忘れないでください。
 
-orgs.none=You are not a member of any organizations.
-orgs.leave_title=Leave an organization
+orgs.none=あなたはどの組織のメンバーでもありません。
+orgs.leave_title=Leave organization
 orgs.leave_desc=You will lose access to all repositories and teams after you left the organization. Do you want to continue?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=アカウントを削除
 delete_prompt=この操作をするとアカウントが完全に削除され、<strong>二度と元に戻すことができなくなります</strong> ！
 confirm_delete_account=削除の確認
 delete_account_title=アカウントの削除
-delete_account_desc=このアカウントは永久に削除しようとしている、継続しますか?
+delete_account_desc=このアカウントは完全に削除されます。 本当によろしいですか？
 
 [repo]
 owner=オーナー
@@ -381,7 +418,7 @@ watchers=ウォッチャー
 stargazers=Stargazers
 forks=フォーク
 
-form.reach_limit_of_creation=The owner has reached maximum creation limit of %d repositories.
+form.reach_limit_of_creation=リポジトリの最大作成数 %d にすでに達しています。
 form.name_reserved=リポジトリ名 '%s' は使用されています。
 form.name_pattern_not_allowed=リポジトリ名に '%s' は使用できません。
 
@@ -390,7 +427,7 @@ migrate_type=マイグレーションの種類
 migrate_type_helper=このリポジトリは、<span class="text blue"> ミラー</span> になります
 migrate_repo=リポジトリを移行
 migrate.clone_address=クローンアドレス
-migrate.clone_address_desc=This can be a HTTP/HTTPS/GIT URL.
+migrate.clone_address_desc=HTTP/HTTPS/GIT URLを設定できます。
 migrate.clone_address_desc_import_local=You're also allowed to migrate a repository by local server path.
 migrate.permission_denied=ローカル リポジトリをインポートすることはできません。
 migrate.invalid_local_path=ローカルパスが無効です。存在しないかディレクトリではありません。
@@ -413,9 +450,9 @@ quick_guide=クイック ガイド
 clone_this_repo=このリポジトリのクローンを作成
 create_new_repo_command=コマンドラインで新しいリポジトリを作成します。
 push_exist_repo=コマンド ・ ラインから既存のリポジトリをプッシュ
-repo_is_empty=このリポジトリは空です、後で戻って来て下さい!
+bare_message=This repository does not have any content yet.
 
-files=Files
+files=ファイル
 branch=ブランチ
 tree=ツリー
 filter_branch_and_tag=ブランチまたはタグをフィルタリング
@@ -426,54 +463,62 @@ pulls=プルリクエスト
 labels=ラベル
 milestones=マイルストーン
 commits=コミット
+git_branches=ブランチ
 releases=リリース
 file_raw=Raw
 file_history=履歴
 file_view_raw=Rawデータを見る
 file_permalink=パーマリンク
 file_too_large=このファイルは大きすぎるため、表示できません。
-video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
+video_not_supported_in_browser=お使いのブラウザーは、HTML5 の video タグをサポートしていません。
 
-editor.new_file=New file
-editor.upload_file=Upload file
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=すべてのブランチ
+branches.updated_by=%[1]s が %[2]s によって更新されました
+branches.change_default_branch=デフォルトブランチの変更
+
+editor.new_file=新規ファイル
+editor.upload_file=ファイルをアップロード
 editor.edit_file=ファイルを編集
 editor.preview_changes=Preview Changes
-editor.cannot_edit_non_text_files=Cannot edit non-text files
+editor.cannot_edit_non_text_files=テキストファイルでないため編集できません
 editor.edit_this_file=このファイルを編集
 editor.must_be_on_a_branch=You must be on a branch to make or propose changes to this file
-editor.fork_before_edit=You must fork this repository before editing the file
+editor.fork_before_edit=ファイルを編集する前にこのリポジトリをフォークする必要があります。
 editor.delete_this_file=このファイルを削除
 editor.must_have_write_access=You must have write access to make or propose changes to this file
-editor.file_delete_success=File '%s' has been deleted successfully!
-editor.name_your_file=Name your file...
+editor.file_delete_success=ファイル '%s' は正常に削除されました！
+editor.name_your_file=ファイル名を設定...
 editor.filename_help=To add directory, just type it and press /. To remove a directory, go to the beginning of the field and press backspace.
-editor.or=or
+editor.or=もしくは
 editor.cancel_lower=キャンセル
 editor.commit_changes=変更をコミット
-editor.add_tmpl=Add '%s/<filename>'
+editor.add_tmpl='%s/<filename>' を追加
 editor.add='%s' を追加
 editor.update='%s' を更新
 editor.delete='%s' を削除
-editor.commit_message_desc=Add an optional extended description...
+editor.commit_message_desc=詳細な説明を追加...
 editor.commit_directly_to_this_branch=Commit directly to the <strong class="branch-name">%s</strong> branch.
 editor.create_new_branch=Create a <strong>new branch</strong> for this commit and start a pull request.
-editor.new_branch_name_desc=New branch name...
+editor.new_branch_name_desc=新しいブランチ名...
 editor.cancel=キャンセル
-editor.filename_cannot_be_empty=Filename cannot be empty.
+editor.filename_cannot_be_empty=ファイル名を空にすることはできません。
 editor.branch_already_exists=Branch '%s' already exists in this repository.
 editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
 editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
-editor.filename_is_a_directory=The filename '%s' is an existing directory in this repository.
-editor.file_editing_no_longer_exists=The file '%s' you are editing no longer exists in the repository.
-editor.file_changed_while_editing=File content has been changed since you started editing. <a target="_blank" href="%s">Click here</a> to see what have been changed or <strong>press commit again</strong> to overwrite those changes.
-editor.file_already_exists=A file with name '%s' already exists in this repository.
-editor.no_changes_to_show=There are no changes to show.
-editor.fail_to_update_file=Failed to update/create file '%s' with error: %v
-editor.add_subdir=Add subdirectory...
-editor.unable_to_upload_files=Failed to upload files to '%s' with error: %v
-editor.upload_files_to_dir=Upload files to '%s'
+editor.filename_is_a_directory=ファイル名 '%s' は、このリポジトリに存在するディレクトリと同じ名前です。
+editor.file_editing_no_longer_exists=あなたが編集しているファイル '%s' は、すでにリポジトリに存在しません。
+editor.file_changed_while_editing=あなたが編集を開始してから、ファイルの内容が変更されました。<a target="_blank" href="%s">ここをクリック</a>して変更箇所を確認するか、<strong>コミットをもう一度押して</strong>変更を上書きしてください。
+editor.file_already_exists=ファイル名 '%s' は、このリポジトリに既に存在します。
+editor.no_changes_to_show=表示する変更箇所はありません。
+editor.fail_to_update_file=ファイル '%s' の作成/更新に失敗しました: %v
+editor.add_subdir=サブディレクトリを追加...
+editor.unable_to_upload_files='%s' へのファイルアップロード中にエラーが発生し、失敗しました: %v
+editor.upload_files_to_dir='%s' にファイルをアップロード
 
-commits.commit_history=Commit History
+commits.commit_history=コミット履歴
 commits.commits=コミット
 commits.search=コミットの検索
 commits.find=検索
@@ -483,7 +528,7 @@ commits.date=日付
 commits.older=古い
 commits.newer=新しい
 
-issues.new=新しい問題
+issues.new=新しい課題
 issues.new.labels=ラベル
 issues.new.no_label=ラベルなし
 issues.new.clear_labels=ラベルをクリア
@@ -495,15 +540,15 @@ issues.new.closed_milestone=クローズされたマイルストーン
 issues.new.assignee=担当者
 issues.new.clear_assignee=担当者をクリア
 issues.new.no_assignee=担当者なし
-issues.create=問題を作成
+issues.create=課題を作成
 issues.new_label=新しいラベル
 issues.new_label_placeholder=ラベル名...
 issues.create_label=ラベルを作成
-issues.label_templates.title=Load a predefined set of labels
-issues.label_templates.info=There aren't any labels yet. You can click on the "New Label" button above to create one or use a predefined set below.
-issues.label_templates.helper=Select a label set
-issues.label_templates.use=Use this label set
-issues.label_templates.fail_to_load_file=Failed to load label template file '%s': %v
+issues.label_templates.title=定義済みラベルセットからラベルを作成
+issues.label_templates.info=ラベルはまだありません。上にある「新しいラベル」ボタンをクリックし新たに作成するか、以下の定義済みラベルセットの中から選択してください。
+issues.label_templates.helper=ラベルセットを選択
+issues.label_templates.use=このラベルセットを使用する
+issues.label_templates.fail_to_load_file=ラベルテンプレートファイル '%s' の読み込みに失敗しました: %v
 issues.open_tab=%d オープン
 issues.close_tab=%d クローズ
 issues.filter_label=ラベル
@@ -513,7 +558,7 @@ issues.filter_milestone_no_select=選択されたマイルストーンなし
 issues.filter_assignee=アサインされた人
 issues.filter_assginee_no_select=選択可能な担当者がいない
 issues.filter_type=タイプ
-issues.filter_type.all_issues=すべての問題
+issues.filter_type.all_issues=すべての課題
 issues.filter_type.assigned_to_you=担当中のリポジトリ
 issues.filter_type.created_by_you=作成したリポジトリ
 issues.filter_type.mentioning_you=あなたに伝える
@@ -524,44 +569,44 @@ issues.filter_sort.recentupdate=最近更新された
 issues.filter_sort.leastupdate=つい最近更新
 issues.filter_sort.mostcomment=一番多いコメント
 issues.filter_sort.leastcomment=一番少ないコメント
-issues.opened_by=opened %[1]s by <a href="%[2]s">%[3]s</a>
-issues.opened_by_fake=opened %[1]s by %[2]s
+issues.opened_by=%[1]s が <a href="%[2]s">%[3]s</a> によって開かれました
+issues.opened_by_fake=%[1]s が %[2]s によって開かれました
 issues.previous=前ページ
 issues.next=次ページ
 issues.open_title=オープン
 issues.closed_title=クローズ
 issues.num_comments=%d コメント
-issues.commented_at=`commented <a href="#%s">%s</a>`
-issues.delete_comment_confirm=Are you sure you want to delete this comment?
+issues.commented_at=`<a href="#%s">%s</a> にコメント`
+issues.delete_comment_confirm=このコメントを削除してよろしいですか？
 issues.no_content=まだコンテンツがありません
 issues.close_issue=閉じる
 issues.close_comment_issue=コメントしてクローズ
 issues.reopen_issue=Reopen
 issues.reopen_comment_issue=コメントと再開
 issues.create_comment=コメント 
-issues.closed_at=`closed <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.reopened_at=`reopened <a id="%[1]s" href="#%[1]s">%[2]s</a>`
-issues.commit_ref_at=`referenced this issue from a commit <a id="%[1]s" href="#%[1]s">%[2]s</a>`
+issues.closed_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> が閉じられました`
+issues.reopened_at=`<a id="%[1]s" href="#%[1]s">%[2]s</a> が再び開かれました`
+issues.commit_ref_at=`この課題がコミット <a id="%[1]s" href="#%[1]s">%[2]s</a> から参照されました`
 issues.poster=ポスター
-issues.collaborator=コラボレータ
+issues.collaborator=共同編集者
 issues.owner=オーナー
-issues.sign_in_require_desc=<a href="%s">Sign in</a> to join this conversation.
+issues.sign_in_require_desc=会話に参加するには <a href="%s">サインイン</a> してください。
 issues.edit=編集
 issues.cancel=キャンセル
 issues.save=保存
 issues.label_title=ラベル名
 issues.label_color=ラベルの色
 issues.label_count=%d ラベル
-issues.label_open_issues=%d 未解決の問題
+issues.label_open_issues=%d 未解決の課題
 issues.label_edit=編集
 issues.label_delete=削除
 issues.label_modify=ラベルの変更
 issues.label_deletion=ラベルの削除
-issues.label_deletion_desc=ラベルを削除すると、関連するすべての問題の情報が削除されます。続行しますか。
+issues.label_deletion_desc=ラベルを削除すると、現在紐付けられているすべての課題から削除されます。よろしいですか？
 issues.label_deletion_success=ラベルは正常に削除されました。
-issues.num_participants=%d Participants
-issues.attachment.open_tab=`Click to see "%s" in a new tab`
-issues.attachment.download=`Click to download "%s"`
+issues.num_participants=%d 参加者
+issues.attachment.open_tab=`クリックして新しいタブで "%s" を見る`
+issues.attachment.download=`クリックして "%s" をダウンロード`
 
 pulls.new=新しいプルリクエスト
 pulls.compare_changes=変更を比較
@@ -583,13 +628,13 @@ pulls.merged=マージされた
 pulls.has_merged=このプルプルリクエストは正常にマージされました!
 pulls.data_broken=Data of this pull request has been broken due to deletion of fork information.
 pulls.is_checking=The conflict checking is still in progress, please refresh page in few moments.
-pulls.can_auto_merge_desc=This pull request can be merged automatically.
-pulls.cannot_auto_merge_desc=This pull request can't be merged automatically because there are conflicts.
+pulls.can_auto_merge_desc=このプルリクエストは自動的にマージできます。
+pulls.cannot_auto_merge_desc=コンフリクトが発生しているため、このプルリクエストを自動的にマージすることはできません。
 pulls.cannot_auto_merge_helper=競合を解決するためには、手動でマージする必要があります。
 pulls.merge_pull_request=プルリクエストをマージします。
 pulls.open_unmerged_pull_exists=`You can't perform reopen operation because there is already an open pull request (#%d) from same repository with same merge information and is waiting for merging.`
-pulls.delete_branch=Delete Branch
-pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
+pulls.delete_branch=ブランチの削除
+pulls.delete_branch_has_new_commits=マージ後に新しいコミットがされているため、ブランチを削除することが出来ません。
 
 milestones.new=新しいマイルストーン
 milestones.open_tab=%d オープン
@@ -628,39 +673,41 @@ wiki.last_commit_info=%s このページを編集 %s
 wiki.edit_page_button=編集
 wiki.new_page_button=新規ページ
 wiki.delete_page_button=ページの削除
-wiki.delete_page_notice_1=This will delete the page <code>"%s"</code>. Please be certain.
+wiki.delete_page_notice_1=ページ <code>"%s"</code> が削除されます。ご確認ください。
 wiki.page_already_exists=既に同じ名前のWiki ページが存在します。
 wiki.pages=ページ
 wiki.last_updated=最終更新 %s
 
 settings=設定
 settings.options=オプション
-settings.collaboration=コラボレーション
+settings.collaboration=共同編集
 settings.collaboration.admin=管理
 settings.collaboration.write=書込
 settings.collaboration.read=読込
-settings.collaboration.undefined=Undefined
-settings.branches=Branches
-settings.default_branch=Default Branch
+settings.collaboration.undefined=未定義
+settings.branches=ブランチ
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
+settings.default_branch=デフォルトブランチ
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
-settings.update=Update
-settings.update_default_branch_success=Default branch of this repository has been updated successfully!
-settings.protected_branches=Protected Branches
-settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
-settings.choose_a_branch=Choose a branch...
-settings.branch_protection=Branch Protection
-settings.branch_protection_desc=Please choose protect options for branch <b>%s</b>.
-settings.protect_this_branch=Protect this branch
-settings.protect_this_branch_desc=Disable force pushes and prevent from deletion.
-settings.protect_require_pull_request=Require pull request instead direct pushing
-settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
-settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
-settings.protect_whitelist_users=Users who can push to this branch
-settings.protect_whitelist_search_users=Search users
-settings.protect_whitelist_teams=Teams for which members of them can push to this branch
-settings.protect_whitelist_search_teams=Search teams
-settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
+settings.update=更新
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
+settings.update_default_branch_success=このリポジトリのデフォルトブランチが更新されました！
+settings.protected_branches=保護されたブランチ
+settings.protected_branches_desc=force pushや偶発的な削除からの保護、コミッターのホワイトリスト設定をおこないます。
+settings.choose_a_branch=ブランチを選択...
+settings.branch_protection=ブランチの保護
+settings.branch_protection_desc=<b>%s</b> ブランチの保護設定を選択してください。
+settings.protect_this_branch=このブランチを保護
+settings.protect_this_branch_desc=force pushの無効化と、ブランチの削除防止をおこないます。
+settings.protect_require_pull_request=直接のプッシュの代わりに、プルリクエストの作成が必要
+settings.protect_require_pull_request_desc=このブランチへの直接のプッシュを無効にするオプションを有効化します。コミットは、別の保護されていないブランチへプッシュをしたのちに、プルリクエストを通してマージする必要があります。
+settings.protect_whitelist_committers=このブランチにプッシュできるユーザー
+settings.protect_whitelist_committers_desc=このブランチに直接プッシュできるユーザーやチームをホワイトリストに追加してください。ホワイトリストのユーザーは、プルリクエストによるチェックを必要としません。
+settings.protect_whitelist_users=このブランチにプッシュできるユーザー
+settings.protect_whitelist_search_users=ユーザーを検索
+settings.protect_whitelist_teams=このブランチに直接プッシュすることができるチーム
+settings.protect_whitelist_search_teams=チームを検索
+settings.update_protect_branch_success=このブランチの保護設定が更新されました！
 settings.hooks=Webhooks
 settings.githooks=Git のフック
 settings.basic_settings=基本設定
@@ -673,22 +720,24 @@ settings.change_reponame_prompt=この変更はリンクがリポジトリに関
 settings.advanced_settings=拡張設定
 settings.wiki_desc=Enable wiki system
 settings.use_internal_wiki=Use builtin wiki
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=外部 wiki を使用します。
 settings.external_wiki_url=外部 Wiki の URL
 settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.issues_desc=Enable issue tracker
 settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=外部課題トラッキングシステムを使用
 settings.external_tracker_url=External Issue Tracker URL
 settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.tracker_url_format=外部課題トラッキングツール URLのフォーマット
 settings.tracker_issue_style=External Issue Tracker Naming Style:
 settings.tracker_issue_style.numeric=数値
-settings.tracker_issue_style.alphanumeric=Alphanumeric
+settings.tracker_issue_style.alphanumeric=英数字
 settings.tracker_url_format_desc=You can use placeholder <code>{user} {repo} {index}</code> for user name, repository name and issue index.
 settings.pulls_desc=Enable pull requests to accept public contributions
 settings.danger_zone=危険地帯
-settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
+settings.cannot_fork_to_same_owner=元の持ち主に向けてフォークすることは出来ません。
 settings.new_owner_has_same_repo=新しいオーナーは、既に同じ名前のリポジトリを持っています。
 settings.convert=Convert To Regular Repository
 settings.convert_desc=You can convert this mirror to a regular repository. This cannot be reversed.
@@ -707,9 +756,9 @@ settings.wiki_deletion_success=Wikiのデータ消去が完了しました。
 settings.delete=このリポジトリを削除
 settings.delete_desc=リポジトリを削除すると元に戻せません。確実に確認してください。
 settings.delete_notices_1=-この操作は<strong>元に戻せません</strong> 。
-settings.delete_notices_2=- This operation will permanently delete the everything of this repository, including Git data, issues, comments and accesses of collaborators.
+settings.delete_notices_2=- この操作は、Git データ、課題、コメント、共同編集者のアクセス権などを含む、このリポジトリに関するすべてを完全に削除します。
 settings.delete_notices_fork_1=- All forks will become independent after deletion.
-settings.deletion_success=Repository has been deleted successfully!
+settings.deletion_success=リポジトリが正常に削除されました。
 settings.update_settings_success=リポジトリ オプションが更新されました。
 settings.transfer_owner=新しいオーナー
 settings.make_transfer=転送
@@ -717,11 +766,11 @@ settings.transfer_succeed=リポジトリの所有権は正常に転送されま
 settings.confirm_delete=削除を確認
 settings.add_collaborator=新しい共同編集者を追加
 settings.add_collaborator_success=新しい共同編集者が追加されました。
-settings.delete_collaborator=Delete
-settings.collaborator_deletion=Collaborator Deletion
-settings.collaborator_deletion_desc=This user will no longer have collaboration access to this repository after deletion. Do you want to continue?
+settings.delete_collaborator=削除
+settings.collaborator_deletion=共同編集者の削除
+settings.collaborator_deletion_desc=削除後、このユーザーはこのリポジトリに、共同編集のためのアクセスができなくなります。続行しますか？
 settings.remove_collaborator_success=共同編集者が削除されました。
-settings.search_user_placeholder=Search users
+settings.search_user_placeholder=ユーザーを検索...
 settings.org_not_allowed_to_be_collaborator=組織を共同編集者として追加することはできません。
 settings.add_webhook=Webhook を追加
 settings.hooks_desc=Webhooksは、Gogsで特定のイベントの発生時に指定された外部サービスに通知を許可します。イベントが発生すると、それぞれ指定されたUrlに、POSTリクエストが送られます。詳細はこちらのの <a target="_blank"href="%s"> Webhooks ガイド</a>をご覧ください。
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webhook が正常に削除されました。
 settings.webhook.test_delivery=テスト配信
 settings.webhook.test_delivery_desc=Send a fake push event delivery to test your webhook settings
 settings.webhook.test_delivery_success=Test webhook has been added to delivery queue. It may take few seconds before it shows up in the delivery history.
+settings.webhook.redelivery=再送信
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=リクエスト
 settings.webhook.response=レスポンス
 settings.webhook.headers=ヘッダ
@@ -755,10 +806,20 @@ settings.event_send_everything=<strong>すべて</strong> が必要です。
 settings.event_choose=必要なものを選択しましょう。
 settings.event_create=Create
 settings.event_create_desc=ブランチ、またはタグを作成
-settings.event_pull_request=Pull Request
-settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
+settings.event_delete=削除
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=フォーク
+settings.event_fork_desc=Repository forked
 settings.event_push=プッシュ
 settings.event_push_desc=Git リポジトリにプッシュ
+settings.event_issues=課題
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=課題へのコメント
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=プルリクエスト
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=リリース
+settings.event_release_desc=リポジトリでリリースが公開されました。
 settings.active=アクティブ
 settings.active_helper=このフックのトリガーが引かれた時に、イベントの詳細を配信します。
 settings.add_hook_success=新しい webhook が追加されました。
@@ -767,8 +828,8 @@ settings.update_hook_success=Webhook を更新しました。
 settings.delete_webhook=Webhook を削除
 settings.recent_deliveries=最近のデリバリー
 settings.hook_type=フックタイプ
-settings.add_slack_hook_desc=<a href="%s"> Slack</a> インテグレーションをリポジトリに追加します。
-settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
+settings.add_slack_hook_desc=リポジトリに <a href="%s"> Slack</a> 連携を追加します。
+settings.add_discord_hook_desc=リポジトリに <a href="%s">Discord</a> 連携を追加します。
 settings.slack_token=トークン
 settings.slack_domain=ドメイン
 settings.slack_channel=チャンネル
@@ -776,7 +837,7 @@ settings.deploy_keys=デプロイキー
 settings.deploy_keys_helper=<b>Common Gotcha!</b> If you're looking for adding personal public keys, please add them in your <a href="%s%s">account settings</a>.
 settings.add_deploy_key=デプロイキーを追加
 settings.deploy_key_desc=個人アカウントのSSHキーとは異なり、デプロイキーは読み取り専用アクセスとなります。
-settings.no_deploy_keys=でプロキーは１つも追加されていません。
+settings.no_deploy_keys=デプロイキーは１つも追加されていません。
 settings.title=タイトル
 settings.deploy_key_content=コンテント
 settings.key_been_used=デプロイキーが使用されています。
@@ -803,7 +864,6 @@ release.releases=リリース
 release.new_release=新しいリリース
 release.draft=ドラフト
 release.prerelease=プレリリース
-release.stable=安定
 release.edit=編集
 release.ahead=このリリース以降 %s へ <strong>%d</strong> コミット
 release.source_code=ソース コード
@@ -828,7 +888,7 @@ release.deletion=リリースの削除
 release.deletion_desc=このリリースを削除すると、対応するGitのタグも削除されます。よろしいですか？
 release.deletion_success=リリースが正常に削除されました。
 release.tag_name_already_exist=このタグ名には既にリリースが存在します。
-release.tag_name_invalid=Tag name is not valid.
+release.tag_name_invalid=使用できないタグ名です。
 release.downloads=Downloads
 
 [org]
@@ -850,9 +910,9 @@ team_name_helper=会話の時、この名前を使用しチーム名を表明し
 team_desc_helper=このチームに関する全ての情報は？
 team_permission_desc=このチームに必要な権限レベルは？
 
-form.name_reserved=組織名 '%s' は予約されています。
+form.name_reserved=組織名 '%s' は使用されています。
 form.name_pattern_not_allowed=組織名のパターン '%s' は許可されていません。
-form.team_name_reserved=Team name '%s' is reserved.
+form.team_name_reserved=チーム名 '%s' は使用されています。
 
 settings=設定
 settings.options=オプション
@@ -868,7 +928,7 @@ settings.delete_account=この組織を削除
 settings.delete_prompt=この操作をすると組織が完全に削除され、<strong>二度と元に戻すことができなくなります</strong> ！
 settings.confirm_delete_account=削除を確認
 settings.delete_org_title=組織の削除
-settings.delete_org_desc=この組織は完全に削除されます、継続しますか?
+settings.delete_org_desc=この組織は完全に削除されます。よろしいですか？
 settings.hooks_desc=この組織のもとで <strong>すべてのリポジトリ</strong> に対してトリガーされる webhook を追加します。
 
 members.membership_visibility=Membership Visibility:
@@ -927,7 +987,7 @@ total=合計: %d
 dashboard.statistic=統計
 dashboard.operations=操作
 dashboard.system_status=システム モニターのステータス
-dashboard.statistic_info=Gogs データベースは <b>%d</b> ユーザ, <b>%d</b> 組織, <b>%d</b> 公開鍵, <b>%d</b> リポジトリ, <b>%d</b> ウォッチ, <b>%d</b> スター, <b>%d</b> 行動, <b>%d</b> アクセス, <b>%d</b> 問題, <b>%d</b> コメント, <b>%d</b> ソーシャルアカウント, <b>%d</b> フォロー, <b>%d</b> ミラー, <b>%d</b> リリース, <b>%d</b> ログイン元, <b>%d</b> webhook, <b>%d</b> マイルストーン, <b>%d</b> ラベル, <b>%d</b> フックタスク, <b>%d</b> チーム, <b>%d</b> アップデートタスク, <b>%d</b> 添付ファイル の情報を持っています。
+dashboard.statistic_info=Gogs データベースは <b>%d</b> ユーザー, <b>%d</b> 組織, <b>%d</b> 公開鍵, <b>%d</b> リポジトリ, <b>%d</b> ウォッチ, <b>%d</b> スター, <b>%d</b> 行動, <b>%d</b> アクセス, <b>%d</b> 課題, <b>%d</b> コメント, <b>%d</b> ソーシャルアカウント, <b>%d</b> フォロー, <b>%d</b> ミラー, <b>%d</b> リリース, <b>%d</b> ログイン元, <b>%d</b> webhook, <b>%d</b> マイルストーン, <b>%d</b> ラベル, <b>%d</b> フックタスク, <b>%d</b> チーム, <b>%d</b> アップデートタスク, <b>%d</b> 添付ファイル の情報を持っています。
 dashboard.operation_name=操作の名前
 dashboard.operation_switch=スイッチ
 dashboard.operation_run=実行
@@ -984,7 +1044,7 @@ users.name=名前
 users.activated=アクティブ化
 users.admin=アドミン
 users.repos=リポジトリ
-users.created=作成されました
+users.created=作成日時
 users.send_register_notify=登録通知をユーザーに送信
 users.new_success=新規アカウント '%s' が正常に作成されました。
 users.edit=編集
@@ -994,13 +1054,13 @@ users.auth_login_name=認証ログイン名
 users.password_helper=それをそのまま空のままにします。
 users.update_profile_success=アカウントのプロファイルが更新されました。
 users.edit_account=アカウントの編集
-users.max_repo_creation=Maximum Repository Creation Limit
-users.max_repo_creation_desc=(Set -1 to use global default limit)
-users.is_activated=アカウントがアクティブされました
-users.prohibit_login=This account is prohibited to login
-users.is_admin=このアカウントには管理者の権限を持つ
-users.allow_git_hook=このアカウントには Git のフックを作成する権限を持つ
-users.allow_import_local=This account has permissions to import local repositories
+users.max_repo_creation=最大リポジトリ作成数
+users.max_repo_creation_desc=（デフォルトの設定を使用する場合は -1 を設定してください）
+users.is_activated=アカウントの有効化
+users.prohibit_login=ログイン禁止のアカウント
+users.is_admin=管理者権限を持つアカウント
+users.allow_git_hook=Git フックの作成権限を持つアカウント
+users.allow_import_local=ローカルリポジトリをインポートする権限を持つアカウント
 users.update_profile=アカウント ・ プロファイルを更新
 users.delete_account=このアカウントを削除
 users.still_own_repo=アカウント所有のリポジトリがあり、リポジトリの削除または所有者の移譲が必要です。
@@ -1019,6 +1079,7 @@ repos.private=プライベート
 repos.watches=Watches
 repos.stars=Stars
 repos.issues=課題
+repos.size=容量
 
 auths.auth_manage_panel=認証管理パネル
 auths.new=新しいソースを追加
@@ -1028,7 +1089,7 @@ auths.enabled=Enabled
 auths.updated=更新しました
 auths.auth_type=認証タイプ
 auths.auth_name=認証名
-auths.security_protocol=Security Protocol
+auths.security_protocol=セキュリティプロトコル
 auths.domain=ドメイン
 auths.host=ホスト
 auths.port=ポート
@@ -1037,11 +1098,16 @@ auths.bind_password=バインド パスワード
 auths.bind_password_helper=警告: このパスワードは暗号化されずに格納されます。特権を持つアカウントに使用しないでください。
 auths.user_base=ユーザ検索ベース
 auths.user_dn=User DN
-auths.attribute_username=Username attribute
+auths.attribute_username=Username Attribute
 auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
-auths.attribute_name=名前属性
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=名字属性
 auths.attribute_mail=Eメール属性
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=User フィルター
 auths.admin_filter=Admin フィルター
@@ -1057,7 +1123,7 @@ auths.pam_service_name=PAMサービス名
 auths.enable_auto_register=自動登録を有効にする
 auths.tips=ヒント
 auths.edit=認証設定を編集
-auths.activated=認証がアクティブされました
+auths.activated=認証の有効化
 auths.new_success=新しい認証 '%s' が正常に追加されました。
 auths.update_success=認証の設定が正常に更新されました。
 auths.update=認証設定を更新
@@ -1077,30 +1143,30 @@ config.offline_mode=オフラインモード
 config.disable_router_log=ルーターのログを無効にする
 config.run_user=実行ユーザ
 config.run_mode=実行モード
-config.git_version=Git Version
+config.git_version=Git バージョン
 config.static_file_root_path=静的ファイルのルートパス
 config.log_file_root_path=ログ ファイルのルート パス
 config.reverse_auth_user=リバース認証ユーザ
 
-config.ssh_config=SSH Configuration
-config.ssh_enabled=Enabled
-config.ssh_start_builtin_server=Start Builtin Server
-config.ssh_domain=Domain
-config.ssh_port=Port
-config.ssh_listen_port=Listen Port
-config.ssh_root_path=Root Path
+config.ssh_config=SSH設定
+config.ssh_enabled=有効
+config.ssh_start_builtin_server=内蔵サーバーの起動
+config.ssh_domain=ドメイン
+config.ssh_port=ポート
+config.ssh_listen_port=リッスンポート
+config.ssh_root_path=ルートパス
 config.ssh_key_test_path=Key Test Path
-config.ssh_keygen_path=Keygen ('ssh-keygen') Path
-config.ssh_minimum_key_size_check=Minimum Key Size Check
-config.ssh_minimum_key_sizes=Minimum Key Sizes
+config.ssh_keygen_path=鍵生成コマンド ('ssh-keygen') のパス
+config.ssh_minimum_key_size_check=最小キーサイズチェック
+config.ssh_minimum_key_sizes=最小キーサイズ
 
 config.repo_config=Repository Configuration
 config.repo_root_path=リポジトリのルートパス
 config.script_type=スクリプトの種類
 config.repo_force_private=Force Private
-config.max_creation_limit=Max Creation Limit
+config.max_creation_limit=最大作成数
 config.preferred_licenses=Preferred Licenses
-config.disable_http_git=Disable HTTP Git
+config.disable_http_git=HTTP Git の無効化
 config.enable_local_path_migration=Enable Local Path Migration
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
@@ -1112,7 +1178,7 @@ config.db_user=ユーザ
 config.db_ssl_mode=SSL モード
 config.db_ssl_mode_helper=(「postgres」のみ）
 config.db_path=パス
-config.db_path_helper=(for "sqlite3" and "tidb")
+config.db_path_helper=（"sqlite3" および "tidb" の場合）
 
 config.service_config=サービスの構成
 config.register_email_confirm=電子メールの確認を必要
@@ -1120,7 +1186,7 @@ config.disable_register=登録を無効にする
 config.show_registration_button=登録ボタンを表示します。
 config.require_sign_in_view=サインインを要求
 config.mail_notify=メール通知
-config.disable_key_size_check=最小キー サイズ チェックを無効にします
+config.disable_key_size_check=最小キーサイズチェックを無効にする
 config.enable_captcha=Captchaを有効にする
 config.active_code_lives=コードリンクの有効期限をアクティブ
 config.reset_password_code_lives=パスワードリンクの有効期限をリセット
@@ -1136,9 +1202,9 @@ config.mailer_disable_helo=HELOコマンド無効
 config.mailer_name=名前
 config.mailer_host=ホスト
 config.mailer_user=ユーザ
-config.send_test_mail=Send Test Email
-config.test_mail_failed=Fail to send test email to '%s': %v
-config.test_mail_sent=Test email has been sent to '%s'.
+config.send_test_mail=テストメールの送信
+config.test_mail_failed='%s' 宛のテストメールの送信に失敗しました: %v
+config.test_mail_sent=テストメールが '%s' に送信されました。
 
 config.oauth_config=OAuth 構成
 config.oauth_enabled=Enabled
@@ -1160,23 +1226,24 @@ config.cookie_life_time=クッキーのライフタイム
 
 config.picture_config=画像構成
 config.picture_service=画像サービス
-config.disable_gravatar=グラバターを無効にする
+config.disable_gravatar=Gravatarを無効にする
 config.enable_federated_avatar=Enable Federated Avatars
 
-config.git_config=Git Configuration
-config.git_disable_diff_highlight=Disable Diff Syntax Highlight
-config.git_max_diff_lines=Max Diff Lines (for a single file)
-config.git_max_diff_line_characters=Max Diff Characters (for a single line)
-config.git_max_diff_files=Max Diff Files (to be shown)
-config.git_gc_args=GC Arguments
+config.git_config=Git 設定
+config.git_disable_diff_highlight=Diff のシンタックスハイライトを無効にする
+config.git_max_diff_lines=Diff の最大行数（１ファイルあたり）
+config.git_max_diff_line_characters=Diff の最大文字数（１行あたり）
+config.git_max_diff_files=Diff の最大ファイル数（表示）
+config.git_gc_args=GC の引数
 config.git_migrate_timeout=Migration Timeout
 config.git_mirror_timeout=Mirror Update Timeout
-config.git_clone_timeout=Clone Operation Timeout
-config.git_pull_timeout=Pull Operation Timeout
-config.git_gc_timeout=GC Operation Timeout
+config.git_clone_timeout=Clone 操作のタイムアウト
+config.git_pull_timeout=Pull 操作のタイムアウト
+config.git_gc_timeout=GC 操作のタイムアウト
 
 config.log_config=ログの構成
-config.log_mode=ログ モード
+config.log_mode=モード
+config.log_options=オプション
 
 monitor.cron=Cron タスク
 monitor.name=名前
@@ -1200,24 +1267,28 @@ notices.delete_all=すべての通知を削除
 notices.type=タイプ
 notices.type_1=リポジトリ
 notices.desc=説明
-notices.op=Op。
+notices.op=操作
 notices.delete_success=システム通知が正常に削除されました。
 
 [action]
 create_repo=がリポジトリ <a href="%s"> %s</a> を作成しました
+fork_repo=リポジトリを <a href="%s">%s</a> にフォークしました
 rename_repo=<code>%[1]s</code> から <a href="%[2]s">[3]s</a> にリポジトリ名を変更しました
 commit_repo=<a href="%[1]s">%[4]s</a>を<a href="%[1]s/src/%[2]s">%[3]s</a>にプッシュしました
-create_issue=`問題 <a href="%s/issues/%s">%s#%[2]s</a> を開きました`
-close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
-reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
-create_pull_request=`プルリクエスト <a href="%s/pulls/%s"> %s[2]s</a>を作成`
-close_pull_request=`closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-reopen_pull_request=`reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`問題 <a href="%s/issues/%s">%s#%[2]s</a> のコメント`
-merge_pull_request=`プルリクエスト <a href="%s/pulls/%s"> %s[2]s</a>をマージしました`
-transfer_repo=リポジトリ <code>%s</code> を <a href="%s">%s</a> へ転送しました
-push_tag=<a href="%[1]s">%[3]s</a> に タグ <a href="%[1]s/src/%[2]s">%[2]s</a> をプッシュしました
 compare_commits=これらの %d コミットの比較を表示
+transfer_repo=リポジトリ <code>%s</code> を <a href="%s">%s</a> へ転送しました
+create_issue=`課題 <a href="%s/issues/%s">%s#%[2]s</a> を開きました`
+close_issue=`課題 <a href="%s/issues/%s">%s#%[2]s</a> を閉じました`
+reopen_issue=`課題 <a href="%s/issues/%s">%s#%[2]s</a> が再び開かれました`
+comment_issue=`課題 <a href="%s/issues/%s">%s#%[2]s</a> へのコメント`
+create_pull_request=`プルリクエスト <a href="%s/pulls/%s"> %s[2]s</a>を作成`
+close_pull_request=`プルリクエスト <a href="%s/pulls/%s">%s#%[2]s</a> を閉じました`
+reopen_pull_request=`プルリクエスト <a href="%s/pulls/%s">%s#%[2]s</a> が再び開かれました`
+merge_pull_request=`プルリクエスト <a href="%s/pulls/%s"> %s[2]s</a>をマージしました`
+create_branch=<a href="%[1]s">%[4]s</a> に、新しいブランチ <a href="%[1]s/src/%[2]s">%[3]s</a> を作成しました
+delete_branch=<a href="%[1]s">%[3]s</a> のブランチ <code>%[2]s</code> を削除しました
+push_tag=<a href="%[1]s">%[3]s</a> に タグ <a href="%[1]s/src/%[2]s">%[2]s</a> をプッシュしました
+delete_tag=<a href="%[1]s">%[3]s</a> のタグ <code>%[2]s</code> を削除しました
 
 [tool]
 ago=前

conf/locale/locale_ko-KR.ini

@@ -48,7 +48,7 @@ cancel=취소
 install=설치
 title=첫 실행을 위한 설치단계
 docker_helper=Gogs를 Docker에서 운영하고 있다면 <a target="_blank" href="%s">안내</a>를 읽고 변경해 주세요!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs 는 MySQL, PostgreSQL, SQLite3, MSSQL 또는 TiDB 를 필요로 합니다.
 db_title=데이터베이스 설정
 db_type=데이터베이스 유형
 host=호스트
@@ -58,8 +58,8 @@ db_name=데이터베이스 이름
 db_helper=MySQL에서는 utf8_general_ci 캐릭터셋으로 INNODB엔진을 이용해 주세요
 ssl_mode=SSL 모드
 path=경로
-sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=SQLite3 데이터베이스의 경로입니다.<br>서비스를 시작할 때는 반드시 절대 경로를 사용해주세요.
+err_empty_db_path=SQLite3 데이터베이스의 경로는 비워둘 수 없습니다.
 no_admin_and_disable_registration=관리자 계정을 만들지 않고 등록을 비활성화할 수 없습니다.
 err_empty_admin_password=관리자 암호는 비워둘 수 없습니다.
 
@@ -74,14 +74,16 @@ domain=도메인
 domain_helper=Git SSH url에 영향을 미칩니다.
 ssh_port=SSH 포트
 ssh_port_helper=SSH서버가 실행되고 있는 포트를 입력하세요. 비워둘 경우 SSH를 사용하지 않습니다.
-use_builtin_ssh_server=Use Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server=내장 SSH 서버 사용
+use_builtin_ssh_server_popup=시스템 SSH 디먼과 구별하기 위해 Git 작업을 위한 빌트인 SSH 서버를 시작하세요.
 http_port=HTTP 포트
 http_port_helper=포트 번호는 애플리케이션에서 열고 있습니다.
 app_url=애플리케이션 URL
 app_url_helper=이 작업은 HTTP/HTTPS 클론 URL과 이메일의 어딘가에 영향을 미칩니다.
 log_root_path=로그 경로
 log_root_path_helper=로그 파일을 쓸 디렉터리.
+enable_console_mode=콘솔 모드 활성화
+enable_console_mode_popup=파일 모드 외에 콘솔에 로그를 인쇄하세요.
 
 optional_title=추가설정
 email_title=이메일 서비스 설정
@@ -117,6 +119,7 @@ sqlite3_not_available=설치하신 버전은 SQLite3을 지원하지 않으므
 invalid_db_setting=데이터베이스 설정이 올바르지 않습니다: %v
 invalid_repo_path=저장소 루트 경로가 올바르지 않습니다: %v
 run_user_not_match=실행 유저가 현재 유저가 아닙니다: %s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=SMTP 보낸 사람 필드가 유효하지 않습니다: %v
 save_config_failed=설정을 저장할 수 없습니다: %v
 invalid_admin_setting=관리자 계정 설정이 잘못되었습니다: %v
@@ -166,6 +169,14 @@ reset_password_helper=이곳을 눌러 비밀번호를 재설정
 password_too_short=비밀번호의 길이는 6글자 미만일 수 없습니다.
 non_local_account=Gogs 계정이 아니면 암호를 변경할 수 없습니다.
 
+login_two_factor=2단계 인증
+login_two_factor_passcode=인증 패스코드
+login_two_factor_enter_recovery_code=2단계 복구 코드를 입력하세요
+login_two_factor_recovery=2단계 복구
+login_two_factor_recovery_code=복구 코드
+login_two_factor_enter_passcode=2단계 패스코드를 입력하세요
+login_two_factor_invalid_recovery_code=복구 코드가 사용 중이거나 유효하지 않습니다.
+
 [mail]
 activate_account=계정을 활성화하세요
 activate_email=이메일 주소 확인
@@ -201,6 +212,7 @@ Content=컨텐츠
 require_error=` 비어 있을 수 없습니다.`
 alpha_dash_error=`은(는) 숫자, 알파벳, 대시(-_) 문자로만 구성되어야 합니다.`
 alpha_dash_dot_error=` 숫자, 알파벳, 점(.), 대시(-_) 문자로만 구성되어야 합니다.`
+alpha_dash_dot_slash_error=` 은(는) 알파벳, 숫자, 대시(-_), 점, 슬래시로만 구성되어야 합니다.`
 size_error=` %s 글자여야 합니다.`
 min_size_error=` 최소 %s 글자여야 합니다.`
 max_size_error=` %s 글자를 넘을 수 없습니다.`
@@ -252,11 +264,11 @@ profile=프로필
 password=비밀번호
 avatar=아바타
 ssh_keys=SSH 키
-social=소셜 계정
-applications=애플리케이션
+security=보안
+repos=저장소
 orgs=조직
+applications=애플리케이션
 delete=계정 삭제
-uid=Uid
 
 public_profile=공개 프로필
 profile_desc=이메일 주소가 공개되며, 사이트를 통해 작업하거나 계정과 관련된 모든 알림에 사용됩니다.
@@ -322,10 +334,30 @@ no_activity=최근 활동 없음
 key_state_desc=이 키는 최근 1주일 동안 사용된 적이 있습니다.
 token_state_desc=이 토큰은 최근 1주일 동안 사용된 적이 있습니다.
 
-manage_social=SNS계정 관리
-social_desc=연결된 SNS계정 리스트입니다. 직접 로그인 하지 않은 계정은 연결을 해제하세요.
-unbind=해제
-unbind_success=SNS계정이 연결 해제되었습니다.
+two_factor=2단계 인증
+two_factor_status=상태:
+two_factor_on=켜기
+two_factor_off=끄기
+two_factor_enable=활성화
+two_factor_disable=비활성화
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=개인 액세스 토큰 관리
 generate_new_token=새 토큰을 생성
@@ -343,6 +375,11 @@ orgs.none=당신은 어떤 조직의 구성원도 아닙니다.
 orgs.leave_title=조직 떠나기
 orgs.leave_desc=조직을 떠난 후에는 모든 리포지토리와 팀에 액세스 할 수 없게 됩니다. 계속 하시겠습니까?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=계정 삭제
 delete_prompt=당신의 계정을 삭제합니다.  완료된 후에는 <strong>취소할 수 없습니다</strong>.
 confirm_delete_account=삭제 승인
@@ -413,7 +450,7 @@ quick_guide=퀵 가이드
 clone_this_repo=이 저장소 복제
 create_new_repo_command=커맨드 라인에서 새 저장소 만들기
 push_exist_repo=커맨드 라인에서 기존 저장소 푸시하기
-repo_is_empty=이 저장소는 비어 있습니다. 나중에 다시 와주세요!
+bare_message=This repository does not have any content yet.
 
 files=파일
 branch=브렌치
@@ -426,6 +463,7 @@ pulls=풀 리퀘스트
 labels=레이블
 milestones=마일스톤
 commits=커밋
+git_branches=Branches
 releases=릴리즈
 file_raw=Raw
 file_history=히스토리
@@ -434,6 +472,13 @@ file_permalink=고유링크
 file_too_large=이 파일은 표시하기엔 너무 큽니다.
 video_not_supported_in_browser=이 브라우저는 HTML5 비디오 태그를 지원하지 않습니다.
 
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=All Branches
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=파일 생성
 editor.upload_file=파일 업로드
 editor.edit_file=파일 수정
@@ -473,7 +518,7 @@ editor.add_subdir=하위 디렉토리 추가...
 editor.unable_to_upload_files=파일 '%s'를 업로드하는데 실패하였습니다. 에러: %v
 editor.upload_files_to_dir=파일 업로드 '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=커밋 기록
 commits.commits=커밋
 commits.search=커밋 검색
 commits.find=찾기
@@ -641,24 +686,26 @@ settings.collaboration.admin=관리자
 settings.collaboration.write=쓰기
 settings.collaboration.read=읽기
 settings.collaboration.undefined=미정의
-settings.branches=Branches
-settings.default_branch=Default Branch
+settings.branches=브랜치
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
+settings.default_branch=기본 브랜치
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
-settings.update=Update
-settings.update_default_branch_success=Default branch of this repository has been updated successfully!
-settings.protected_branches=Protected Branches
-settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
-settings.choose_a_branch=Choose a branch...
-settings.branch_protection=Branch Protection
-settings.branch_protection_desc=Please choose protect options for branch <b>%s</b>.
-settings.protect_this_branch=Protect this branch
-settings.protect_this_branch_desc=Disable force pushes and prevent from deletion.
-settings.protect_require_pull_request=Require pull request instead direct pushing
-settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
-settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
-settings.protect_whitelist_users=Users who can push to this branch
-settings.protect_whitelist_search_users=Search users
+settings.update=업데이트
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
+settings.update_default_branch_success=이 레포지토리의 기본 브랜치가 성공적으로 설정되었습니다!
+settings.protected_branches=보호된 브랜치
+settings.protected_branches_desc=보호된 브랜치는 force 푸시, 실수로 인한 코드 삭제를 방지하며 코드 커미터를 화이트리스트 합니다.
+settings.choose_a_branch=브랜치를 선택하세요...
+settings.branch_protection=브랜치 보호
+settings.branch_protection_desc=브랜치 <b>%s</b> 의 보호 설정을 선택하세요.
+settings.protect_this_branch=이 브랜치를 보호하기
+settings.protect_this_branch_desc=Force 푸시와 삭제를 비활성화합니다.
+settings.protect_require_pull_request=직접 push 를 하지 않고 Pull Request 를 필요로 하도록 합니다.
+settings.protect_require_pull_request_desc=이 브랜치에 직접 푸시를 하는 것을 막고 싶다면 이 옵션을 활성화하세요. 커밋은 다른 비보호 브랜치에 푸시되어야 하며 이 브랜치에는 Pull Request 를 통해 병합될 것입니다.
+settings.protect_whitelist_committers=이 브랜치에 푸시할 수 있는 유저
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
+settings.protect_whitelist_users=이 브랜치에 푸시를 할 수 있는 유저
+settings.protect_whitelist_search_users=유저 검색
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
 settings.protect_whitelist_search_teams=Search teams
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
@@ -674,11 +721,13 @@ settings.change_reponame_prompt=이 변경은 이 저장소와 연관된 링크
 settings.advanced_settings=고급 설정
 settings.wiki_desc=위키 시스템 활성화
 settings.use_internal_wiki=내장 위키 사용
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=외부 위키 사용하기
 settings.external_wiki_url=외부 위키 URL
 settings.external_wiki_url_desc=탭을 클릭하면 URL로 리다이렉트됩니다.
 settings.issues_desc=이슈 추적기를 사용하도록 설정
 settings.use_internal_issue_tracker=내장된 경량 이슈 트레커를 사용
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=외부 이슈 트래커 사용하기
 settings.external_tracker_url=외부 이슈 트래커 URL
 settings.external_tracker_url_desc=방문자는 탭을 클릭하면 URL로 리다이렉트 됩니다.
@@ -732,6 +781,8 @@ settings.webhook_deletion_success=Webhook을 성공적으로 삭제했습니다!
 settings.webhook.test_delivery=전달 시험
 settings.webhook.test_delivery_desc=가짜 푸시 이벤트 전달하여 웹훅 설정을 테스트합니다.
 settings.webhook.test_delivery_success=Webhook 테스트가 delivery 큐에 추가되었습니다. delivery 기록에서 나오기까지 몇 초의 시간이 걸릴 것입니다.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=요청
 settings.webhook.response=응답
 settings.webhook.headers=제목
@@ -756,10 +807,20 @@ settings.event_send_everything=<strong>모든 것</strong>이 필요합니다.
 settings.event_choose=필요한 것을 선택해주세요.
 settings.event_create=생성
 settings.event_create_desc=브랜치 또는 태그를 생성합니다.
-settings.event_pull_request=끌어오기 요청
-settings.event_pull_request_desc=끌어오기 요청 열기, 닫기, 다시 열기, 편집, 할당, 할당 해제, 라벨 업데이트, 라벨 지우기 또는 동기화.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=푸시
 settings.event_push_desc=깃 저장소로 푸시
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=끌어오기 요청
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Release
+settings.event_release_desc=Release published in a repository.
 settings.active=활성
 settings.active_helper=후크를 트리거하면 이벤트에 대한 세부 정보도 전달됩니다.
 settings.add_hook_success=새로운 웹훅이 생성되었습니다.
@@ -804,7 +865,6 @@ release.releases=릴리즈
 release.new_release=새로운 릴리즈
 release.draft=초안
 release.prerelease=사전 릴리즈
-release.stable=안정
 release.edit=편집
 release.ahead=이 릴리스 이후로 <strong>%d</strong> %s에 커밋합니다.
 release.source_code=소스 코드
@@ -1020,6 +1080,7 @@ repos.private=비공개
 repos.watches=지켜보기
 repos.stars=Stars
 repos.issues=이슈
+repos.size=Size
 
 auths.auth_manage_panel=인증 관리 패널
 auths.new=새로운 소스를 추가
@@ -1040,9 +1101,14 @@ auths.user_base=사용자 검색 기준
 auths.user_dn=사용자 DN
 auths.attribute_username=유저 명 속성
 auths.attribute_username_placeholder=사용자 이름에 대한 로그인 폼 필드 값을 사용하려면 비워 둡니다.
-auths.attribute_name=이름 속성
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=성씨 속성
 auths.attribute_mail=이메일 속성
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=DN 컨텍스트에서 속성을 가져와 연결합니다.
 auths.filter=사용자 필터
 auths.admin_filter=관리자 필터
@@ -1177,7 +1243,8 @@ config.git_pull_timeout=끌어오기 작업 시간 제한
 config.git_gc_timeout=가비지 콜렉션 작업 시간 제한
 
 config.log_config=로그 설정
-config.log_mode=로그 모드
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Cron 작업
 monitor.name=이름
@@ -1206,19 +1273,23 @@ notices.delete_success=시스템 알림들이 성공적으로 삭제되었습니
 
 [action]
 create_repo=저장소를 만들었습니다. <a href="%s">%s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=<code>%[1]s에서</code>에서 <a href="%[2]s"> %[3]s</a>으로 저장소 이름을 바꾸었습니다.
 commit_repo=<a href="%[1]s">%[4]s</a>에서 <a href="%[1]s/src/%[2]s">%[3]s</a>으로 푸시함
+compare_commits=이 %d개의 커밋에 대한 비교 보기
+transfer_repo=<code>%s</code>에서 <a href="%s">%s</a>로 저장소가 전송되었습니다.
 create_issue=`열린 이슈 <a href="%s/issues/%s"> %s #%[2]s</a>`
 close_issue=`닫힌 이슈 <a href="%s/issues/%s"> %s #%[2]s</a>`
 reopen_issue=`다시 열린 이슈 <a href="%s/issues/%s"> %s #%[2]s</a>`
+comment_issue=`이슈에 댓글이 달렸습니다. <a href="%s/issues/%s"> %s #%[2]s</a>`
 create_pull_request=`만들어진 끌어오기 요청 <a href="%s/pulls/%s"> %s #%[2]s</a>`
 close_pull_request=`닫힌 끌어오기 요청 <a href="%s/pulls/%s"> %s #%[2]s</a>`
 reopen_pull_request=`다시 열린 끌어오기 요청 <a href="%s/pulls/%s"> %s #%[2]s</a>`
-comment_issue=`이슈에 댓글이 달렸습니다. <a href="%s/issues/%s"> %s #%[2]s</a>`
 merge_pull_request=`병합된 끌어오기 요청 <a href="%s/pulls/%s"> %s #%[2]s</a>`
-transfer_repo=<code>%s</code>에서 <a href="%s">%s</a>로 저장소가 전송되었습니다.
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=태그 <a href="%s/src/%s">%[2]s</a>를 <a href="%[1]s">%[3]s</a>로 푸시함
-compare_commits=이 %d개의 커밋에 대한 비교 보기
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=전

conf/locale/locale_lv-LV.ini

@@ -48,7 +48,7 @@ cancel=Atcelt
 install=Instalācija
 title=Instalācijas soļi pirmo reizi palaižot
 docker_helper=Ja Gogs tiek lietots zem Docker, izlasiet uzmanīgi <a target="_blank" href="%s">vadlīnijas</a>, pirms ko maināt šajā lapā!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs ir nepieciešams MySQL, PostgreSQL, SQLite3, MSSQL vai TiDB.
 db_title=Datu bāzes iestatījumi
 db_type=Datu bāzes veids
 host=Resursdators
@@ -58,8 +58,8 @@ db_name=Datu bāzes nosaukums
 db_helper=Nepieciešams izmantot MySQL INNODB dzini ar rakstzīmju kopu utf8_general_ci.
 ssl_mode=SSL režīms
 path=Ceļš
-sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=Faila ceļs uz SQLite3 datu bāzi. <br>Norādiet absolūtu ceļu, kad laižat kā servisu.
+err_empty_db_path=SQLite3 datu bāzes ceļš nevar būt tukšs.
 no_admin_and_disable_registration=Reģistrāciju nevar atslēgt, kamēr nav izveidots administratora konts.
 err_empty_admin_password=Administratora kontam ir obligāti jānorāda parole.
 
@@ -74,14 +74,16 @@ domain=Domēns
 domain_helper=Tas ietekmē SSH klonēšanas URL.
 ssh_port=SSH ports
 ssh_port_helper=Porta numurs, kuru izmanto Jūsu SSH serveris, atstājiet tukšu, ja nevēlaties izmantot SSH.
-use_builtin_ssh_server=Use Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server=Izmantot iebūvēto SSH serveri
+use_builtin_ssh_server_popup=Startēt iebūvēto SSH serveri Git darbībām, lai atšķirtu no sistēmas SSH servisa.
 http_port=HTTP ports
 http_port_helper=Porta numurs pēc kura lietojumprogrammai būs iespējams pieslēgties.
 app_url=Lietotnes URL
 app_url_helper=Tas ietekmē HTTP/HTTPS klonēšanas URL un e-pasta saturā izsūtītās saites.
 log_root_path=Žurnalizēšanas direktorija
 log_root_path_helper=Direktorija, kurā tiks glabāti žurnāla faili.
+enable_console_mode=Iespējot konsoles režīmu
+enable_console_mode_popup=Papildus faila režīmam, papildus rakstīt žurnāla ierakstus konsolē.
 
 optional_title=Neobligātie iestatījumi
 email_title=E-pasta pakalpojuma iestatījumi
@@ -117,7 +119,8 @@ sqlite3_not_available=Jūsu versija neatbalsta SQLite3, lūdzu lejupielādējiet
 invalid_db_setting=Datu bāzes iestatījums nav pareizs: %v
 invalid_repo_path=Repozitorija atrašanās vieta ir nekorekta: %v
 run_user_not_match=Izpildes lietotājs nav pašreizējais lietotājs: %s -> %s
-invalid_smtp_from=SMTP From field is not valid: %v
+smtp_host_missing_port=SMTP Host is missing port in address.
+invalid_smtp_from=SMTP sūtītāja lauks ir nekorekts: %v
 save_config_failed=Neizdevās saglabāt konfigurāciju: %v
 invalid_admin_setting=Nekorekts admin konta iestatījums: %v
 install_success=Laipni lūdzam! Mēs priecājamies, ka Jūs izvēlaties Gogs, patīkamu lietošanu!
@@ -139,7 +142,7 @@ issues.in_your_repos=Jūsu repozitorijos
 [explore]
 repos=Repozitoriji
 users=Lietotāji
-organizations=Organizations
+organizations=Organizācijas
 search=Meklēt
 
 [auth]
@@ -166,6 +169,14 @@ reset_password_helper=Nospiediet šeit, lai atjaunotu paroli
 password_too_short=Paroles garums nedrīkst būt mazāks par 6.
 non_local_account=Tikai lokālie konti var nomainīt savu paroli Gogs.
 
+login_two_factor=Divu faktoru autentifikācija
+login_two_factor_passcode=Autentifikācijas kods
+login_two_factor_enter_recovery_code=Ievadiet divu faktoru atjaunošanas kodu
+login_two_factor_recovery=Divu faktoru atjaunošana
+login_two_factor_recovery_code=Atjaunošanas kods
+login_two_factor_enter_passcode=Ievadiet divu faktoru kodu
+login_two_factor_invalid_recovery_code=Atjaunošanas kods jau ir izmantots vai nav pareizs.
+
 [mail]
 activate_account=Lūdzu, aktivizējiet savu kontu
 activate_email=Apstipriniet savu e-pasta adresi
@@ -201,6 +212,7 @@ Content=Saturs
 require_error=` nedrīkst būt tukšs.`
 alpha_dash_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus vai domuzīmes (-_).`
 alpha_dash_dot_error=` drīkst saturēt tikai latīņu alfabēta burtus, ciparus, domuzīmes (-_) vai punktu.`
+alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
 size_error=` jābūt %s simbolus garam.`
 min_size_error=` jabūt vismaz %s simbolu garumā.`
 max_size_error=` jabūt ne mazāk kā %s simbolu garumā.`
@@ -252,11 +264,11 @@ profile=Profils
 password=Parole
 avatar=Profila attēls
 ssh_keys=SSH atslēgas
-social=Sociālie konti
-applications=Lietotnes
+security=Drošība
+repos=Repozitoriji
 orgs=Organizācijas
+applications=Lietotnes
 delete=Dzēst kontu
-uid=Lietotāja ID
 
 public_profile=Publiskais profils
 profile_desc=Jūsu e-pasta adrese ir publiska un tiks izmantota, lai nosūtītju Jums paziņojumus, kas saistīti ar Jūsu kontu vai darbībām veiktām caur šo mājas lapu.
@@ -322,10 +334,30 @@ no_activity=Nav nesenas aktivitātes
 key_state_desc=Šī atslēga tika izmantota pēdējo 7 dienu laikā
 token_state_desc=Šis talons tika izmantots pēdējo 7 dienu laikā
 
-manage_social=Pārvaldīt piesaistītos sociālos kontus
-social_desc=Šeit tiek attēloti visi sociālie konti, kas ir piesaistīti Jūsu kontam. Dzēsiet visus, kurus Jūs neatpazīstat.
-unbind=Atsaistīt
-unbind_success=Sociālais konts tika atsaistīts.
+two_factor=Divu faktoru autentifikācija
+two_factor_status=Statuss:
+two_factor_on=Ieslēgts
+two_factor_off=Izslēgts
+two_factor_enable=Iespējot
+two_factor_disable=Atspējot
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=HTTP/HTTPS darbībām vairs nav iespējams izmantot tikai lietotāja vārdu un paroli. Izveidojiet un izmantojiet <a href="%[1]s%[2]s">Personīgo piekļuves talonu</a> kā pilnvaru, piemēram, <code>%[3]s</code>.
+two_factor_enable_title=Iespējot divu faktoru autentifikāciju
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Vai ievadiet noslēpumu:
+two_factor_then_enter_passcode=Pēc tam ievadiet kodu:
+two_factor_verify=Pārbaudīt
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Atspējot divu faktoru autentifikāciju
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=Pārvaldīt personīgos piekļuves talonus
 generate_new_token=Ģenerēt jaunu talonu
@@ -340,9 +372,14 @@ access_token_deletion_desc=Dzēšot personīgo piekļuves talonu, tiks liegta pi
 delete_token_success=Personīgās piekļuves talons veiksmīgi izdzēsts! Neaizmirstiet nomainīt uz citu aplikācijās, kas to izmantoja.
 
 orgs.none=You are not a member of any organizations.
-orgs.leave_title=Leave an organization
+orgs.leave_title=Pamest organizāciju
 orgs.leave_desc=You will lose access to all repositories and teams after you left the organization. Do you want to continue?
 
+repos.leave=Pamest
+repos.leave_title=Pamest repozitoriju
+repos.leave_desc=Tiks zaudēta piekļuve repozitorijam, kad būsiet to pametis. Vai patiešām vēlaties turpināt?
+repos.leave_success=Repozitorijs '%s' veiksmīgi pamests!
+
 delete_account=Dzēst savu kontu
 delete_prompt=Šī darbība pilnībā izdzēsīs Jūsu kontu, kā arī tā ir <strong>NEATGRIEZENISKA</strong>!
 confirm_delete_account=Apstiprināt dzēšanu
@@ -370,7 +407,7 @@ readme=LasiMani
 readme_helper=Izvēlieties faila LasiMani sagatavi
 auto_init=Inicializēt šo repozitoriju ar izvēlētajiem failiem un sagatavi
 create_repo=Izveidot repozitoriju
-default_branch=Noklusējuma atzars
+default_branch=Noklusētais atzars
 mirror_prune=Izmest
 mirror_prune_desc=Izdzēst visas ārējās atsauces, kas ārējā repozitorijā vairs neeksistē
 mirror_interval=Spoguļošanas intervāls (stundās)
@@ -390,7 +427,7 @@ migrate_type=Migrācijas veids
 migrate_type_helper=Šis repozitorijs būs <span class="text blue">spogulis</span>
 migrate_repo=Migrēt repozitoriju
 migrate.clone_address=Klonēšanas adrese
-migrate.clone_address_desc=This can be a HTTP/HTTPS/GIT URL.
+migrate.clone_address_desc=Tas var būt HTTP/HTTPS/GIT URL.
 migrate.clone_address_desc_import_local=You're also allowed to migrate a repository by local server path.
 migrate.permission_denied=Jums nav tiesību importēt lokālu repozitoriju.
 migrate.invalid_local_path=Nekorents lokālais ceļš, tas neeksistē vai nav direktorijs.
@@ -413,9 +450,9 @@ quick_guide=Īsa pamācība
 clone_this_repo=Klonēt šo repozitoriju
 create_new_repo_command=Izveidot jaunu repozitoriju komandrindā
 push_exist_repo=Nosūtīt izmaiņas no komandrindas eksistējošam repozitorijam
-repo_is_empty=Šis repozitorijs ir tukšs, apskatiet atkal vēlāk!
+bare_message=This repository does not have any content yet.
 
-files=Files
+files=Faili
 branch=Atzars
 tree=Koks
 filter_branch_and_tag=Filtrēt atzarus vai tagus
@@ -426,6 +463,7 @@ pulls=Izmaiņu pieprasījumi
 labels=Etiķetes
 milestones=Atskaites punkti
 commits=Revīzijas
+git_branches=Atzari
 releases=Laidieni
 file_raw=Neapstrādāts
 file_history=Vēsture
@@ -434,6 +472,13 @@ file_permalink=Patstāvīgā saite
 file_too_large=Šis fails ir par lielu, lai to parādītu
 video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
+branches.overview=Pārskats
+branches.active_branches=Aktīvie atzari
+branches.stale_branches=Pamests atzars
+branches.all=Visi atzari
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Mainīt noklusēto atzaru
+
 editor.new_file=Jauns fails
 editor.upload_file=Augšupielādēt failu
 editor.edit_file=Labot failu
@@ -462,7 +507,7 @@ editor.cancel=Atcelt
 editor.filename_cannot_be_empty=Nav ievadīts faila nosaukums.
 editor.branch_already_exists=Atzars '%s' šajā repozitorijā jau eksistē.
 editor.directory_is_a_file=Ieraksts '%s' vecāka ceļā ir fails nevis direktorija šajā repozitorijā.
-editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
+editor.file_is_a_symlink=Fails '%s" ir norāde, kuru nav iespējams labot no tīmekļa redaktora.
 editor.filename_is_a_directory=Faila nosaukums '%s' sakrīt ar direktorijas nosaukumu šajā repozitorijā.
 editor.file_editing_no_longer_exists=Fails '%s', ko labojat, vairs neeksistē repozitorijā.
 editor.file_changed_while_editing=Faila saturs ir mainījies kopš brīža, kad sākāt to labot. <a target="_blank" href="%s">Nospiediet šeit</a>, lai redzētu kas ir mainījies vai <strong>nospiediet atkārtoti pabeigt revīziju</strong>, lai pārrakstītu izmaiņas.
@@ -473,7 +518,7 @@ editor.add_subdir=Pievienot apakšdirektoriju...
 editor.unable_to_upload_files=Neizdevās augšupielādēt failus uz direktoriju '%s', kļūda: %v
 editor.upload_files_to_dir=Augšupielādēt failus uz direktoriju '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=Revīziju vēsture
 commits.commits=Revīzijas
 commits.search=Meklēt revīzijas
 commits.find=Meklēt
@@ -588,7 +633,7 @@ pulls.cannot_auto_merge_desc=Šis izmaiņu pieprasījums nevar tikt automātiski
 pulls.cannot_auto_merge_helper=Lūdzu sapludiniet manuāli, lai atrisinātu konfliktus.
 pulls.merge_pull_request=Izmaiņu pieprasījuma sapludināšana
 pulls.open_unmerged_pull_exists=`Jūs nevarat veikt atkārtotas atvēršanas darbību, jo jau eksistē izmaiņu pieprasījums (#%d) no šī repozitorija ar tādu pašu sapludināšanas informāciju un gaida sapludināšanu.`
-pulls.delete_branch=Delete Branch
+pulls.delete_branch=Dzēst atzaru
 pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
 
 milestones.new=Jauns atskaites punkts
@@ -640,26 +685,28 @@ settings.collaboration.admin=Administrators
 settings.collaboration.write=Rakstīšanas
 settings.collaboration.read=Skatīšanās
 settings.collaboration.undefined=Nedefinētas
-settings.branches=Branches
-settings.default_branch=Default Branch
-settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
-settings.update=Update
+settings.branches=Atzari
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
+settings.default_branch=Noklusētais atzars
+settings.default_branch_desc=Noklusētais atzars tiek uzskatīts par pamata atzaru koda revīzijām, izmaiņu pieprasījumiem un tiešsaistes rediģēšanai.
+settings.update=Atjaunot
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
-settings.protected_branches=Protected Branches
+settings.protected_branches=Aizsargātie atzari
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
-settings.choose_a_branch=Choose a branch...
-settings.branch_protection=Branch Protection
+settings.choose_a_branch=Izvēlēties atzarus...
+settings.branch_protection=Atzaru aizsargāšana
 settings.branch_protection_desc=Please choose protect options for branch <b>%s</b>.
-settings.protect_this_branch=Protect this branch
+settings.protect_this_branch=Aizsargāt šo atzaru
 settings.protect_this_branch_desc=Disable force pushes and prevent from deletion.
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
-settings.protect_whitelist_users=Users who can push to this branch
-settings.protect_whitelist_search_users=Search users
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
+settings.protect_whitelist_users=Lietotāji, kas var nosūtīt izmaiņas uz šo atzaru
+settings.protect_whitelist_search_users=Meklēt lietotajus
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
-settings.protect_whitelist_search_teams=Search teams
+settings.protect_whitelist_search_teams=Meklēt komandas
 settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
 settings.hooks=Tīmekļa āķi
 settings.githooks=Git āķi
@@ -673,13 +720,15 @@ settings.change_reponame_prompt=Šī izmaiņa ietekmēs saites, kas ir saistīta
 settings.advanced_settings=Papildu iestatījumi
 settings.wiki_desc=Iespējot vikivietnes
 settings.use_internal_wiki=Izmantot iebūvēto vikivietni
+settings.allow_public_wiki_desc=Atļaut publisko piekļuvi vikivietnei, ja repozitorijs ir privāts
 settings.use_external_wiki=Izmantot ārējo vikivietni
 settings.external_wiki_url=Ārējās Vikivietnes adrese
 settings.external_wiki_url_desc=Apmeklētāji tiks novirzīti uz adresi, kad viņi uzklikšķinās uz cilnes.
 settings.issues_desc=Iespējot problēmu sekotāju
 settings.use_internal_issue_tracker=Izmantot iebūvētu vieglu problēmu sekotāju
+settings.allow_public_issues_desc=Atļaut publisko piekļuvi problēmām, ja repozitorijs ir privāts
 settings.use_external_issue_tracker=Izmantot ārējo problēmu sekotāju
-settings.external_tracker_url=External Issue Tracker URL
+settings.external_tracker_url=Ārējā problēmu sekotāja URL
 settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
 settings.tracker_url_format=Ārējā problēmu sekotāja adreses formāts
 settings.tracker_issue_style=Ārējā problēmu reģistra nosaukumu stils:
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Tīmekļa āķis tika veiksmīgi izdzēsts!
 settings.webhook.test_delivery=Testa piegāde
 settings.webhook.test_delivery_desc=Veikt viltus push-notikuma piegādi lai notestētu Jūsu tīmekļa āķa iestatījumus
 settings.webhook.test_delivery_success=Testa web-āķis ir pievienots piegādes rindai. Var paiet dažas sekundes, kamēr tas parādīsies piegāžu vēsturē.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=Pieprasījums
 settings.webhook.response=Atbilde
 settings.webhook.headers=Galvenes
@@ -755,10 +806,20 @@ settings.event_send_everything=Vēlos saņemt <strong>visu</strong>.
 settings.event_choose=Atzīmēt, ko vēlos saņemt.
 settings.event_create=Izveidot
 settings.event_create_desc=Atzara vai taga izveidošana
-settings.event_pull_request=Izmaiņu pieprasījums
-settings.event_pull_request_desc=Atvērts, aizvērts, atkāroti atvērts, labots, piešķirts vai noņemts izmaiņu pieprasījums, vai mainīta etiķete, vai veikta sinhronizācija.
+settings.event_delete=Dzēst
+settings.event_delete_desc=Atzars vai tags izdzēsts
+settings.event_fork=Atdalīts
+settings.event_fork_desc=Repozitorijs atdalīts
 settings.event_push=Izmaiņu nosūtīšana
 settings.event_push_desc=Git izmaiņu nosūtīšana uz repozitoriju
+settings.event_issues=Problēmas
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Problēmas komentārs
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=Izmaiņu pieprasījums
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Laidiens
+settings.event_release_desc=Laidiens publicēts repozitorijā.
 settings.active=Aktīvs
 settings.active_helper=Tiks nosūtīti notikuma dati, kad nostrādās šis āķis.
 settings.add_hook_success=Jauns tīmekļa āķis tika veiksmīgi pievienots.
@@ -803,7 +864,6 @@ release.releases=Laidieni
 release.new_release=Jauns laidiens
 release.draft=Melnraksts
 release.prerelease=Pirmsizlaides versija
-release.stable=Stabila
 release.edit=labot
 release.ahead=<strong>%d</strong> revīzijas atzarā %s kopš šī laidiena
 release.source_code=Izejas kods
@@ -852,7 +912,7 @@ team_permission_desc=Kādām tiesībām šai komandai būtu jābūt?
 
 form.name_reserved=Organizācijas nosaukums '%s' ir rezervēts.
 form.name_pattern_not_allowed=Organizācijas nosaukums '%s' nav atļauts.
-form.team_name_reserved=Team name '%s' is reserved.
+form.team_name_reserved=Komandas vārds '%s' ir rezervēts.
 
 settings=Iestatījumi
 settings.options=Opcijas
@@ -1019,6 +1079,7 @@ repos.private=Privāts
 repos.watches=Vērošana
 repos.stars=Atzīmētās zvaigznītes
 repos.issues=Problēmas
+repos.size=Izmērs
 
 auths.auth_manage_panel=Autentifikācijas pārvaldības panelis
 auths.new=Pievienot jaunu avotu
@@ -1039,9 +1100,14 @@ auths.user_base=Lietotāja pamatnosacījumi
 auths.user_dn=Lietotāja DN
 auths.attribute_username=Lietotājvārda atribūts
 auths.attribute_username_placeholder=Atstājiet tukšu, lai izmantotu lietotājvārdu ar kuru autorizējaties.
-auths.attribute_name=Vārda atribūts
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Uzvārda atribūts
 auths.attribute_mail=E-pasta atribūts
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Nolasīt atribūtus no saistīšanas DN konteksta
 auths.filter=Lietotāju filts
 auths.admin_filter=Administratoru filtrs
@@ -1066,7 +1132,7 @@ auths.delete_auth_title=Autentifikācijas dzēšana
 auths.delete_auth_desc=Šī autentifikācija tiks dzēsta, vai vēlaties turpināt?
 auths.still_in_used=Daži lietotāji joprojām izmanto šo autentifikācijas veidu. Nepieciešams veikt šo lietotāju konvertāciju vai dzēšanu.
 auths.deletion_success=Autentifikācija tika veiksmīgi izdzēsta!
-auths.login_source_exist=Login source '%s' already exists.
+auths.login_source_exist=Pieteikšanās avots '%s' jau eksistē.
 
 config.server_config=Servera konfigurācija
 config.app_name=Lietotnes nosaukums
@@ -1077,7 +1143,7 @@ config.offline_mode=Bezsaistes režīms
 config.disable_router_log=Atspējot maršrutētāja žurnalizēšanu
 config.run_user=Izpildes lietotājs
 config.run_mode=Izpildes režīms
-config.git_version=Git Version
+config.git_version=Git versija
 config.static_file_root_path=Statisko failu atrašanās vieta
 config.log_file_root_path=Žurnalizēšanas failu glabāšanas vieta
 config.reverse_auth_user=Reversā lietotāja autentifikācija
@@ -1094,14 +1160,14 @@ config.ssh_keygen_path=Keygen ('ssh-keygen') ceļš
 config.ssh_minimum_key_size_check=Minimālā atslēgas lieluma pārbaude
 config.ssh_minimum_key_sizes=Minimālais atslēgas lielums
 
-config.repo_config=Repository Configuration
+config.repo_config=Repozitorija konfigurācija
 config.repo_root_path=Repozitoriju glabāšanas vieta
 config.script_type=Skripta veids
-config.repo_force_private=Force Private
+config.repo_force_private=Piespiedu privāti repozitoriji
 config.max_creation_limit=Max Creation Limit
 config.preferred_licenses=Preferred Licenses
-config.disable_http_git=Disable HTTP Git
-config.enable_local_path_migration=Enable Local Path Migration
+config.disable_http_git=Atspējot HTTP Git
+config.enable_local_path_migration=Atļaut migrāciju no lokāla ceļa
 config.commits_fetch_concurrency=Commits Fetch Concurrency
 
 config.db_config=Datu bāzes konfigurācija
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Izmaiņu saņemšanas darbības noilgums
 config.git_gc_timeout=GC darbības noilgums
 
 config.log_config=Žurnalizēšanas konfigurācija
-config.log_mode=Žurnalizēšanas veids
+config.log_mode=Režīms
+config.log_options=Opcijas
 
 monitor.cron=Cron uzdevumi
 monitor.name=Nosaukums
@@ -1205,19 +1272,23 @@ notices.delete_success=Sistēmas paziņojumi tika veiksmīgi izdzēstas.
 
 [action]
 create_repo=izveidoja repozitoriju <a href="%s">%s</a>
+fork_repo=atdalīja repozitoriju uz <a href="%s">%s</a>
 rename_repo=pārsauca repozitoriju no <code>%[1]s</code> uz <a href="%[2]s">%[3]s</a>
 commit_repo=veica izmaiņu nosūtīšanu atzaram <a href="%[1]s/src/%[2]s">%[3]s</a> repozitorijā <a href="%[1]s">%[4]s</a>
+compare_commits=Salīdzināt šīs %d revīzijas
+transfer_repo=mainīja repozitorija <code>%s</code> īpašnieku uz <a href="%s">%s</a>
 create_issue=`reģistrēja problēmu <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`slēdza problēmu <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`atkārtoti atvēra problēmu <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`pievienoja komentāru problēmai <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`izveidoja izmaiņu pieprasījumu <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`aizvēra izmaiņu pieprasījumu <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`atkārtoti atvēra izmaiņu pieprasījumu <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`pievienoja komentāru problēmai <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`sapludināja izmaiņu pieprasījumu <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=mainīja repozitorija <code>%s</code> īpašnieku uz <a href="%s">%s</a>
+create_branch=izveidoja jaunu atzaru <a href="%[1]s/src/%[2]s">%[3]s</a> repozitorijā <a href="%[1]s">%[4]s</a>
+delete_branch=izdzēsa atzaru <code>%[2]s</code> repozitorijā <a href="%[1]s">%[3]s</a>
 push_tag=pievienoja tagu <a href="%s/src/%s">%[2]s</a> repozitorijam <a href="%[1]s">%[3]s</a>
-compare_commits=Salīdzināt šīs %d revīzijas
+delete_tag=izdzēsa tagu <code>%[2]s</code> repozitorijā <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=atpakaļ

conf/locale/locale_nl-NL.ini

@@ -48,7 +48,7 @@ cancel=Annuleren
 install=Installatie
 title=Installatiestappen voor de eerste keer opstarten
 docker_helper=Als u gebruik maakt Gogs binnen Docker, lees dan de <a target="_blank" href="%s">richtlijnen</a> voordat u iets veranderen op deze pagina!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs vereist MySQL, PostgreSQL, SQLite3, MSSQL of TiDB.
 db_title=Database-instellingen
 db_type=Database-type
 host=Host
@@ -58,8 +58,8 @@ db_name=Databasenaam
 db_helper=Gebruik InnoDB engine met utf8_general_ci karakterset voor MySQL.
 ssl_mode=SSL-modus
 path=Pad
-sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=Het pad van de SQLite3-database.<br>Als u Gogs start als een service, geef dan een absoluut pad op.
+err_empty_db_path=SQLite3 database pad mag niet leeg zijn.
 no_admin_and_disable_registration=Je kunt niet de registratie uit te schakelen zonder een beheerders account.
 err_empty_admin_password=Beheerder wachtwoord kan niet leeg zijn.
 
@@ -74,14 +74,16 @@ domain=Domein
 domain_helper=Dit heeft invloed op de SSH kloon URLs
 ssh_port=SSH-poort
 ssh_port_helper=Nummer van de poort die uw SSH-server gebruikt, laat dit leeg om de SSH functie uit te schakelen.
-use_builtin_ssh_server=Use Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server=Gebruik de ingebouwde SSH server
+use_builtin_ssh_server_popup=Start de ingebouwde SSH server zodat de Git operaties herkenbaar zijn tegenover het systeem SSH Deamon.
 http_port=HTTP-poort
 http_port_helper=Poortnummer waar het programma naar luistert.
 app_url=Applicatie URL
 app_url_helper=Dit heeft invloed op de HTTP/HTTPS kloon urls en de urls die in de email worden gebruikt
 log_root_path=Log-pad
 log_root_path_helper=Directory waar logbestanden opgeslagen worden.
+enable_console_mode=Schakel Console modus in
+enable_console_mode_popup=Naast de bestand modus print het ook de logs naar de console.
 
 optional_title=Optionele instellingen
 email_title=E-mail service instellingen
@@ -97,8 +99,8 @@ offline_mode=Off line modus inschakelen
 offline_mode_popup=Schakel CDN uit in productiemodus, alle bestanden worden lokaal aangeboden.
 disable_gravatar=Gravatar Service uitschakelen
 disable_gravatar_popup=Schakel Gravatar en andere bronnen uit, alle avatars worden door gebruikers geüpload of zijn standaard.
-federated_avatar_lookup=Enable Federated Avatars Lookup
-federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
+federated_avatar_lookup=Federated Avatars zoekopdracht inschakelen
+federated_avatar_lookup_popup=Schakel federated avatars zoekopdracht in om de op libravatar gebaseerde leveranciers te gebruiken.
 disable_registration=Schakel zelfregistratie uit
 disable_registration_popup=Schakel zelfregistratie uit, alleen admins kunnen accounts maken.
 enable_captcha=Inschakelen Captcha
@@ -117,7 +119,8 @@ sqlite3_not_available=Uw versie biedt geen ondersteuning voor SQLite3, download
 invalid_db_setting=Uw database instellingen zijn niet correct: %v
 invalid_repo_path=Repositorie basis map is niet correct: %v
 run_user_not_match=De uitvoerende gebruiker is niet de huidig gebruiker: %s -> %s
-invalid_smtp_from=SMTP From field is not valid: %v
+smtp_host_missing_port=SMTP Host is missing port in address.
+invalid_smtp_from=SMTP-van-veld is niet geldig: %v
 save_config_failed=Kan de configuratie niet opslaan: %v
 invalid_admin_setting=Uw admin-instellingen zijn niet geldig: %v
 install_success=Welkom! Wij zijn veheugd dat u voor Gogs heeft gekozen, veel plezier en tot ziens
@@ -164,7 +167,15 @@ reset_password=Reset uw wachtwoord
 invalid_code=Sorry, uw bevestigingscode is verlopen of niet meer geldig.
 reset_password_helper=Klik hier om uw wachtwoord opnieuw in te stellen.
 password_too_short=De lengte van uw wachtwoord moet minimaal zes karakters zijn.
-non_local_account=Non-local accounts cannot change passwords through Gogs.
+non_local_account=Niet lokale accounts mogen hun wachtwoord niet veranderen via Gogs.
+
+login_two_factor=Twee-traps authenticatie
+login_two_factor_passcode=Authenticatie wachtwoord
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Recovery Code
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
 
 [mail]
 activate_account=Activeer uw account
@@ -201,6 +212,7 @@ Content=Inhoud
 require_error=kan niet leeg zijn.
 alpha_dash_error=moet een valide alfanumeriek of dash(-_) karakter zijn.
 alpha_dash_dot_error=moet een valide alfanumeriek, dash(-_) of (.) punt karakter zijn.
+alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
 size_error=moet groter zijn dan %s
 min_size_error=moet minimaal %s karakters bevatten.
 max_size_error=mag maximaal %s karakters bevatten.
@@ -252,11 +264,11 @@ profile=Profiel
 password=Wachtwoord
 avatar=Profielfoto
 ssh_keys=SSH-sleutels
-social=Sociale netwerk-accounts
-applications=Toepassingen
+security=Security
+repos=Repositories
 orgs=Organisaties
+applications=Toepassingen
 delete=Verwijder account
-uid=uid
 
 public_profile=Openbaar profiel
 profile_desc=Uw e-mailadres is openbaar en zal gebruikt worden voor alle account gerelateerde berichtgevingen en bewerkingingen die via de website worden gedaan.
@@ -322,10 +334,30 @@ no_activity=Geen recente activiteiten
 key_state_desc=Deze sleutel werd gebruikt in de laatste 7 dagen
 token_state_desc=Deze token is de laatste 7 dagen gebruikt
 
-manage_social=Beheer gekoppelde sociale accounts
-social_desc=Dit is een lijst van de bijbehorende sociale accounts koppelingen, Verwijder eventueel koppelingen die u niet herkent.
-unbind=Loskoppelen
-unbind_success=Sociaal account is ontkoppeld.
+two_factor=Two-factor Authentication
+two_factor_status=Status:
+two_factor_on=On
+two_factor_off=Off
+two_factor_enable=Enable
+two_factor_disable=Disable
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=Persoonlijke toegangstokens beheren
 generate_new_token=Nieuwe Token genereren
@@ -343,6 +375,11 @@ orgs.none=U bent geen lid van een organisatie.
 orgs.leave_title=Een organisatie verlaten
 orgs.leave_desc=U verliest toegang tot alle repositories en teams nadat u de organisatie verlaten hebt. Wilt u doorgaan?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=Verwijder uw account
 delete_prompt=Deze handeling zal uw account definitief verwijderen, u kunt dit <strong> NIET </strong> terug draaien!
 confirm_delete_account=Bevestig verwijdering
@@ -413,7 +450,7 @@ quick_guide=Snelstart gids
 clone_this_repo=Kloon deze repositorie
 create_new_repo_command=Maak een nieuwe repositorie aan vanaf de console
 push_exist_repo=Push een bestaande repositorie vanaf de console
-repo_is_empty=Deze repositories is leeg is, probeer het later opnieuw!
+bare_message=This repository does not have any content yet.
 
 files=Bestanden
 branch=Aftakking
@@ -426,6 +463,7 @@ pulls=Pull-aanvragen
 labels=Labels
 milestones=Mijlpalen
 commits=Commits
+git_branches=Branches
 releases=Publicaties
 file_raw=Ruwe
 file_history=Geschiedenis
@@ -434,6 +472,13 @@ file_permalink=Permalink
 file_too_large=Dit bestand is te groot om te worden getoond
 video_not_supported_in_browser=Uw browser ondersteunt geen HTML5 video label.
 
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=All Branches
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=Nieuw bestand
 editor.upload_file=Bestand uploaden
 editor.edit_file=Bewerk bestand
@@ -641,9 +686,11 @@ settings.collaboration.write=Schrijven
 settings.collaboration.read=Lezen
 settings.collaboration.undefined=Niet gedefinieerd
 settings.branches=Branches
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch=Default Branch
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=Update
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
 settings.protected_branches=Protected Branches
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Disable force pushes and prevent from deletion
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
 settings.protect_whitelist_search_users=Search users
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Deze verandering zal gevolgen hebben voor hoe li
 settings.advanced_settings=Geavanceerde opties
 settings.wiki_desc=Wiki-systeem inschakelen
 settings.use_internal_wiki=Ingebouwde wiki gebruiken
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Externe wiki gebruiken
 settings.external_wiki_url=Externe wiki-URL
 settings.external_wiki_url_desc=Bezoekers worden doorgestuurd naar de URL als ze op het tabblad klikken.
 settings.issues_desc=Kwestietracker inschakelen
 settings.use_internal_issue_tracker=Gebruik ingebouwde eenvoudige kwestietracker
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Externe issuetracker gebruiken
 settings.external_tracker_url=URL externe kwestietracker
 settings.external_tracker_url_desc=Bezoekers worden doorgestuurd naar de URL als ze op het tabblad klikken.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webhook is succesvol verwijderd!
 settings.webhook.test_delivery=Test-bezorging
 settings.webhook.test_delivery_desc=Stuur een nep push bericht om de webhook te testen
 settings.webhook.test_delivery_success=De test webhook is toegevoegd aan de wachtrij. Het kan enkele seconden duren voor deze in de geschiedenis wordt weergegeven.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=Verzoek
 settings.webhook.response=Antwoord
 settings.webhook.headers=Headers
@@ -755,10 +806,20 @@ settings.event_send_everything=Ik moet <strong>alles</strong> hebben.
 settings.event_choose=Laat me kiezen wat ik nodig heb.
 settings.event_create=Creëer
 settings.event_create_desc=Branch, of tag aangemaakt
-settings.event_pull_request=Pull request
-settings.event_pull_request_desc=Pull request geopend, gesloten, opnieuw geopend, bewerkt, toegewezen, niet-toegewezen, label bijgewerkt, label gewist of gesynchroniseerd.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=Push
 settings.event_push_desc=Git push naar een repository
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=Pull request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Release
+settings.event_release_desc=Release published in a repository.
 settings.active=Actief
 settings.active_helper=We zullen details van de gebeurtenissen af leveren wanneer deze webhook wordt geactiveerd.
 settings.add_hook_success=Nieuwe webhook toegevoegd.
@@ -803,7 +864,6 @@ release.releases=Releases
 release.new_release=Nieuwe release
 release.draft=Concept
 release.prerelease=Voorlopige versie
-release.stable=Stabiel
 release.edit=bewerken
 release.ahead=<strong>%d</strong> aanpassingen aan %s sinds deze versie
 release.source_code=Broncode
@@ -1019,6 +1079,7 @@ repos.private=Prive
 repos.watches=Volgers
 repos.stars=Sterren
 repos.issues=Kwesties
+repos.size=Size
 
 auths.auth_manage_panel=Authenticatie-beheer paneel
 auths.new=Nieuwe bron toevoegen
@@ -1039,9 +1100,14 @@ auths.user_base=User Search Base
 auths.user_dn=User DN
 auths.attribute_username=Gebruikersnaam attribuut
 auths.attribute_username_placeholder=Laat leeg om het login veld van het formulier te gebruiken als gebruikersnaam.
-auths.attribute_name=Voornaam attribuut
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Achternaam attribuut
 auths.attribute_mail=E-mail attribuut
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Verkrijg attributes van de Bind DN context
 auths.filter=Gebruikersfilter
 auths.admin_filter=Beheerdersfilter
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Pull Operation Timeout
 config.git_gc_timeout=GC Operation Timeout
 
 config.log_config=Logconfiguratie
-config.log_mode=Log-modus
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Cron-taken
 monitor.name=Naam
@@ -1205,19 +1272,23 @@ notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=repositorie aangemaakt in <a href="%s">%s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=hernoemde repository van <code>%[1]s</code> naar <a href="%[2]s">%[3]s</a>
 commit_repo=push update naar <a href="%[1]s/src/%[2]s">%[3]s</a> in <a href="%[1]s">%[4]s</a>
+compare_commits=Toon vergelijking voor deze %d commits
+transfer_repo=repositorie verplaatst naar <code>%s</code> naar <a href="%s">%s</a>
 create_issue=`opende issue in <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`sloot kwestie <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`heropende kwestie <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`reactie op issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`maakte pull request <a href="%s/issues/%s">%s#%[2]s</a>`
 close_pull_request=`sloot pull request <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_pull_request=`heropende pull request <a href="%s/issues/%s">%s#%[2]s</a>`
-comment_issue=`reactie op issue <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`voegde pull request samen <a href="%s/issues/%s">%s#%[2]s</a>`
-transfer_repo=repositorie verplaatst naar <code>%s</code> naar <a href="%s">%s</a>
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=geduwd label <a href="%s/src/%s"> %[2]s</a> naar <a href="%[1]s"> %[3]s</a>
-compare_commits=Toon vergelijking voor deze %d commits
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=geleden

conf/locale/locale_pl-PL.ini

@@ -40,7 +40,7 @@ your_settings=Twoje ustawienia
 
 activities=Aktywności
 pull_requests=Oczekujące zmiany
-issues=Problemy
+issues=Zagadnienia
 
 cancel=Anuluj
 
@@ -48,7 +48,7 @@ cancel=Anuluj
 install=Instalacja
 title=Kroki instalacyjne dla pierwszego uruchomienia
 docker_helper=Jeśli używasz Gogs wewnątrz Dockera, proszę przeczytaj <a target="_blank" href="%s">wytyczne</a>, zanim zmienisz coś na tej stronie!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs wymaga bazy MySQL, PostgreSQL, SQLite3 lub TiDB.
 db_title=Ustawienia bazy danych
 db_type=Typ bazy danych
 host=Host
@@ -58,8 +58,8 @@ db_name=Nazwa bazy danych
 db_helper=Proszę użyć silnika INNODB z kodowaniem utf8_general_ci dla MySQL.
 ssl_mode=Tryb SSL
 path=Ścieżka
-sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=Ścieżka do pliku bazy danych SQLite3.<br>Proszę użyć ścieżki bezwzględnej podczas uruchamiania usługi.
+err_empty_db_path=Ścieżka do pliku bazy danych SQLite3 nie może być pusta.
 no_admin_and_disable_registration=Rejestracji nie można wyłączyć bez tworzenia konta admina.
 err_empty_admin_password=Hasło admina nie może być puste.
 
@@ -74,14 +74,16 @@ domain=Domena
 domain_helper=To wpłynie na URLe do klonowania poprzez SSH.
 ssh_port=Port SSH
 ssh_port_helper=Numer portu, z którego korzysta z serwer SSH; pozostaw puste, aby wyłączyć funkcję SSH.
-use_builtin_ssh_server=Use Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server=Użyj wbudowanego serwera SSH
+use_builtin_ssh_server_popup=Uruchom wbudowany serwer SSH dla odróżnienia operacji GIT od systemowego demona SSH.
 http_port=Port HTTP
 http_port_helper=Numer portu na którym aplikacja jest dostępna.
 app_url=Adres URL aplikacji
 app_url_helper=To wpłynie na adresy klonowania HTTP/HTTPS i w wiadomościach e-mail.
 log_root_path=Ścieżka dla logów
 log_root_path_helper=Katalog do zapisu logów.
+enable_console_mode=Włącz tryb konsolowy
+enable_console_mode_popup=Oprócz zapisywania do pliku wyświetlaj logi także w konsoli.
 
 optional_title=Ustawienia opcjonalne
 email_title=Ustawienia serwera e-mail
@@ -97,8 +99,8 @@ offline_mode=Włącz tryb offline
 offline_mode_popup=Wyłącz CDN, nawet w trybie produkcyjnym, wszystkie pliki zasobów będą podawane lokalnie.
 disable_gravatar=Wyłącz usługę Gravatar
 disable_gravatar_popup=Wyłącz Gravatar i niestandardowe źrodła, awatary muszą być przesyłane przez użytkowników.
-federated_avatar_lookup=Enable Federated Avatars Lookup
-federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
+federated_avatar_lookup=Włączyć wyszukiwanie avatarów w powiązanych systemach
+federated_avatar_lookup_popup=Włączyć wyszukiwanie avatarów w powiązanych systemach opartych na usłudze libravatar.
 disable_registration=Wyłącz samodzielną rejestrację
 disable_registration_popup=Wyłącz samodzielną rejestrację użytkownika, tylko administrator będzie mógł tworzyć konta.
 enable_captcha=Włącz Captcha
@@ -117,7 +119,8 @@ sqlite3_not_available=Twoje wydanie nie obsługuje SQLite3, proszę pobrać ofic
 invalid_db_setting=Ustawienia bazy danych nie są poprawne: %v
 invalid_repo_path=Ścieżka repozytoriów nie jest poprawna: %v
 run_user_not_match=Użytkownik aplikacji nie jest aktualnym użytkownikiem: %s -> %s
-invalid_smtp_from=SMTP From field is not valid: %v
+smtp_host_missing_port=W SMTP Host brakuje portu w adresie.
+invalid_smtp_from=Pole SMTP OD nie jest prawidłowe: %v
 save_config_failed=Nie udało się zapisać konfiguracji: %v
 invalid_admin_setting=Nieprawidłowe ustawienia konta admina: %v
 install_success=Cześć! Cieszymy się, że wybierałeś Gogs, baw się dobrze.
@@ -139,7 +142,7 @@ issues.in_your_repos=W Twoich repozytoriach
 [explore]
 repos=Repozytoria
 users=Użytkownicy
-organizations=Organizations
+organizations=Organizacje
 search=Wyszukiwanie
 
 [auth]
@@ -166,6 +169,14 @@ reset_password_helper=Kliknij tutaj, aby zresetować hasło
 password_too_short=Długość hasła nie może być mniejsza niż 6 znaków.
 non_local_account=Nie lokalne konta nie mogą zmieniać haseł przez Gogs.
 
+login_two_factor=Weryfikacja dwuetapowa
+login_two_factor_passcode=Kod uwierzytelniania
+login_two_factor_enter_recovery_code=Wprowadź kod odzyskiwania weryfikacji dwuetapowej
+login_two_factor_recovery=Dwuetapowe odzyskiwanie kodu
+login_two_factor_recovery_code=Kod odzyskiwania
+login_two_factor_enter_passcode=Wprowadź hasło dwuetapowe
+login_two_factor_invalid_recovery_code=Kod odzyskiwania został już wykorzystany lub nie jest prawidłowy.
+
 [mail]
 activate_account=Prosimy aktywować swoje konto
 activate_email=Potwierdź swój adres e-mail
@@ -201,6 +212,7 @@ Content=Treść
 require_error=` nie może być puste.`
 alpha_dash_error=` musi się składać z prawidłowych znaków alfanumerycznych, myślników oraz podkreśleń.`
 alpha_dash_dot_error=` musi się składać z prawidłowych znaków alfanumerycznych, myślników, podkreśleń oraz kropek.`
+alpha_dash_dot_slash_error=` musi być alfa/numeryczny lub zawierać daszek, myślnik, kropkę lub ukośnik.`
 size_error=` musi być wielkości %s.`
 min_size_error=` musi zawierać co najwyżej %s znaków.`
 max_size_error=` musi zawierać co najwyżej %s znaków.`
@@ -252,11 +264,11 @@ profile=Profil
 password=Hasło
 avatar=Awatar
 ssh_keys=Klucze SSH
-social=Konta społecznościowe
-applications=Aplikacje
+security=Bezpieczeństwo
+repos=Repozytoria
 orgs=Organizacje
+applications=Aplikacje
 delete=Usuń konto
-uid=UID
 
 public_profile=Profil publiczny
 profile_desc=Twój adres e-mail jest publiczny i będzie używany dla wszystkich powiadomień związanych z kontem i dla każdej operacji wykonanej przez tę stronę.
@@ -272,7 +284,7 @@ continue=Kontynuuj
 cancel=Anuluj
 
 lookup_avatar_by_mail=Wyszukaj Avatar po mailu
-federated_avatar_lookup=Federated Avatar Lookup
+federated_avatar_lookup=Wyszukiwanie Avatarów w powiązanych systemach
 enable_custom_avatar=Włącz niestandardowe awatary
 choose_new_avatar=Wybierz nowy avatar
 update_avatar=Zaktualizuj ustawienia awatara
@@ -322,10 +334,30 @@ no_activity=Brak aktywności
 key_state_desc=Ten klucz został użyty w ciągu ostatnich 7 dni
 token_state_desc=Ten token został użyty w ciągu ostatnich 7 dni
 
-manage_social=Zarządzaj powiązanymi kontami społecznościowymi
-social_desc=To jest lista powiązanych kont społecznościowych. Usuń powiązania, których nie rozpoznajesz.
-unbind=Usuń powiązanie
-unbind_success=Konto społecznościowe zostało odpięte.
+two_factor=Weryfikacja dwuetapowa
+two_factor_status=Status:
+two_factor_on=Włączony
+two_factor_off=Wyłączony
+two_factor_enable=Włącz
+two_factor_disable=Wyłącz
+two_factor_view_recovery_codes=Wyświetl i zapisz Twoje <a href="%s%s">kody odzyskiwania</a> w bezpiecznym miejscu. Można użyć ich jako kod dostępu, jeśli stracisz dostęp do aplikacji uwierzytelniania.
+two_factor_http=Dla operacji HTTP/HTTPS już nie jest obsługiwana zwykła nazwa użytkownika i hasło. Prosimy o tworzenie i używanie <a href="%[1]s%[2]s"> osobistych tokenów dostępu</a> jako swoich poświadczeń, np.: <code>%[3]s</code>.
+two_factor_enable_title=Włącz weryfikację dwuetapową
+two_factor_scan_qr=Proszę używać uwierzytelniania aplikacji do skanowania obrazów:
+two_factor_or_enter_secret=Lub wprowadź sekret:
+two_factor_then_enter_passcode=Następnie wprowadź kod dostępu:
+two_factor_verify=Weryfikuj
+two_factor_invalid_passcode=Wprowadzony kod nie jest prawidłowy, spróbuj ponownie!
+two_factor_enable_error=Włączenie dwuetapowego uwierzytelniania nie powiodło się: %v
+two_factor_enable_success=Uwierzytelnianie dwuetapowe Twojego konta zostało włączone pomyślnie!
+two_factor_recovery_codes_title=Kody odzyskiwania uwierzytelniania dwuetapowego
+two_factor_recovery_codes_desc=Kody odzyskiwania są używane, gdy tymczasowo utracić dostęp do aplikacji uwierzytelniania. Każdy kod odzyskiwania może być tylko używany raz, <b>Proszę zachować te kody w bezpiecznym miejscu</b>.
+two_factor_regenerate_recovery_codes=Ponownie wygeneruj kody odzyskiwania
+two_factor_regenerate_recovery_codes_error=Ponowne wygenerowanie kodu odzyskiwania nie powiodło się: %v
+two_factor_regenerate_recovery_codes_success=Nowy kod odzyskiwania został wygenerowany pomyślnie!
+two_factor_disable_title=Wyłącz weryfikację dwuetapową
+two_factor_disable_desc=Poziom zabezpieczeń konta zmniejszy się po wyłączeniu uwierzytelnianie dwuetapowego. Czy chcesz kontynuować?
+two_factor_disable_success=Uwierzytelnianie dwuetapowe wyłączono pomyślnie!
 
 manage_access_token=Zarządzaj osobistymi tokenami dostępu
 generate_new_token=Wygeneruj nowy token
@@ -339,9 +371,14 @@ access_token_deletion=Usuwanie osobistego tokena dostępu
 access_token_deletion_desc=Usunięcie tego tokena osobistego dostęp spowoduje usunięcie wszystkich powiązanych dostępów do aplikacji. Czy chcesz kontynuować?
 delete_token_success=Osobisty token dostępu został usunięty pomyślnie! Nie zapomnij również zaktualizować swoich aplikacji.
 
-orgs.none=You are not a member of any organizations.
-orgs.leave_title=Leave an organization
-orgs.leave_desc=You will lose access to all repositories and teams after you left the organization. Do you want to continue?
+orgs.none=Nie jesteś członkiem żadnej organizacji.
+orgs.leave_title=Opuść organizację
+orgs.leave_desc=Po opuszczeniu organizacji utracisz dostęp do wszystkich repozytoriów i zespołów. Czy chcesz kontynuować?
+
+repos.leave=Opuść
+repos.leave_title=Opuść repozytorium
+repos.leave_desc=Po opuszczeniu, stracisz dostęp do repozytorium. Czy chcesz kontynuować?
+repos.leave_success=Pomyślnie opuściłeś repozytorium '%s'!
 
 delete_account=Usuń swoje konto
 delete_prompt=Ta operacja trwale usunie Twoje konto i <strong>NIE MOŻE</strong> zostać cofnięta!
@@ -390,8 +427,8 @@ migrate_type=Typ migracji
 migrate_type_helper=To repozytorium będzie <span class="text blue">kopią lustrzaną</span>
 migrate_repo=Przenieś repozytorium
 migrate.clone_address=Sklonuj adres
-migrate.clone_address_desc=This can be a HTTP/HTTPS/GIT URL.
-migrate.clone_address_desc_import_local=You're also allowed to migrate a repository by local server path.
+migrate.clone_address_desc=URL może być adresem HTTP/HTTPS/GIT.
+migrate.clone_address_desc_import_local=Masz także możliwość migracji repozytorium przez ścieżka serwera lokalnego.
 migrate.permission_denied=Nie możesz importować lokalnych repozytoriów.
 migrate.invalid_local_path=Ścieżka jest niepoprawna. Nie istnieje lub nie jest katalogiem.
 migrate.failed=Migracja nie powiodła się: %v
@@ -413,9 +450,9 @@ quick_guide=Skrócona instrukcja
 clone_this_repo=Klonuj repozytorium
 create_new_repo_command=Utwórz nowe repozytorium z wiersza poleceń
 push_exist_repo=Prześlij istniejące repozytorium z wiersza poleceń
-repo_is_empty=To repozytorium jest puste, proszę wrócić później!
+bare_message=To repozytorium nie ma jeszcze żadnej zawartości.
 
-files=Files
+files=Pliki
 branch=Gałąź
 tree=Drzewo
 filter_branch_and_tag=Filtruj gałąź lub tag
@@ -426,13 +463,21 @@ pulls=Oczekujące zmiany
 labels=Etykiety
 milestones=Kamienie milowe
 commits=Commity
+git_branches=Gałęzie
 releases=Wydania
 file_raw=Czysty
 file_history=Historia
 file_view_raw=Zobacz czysty
 file_permalink=Bezpośredni odnośnik
 file_too_large=Ten plik jest zbyt duży, aby go wyświetlić
-video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
+video_not_supported_in_browser=Twoja przeglądarka nie obsługuje znacznika HTML5 video.
+
+branches.overview=Przegląd
+branches.active_branches=Aktywne gałęzie
+branches.stale_branches=Stare gałęzie
+branches.all=Wszystkie gałęzie
+branches.updated_by=Zaktualizowano %[1]s przez %[2]s
+branches.change_default_branch=Zmiana domyślnej gałęzi
 
 editor.new_file=Nowy plik
 editor.upload_file=Załaduj plik
@@ -461,8 +506,8 @@ editor.new_branch_name_desc=Nazwa nowej gałęzi...
 editor.cancel=Anuluj
 editor.filename_cannot_be_empty=Nazwa pliku nie może być pusta.
 editor.branch_already_exists=Gałąź '%s' już istnieje w tym repozytorium.
-editor.directory_is_a_file=Entry '%s' in the parent path is a file not a directory in this repository.
-editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
+editor.directory_is_a_file=Wpis '%s' w ścieżce nadrzędnej jest plikiem a nie katalogiem w tym repozytorium.
+editor.file_is_a_symlink=Plik '%s' jest dowiązaniem symbolicznym, które nie mogą być modyfikowane z poziomu przeglądarki internetowej.
 editor.filename_is_a_directory=Nazwa '%s' jest istniejącym katalogiem w tym repozytorium.
 editor.file_editing_no_longer_exists=Plik '%s' który edytujesz nie istnieje już w tym repozytorium.
 editor.file_changed_while_editing=Zawartość pliku została zmieniona od rozpoczęcia edycji. <a target="_blank" href="%s">Kliknij tutaj</a> aby zobaczyć, co zostało zmienione lub <strong>naciśnij commit ponownie</strong> aby nadpisać te zmiany.
@@ -473,7 +518,7 @@ editor.add_subdir=Dodaj podkatalog...
 editor.unable_to_upload_files=Wysyłanie plików do '%s' nie powiodło się z błędem: %v
 editor.upload_files_to_dir=Prześlij pliki do '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=Historia zmian
 commits.commits=Commity
 commits.search=Przeszukaj commity
 commits.find=Szukaj
@@ -588,8 +633,8 @@ pulls.cannot_auto_merge_desc=Pull request nie może być automatycznie scalony z
 pulls.cannot_auto_merge_helper=Proszę scalić ręcznie, aby rozwiązać konflikty.
 pulls.merge_pull_request=Scal Pull Request
 pulls.open_unmerged_pull_exists=`Nie można otworzyć ponownie ponieważ już istnieje gotowy do scalenia pull request (#%d) z tego samego repozytorium z tymi samymi informacjami.`
-pulls.delete_branch=Delete Branch
-pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
+pulls.delete_branch=Usuń gałąź
+pulls.delete_branch_has_new_commits=Gałęzi nie można usunąć ponieważ są nowe zmiany po scaleniu.
 
 milestones.new=Nowy kamień milowy
 milestones.open_tab=Otwarte %d
@@ -640,27 +685,29 @@ settings.collaboration.admin=Administrator
 settings.collaboration.write=Zapis
 settings.collaboration.read=Odczyt
 settings.collaboration.undefined=Niezdefiniowany
-settings.branches=Branches
-settings.default_branch=Default Branch
-settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
-settings.update=Update
-settings.update_default_branch_success=Default branch of this repository has been updated successfully!
-settings.protected_branches=Protected Branches
-settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
-settings.choose_a_branch=Choose a branch...
-settings.branch_protection=Branch Protection
-settings.branch_protection_desc=Please choose protect options for branch <b>%s</b>.
-settings.protect_this_branch=Protect this branch
-settings.protect_this_branch_desc=Disable force pushes and prevent from deletion.
-settings.protect_require_pull_request=Require pull request instead direct pushing
-settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
-settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
-settings.protect_whitelist_users=Users who can push to this branch
-settings.protect_whitelist_search_users=Search users
-settings.protect_whitelist_teams=Teams for which members of them can push to this branch
-settings.protect_whitelist_search_teams=Search teams
-settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
+settings.branches=Gałęzie
+settings.branches_bare=Nie można zarządzać pustym repozytorium bare. Proszę wypchnąć najpierw dowolną zawartość.
+settings.default_branch=Domyślna gałąź
+settings.default_branch_desc=Domyślna gałąź jest uważana za podstawową gałąź dla wypychania zmian, pull requestów i edycji online.
+settings.update=Aktualizuj
+settings.update_default_branch_unsupported=Zmiana domyślnej gałęzi nie jest obsługiwana przez wersję Git na serwerze.
+settings.update_default_branch_success=Domyślny gałąź repozytorium została pomyślnie zaktualizowana!
+settings.protected_branches=Chronione gałęzie
+settings.protected_branches_desc=Chroń gałąź z wymuszonego pchania, przypadkowych usunięć i białych listy z prawami zmian w kodzie.
+settings.choose_a_branch=Wybierz gałąź...
+settings.branch_protection=Ochrona gałęzi
+settings.branch_protection_desc=Proszę wybrać opcje zabezpieczeń dla gałęzi <b>%s</b>.
+settings.protect_this_branch=Chroń tą gałąź
+settings.protect_this_branch_desc=Wyłącz wymuszanie wypchnięć zmian i zabroń usuwania.
+settings.protect_require_pull_request=Wymagane utworzenie Pull Requesta zamiast bezpośredniego wypchnięcia
+settings.protect_require_pull_request_desc=Włącz tę opcję aby wyłączyć bezpośrednie pchanie do tej gałęzi. Zmiany muszą być wypychane do innej niechronionej gałęzi i scalone z tą gałęzią, za pośrednictwem Pull Requesta.
+settings.protect_whitelist_committers=Biała lista, kto może wypychać do tej gałęzi
+settings.protect_whitelist_committers_desc=Dodaj osoby lub zespoły do białej listy wypychających, do tej gałęzi. Użytkownicy z białej listy nie będą czekać na zatwierdzenie pull requesta.
+settings.protect_whitelist_users=Użytkownicy, którzy mogą popchnąć do tej gałęzi
+settings.protect_whitelist_search_users=Szukaj użytkowników
+settings.protect_whitelist_teams=Zespoły, których członkowie mogą popchnąć do tej gałęzi
+settings.protect_whitelist_search_teams=Szukaj drużyn
+settings.update_protect_branch_success=Opcje zabezpieczeń dla tej gałęzi zostały pomyślnie zaktualizowane!
 settings.hooks=Webhooki
 settings.githooks=Hooki Git
 settings.basic_settings=Ustawienia podstawowe
@@ -673,14 +720,16 @@ settings.change_reponame_prompt=Zmiana nazwy repozytorium wpłynie na linki do n
 settings.advanced_settings=Ustawienia zaawansowane
 settings.wiki_desc=Włącz system wiki
 settings.use_internal_wiki=Użyj wbudowanego wiki
+settings.allow_public_wiki_desc=Umożliw publiczny dostęp do wiki, gdy repozytorium jest prywatne
 settings.use_external_wiki=Użyj zewnętrznego Wiki
 settings.external_wiki_url=Adres URL zewnętrznego Wiki
 settings.external_wiki_url_desc=Odwiedzający zostaną przekierowani do adresu URL po kliknięciu zakładki.
 settings.issues_desc=Włącz system zgłaszania problemów
 settings.use_internal_issue_tracker=Użyj wbudowany lekki system zgłaszania problemów
+settings.allow_public_issues_desc=Umożliw publiczny dostęp do zagadnień, gdy repozytorium jest prywatne
 settings.use_external_issue_tracker=Użyj zewnętrznego systemu zgłaszania problemów
-settings.external_tracker_url=External Issue Tracker URL
-settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
+settings.external_tracker_url=URL zewnętrznego trackera zagadnień
+settings.external_tracker_url_desc=Odwiedzający zostaną przekierowani do adresu URL po kliknięciu zakładki.
 settings.tracker_url_format=Format dla adresu URL zewnętrznego systemu
 settings.tracker_issue_style=Styl nazw zewnętrznego systemu zgłaszania problemów:
 settings.tracker_issue_style.numeric=Numeryczny
@@ -688,7 +737,7 @@ settings.tracker_issue_style.alphanumeric=Alfanumeryczne
 settings.tracker_url_format_desc=Symbole zastępcze <code>{user} {repo} {index}</code> mogą być użyte dla nazwy użytkownika, nazwy repozytorium i numeru problemu.
 settings.pulls_desc=Włącz obsługę pull request, aby akceptować publiczny wkład
 settings.danger_zone=Strefa niebezpieczeństwa
-settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
+settings.cannot_fork_to_same_owner=Nie można sforkować repozytorium do pierwotnego właściciela.
 settings.new_owner_has_same_repo=Nowy właściciel już posiada repozytorium o tej samej nazwie.
 settings.convert=Konwersja na repozytorium regularne
 settings.convert_desc=Możesz przekonwertować ten mirror na repozytorium regularne. Ta czynność nie może być odwrócona.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webhook został pomyślnie usunięty!
 settings.webhook.test_delivery=Testuj dostawę
 settings.webhook.test_delivery_desc=Wyślij fałszywe zdarzenie push aby przetestować ustawienie webhooka
 settings.webhook.test_delivery_success=Testowy webhook został dodany do kolejki dostawy. To może zająć kilka sekund, zanim to pojawia się w historii dostawy.
+settings.webhook.redelivery=Redystrybucja
+settings.webhook.redelivery_success=Zadanie '%s' zostało ponownie dodane do kolejki. Może upłynąć kilka sekund, aby zaktualizować jego status w historii.
 settings.webhook.request=Żądanie
 settings.webhook.response=Odpowiedź
 settings.webhook.headers=Nagłówki
@@ -745,7 +796,7 @@ settings.add_webhook_desc=Wyślemy żądanie <code>POST</code> pod poniższy adr
 settings.payload_url=URL do wywołania
 settings.content_type=Typ zawartości
 settings.secret=Sekret
-settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
+settings.secret_desc=Sekret zostanie wysłany jako SHA256 HMAC hex digest of payload z nagłówkiem <code>X-Gogs-Signature</code>.
 settings.slack_username=Użytkownik
 settings.slack_icon_url=Adres URL ikony
 settings.slack_color=Kolor
@@ -755,10 +806,20 @@ settings.event_send_everything=Potrzebuję <strong>wszystkiego</strong>.
 settings.event_choose=Pozwól mi wybrać, czego potrzebuję.
 settings.event_create=Utwórz
 settings.event_create_desc=Utworzono gałąź lub tag
-settings.event_pull_request=Pull Request
-settings.event_pull_request_desc=Otworzono żądanie pull, zamknięto, otwarto ponownie, zaktualizowano, przypisano, nieprzypisano, zaktualizowano etykietę, wyczyszczono etykietę lub zsynchronizowano.
+settings.event_delete=Usuń
+settings.event_delete_desc=Gałąź lub tag usunięty
+settings.event_fork=Forkuj
+settings.event_fork_desc=Repozytorium zforkowane
 settings.event_push=Wypchnięcie
 settings.event_push_desc=Wypchnięcie (push) do repozytorium Git
+settings.event_issues=Zagadnienia
+settings.event_issues_desc=Zagadnienie otwarte, zamknięte, ponownie otwarte, wyedytowane, przypisane, nieprzypisane, etykieta uaktualniona, etykieta wyczyszczona, kamień milowy, kamień milowy usunięty.
+settings.event_issue_comment=Komentarz zagadnienia
+settings.event_issue_comment_desc=Komentarz zagadnienia utworzony, wyedytowany lub usunięty.
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request otwarty, zamknięty, ponownie otwarty, edytowany, przypisany, nieprzypisany, etykieta zaktualizowana, etykieta wyczyszczona, kamień milowy, kamień milowy wyczyszczony; lub zsynchronizowany.
+settings.event_release=Wydanie
+settings.event_release_desc=Wydanie opublikowane w repozytorium.
 settings.active=Aktywny
 settings.active_helper=Dostarczymy szczegóły zdarzenia, gdy ten webhook zostanie wywołany.
 settings.add_hook_success=Nowy webhook został dodany.
@@ -768,12 +829,12 @@ settings.delete_webhook=Usuń webhook
 settings.recent_deliveries=Ostatnie wywołania
 settings.hook_type=Typ hooka
 settings.add_slack_hook_desc=Dodaj integrację ze <a href="%s">Slackiem</a> do Twojego repozytorium.
-settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
+settings.add_discord_hook_desc=Dodaj integrację <a href="%s">Discord</a> do Twojego repozytorium.
 settings.slack_token=Token
 settings.slack_domain=Domena
 settings.slack_channel=Kanał
 settings.deploy_keys=Klucze wdrożeniowe
-settings.deploy_keys_helper=<b>Common Gotcha!</b> If you're looking for adding personal public keys, please add them in your <a href="%s%s">account settings</a>.
+settings.deploy_keys_helper=<b>TIP!</b> Jeśli szukasz dodawanie osobistych kluczy publicznych, dodaj je proszę w <a href="%s%s">ustawieniach konta</a>.
 settings.add_deploy_key=Dodaj klucz wdrożenia
 settings.deploy_key_desc=Klucze wdrożenia pozwalają na dostęp tylko do odczytu. To nie to samo co klucze SSH dla konta osobistego.
 settings.no_deploy_keys=Nie dodałeś żadnego klucza wdrożenia.
@@ -803,7 +864,6 @@ release.releases=Wydania
 release.new_release=Nowe wydanie
 release.draft=Szkic
 release.prerelease=Wersja wstępna
-release.stable=Stabilny
 release.edit=edytuj
 release.ahead=<strong>%d</strong> commitów w %s od tego wydania
 release.source_code=Kod źródłowy
@@ -852,7 +912,7 @@ team_permission_desc=Jaki poziom uprawnień powinien mieć ten zespół?
 
 form.name_reserved=Nazwa organizacji „%s” jest zarezerwowana.
 form.name_pattern_not_allowed=Wzorzec nazwy organizacji „%s” jest niedozwolony.
-form.team_name_reserved=Team name '%s' is reserved.
+form.team_name_reserved=Nazwa zespołu '%s' jest zarezerwowana.
 
 settings=Ustawienia
 settings.options=Opcje
@@ -943,8 +1003,8 @@ dashboard.git_gc_repos=Usuń śmieci z repozytoriów
 dashboard.git_gc_repos_success=Wszystkie repozytoria zakończyły odśmiecanie pomyślnie.
 dashboard.resync_all_sshkeys=Przeładuj klucze publiczne w pliku '.ssh/authorized_keys' (uwaga: klucze poza Gogs zostaną usunięte)
 dashboard.resync_all_sshkeys_success=Przeładowanie kluczy publicznych zakończyło się sukcesem.
-dashboard.resync_all_hooks=Resync pre-receive, update and post-receive hooks of all repositories
-dashboard.resync_all_hooks_success=All repositories' pre-receive, update and post-receive hooks have been resynced successfully.
+dashboard.resync_all_hooks=Ponowa synchronizacja wpływa na wypychanie, aktualizowanie i odbieranie zmian we wszystkich repozytoriach
+dashboard.resync_all_hooks_success=Ponowa synchronizacja została wykonana pomyślnie we wszystkich repozytoriach.
 dashboard.reinit_missing_repos=Ponownie inicjalizuj wszystkie repozytoria, które straciły pliki Git
 dashboard.reinit_missing_repos_success=Wszystkie repozytoria, które straciły pliki Git, zostały ponownie zainicjować pomyślnie.
 
@@ -1019,6 +1079,7 @@ repos.private=Prywatne
 repos.watches=Obserwujących
 repos.stars=Polubienia
 repos.issues=Problemy
+repos.size=Rozmiar
 
 auths.auth_manage_panel=Panel zarządzania uwierzytelnianiem
 auths.new=Dodaj nowe źródło
@@ -1042,6 +1103,11 @@ auths.attribute_username_placeholder=Zostaw puste aby użyć wartości podanej p
 auths.attribute_name=Atrybut imienia
 auths.attribute_surname=Atrybut nazwiska
 auths.attribute_mail=Atrybut e-mail
+auths.verify_group_membership=Sprawdź członkostwo w grupie
+auths.group_search_base_dn=Grupa wyszukiwania Base DN
+auths.group_filter=Filtr grupy
+auths.group_attribute_contain_user_list=Atrybut grupy zawierający listę użytkowników
+auths.user_attribute_listed_in_group=Atrybut użytkownika wymieniony w grupie
 auths.attributes_in_bind=Pobierz atrybuty w kontekście Bind DN
 auths.filter=Filtr użytkownika
 auths.admin_filter=Filtr administratora
@@ -1066,7 +1132,7 @@ auths.delete_auth_title=Usunięcie uwierzytelnienia
 auths.delete_auth_desc=To uwierzytelnienie zostanie usunięte, czy chcesz kontynuować?
 auths.still_in_used=Ten rodzaj autentykacji jest wciąż wykorzystywany przez niektórych użytkowników. Usuń lub przekonwertuj użytkowników, aby wykorzystywali inny typ logowania.
 auths.deletion_success=Uwierzytelnienie zostało usunięte pomyślnie!
-auths.login_source_exist=Login source '%s' already exists.
+auths.login_source_exist=Login '%s' już istnieje.
 
 config.server_config=Konfiguracja serwera
 config.app_name=Nazwa aplikacji
@@ -1077,7 +1143,7 @@ config.offline_mode=Tryb offline
 config.disable_router_log=Wyłącz dziennik routera
 config.run_user=Użytkownik uruchomieniowy
 config.run_mode=Tryb uruchamienia
-config.git_version=Git Version
+config.git_version=Wersja Git
 config.static_file_root_path=Ścieżka plików statycznych
 config.log_file_root_path=Ścieżka plików dziennika
 config.reverse_auth_user=Użytkownik dostarczony przez odwrotne proxy
@@ -1094,15 +1160,15 @@ config.ssh_keygen_path=Ścieżka generatora ('ssh-keygen')
 config.ssh_minimum_key_size_check=Sprawdzanie minimalnej długości klucza
 config.ssh_minimum_key_sizes=Minimalne rozmiary kluczy
 
-config.repo_config=Repository Configuration
+config.repo_config=Konfiguracja repozytorium
 config.repo_root_path=Ścieżka repozytoriów
 config.script_type=Typ skryptu
-config.repo_force_private=Force Private
-config.max_creation_limit=Max Creation Limit
-config.preferred_licenses=Preferred Licenses
-config.disable_http_git=Disable HTTP Git
-config.enable_local_path_migration=Enable Local Path Migration
-config.commits_fetch_concurrency=Commits Fetch Concurrency
+config.repo_force_private=Forsuj tryb prywatny
+config.max_creation_limit=Maksymalny limit utworzeń
+config.preferred_licenses=Preferowane licencje
+config.disable_http_git=Wyłącz HTTP Git
+config.enable_local_path_migration=Włącz lokalną ścieżkę migracji
+config.commits_fetch_concurrency=Pobieraj zmiany w trybie równoległym
 
 config.db_config=Konfiguracja bazy danych
 config.db_type=Typ
@@ -1161,7 +1227,7 @@ config.cookie_life_time=Czas życia ciasteczka
 config.picture_config=Ustawienia obrazów
 config.picture_service=Serwis obrazów
 config.disable_gravatar=Wyłącz Gravatara
-config.enable_federated_avatar=Enable Federated Avatars
+config.enable_federated_avatar=Włącz zewnętrzne avatary
 
 config.git_config=Konfiguracja Git
 config.git_disable_diff_highlight=Wyłączyć wyróżnianie składni diff
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Limit czasu dla operacji pull
 config.git_gc_timeout=Limit czasu odśmiecania pamięci
 
 config.log_config=Konfiguracja dziennika
-config.log_mode=Tryb dziennika
+config.log_mode=Tryb
+config.log_options=Ustawienia
 
 monitor.cron=Zadania cron
 monitor.name=Nazwa
@@ -1205,19 +1272,23 @@ notices.delete_success=Powiadomienia systemowe zostały pomyślnie usunięte.
 
 [action]
 create_repo=tworzy repozytorium <a href="%s">%s</a>
+fork_repo=rozwidlone repozytorium do <a href="%s"> %s</a>
 rename_repo=zmienia nazwę repozytorium <code>%[1]s</code> na <a href="%[2]s">%[3]s</a>
 commit_repo=wypycha do <a href="%[1]s/src/%[2]s">%[3]s</a> w <a href="%[1]s">%[4]s</a>
+compare_commits=Zobacz porównanie tych %d commitów
+transfer_repo=przenosi repozytorium <code>%s</code> do <a href="%s">%s</a>
 create_issue=`zgłasza problem <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`zamknięcie problemu <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`ponowne otwarcie problemu <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`komentuje problem <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`tworzy pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`zamknięcie pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`ponowne otwarcie pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`komentuje problem <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`scala pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=przenosi repozytorium <code>%s</code> do <a href="%s">%s</a>
+create_branch=stworzył nową gałąź <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=usunął gałąź <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=taguje <a href="%s/src/%s">%[2]s</a> w <a href="%[1]s">%[3]s</a>
-compare_commits=Zobacz porównanie tych %d commitów
+delete_tag=usunięty tag <code>%[2]s</code> % <a href="%[1]s">[3]s</a>
 
 [tool]
 ago=temu

conf/locale/locale_pt-BR.ini

@@ -82,6 +82,8 @@ app_url=URL do aplicativo
 app_url_helper=Isto afeta a URL de clone via HTTP/HTTPs e também o e-mail.
 log_root_path=Caminho do log
 log_root_path_helper=Pasta dos arquivos de log.
+enable_console_mode=Enable Console Mode
+enable_console_mode_popup=In addition to file mode, also print logs to console.
 
 optional_title=Configurações opcionais
 email_title=Configurações do serviço de e-mail
@@ -117,6 +119,7 @@ sqlite3_not_available=Sua versão não suporta SQLite3, por favor faça o downlo
 invalid_db_setting=Configuração do banco de dados não está correta: %v
 invalid_repo_path=A raiz do repositório é inválida: %v
 run_user_not_match=O usuário da execução não é o usuário atual: %s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=O SMTP do campo não é válido: %v
 save_config_failed=Falha ao salvar a configuração: %v
 invalid_admin_setting=Configuração da conta de administrador está inválida: %v
@@ -166,6 +169,14 @@ reset_password_helper=Clique aqui para redefinir sua senha
 password_too_short=O comprimento da senha não pode ser menor que 6.
 non_local_account=Não é possível mudar a senha de contas remotas pelo Gogs.
 
+login_two_factor=Two-factor Authentication
+login_two_factor_passcode=Authentication Passcode
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Recovery Code
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+
 [mail]
 activate_account=Por favor, ative sua conta
 activate_email=Verifique seu endereço de e-mail
@@ -201,6 +212,7 @@ Content=Conteúdo
 require_error=` não pode estar vazio.`
 alpha_dash_error=` devem ser caracteres alfanuméricos, hífen (-) ou sublinhado (_).`
 alpha_dash_dot_error=` devem ser caracteres alfanuméricos ou hífen (-) ou sublinhado (_).`
+alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
 size_error=`deve ser do tamanho %s.`
 min_size_error=` deve conter pelo menos %s caracteres.`
 max_size_error=` deve conter no máximo %s caracteres.`
@@ -252,11 +264,11 @@ profile=Perfil
 password=Senha
 avatar=Avatar
 ssh_keys=Chaves SSH
-social=Contas sociais
-applications=Aplicativos
+security=Security
+repos=Repositories
 orgs=Organizações
+applications=Aplicativos
 delete=Deletar conta
-uid=Uid
 
 public_profile=Perfil público
 profile_desc=Seu endereço de E-mail é publico e será usado para qualquer notificação relacionada à conta, e qualquer operação na web feita através do site.
@@ -322,10 +334,30 @@ no_activity=Nenhuma atividade recente
 key_state_desc=Usada a pelo menos 7 dias
 token_state_desc=Este token é usado em pelo menos 7 dias
 
-manage_social=Gerenciar contas sociais associadas
-social_desc=Esta é uma lista de contas sociais. Remova qualquer ligação que você não reconheça.
-unbind=Desvincular
-unbind_success=A conta social foi desvinculada.
+two_factor=Two-factor Authentication
+two_factor_status=Status:
+two_factor_on=On
+two_factor_off=Off
+two_factor_enable=Enable
+two_factor_disable=Disable
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=Gerenciar tokens de acesso pessoal
 generate_new_token=Gerar novo token
@@ -343,6 +375,11 @@ orgs.none=Você não é participante de nenhuma organização.
 orgs.leave_title=Deixar uma organização
 orgs.leave_desc=Você perderá acesso a todos os repositórios e equipes após deixar a organização. Deseja continuar?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=Deletar sua conta
 delete_prompt=A operação deletará sua conta permanentemente, e <strong>NÃO PODERÁ</strong> ser desfeita!
 confirm_delete_account=Confirmar exclusão
@@ -413,7 +450,7 @@ quick_guide=Guia rápido
 clone_this_repo=Clonar este repositório
 create_new_repo_command=Criar um novo repositório na linha de comando
 push_exist_repo=Push um repositório existente na linha de comando
-repo_is_empty=Este repositório está vazio, por favor volte mais tarde!
+bare_message=This repository does not have any content yet.
 
 files=Arquivos
 branch=Branch
@@ -426,6 +463,7 @@ pulls=Pull Requests
 labels=Etiquetas
 milestones=Milestones
 commits=Commits
+git_branches=Branches
 releases=Versões
 file_raw=Raw
 file_history=Histórico
@@ -434,6 +472,13 @@ file_permalink=Link permanente
 file_too_large=Este arquivo é muito grande para ser exibido
 video_not_supported_in_browser=Seu navegador não suporta a tag de vídeo do HTML5.
 
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=All Branches
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=Novo arquivo
 editor.upload_file=Enviar arquivo
 editor.edit_file=Editar arquivo
@@ -641,9 +686,11 @@ settings.collaboration.write=Escrita
 settings.collaboration.read=Leitura
 settings.collaboration.undefined=Indefinido
 settings.branches=Branches
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch=Default Branch
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=Update
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
 settings.protected_branches=Protected Branches
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Disable force pushes and prevent from deletion
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
 settings.protect_whitelist_search_users=Search users
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Esta mudança irá afetar os links para este rep
 settings.advanced_settings=Configurações avançadas
 settings.wiki_desc=Habilitar sistema de wiki
 settings.use_internal_wiki=Usar wiki nativa
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Usar wiki externa
 settings.external_wiki_url=URL externa da wiki
 settings.external_wiki_url_desc=Os visitantes serão redirecionados para a URL ao clicar na aba.
 settings.issues_desc=Habilitar issue tracker
 settings.use_internal_issue_tracker=Usar o issue tracker nativo
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Usar issue tracker externo
 settings.external_tracker_url=URL do Issue Tracker Externo
 settings.external_tracker_url_desc=Visitantes serão redirecionados ao URL quando clicarem na aba.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webhook deletado com sucesso!
 settings.webhook.test_delivery=Entrega de teste
 settings.webhook.test_delivery_desc=Enviar uma entrega de evento de Push falso para testar suas configurações de webhook
 settings.webhook.test_delivery_success=O Webhook de teste foi adicionado para a fila de entrega. Pode demorar alguns segundos antes de ser exibido no histórico de entrega.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=Solicitação
 settings.webhook.response=Resposta
 settings.webhook.headers=Cabeçalhos
@@ -755,10 +806,20 @@ settings.event_send_everything=Preciso de <strong>tudo</strong>.
 settings.event_choose=Deixe-me escolher o que eu preciso.
 settings.event_create=Criar
 settings.event_create_desc=Branch ou Tag criado
-settings.event_pull_request=Pull Request
-settings.event_pull_request_desc=Pull request aberto, fechado, reaberto, atribuído, desatribuído, teve etiqueta atualizada ou limpada ou foi sincronizado.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=Push
 settings.event_push_desc=Git push para o repositório
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Release
+settings.event_release_desc=Release published in a repository.
 settings.active=Ativo
 settings.active_helper=Enviaremos detalhes do evento quando este hook for acionado.
 settings.add_hook_success=Novos hooks de web foram adicionados.
@@ -803,7 +864,6 @@ release.releases=Versões
 release.new_release=Nova versão
 release.draft=Rascunho
 release.prerelease=Versão prévia
-release.stable=Estável
 release.edit=editar
 release.ahead=<strong>%d</strong> commits para %s depois desta versão
 release.source_code=Código fonte
@@ -1019,6 +1079,7 @@ repos.private=Privado
 repos.watches=Observadores
 repos.stars=Favoritos
 repos.issues=Issues
+repos.size=Size
 
 auths.auth_manage_panel=Painel de gerenciamento da autenticação
 auths.new=Adicionar nova fonte
@@ -1039,9 +1100,14 @@ auths.user_base=Base de pesquisa do usuário
 auths.user_dn=Usuário do DN
 auths.attribute_username=Atributo nome de usuário
 auths.attribute_username_placeholder=Deixe vazio para usar o valor do campo de formulário de entrada de nome de usuário.
-auths.attribute_name=Atributo primeiro nome
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Atributo sobrenome
 auths.attribute_mail=Atributo e-mail
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Buscar os atributos no contexto de Bind DN
 auths.filter=Filtro de usuário
 auths.admin_filter=Filtro de administrador
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Timeout para operação de pull
 config.git_gc_timeout=Timeout para execução do GC
 
 config.log_config=Configuração de log
-config.log_mode=Modo do log
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Tarefas cron
 monitor.name=Nome
@@ -1205,19 +1272,23 @@ notices.delete_success=Avisos do sistema foram excluídos com sucesso.
 
 [action]
 create_repo=repositório criado <a href="%s"> %s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=renomeou o o repositório <code>%[1]s</code> para <a href="%[2]s">%[3]s</a>
 commit_repo=pushed para <a href="%[1]s/src/%[2]s">%[3]s</a> em <a href="%[1]s">%[4]s</a>
+compare_commits=Ver comparação entre esses %d commits
+transfer_repo=repositório transferido de <code>%s</code> para <a href="%s">%s</a>
 create_issue=`questão aberta <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`questão fechada <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`questão reaberta <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`comentou sobre a questão <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`criou o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`fechou o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`reabriu o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`comentou sobre a questão <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`mesclou o pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=repositório transferido de <code>%s</code> para <a href="%s">%s</a>
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=Foi feito push na tag <a href="%s/src/%s">%[2]s</a> para <a href="%[1]s">%[3]s</a>
-compare_commits=Ver comparação entre esses %d commits
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=atrás

conf/locale/locale_ru-RU.ini

@@ -48,7 +48,7 @@ cancel=Отмена
 install=Установка
 title=Установочные шаги для первого запуска
 docker_helper=Если вы запускаете Gogs внутри Docker, пожалуйста прочтите <a target="_blank" href="%s">эти советы</a> внимательно перед тем как что-либо изменить на этой странице!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs требует наличия MySQL, PostgreSQL, SQLite3, MSSQL или TiDB.
 db_title=Настройки базы данных
 db_type=Тип базы данных
 host=Хост
@@ -58,8 +58,8 @@ db_name=Имя базы данных
 db_helper=Для MySQL используйте тип таблиц InnoDB с кодировкой utf8_general_ci.
 ssl_mode=Режим SSL
 path=Путь
-sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=Путь к файлу базы данный SQLite3. <br>Пожалуйста, используйте абсолютный путь если Gogs запускается как сервис.
+err_empty_db_path=Путь к файлу базы данных SQLite3 не может быть пустым.
 no_admin_and_disable_registration=Вы не можете отключить регистрацию до создания учетной записи администратора.
 err_empty_admin_password=Пароль администратора не может быть пустым.
 
@@ -74,14 +74,16 @@ domain=Домен
 domain_helper=Влияет на URL-адреса для клонирования по SSH.
 ssh_port=SSH порт
 ssh_port_helper=Номер порта, который использует SSH сервер. Оставьте пустым, чтобы отключить SSH.
-use_builtin_ssh_server=Use Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server=Использовать встроенный SSH сервер
+use_builtin_ssh_server_popup=Запустить встроенный SSH сервер для различения операций Git и системного демона SSH.
 http_port=Порт HTTP
 http_port_helper=Номер порта, который приложение будет слушать.
 app_url=URL приложения
 app_url_helper=Этот параметр влияет на URL для клонирования по HTTP/HTTPS и на адреса в электронной почте.
 log_root_path=Путь к журналу
 log_root_path_helper=Каталог для записи файлов журнала.
+enable_console_mode=Включите режим консоли
+enable_console_mode_popup=В дополнение к файловому режиму, выводить лог в консоль.
 
 optional_title=Расширенные настройки
 email_title=Настройки службы электронной почты
@@ -117,7 +119,8 @@ sqlite3_not_available=Ваша версия не поддерживает SQLite
 invalid_db_setting=Настройки базы данных не правильные: %v
 invalid_repo_path=Недопустимый путь к корню репозитория: %v
 run_user_not_match=Текущий пользователь не является пользователем для запуска: %s -> %s
-invalid_smtp_from=SMTP From field is not valid: %v
+smtp_host_missing_port=SMTP Host is missing port in address.
+invalid_smtp_from=Поле SMTP From неправильное: %v
 save_config_failed=Не удалось сохранить конфигурацию: %v
 invalid_admin_setting=Указан недопустимый параметр учетной записи администратора: %v
 install_success=Добро пожаловать! Мы рады, что вы выбрали Gogs. Веселитесь и берегите себя.
@@ -166,6 +169,14 @@ reset_password_helper=Нажмите здесь, чтобы сбросить с
 password_too_short=Длина пароля не менее 6 символов.
 non_local_account=Нелокальные аккаунты не могут изменить пароль через Gogs.
 
+login_two_factor=Двухфакторная аутентификация
+login_two_factor_passcode=Код проверки подлинности
+login_two_factor_enter_recovery_code=Введите код двухфакторной аутентификации
+login_two_factor_recovery=Двухфакторная аутентификация
+login_two_factor_recovery_code=Код восстановления
+login_two_factor_enter_passcode=Введите код двухфакторной аутентификации
+login_two_factor_invalid_recovery_code=Код восстановления был использован или не действителен.
+
 [mail]
 activate_account=Пожалуйста активируйте свой аккаунт
 activate_email=Подтвердите адрес своей электронной почты
@@ -201,6 +212,7 @@ Content=Содержимое
 require_error=` не может быть пустым.`
 alpha_dash_error=«должен быть допустимым символьным, числовым или dash(-_) значением.»
 alpha_dash_dot_error=«должен быть допустимым символьным, числовым или dash(-_) символами, включая точку.»
+alpha_dash_dot_slash_error=«должен быть допустимым символьным, числовым или dash(-_) символами, включая точку или слэш.»
 size_error=` должен быть размер %s.`
 min_size_error=«должен содержать по крайней мере %s символов.»
 max_size_error=` должен содержать максимум %s символов.`
@@ -252,11 +264,11 @@ profile=Профиль
 password=Пароль
 avatar=Аватар
 ssh_keys=SSH ключи
-social=Учетные записи в соцсетях
-applications=Приложения
+security=Безопасность
+repos=Репозитории
 orgs=Организации
+applications=Приложения
 delete=Удалить аккаунт
-uid=UID
 
 public_profile=Открытый профиль
 profile_desc=Адрес вашей электронной почты является публичным и будет использован для любых уведомлений, связанных с аккаунтом, а также для любых действий, совершенных через сайт.
@@ -322,10 +334,30 @@ no_activity=Еще не применялся
 key_state_desc=Этот ключ использовался за последние 7 дней
 token_state_desc=Этот токен использовался за последние 7 дней
 
-manage_social=Управление привязанными учетными записями в соцсетях
-social_desc=Это список привязанных учетных записей в соцсетях. Удаляйте любые неизвестные вам привязки.
-unbind=Отвязать
-unbind_success=Социальная учетная запись отвязана.
+two_factor=Двухфакторная аутентификация
+two_factor_status=Статус:
+two_factor_on=Включено
+two_factor_off=Выключен
+two_factor_enable=Включить
+two_factor_disable=Выключить
+two_factor_view_recovery_codes=Просмотрите и сохранените <a href="%s%s">коды вашего восстановления</a> в надежном месте. Вы можете использовать их в качестве пароля, если потеряете доступ к приложению.
+two_factor_http=Для операций HTTP/HTTPS вы больше не сможете использовать просто имя пользователя и пароль. Пожалуйста, создайте и используйте для подписи ваших запросов <a href="%[1]s%[2]s">Персональный ключ доступа</a>, например, <code>%[3]s</code>.
+two_factor_enable_title=Включить двухфакторную аутентификацию
+two_factor_scan_qr=Пожалуйста, используйте приложения проверки подлинности для сканирования изображения:
+two_factor_or_enter_secret=Или введите кодовое слово:
+two_factor_then_enter_passcode=Затем введите пароль:
+two_factor_verify=Проверить
+two_factor_invalid_passcode=Введенные пароли не совпадают; пожалуйста, повторите попытку!
+two_factor_enable_error=Ошибка активация двухфакторной аутентификации: %v
+two_factor_enable_success=Двухфакторная аутентификация активирована для вашей учетной записи!
+two_factor_recovery_codes_title=Коды восстановления для двухфакторная аутентификации
+two_factor_recovery_codes_desc=Коды восстановления должны использоваться, когда у вас нет возможности использовать приложение аутентификации. Каждый код восстановления может быть использован один раз, <b>пожалуйста, держите эти коды в надежном месте</b>.
+two_factor_regenerate_recovery_codes=Сгенерировать новые коды восстановления
+two_factor_regenerate_recovery_codes_error=Ошибка создания новых кодов восстановления: %v
+two_factor_regenerate_recovery_codes_success=Новые коды восстановления созданы!
+two_factor_disable_title=Отключить двухфакторную аутентификацию
+two_factor_disable_desc=Уровень безопасности вашего аккаунта понизится после отключения двухфакторной аутентификации. Вы хотите продолжить?
+two_factor_disable_success=Двухфакторная аутентификация выключена!
 
 manage_access_token=Управление Токенами Персонального Доступа
 generate_new_token=Создать новый token
@@ -343,6 +375,11 @@ orgs.none=Вы не состоите ни в одной организации.
 orgs.leave_title=Покинуть организацию
 orgs.leave_desc=Вы потеряете доступ ко всем репозиториям и командам, как только покинете организацию. Вы хотите продолжить?
 
+repos.leave=Выйти
+repos.leave_title=Покинуть репозиторий
+repos.leave_desc=Вы потеряете доступ к репозиторию, после того, как вы его покинете. Вы хотите продолжить?
+repos.leave_success=Вы покинули репозиторий «%s» успешно!
+
 delete_account=Удалить свой аккаунт
 delete_prompt=Этим действием вы удалите свою учетную запись навсегда и <strong>НЕ СМОЖЕТЕ</strong> ее вернуть!
 confirm_delete_account=Подтвердите удаление
@@ -391,7 +428,7 @@ migrate_type_helper=Этот репозиторий будет <span class="text
 migrate_repo=Перенос репозитория
 migrate.clone_address=Скопировать адрес
 migrate.clone_address_desc=Это может быть HTTP/HTTPS/GIT URL-адрес.
-migrate.clone_address_desc_import_local=You're also allowed to migrate a repository by local server path.
+migrate.clone_address_desc_import_local=Вы также можете мигрировать репозиторий по локальному пути на сервере.
 migrate.permission_denied=У вас нет прав на импорт локальных репозиториев.
 migrate.invalid_local_path=Недопустимый локальный путь. Возможно он не существует или является не папкой.
 migrate.failed=Миграция не удалась: %v
@@ -413,7 +450,7 @@ quick_guide=Краткое руководство
 clone_this_repo=Клонировать репозиторий
 create_new_repo_command=Создать новый репозиторий из командной строки
 push_exist_repo=Отправить существующий репозиторий из командной строки
-repo_is_empty=Этот репозиторий пуст, пожалуйста, возвращайтесь позже!
+bare_message=В репозитории еще нет файлов.
 
 files=Файлы
 branch=Ветка
@@ -426,6 +463,7 @@ pulls=Запросы на слияние
 labels=Метки
 milestones=Этапы
 commits=Коммиты
+git_branches=Ветки
 releases=Релизы
 file_raw=Исходник
 file_history=История
@@ -434,6 +472,13 @@ file_permalink=Постоянная ссылка
 file_too_large=Этот файл слишком большой, поэтому он не может быть отображен
 video_not_supported_in_browser=Ваш браузер не поддерживает HTML5 видео тэг.
 
+branches.overview=Обзор
+branches.active_branches=Активные ветки
+branches.stale_branches=Устаревшие ветки
+branches.all=Все ветки
+branches.updated_by=Обновлено %[1]s %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=Новый файл
 editor.upload_file=Загрузить файл
 editor.edit_file=Редактировать файл
@@ -473,7 +518,7 @@ editor.add_subdir=Добавьте подкаталог...
 editor.unable_to_upload_files=Не удалось загрузить файлы в «%s» из-за ошибки: %v
 editor.upload_files_to_dir=Загрузить файлы '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=История коммитов
 commits.commits=Коммиты
 commits.search=Поиск коммитов
 commits.find=Найти
@@ -640,27 +685,29 @@ settings.collaboration.admin=Администратор
 settings.collaboration.write=Запись
 settings.collaboration.read=Просмотр
 settings.collaboration.undefined=Не определено
-settings.branches=Branches
-settings.default_branch=Default Branch
-settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
-settings.update=Update
-settings.update_default_branch_success=Default branch of this repository has been updated successfully!
-settings.protected_branches=Protected Branches
-settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
-settings.choose_a_branch=Choose a branch...
-settings.branch_protection=Branch Protection
-settings.branch_protection_desc=Please choose protect options for branch <b>%s</b>.
-settings.protect_this_branch=Protect this branch
-settings.protect_this_branch_desc=Disable force pushes and prevent from deletion.
-settings.protect_require_pull_request=Require pull request instead direct pushing
-settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
-settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
-settings.protect_whitelist_users=Users who can push to this branch
-settings.protect_whitelist_search_users=Search users
-settings.protect_whitelist_teams=Teams for which members of them can push to this branch
-settings.protect_whitelist_search_teams=Search teams
-settings.update_protect_branch_success=Protect options for this branch has been updated successfully!
+settings.branches=Ветки
+settings.branches_bare=Вы не можете управлять ветками для пустого репозитория. Пожалуйста, сначала создайте что-нибудь.
+settings.default_branch=Ветка по умолчанию
+settings.default_branch_desc=Ветка по-умолчанию считается основной для коммитов, запросов на слияние и онлайн-редактирования.
+settings.update=Обновить
+settings.update_default_branch_unsupported=Изменение ветки по умолчанию не поддерживается в версии Git на сервере.
+settings.update_default_branch_success=Ветка по умолчанию для этого репозитория была успешно изменена!
+settings.protected_branches=Защищенные ветки
+settings.protected_branches_desc=Защитить ветки от принудительного push, случайного удаления и разрешить изменения только коммитерам из белого списка.
+settings.choose_a_branch=Выберите ветку...
+settings.branch_protection=Защита веток
+settings.branch_protection_desc=Пожалуйста, выберите параметры защиты для ветки <b>%s</b>.
+settings.protect_this_branch=Защитить эту ветку
+settings.protect_this_branch_desc=Выключить принудительный push и защитить от удаления.
+settings.protect_require_pull_request=Требовать запрос на слияние вместо прямого push
+settings.protect_require_pull_request_desc=Включите этот параметр для запрета прямого push в это ветку. Коммит должен быть запушен в незащищенную ветку и слит в эту ветку через запрос на слияние.
+settings.protect_whitelist_committers=Белый список тех, кто может делать push в эту ветку
+settings.protect_whitelist_committers_desc=Добавьте людей или команды в белый список для прямого доступа к этой ветке. Пользователи из белого списка будут обходить проверку pull request.
+settings.protect_whitelist_users=Пользователи которые могут делать push в эту ветку
+settings.protect_whitelist_search_users=Поиск пользователей
+settings.protect_whitelist_teams=Команды, члены которых могут делать push в эту ветку
+settings.protect_whitelist_search_teams=Поиск команд
+settings.update_protect_branch_success=Параметры защиты этой ветки были успешно обновлены!
 settings.hooks=Автоматическое обновление
 settings.githooks=Git хуки
 settings.basic_settings=Основные параметры
@@ -673,14 +720,16 @@ settings.change_reponame_prompt=Это изменение повлияет на
 settings.advanced_settings=Расширенные настройки
 settings.wiki_desc=Включить систему Wiki
 settings.use_internal_wiki=Использовать встроенную wiki
+settings.allow_public_wiki_desc=Разрешить публичный доступ к wiki-разделу, если репозиторий приватный
 settings.use_external_wiki=Использовать внешнюю Wiki
 settings.external_wiki_url=URL-адрес внешней Вики
 settings.external_wiki_url_desc=Посетители будут перенаправлены на URL-адрес, когда они кликнут по вкладке.
 settings.issues_desc=Включить систему отслеживания ошибок
 settings.use_internal_issue_tracker=Использовать встроенную легковесную систему отслеживания ошибок
+settings.allow_public_issues_desc=Разрешить публичный доступ к вопросам, если репозиторий приватный
 settings.use_external_issue_tracker=Использовать внешнюю систему отслеживания ошибок
-settings.external_tracker_url=External Issue Tracker URL
-settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
+settings.external_tracker_url=URL внешней системы отслеживания ошибок
+settings.external_tracker_url_desc=Посетители будут перенаправлены на URL когда они нажмут на вкладку.
 settings.tracker_url_format=Внешний формат ссылки системы отслеживания ошибок.
 settings.tracker_issue_style=Стиль Именования Внешней Системы Учета Задач:
 settings.tracker_issue_style.numeric=Цифровой
@@ -688,7 +737,7 @@ settings.tracker_issue_style.alphanumeric=Буквенноцифровой
 settings.tracker_url_format_desc=Вы можете использовать шаблон <code>{user} {repo} {index}</code> для имени пользователя, репозитория и номера задачи.
 settings.pulls_desc=Включить публичные запросы на слияние
 settings.danger_zone=Опасная зона
-settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
+settings.cannot_fork_to_same_owner=Вы не можете ответвить репозиторий его же владельцу.
 settings.new_owner_has_same_repo=У нового владельца уже есть хранилище с таким названием.
 settings.convert=Преобразовать в обычный репозиторий
 settings.convert_desc=Это зеркало можно преобразовать в обычный репозиторий. Это не может быть отменено.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Веб-хук успешно удален!
 settings.webhook.test_delivery=Проверить доставку
 settings.webhook.test_delivery_desc=Отправить push для тестирования настройки веб-хуков
 settings.webhook.test_delivery_success=Тест веб-хука была добавлен в очередь доставки. Это может занять несколько секунд, прежде чем он отобразится в истории доставки.
+settings.webhook.redelivery=Повторная доставка
+settings.webhook.redelivery_success=Хук задачи «%s» было отправлен в очередь доставки. Обновление статуса в истории может занять некоторое время.
 settings.webhook.request=Запрос
 settings.webhook.response=Ответ
 settings.webhook.headers=Заголовки
@@ -745,7 +796,7 @@ settings.add_webhook_desc=Мы отправим запрос <code>POST</code>
 settings.payload_url=URL обработчика
 settings.content_type=Тип содержимого
 settings.secret=Secret
-settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
+settings.secret_desc=Секрет будет отправлен как SHA256 HMAC контента в шестнадцатеричном виде в заголовке <code>X-Gogs-Signature</code>.
 settings.slack_username=Имя пользователя
 settings.slack_icon_url=URL иконки
 settings.slack_color=Цвет
@@ -755,10 +806,20 @@ settings.event_send_everything=Мне нужно <strong>все</strong>.
 settings.event_choose=Позвольте мне выбрать то, что нужно.
 settings.event_create=Создать
 settings.event_create_desc=Ветка или тэг созданы
-settings.event_pull_request=Запросы на слияние
-settings.event_pull_request_desc=Запрос слияния открыт, закрыт, переоткрыт, изменён, назначен, снят, метка обновлена, метка убрана, или синхронизирован.
+settings.event_delete=Удалить
+settings.event_delete_desc=Ветка или метка удалена
+settings.event_fork=Ответвить
+settings.event_fork_desc=Репозиторий склонирован
 settings.event_push=Push
 settings.event_push_desc=Push в репозиторий
+settings.event_issues=Вопросы
+settings.event_issues_desc=Задача изменена
+settings.event_issue_comment=Комментарии в задаче
+settings.event_issue_comment_desc=Комментарий создан, изменен или удален.
+settings.event_pull_request=Запросы на слияние
+settings.event_pull_request_desc=Запрос слияния открыт, закрыт, переоткрыт, изменён, назначен, снят, метка обновлена, метка убрана, добавлен промежуточный этап, убран промежуточный этап или синхронизирован.
+settings.event_release=Релиз
+settings.event_release_desc=Релиз опубликован в репозитории.
 settings.active=Активен
 settings.active_helper=Подробности о событии, вызвавшем срабатывание хука, также будут предоставлены.
 settings.add_hook_success=Был добавлен новый webhook.
@@ -768,12 +829,12 @@ settings.delete_webhook=Удалить автоматическое обновл
 settings.recent_deliveries=Недавние рассылки
 settings.hook_type=Тип перехватчика
 settings.add_slack_hook_desc=Добавить интеграцию с <a href="%s">Slack</a> в ваш репозиторий.
-settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
+settings.add_discord_hook_desc=Добавить интеграцию с <a href="%s">Discord</a> в ваш репозиторий.
 settings.slack_token=Token
 settings.slack_domain=Домен
 settings.slack_channel=Канал
 settings.deploy_keys=Ключи развертывания
-settings.deploy_keys_helper=<b>Common Gotcha!</b> If you're looking for adding personal public keys, please add them in your <a href="%s%s">account settings</a>.
+settings.deploy_keys_helper=<b>Common Gotcha!</b> Если вы ищите куда добавить персональные публичные ключи, добавьте их в <a href="%s%s">настройках вашего аккаунта</a>.
 settings.add_deploy_key=Добавить ключ развертывания
 settings.deploy_key_desc=Ключи развёртывания доступны только для чтения. Это не то же самое что и SSH-ключи аккаунта.
 settings.no_deploy_keys=Вы не добавляли ключи развертывания.
@@ -803,7 +864,6 @@ release.releases=Релизы
 release.new_release=Новый релиз
 release.draft=Черновик
 release.prerelease=Пре-релиз
-release.stable=Стабильный
 release.edit=Редактировать
 release.ahead=<strong>%d</strong> коммитов %s начиная с этого релиза
 release.source_code=Исходный код
@@ -852,7 +912,7 @@ team_permission_desc=Какой уровень разрешений должен
 
 form.name_reserved=Наименование организации  '%s' зарезервированно.
 form.name_pattern_not_allowed=Шаблон организации  '%s' не допускается.
-form.team_name_reserved=Team name '%s' is reserved.
+form.team_name_reserved=Имя команды '%s' зарезервировано.
 
 settings=Настройки
 settings.options=Опции
@@ -943,8 +1003,8 @@ dashboard.git_gc_repos=Выполнить сборку мусора на реп
 dashboard.git_gc_repos_success=Сборка мусора на всех репозиториях успешно выполнена.
 dashboard.resync_all_sshkeys=Переписать файл «.ssh/authorized_keys» (осторожно: не Gogs ключи будут утеряны)
 dashboard.resync_all_sshkeys_success=Были успешно переписаны все открытые ключи.
-dashboard.resync_all_hooks=Resync pre-receive, update and post-receive hooks of all repositories
-dashboard.resync_all_hooks_success=All repositories' pre-receive, update and post-receive hooks have been resynced successfully.
+dashboard.resync_all_hooks=Повторная синхронизация хуков pre-receive, update и post-receive во всех репозиториях
+dashboard.resync_all_hooks_success=Все хуки pre-receive, update и post-receive во всех репозиториях были успешно повторно синхронизированы.
 dashboard.reinit_missing_repos=Реинициализировать все репозитории с утерянными Git файлами
 dashboard.reinit_missing_repos_success=Все репозитории с утерянными Git файлами успешно реинициализированы.
 
@@ -1019,6 +1079,7 @@ repos.private=Приватный
 repos.watches=Следят
 repos.stars=В избранном
 repos.issues=Задачи
+repos.size=Размер
 
 auths.auth_manage_panel=Панель управления аутнентификациями
 auths.new=Добавить новый источник
@@ -1039,9 +1100,14 @@ auths.user_base=База для поиска пользователя
 auths.user_dn=DN пользователя
 auths.attribute_username=Атрибут username
 auths.attribute_username_placeholder=Оставьте пустым, чтобы использовать имя пользователя для регистрации.
-auths.attribute_name=Имя аттрибута
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Фамилия аттрибута
 auths.attribute_mail=Электронная почта аттрибута
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Извлечение атрибутов в виде Bind DN
 auths.filter=Фильтр пользователя
 auths.admin_filter=Фильтр администратора
@@ -1077,7 +1143,7 @@ config.offline_mode=Автономный режим
 config.disable_router_log=Отключение журнала маршрутизатора
 config.run_user=Запуск пользователем
 config.run_mode=Режим выполнения
-config.git_version=Git Version
+config.git_version=Версия Git
 config.static_file_root_path=Статичный путь до файла
 config.log_file_root_path=Путь до папки с логами
 config.reverse_auth_user=Заголовок с именем пользователя для авторизации на reverse proxy
@@ -1094,15 +1160,15 @@ config.ssh_keygen_path=Путь к генератору ключей ('ssh-keyge
 config.ssh_minimum_key_size_check=Минимальный размер ключа проверки
 config.ssh_minimum_key_sizes=Минимальные размеры ключа
 
-config.repo_config=Repository Configuration
+config.repo_config=Настройка репозитория
 config.repo_root_path=Путь до корня репозитория
 config.script_type=Тип сценария
-config.repo_force_private=Force Private
-config.max_creation_limit=Max Creation Limit
-config.preferred_licenses=Preferred Licenses
-config.disable_http_git=Disable HTTP Git
-config.enable_local_path_migration=Enable Local Path Migration
-config.commits_fetch_concurrency=Commits Fetch Concurrency
+config.repo_force_private=Сделать личным принудительно
+config.max_creation_limit=Лимит созданий
+config.preferred_licenses=Предпочитаемые лицензии
+config.disable_http_git=Выключить HTTP Git
+config.enable_local_path_migration=Включить миграцию с локального пути
+config.commits_fetch_concurrency=Параллельность получения коммитов
 
 config.db_config=Конфигурация базы данных
 config.db_type=Тип
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Время Ожидания Операции Извле
 config.git_gc_timeout=Время Ожидания Операции Сборки Мусора
 
 config.log_config=Конфигурация журнала
-config.log_mode=Режим журналирования
+config.log_mode=Режим
+config.log_options=Опции
 
 monitor.cron=Задачи cron
 monitor.name=Имя
@@ -1205,19 +1272,23 @@ notices.delete_success=Системное уведомление успешно
 
 [action]
 create_repo=создал(а) репозиторий <a href="%s"> %s</a>
+fork_repo=склонировать репозиторий в <a href="%s">%s</a>
 rename_repo=переименовал(а) репозиторий из <code>%[1]s</code> на <a href="%[2]s">%[3]s</a>
 commit_repo=запушил(а) <a href="%[1]s/src/%[2]s">%[3]s</a> в <a href="%[1]s">%[4]s</a>
+compare_commits=Просмотр сравнение для этих %d коммитов
+transfer_repo=перенес репозиторий <code>%s</code> в <a href="%s">%s</a>
 create_issue=`открыл(а) задачу <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`закрыл(а) задачу <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`возобновил(а) задачу <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`прокомментировал(а) вопрос <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`создал запрос на слияние <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`закрыл запрос на слияние <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`открыл снова запрос на слияние <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`прокомментировал(а) вопрос <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`слил пул реквест <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=перенес репозиторий <code>%s</code> в <a href="%s">%s</a>
+create_branch=создать новую ветку <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=удален бранч <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=запушил(а) метку <a href="%s/src/%s">%[2]s</a> в <a href="%[1]s">%[3]s</a>
-compare_commits=Просмотр сравнение для этих %d коммитов
+delete_tag=удален тег <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=назад

conf/locale/locale_sr-SP.ini

@@ -48,7 +48,7 @@ cancel=Откажи
 install=Инсталација
 title=Инсталационе кораке за првог покретања
 docker_helper=Ако покрећете Gogs унутар Docker, молимо прочитајте <a target="_blank" href="%s">ове савете</a> пажљиво пре него што сте било шта променили на овој страници!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs захтева MySQL, PostgreSQL, SQLite3, MSSQL или TiDB.
 db_title=Подешавања базе
 db_type=Тип базе података
 host=Хост
@@ -58,8 +58,8 @@ db_name=Име базе података
 db_helper=За MySQL користите тип табела InnoDB са кодирањем utf8_general_ci.
 ssl_mode=Режим SSL
 path=Пут
-sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+sqlite_helper=Пут датотеке за базу података SQLite3. <br>Молимо користите апсолутни пут када покренете као сервис.
+err_empty_db_path=Пут базе података SQLite3 не може да буде празан.
 no_admin_and_disable_registration=Ви не можете онемогућити регистрацију до стварања налог администратора.
 err_empty_admin_password=Лозинка администратора не може бити празна.
 
@@ -74,14 +74,16 @@ domain=Домен
 domain_helper=Утиче на URL адресе клониране преко SSH.
 ssh_port=SSH порт
 ssh_port_helper=Број порта који користи SSH сервер. Оставите празно да бисте онемогућили SSH.
-use_builtin_ssh_server=Use Builtin SSH Server
-use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
+use_builtin_ssh_server=Користите уграђени SSH Сервер
+use_builtin_ssh_server_popup=Покрени уграђени SSH сервер за Git операције да их разликовати од система SSH daemon.
 http_port=Порт HTTP
 http_port_helper=Број порта преко којој ће апликација слушати.
 app_url=URL адреса апликације
 app_url_helper=Ова поставка утиче на URL за клонирање преко HTTP/HTTPS протокола и на адресама е-поште.
 log_root_path=Пут до журнала
 log_root_path_helper=Директоријум где ће бити снимане датотеке журнала.
+enable_console_mode=Омогући конзол начин
+enable_console_mode_popup=Поред начин датотеке, пошаљи системске извештаје и конзолу.
 
 optional_title=Напредна подешавања
 email_title=Подешавања сервиса е-поште
@@ -117,7 +119,8 @@ sqlite3_not_available=Ваша верзија не подржава SQLite3, м
 invalid_db_setting=Подешавања базе података су неправилна: %v
 invalid_repo_path=Пут до корена спремишта не неправилно: %v
 run_user_not_match=Тренутни корисник није корисник за покретање: %s -> %s
-invalid_smtp_from=SMTP From field is not valid: %v
+smtp_host_missing_port=У адресу SMTP сервера недостаје порт.
+invalid_smtp_from=Поље SMTP From није важећи: %v
 save_config_failed=Није могуће сачувати конфигурацију: %v
 invalid_admin_setting=Подешавањна администратора су неправилна: %v
 install_success=Добродошли! Ми смо срећни што сте изабрали Gogs.
@@ -139,7 +142,7 @@ issues.in_your_repos=У вашим спремиштима
 [explore]
 repos=Спремишта
 users=Корисници
-organizations=Organizations
+organizations=Организације
 search=Претрага
 
 [auth]
@@ -166,6 +169,14 @@ reset_password_helper=Кликните овде да ресетујете ваш
 password_too_short=Лозинка неможе бити краћа од 6 карактера.
 non_local_account=Нелокални налози не могу да промените лозинку преко Gogs.
 
+login_two_factor=Двострука аутентификација
+login_two_factor_passcode=Шифра аутентификације
+login_two_factor_enter_recovery_code=Унеси двоструку шифру за опоравак
+login_two_factor_recovery=Двоструки опоравак
+login_two_factor_recovery_code=Шифра за опоравак
+login_two_factor_enter_passcode=Унеси двоструку шифру
+login_two_factor_invalid_recovery_code=Шифра за опоравак је већ била коришћена или није више важећа.
+
 [mail]
 activate_account=Молимо вас активирајте ваш налог
 activate_email=Потврдите вашу адресу е-поште
@@ -201,6 +212,7 @@ Content=Садржај
 require_error=` не може бити празно.`
 alpha_dash_error=` мора се састојати словима, бројевима или dash(-_) карактера.`
 alpha_dash_dot_error=` мора се састојати словима, бројевима, dash(-_) карактера, или тачком.`
+alpha_dash_dot_slash_error=` мора да буде слово, број, црта или тачка.`
 size_error=` мора бити величине %s.`
 min_size_error=` мора да садржи најмање %s карактера.`
 max_size_error=` мора да садржи највише %s карактера.`
@@ -252,11 +264,11 @@ profile=Профил
 password=Лозинка
 avatar=Аватар
 ssh_keys=SSH Кључеви
-social=Налози на друштвеним мрежама
-applications=Апликације
+security=Безбедност
+repos=Спремишта
 orgs=Организације
+applications=Апликације
 delete=Уклоните налог
-uid=Uid
 
 public_profile=Јавни профил
 profile_desc=Ваша адреса е-поште је јавна и коришће се за све обавести везане са налогом, као и друге операције почињене кроз Gogs.
@@ -322,10 +334,30 @@ no_activity=Нема недавних активности
 key_state_desc=Овај кључ је коришћен у задњих 7 дана
 token_state_desc=Токен је коришћен у задњих 7 дана
 
-manage_social=Управљање прикључених друштвеним мрежама
-social_desc=Ово је списак повезаних друштвених мрежа. Уклоните све непознате.
-unbind=Обвежи
-unbind_success=Друштвена мрежа је обвежена.
+two_factor=Двострука аутентификација
+two_factor_status=Стање:
+two_factor_on=Укључено
+two_factor_off=Искључено
+two_factor_enable=Омогући
+two_factor_disable=Онемогући
+two_factor_view_recovery_codes=Гледајте и сачувајте <a href="%s%s">ваше шифре за опоравак</a> на сигурном месту. Можете да их користите у случају да изгубите приступ до апликације за аутентификацију.
+two_factor_http=За HTTP/HTTPS операције, нећете виће моћи да користите корисничко име и лозинку. Молим вас да креирате и користите <a href="%[1]s%[2]s"> лични приступни токен</a> као ваш акредитив, на пример <code>%[3]s</code>.
+two_factor_enable_title=Омогући двострука аутентификација
+two_factor_scan_qr=Молим вас користите вашу апликацију за аутентификацију за скенирање слику:
+two_factor_or_enter_secret=Или унесите тајну шифру:
+two_factor_then_enter_passcode=Па унесите шифру:
+two_factor_verify=Проверити
+two_factor_invalid_passcode=Шифрa коју сте унели није важећа, молим бас пробајте поново!
+two_factor_enable_error=Активација двоструке аутентификације није успела: %v
+two_factor_enable_success=Двострука аутентификација је успешно активирана за ваш налог!
+two_factor_recovery_codes_title=Шифра за опоравак за двоструку аутентификацију
+two_factor_recovery_codes_desc=Шифре за опоравак требају када привремено изгубите приступ до апликације за аутентификацију. Свака шифра за опоравак може да се користи само једном, <b>молим вас да сачувате те шифре на сигурном месту</b>.
+two_factor_regenerate_recovery_codes=Обновите шифре за опоравак
+two_factor_regenerate_recovery_codes_error=Обнова шифри за опоравак није успела: %v
+two_factor_regenerate_recovery_codes_success=Нове шифре за опоравак су успешно креиране!
+two_factor_disable_title=Онемогући двоструку аутентификацију
+two_factor_disable_desc=Ниво безбедности вашег налога биће ниже пошто сте онемогућили двоструку аутентификацију. Да ли желите да наставите?
+two_factor_disable_success=Двострука аутентификација је успешно искључена!
 
 manage_access_token=Управљање токенима особном приступу
 generate_new_token=Генериши нови токен
@@ -339,9 +371,14 @@ access_token_deletion=Уклоњење токена личног приступ
 access_token_deletion_desc=Уклоњење овог токена ће онемогућити сав приступ. Да ли желите да наставите?
 delete_token_success=Лични токен је успешно избришен! Не заборавите да ажурирате апликацију.
 
-orgs.none=You are not a member of any organizations.
-orgs.leave_title=Leave an organization
-orgs.leave_desc=You will lose access to all repositories and teams after you left the organization. Do you want to continue?
+orgs.none=Нисте члан било које организације.
+orgs.leave_title=Напусти организацију
+orgs.leave_desc=Изгубићете приступ до свих спремишта и тимова после одласка из организације. Да ли желите да наставите?
+
+repos.leave=Изаћи
+repos.leave_title=Напусти српемиште
+repos.leave_desc=Изгубићете приступ до спремишта после одласка. Да ли желите да наставите?
+repos.leave_success=Успешно сте напустили спремиште '%s'!
 
 delete_account=Уклоните ваш налог
 delete_prompt=Операција ће трајно избрисати ваш налог, што се <strong>НЕ може</strong> поввратити!
@@ -390,8 +427,8 @@ migrate_type=Тип миграције
 migrate_type_helper=Ово спремиште ће бити <span class="text blue">огледало</span>
 migrate_repo=Мигрирајте спремиште
 migrate.clone_address=Адреса за клонирање
-migrate.clone_address_desc=This can be a HTTP/HTTPS/GIT URL.
-migrate.clone_address_desc_import_local=You're also allowed to migrate a repository by local server path.
+migrate.clone_address_desc=Могуће је да буде једна HTTP/HTTPS/GIT адреса.
+migrate.clone_address_desc_import_local=Можете и да мигрирате спремиште користећи пут на локалном серверу.
 migrate.permission_denied=Немате права на увезете локално спремиште.
 migrate.invalid_local_path=Невашећи локални пут. Можда не постоји или није директоријум.
 migrate.failed=Миграција није успела: %v
@@ -413,9 +450,9 @@ quick_guide=Кратак водич
 clone_this_repo=Клонирај спремиште
 create_new_repo_command=Направите ново спремиште са командне линије
 push_exist_repo=Push постојећe спремиште са командне линије
-repo_is_empty=Овo спремиште je празнo, молимо вас, вратите се касније!
+bare_message=Ово спремиште не садржи још било који садржај.
 
-files=Files
+files=Датотеке
 branch=Грана
 tree=Дрво
 filter_branch_and_tag=Профилтрирај по грани или ознаци
@@ -426,13 +463,21 @@ pulls=Захтеви за спајање
 labels=Лабеле
 milestones=Фазе
 commits=Комити
+git_branches=Гране
 releases=Издања
 file_raw=Датотека
 file_history=Историја
 file_view_raw=Прегледај саму датотеку
 file_permalink=Пермалинк
 file_too_large=Ова датотека је превише веика да би се приказала
-video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
+video_not_supported_in_browser=Ваш прегледач не подржава HTML5 видео ознаке.
+
+branches.overview=Преглед
+branches.active_branches=Активне гране
+branches.stale_branches=Застареле гране
+branches.all=Све гране
+branches.updated_by=Ажуриран %[1]s од %[2]s
+branches.change_default_branch=Промените подразумевану грану
 
 editor.new_file=Нова датотека
 editor.upload_file=Отпреми датотеку
@@ -462,7 +507,7 @@ editor.cancel=Откажи
 editor.filename_cannot_be_empty=Име датотеке неможе бити празно.
 editor.branch_already_exists=Грана '%s' већ постоји за ово спремиште.
 editor.directory_is_a_file='%s' је већ постојећа датотека а не директоријум у спремишту.
-editor.file_is_a_symlink=The file '%s' is a symlink that cannot be modified from the web editor.
+editor.file_is_a_symlink=Датотека '%s' је једна симболична веза која се не може модификовати из веб-уредника.
 editor.filename_is_a_directory='%s' је постојећи директоријум у спремишту.
 editor.file_editing_no_longer_exists=Датотека '%s' више не постоји у спремишту.
 editor.file_changed_while_editing=Садржај датотеке је промењен од почетка уређивања. <a target="_blank" href="%s">Кликните овде</a> да видите шта је промењено или <strong>опет поднесите комит</strong> да пребришете промене.
@@ -473,7 +518,7 @@ editor.add_subdir=Додај поддиректоријуми...
 editor.unable_to_upload_files=Учитање датотеке '%s' није успело са грешкном: %v
 editor.upload_files_to_dir=Пошаљи датотеке на '%s'
 
-commits.commit_history=Commit History
+commits.commit_history=Историја ревизија
 commits.commits=Комити
 commits.search=Претражи комите
 commits.find=Претражи
@@ -588,8 +633,8 @@ pulls.cannot_auto_merge_desc=Овај захтев за спајање не мо
 pulls.cannot_auto_merge_helper=Молимо вас, обавите спајање ручно да би сте разрешили сукобе.
 pulls.merge_pull_request=Обави спајање
 pulls.open_unmerged_pull_exists=`Неможете поново отворити јер већ постоји захтев за спајање (#%d) из истог спремишта са истим информацијама о спајању и чека спајање.`
-pulls.delete_branch=Delete Branch
-pulls.delete_branch_has_new_commits=Branch cannot be deleted because it has new commits after mergence.
+pulls.delete_branch=Избришите грану
+pulls.delete_branch_has_new_commits=Грана не може да буде избрисана због нових ревизија после уједињења.
 
 milestones.new=Нова фаза
 milestones.open_tab=%d отворено
@@ -640,12 +685,14 @@ settings.collaboration.admin=За администратора
 settings.collaboration.write=За писање
 settings.collaboration.read=Читање
 settings.collaboration.undefined=Није дефинисано
-settings.branches=Branches
-settings.default_branch=Default Branch
-settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
-settings.update=Update
-settings.update_default_branch_success=Default branch of this repository has been updated successfully!
-settings.protected_branches=Protected Branches
+settings.branches=Гране
+settings.branches_bare=Не можете да управљате гране за празно спремиште. Молим да прво ставите неке садржаје.
+settings.default_branch=Подразумевана грана
+settings.default_branch_desc=Подразумевана грана се сматра 'основим' граном за ревизије кода, пул захтеве и онлајн уређивање.
+settings.update=Ажурирање
+settings.update_default_branch_unsupported=Промена подразумеване гране није подржавана од стране Git верзија сервера.
+settings.update_default_branch_success=Подразумевана грана овог спремишта је била успешно ажурирана!
+settings.protected_branches=Заштићене гране
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
 settings.choose_a_branch=Choose a branch...
 settings.branch_protection=Branch Protection
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Disable force pushes and prevent from deletion
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
 settings.protect_whitelist_search_users=Search users
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Ова промена ће утицати на
 settings.advanced_settings=Напредна подешавања
 settings.wiki_desc=Омогући систем вики
 settings.use_internal_wiki=Користи уграђен вики
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Користи спољни Вики
 settings.external_wiki_url=URL адреса спољног Вики
 settings.external_wiki_url_desc=Посетиоци ће бити преусмерени URL адреси након што кликну на картицу.
 settings.issues_desc=Омогући систем праћења грешака
 settings.use_internal_issue_tracker=Користи уграђен систем праћења грешака
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Користи спољни систем праћења грешака
 settings.external_tracker_url=External Issue Tracker URL
 settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webhook успешно избрисан!
 settings.webhook.test_delivery=Провери испоруку
 settings.webhook.test_delivery_desc=Пошаљи push за тестирање подешавања webhook
 settings.webhook.test_delivery_success=Тест webhook је додат у месту испоруке. Процес може да потраје неколико секунди пре него што ће показати у историји испоруке.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=Захтев
 settings.webhook.response=Одговор
 settings.webhook.headers=Наслови
@@ -755,10 +806,20 @@ settings.event_send_everything=У <strong>свим</strong> догађајима
 settings.event_choose=Изабраћу шта ми је потребно.
 settings.event_create=Креирај
 settings.event_create_desc=Створена грана или ознака
-settings.event_pull_request=Захтев за спајање
-settings.event_pull_request_desc=Захтев за спајање отворенo, затворено, додељено, недодељенo, лабела ажурирана, лабела избрисана, или синхронизовано.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=Push
 settings.event_push_desc=Git push у спремиште
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Коментар проблема
+settings.event_issue_comment_desc=Коментар проблема креиран, уређиван или избришен.
+settings.event_pull_request=Захтев за спајање
+settings.event_pull_request_desc=Захтев за спајање отворенo, затворено, додељено, недодељенo, ознака ажурирана, ознака избрисана, створена прекретница, избрисана прекретница, или синхронизовано.
+settings.event_release=Издање
+settings.event_release_desc=Издање објављено на спремишту.
 settings.active=Активно
 settings.active_helper=Детаљи о догађају што је проузроковало hook ће исто бити испоручено.
 settings.add_hook_success=Додат је нови webhook.
@@ -768,12 +829,12 @@ settings.delete_webhook=Уклони Webhook
 settings.recent_deliveries=Недавне испоруке
 settings.hook_type=Тип Hook-а
 settings.add_slack_hook_desc=Додавање интеграције <a href="%s">Slack</a> у спремиште.
-settings.add_discord_hook_desc=Add <a href="%s">Discord</a> integration to your repository.
+settings.add_discord_hook_desc=Додавати <a href="%s">Discord</a> интеграцију вашем спремишту.
 settings.slack_token=Токен
 settings.slack_domain=Домен
 settings.slack_channel=Канал
 settings.deploy_keys=Кључеви за распоређивање
-settings.deploy_keys_helper=<b>Common Gotcha!</b> If you're looking for adding personal public keys, please add them in your <a href="%s%s">account settings</a>.
+settings.deploy_keys_helper=<b>Common Gotcha!</b> Ако хоћете да додате личне јавне кључеве, молим вас да их додате у <a href="%s%s">поставке вашег налога</a>.
 settings.add_deploy_key=Додај кључ за распоређивање
 settings.deploy_key_desc=Кључеви за распоређивање имају само приступ за читање. То није исто што и SSH кључеви.
 settings.no_deploy_keys=Нисте додали ниједан кључ за распоређивање.
@@ -803,7 +864,6 @@ release.releases=Издања
 release.new_release=Ново издање
 release.draft=Нацрт
 release.prerelease=Пред-верзија
-release.stable=Стабилно
 release.edit=уреди
 release.ahead=<strong>%d</strong> комита на %s почев од овог издања
 release.source_code=Изворни код
@@ -852,7 +912,7 @@ team_permission_desc=Који ниво приступа треба имати о
 
 form.name_reserved=Име организације '%s' је резервирано.
 form.name_pattern_not_allowed=Шаблон имена '%s' није дозвољено.
-form.team_name_reserved=Team name '%s' is reserved.
+form.team_name_reserved=Име тима '%s' је резервисано.
 
 settings=Подешавања
 settings.options=Опције
@@ -1019,6 +1079,7 @@ repos.private=Приватно
 repos.watches=Watches
 repos.stars=Фаворити
 repos.issues=Задаци
+repos.size=Size
 
 auths.auth_manage_panel=Контролна панела аутентикације
 auths.new=Додај нови извор
@@ -1039,9 +1100,14 @@ auths.user_base=База претраживање корисника
 auths.user_dn=DN корисника
 auths.attribute_username=Атрибут username
 auths.attribute_username_placeholder=Оставите празно да бисте користили корисничко име за регистрацију.
-auths.attribute_name=Име атрибута
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Презиме атрибута
 auths.attribute_mail=Е-маил адреса
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Екстракција атрибута у облику Bind DN
 auths.filter=Филтер корисника
 auths.admin_filter=Филтер администратора
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Време до отказивања pull операци
 config.git_gc_timeout=Време до отказивања cакупљање смећа
 
 config.log_config=Kонфигурација журнала
-config.log_mode=Режим журналовања
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Cron задаци
 monitor.name=Име
@@ -1205,19 +1272,23 @@ notices.delete_success=Системска обавештавања су успе
 
 [action]
 create_repo=креира спремиште <a href="%s">%s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=преимензје спремиште од <code>%[1]s</code> на <a href="%[2]s">%[3]s</a>
 commit_repo=извршује push на <a href="%[1]s/src/%[2]s">%[3]s</a> у <a href="%[1]s">%[4]s</a>
+compare_commits=Поређење ових %d комита
+transfer_repo=преноси спремиште <code>%s</code> на <a href="%s">%s</a>
 create_issue=`отвара задатак <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`затвара задатак <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`поново отвара задатак <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`коментарише на задатаку <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`шаље захтев за спајање <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`затвара захтев за спајање <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`поново отвара захтев за спајање <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`коментарише на задатаку <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`прихваћује захтев за спајање <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=преноси спремиште <code>%s</code> на <a href="%s">%s</a>
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=извршује push са ознаком <a href="%s/src/%s">%[2]s</a> на <a href="%[1]s">%[3]s</a>
-compare_commits=Поређење ових %d комита
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=пре

conf/locale/locale_sv-SE.ini

@@ -82,6 +82,8 @@ app_url=Applikationsadressen
 app_url_helper=Detta påverkar HTTP/HTTPS kloningsadressen och på platser i e-post.
 log_root_path=Loggsökväg
 log_root_path_helper=Katalog till vilken loggfiler skrivs.
+enable_console_mode=Enable Console Mode
+enable_console_mode_popup=In addition to file mode, also print logs to console.
 
 optional_title=Övriga inställningar
 email_title=E-post tjänstens inställningar
@@ -117,6 +119,7 @@ sqlite3_not_available=Din release stödjer ej SQLite3, ladda vänligen ner den o
 invalid_db_setting=Databas inställningen är inkorrekt: %v
 invalid_repo_path=Utvecklingskatalogens rotsökväg är ogiltig: %v
 run_user_not_match=Köranvändaren är inte aktuell användare: %s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=SMTP From field is not valid: %v
 save_config_failed=Konfigurationssparningen misslyckades: %v
 invalid_admin_setting=Inställningarna för administratörskontot är felaktiga: %v
@@ -166,6 +169,14 @@ reset_password_helper=Klicka här för att återställa ditt lösenord
 password_too_short=Lösenordet får ej vara kortare än 6 tecken.
 non_local_account=Icke-lokala konton får inte ändra lösenord genom Gogs.
 
+login_two_factor=Two-factor Authentication
+login_two_factor_passcode=Authentication Passcode
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Recovery Code
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+
 [mail]
 activate_account=Vänligen aktivera ditt konto
 activate_email=Verifiera din epostaddress
@@ -201,6 +212,7 @@ Content=Innehåll
 require_error=får inte vara tomt
 alpha_dash_error=` får bara innehålla bokstäver, nummer och bindestreck (-_).`
 alpha_dash_dot_error=` får bara innehålla bokstäver, nummer, bindestreck (-_) och punkt`
+alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
 size_error=` måste vara av storleken %s`
 min_size_error=` måste innehålla minst %s tecken.`
 max_size_error=` får inte innehålla mer än %s tecken.`
@@ -252,11 +264,11 @@ profile=Profil
 password=Lösenord
 avatar=Avatar
 ssh_keys=SSH-nycklar
-social=Sociala konton
-applications=Applikationer
+security=Security
+repos=Repositories
 orgs=Organisationer
+applications=Applikationer
 delete=Radera konto
-uid=Uid
 
 public_profile=Offentlig profil
 profile_desc=Din epostaddress är offentlig och kommer att användas för alla kontorelaterade notifieringar och alla webbaserade åtgärder gjorda på sidan.
@@ -322,10 +334,30 @@ no_activity=Ingen nylig aktivitet
 key_state_desc=Denna nyckel har använts inom dom senaste 7 dagarna
 token_state_desc=Denna token har används inom dom senaste 7 dagarna
 
-manage_social=Hantera länkade sociala konton
-social_desc=Detta är en lista över länkade sociala konton. Ta bort alla länkningar som du inte känner igen.
-unbind=Ta bort länkning
-unbind_success=Socialt konto är inte längre länkat.
+two_factor=Two-factor Authentication
+two_factor_status=Status:
+two_factor_on=On
+two_factor_off=Off
+two_factor_enable=Enable
+two_factor_disable=Disable
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=Hantera personliga åtkomst-tokens
 generate_new_token=Generera Nya Tokens
@@ -343,6 +375,11 @@ orgs.none=Du är inte en medlem i någon organisation.
 orgs.leave_title=Lämna en organisation
 orgs.leave_desc=You will lose access to all repositories and teams after you left the organization. Do you want to continue?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=Radera ditt konto
 delete_prompt=Åtgärden kommer at ta bort ditt konto permanent, och kan <strong>INTE</strong> ångras!
 confirm_delete_account=Bekräfta Borttagelsen
@@ -413,7 +450,7 @@ quick_guide=Snabbguide
 clone_this_repo=Klona detta repo
 create_new_repo_command=Skapa ett nytt repo på kommandoraden
 push_exist_repo=Knuffa ett existerande repo från kommandoraden
-repo_is_empty=Detta repo är tomt, vänligen kom tillbaka senare!
+bare_message=This repository does not have any content yet.
 
 files=Filer
 branch=Gren
@@ -426,6 +463,7 @@ pulls=Pull-förfrågningar
 labels=Etiketter
 milestones=Milstenar
 commits=Incheckningar
+git_branches=Branches
 releases=Släpp
 file_raw=Rå
 file_history=Historik
@@ -434,6 +472,13 @@ file_permalink=Permalänk
 file_too_large=Denna fil är för stor för att visas
 video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=All Branches
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=Ny fil
 editor.upload_file=Ladda upp fil
 editor.edit_file=Redigera fil
@@ -641,9 +686,11 @@ settings.collaboration.write=Skriva
 settings.collaboration.read=Läsa
 settings.collaboration.undefined=Odefinierad
 settings.branches=Branches
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch=Default Branch
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=Update
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
 settings.protected_branches=Protected Branches
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Disable force pushes and prevent from deletion
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
 settings.protect_whitelist_search_users=Search users
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Denna ändring kommer att påverka hur länkar r
 settings.advanced_settings=Advancerade Inställningar
 settings.wiki_desc=Aktivera wikisystem
 settings.use_internal_wiki=Använd inbyggd wiki
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Använd extern wiki
 settings.external_wiki_url=Extern Wiki-URL
 settings.external_wiki_url_desc=Besökare kommer att bli omdirigerade till denna URL när dom klickar på fliken.
 settings.issues_desc=Aktivera ärendehantering
 settings.use_internal_issue_tracker=Använd enkel inbyggd ärendehantering
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Använd extern ärendehanterare
 settings.external_tracker_url=External Issue Tracker URL
 settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webbhook har tagits bort!
 settings.webhook.test_delivery=Testa Leverans
 settings.webhook.test_delivery_desc=Skicka en falsk pushhändelse för att testa dina webbhook-inställningar
 settings.webhook.test_delivery_success=Testwebbhook har lagts till leveranskön. Det kan ta några sekunder innan den visas i leveranshistoriken.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=Begäran
 settings.webhook.response=Svar
 settings.webhook.headers=Huvuden
@@ -755,10 +806,20 @@ settings.event_send_everything=Jag behöver <strong>allt</strong>.
 settings.event_choose=Låt mig välja.
 settings.event_create=Skapa
 settings.event_create_desc=Branch eller tagg skapad
-settings.event_pull_request=Hämtningsbegäran
-settings.event_pull_request_desc=Hämtningsbegäran öppnad, stängd, återöppnad, redigerad, tilldelad, otilldelad, etikett uppdaterad, etikett rensad eller synkroniserad.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=Pusha
 settings.event_push_desc=Uppladdning till ett förråd
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=Hämtningsbegäran
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Release
+settings.event_release_desc=Release published in a repository.
 settings.active=Aktiv
 settings.active_helper=Detaljer kring händelsen som triggade kroken kommer också levereras.
 settings.add_hook_success=Ny webbkrok har lagts till.
@@ -803,7 +864,6 @@ release.releases=Släpp
 release.new_release=Nytt Släpp
 release.draft=Utkast
 release.prerelease=Försläpp
-release.stable=Stabil
 release.edit=redigera
 release.ahead=<strong>%d</strong> ändringar mot %s sedan detta släpp
 release.source_code=Källkod
@@ -1019,6 +1079,7 @@ repos.private=Privat
 repos.watches=Vakter
 repos.stars=Stjärnor
 repos.issues=Ärenden
+repos.size=Size
 
 auths.auth_manage_panel=Panel för hantering av autentisering
 auths.new=Lägg till ny källa
@@ -1039,9 +1100,14 @@ auths.user_base=User Search Base
 auths.user_dn=User DN
 auths.attribute_username=Användarnamnsattribut
 auths.attribute_username_placeholder=Leave empty to use sign-in form field value for user name.
-auths.attribute_name=Förnamnsattribut
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Efternamnsattribut
 auths.attribute_mail=E-postattribut
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=Användarfilter
 auths.admin_filter=Adminfilter
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Pull Operation Timeout
 config.git_gc_timeout=GC Operation Timeout
 
 config.log_config=Logg-konfiguration
-config.log_mode=Loggningsläge
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Cron-jobb
 monitor.name=Namn
@@ -1205,19 +1272,23 @@ notices.delete_success=System notices have been deleted successfully.
 
 [action]
 create_repo=skapade utvecklingskatalog <a href="%s"> %s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=renamed repository from <code>%[1]s</code> to <a href="%[2]s">%[3]s</a>
 commit_repo=pushed to <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+compare_commits=View comparison for these %d commits
+transfer_repo=transfered repository <code>%s</code> to <a href="%s">%s</a>
 create_issue=`opened issue <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`commented on issue <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`created pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`commented on issue <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`merged pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=transfered repository <code>%s</code> to <a href="%s">%s</a>
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=pushed tag <a href="%s/src/%s">%[2]s</a> to <a href="%[1]s">%[3]s</a>
-compare_commits=View comparison for these %d commits
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=sedan

conf/locale/locale_tr-TR.ini

@@ -48,7 +48,7 @@ cancel=İptal
 install=Kurulum
 title=İlk Kez Çalıştırma İçin Kurulum Adımları
 docker_helper=Gogs'u Docker içinde kullanıyorsanız bu sayfada herhangi bir değişiklik yapmadan önce lütfen <a target="_blank" href="%s">kılavuzu</a> dikkatlice okuyunuz!
-requite_db_desc=Gogs requires MySQL, PostgreSQL, SQLite3, MSSQL or TiDB.
+requite_db_desc=Gogs MySQL, PostgreSQL, SQLite3, MSSQL veya TiDB'ye ihtiyaç duyar.
 db_title=Veritabanı Ayarları
 db_type=Veritabanı Türü
 host=Sunucu
@@ -59,7 +59,7 @@ db_helper=Lütfen MySQL için INNODB motorunu utf8_general_ci karakter setiyle k
 ssl_mode=SSL Biçimi
 path=Yol
 sqlite_helper=The file path of SQLite3 database. <br>Please use absolute path when you start as service.
-err_empty_db_path=SQLite3 database path cannot be empty.
+err_empty_db_path=SQLite3 veritabanının yolu boş olamaz.
 no_admin_and_disable_registration=Bir yönetici hesabı oluşturmadan kullanıcı kaydını devre dışı bırakamazsınız.
 err_empty_admin_password=Yönetici parolası boş olamaz.
 
@@ -74,7 +74,7 @@ domain=Alan Adı
 domain_helper=Bu, SSH klon bağlantılarını etkiler.
 ssh_port=SSH Portu
 ssh_port_helper=SSH sunucunuzun portu kullanılıyor, boş bırakın ya da SSH özelliğini devre dışı bırakın.
-use_builtin_ssh_server=Use Builtin SSH Server
+use_builtin_ssh_server=Yerleşik SSH sunucusu kullanın
 use_builtin_ssh_server_popup=Start builtin SSH server for Git operations to distinguish from system SSH daemon.
 http_port=HTTP Portu
 http_port_helper=Uygulamanın dinleyeceği port.
@@ -82,6 +82,8 @@ app_url=Uygulama Bağlantısı
 app_url_helper=Bu, HTTP/HTTPS klon bağlantılarını ve e-postadaki bazı kısımları etkiler.
 log_root_path=Günlük Dosyaları Yolu
 log_root_path_helper=Günlük dosyalarının yazılacağı dizin.
+enable_console_mode=Konsol Modunu Etkinleştir
+enable_console_mode_popup=In addition to file mode, also print logs to console.
 
 optional_title=İsteğe Bağlı Ayarlar
 email_title=E-Posta Servisi Ayarları
@@ -117,6 +119,7 @@ sqlite3_not_available=Yayın sürümünüz SQLite3'ü desteklemiyor, lütfen %s'
 invalid_db_setting=Veritabanı ayarları geçersiz: %v
 invalid_repo_path=Depo kök dizini geçersiz: %v
 run_user_not_match=Çalıştırma kullanıcısı geçerli kullanıcı değil: %s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=SMTP From field is not valid: %v
 save_config_failed=Yapılandırma kaydedilemedi: %v
 invalid_admin_setting=Yönetici hesap ayarları geçersiz: %v
@@ -139,7 +142,7 @@ issues.in_your_repos=Depolarınızda
 [explore]
 repos=Depolar
 users=Kullanıcılar
-organizations=Organizations
+organizations=Organizasyonlar
 search=Ara
 
 [auth]
@@ -166,6 +169,14 @@ reset_password_helper=Parolanızı sıfırlamak için buraya tıklayın
 password_too_short=Parola uzunluğu 6 karakterden az olamaz.
 non_local_account=Yerel olmayan hesapların şifrelerini Gogs aracılığıyla değiştiremezsiniz.
 
+login_two_factor=İki aşamalı doğrulama
+login_two_factor_passcode=Authentication Passcode
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Kurtarma kodu
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+
 [mail]
 activate_account=Lütfen hesabınızı aktifleştirin
 activate_email=E-posta adresinizi doğrulayın
@@ -192,15 +203,16 @@ AuthName=Yetkilendirme adı
 AdminEmail=Yönetici e-postası
 
 NewBranchName=New branch name
-CommitSummary=Commit summary
-CommitMessage=Commit message
-CommitChoice=Commit choice
+CommitSummary=İşleme özeti
+CommitMessage=İşleme mesajı
+CommitChoice=İşleme tercihi
 TreeName=Dosya yolu
-Content=Content
+Content=İçerik
 
 require_error=` boş olamaz.`
 alpha_dash_error=` sadece karakter, rakam veya çizgi(-_) içermelidir.`
 alpha_dash_dot_error=` sadece karakter, rakam, çizgi(-_) veya nokta içermelidir.`
+alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
 size_error=` uzunluk en fazla %s olmalıdır.`
 min_size_error=` en az %s karakter içermelidir.`
 max_size_error=` en fazla %s karakter içermelidir.`
@@ -252,11 +264,11 @@ profile=Profil
 password=Parola
 avatar=Avatar
 ssh_keys=SSH Anahtarları
-social=Sosyal Medya Hesapları
-applications=Uygulamalar
+security=Güvenlik
+repos=Depolar
 orgs=Organizasyonlar
+applications=Uygulamalar
 delete=Hesabı Sil
-uid=Tekil ID
 
 public_profile=Herkese Açık Profil
 profile_desc=E-posta adresiniz herkese açıktır ve hesabınızla ilgili bilgilendirmelerde ve web tabanlı operasyonlarda kullanılacaktır.
@@ -322,10 +334,30 @@ no_activity=Yeni aktivite yok
 key_state_desc=Bu anahtar son 7 gün içinde kullanıldı
 token_state_desc=Bu erişim anahtarı son 7 gün içinde kullanıldı
 
-manage_social=Bağlanmış Sosyal Hesapları Yönet
-social_desc=Bu, bağlanmış sosyal hesapların bir listesidir. Tanımadığınız bağlantıyı kaldırın.
-unbind=Bağlantıyı Kopar
-unbind_success=Sosyal hesabın bağlantısı koparıldı.
+two_factor=Two-factor Authentication
+two_factor_status=Status:
+two_factor_on=Açık
+two_factor_off=Kapalı
+two_factor_enable=Enable
+two_factor_disable=Disable
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=Kişisel Erişim Anahtarlarını Yönet
 generate_new_token=Yeni Erişim Anahtarı Üret
@@ -340,9 +372,14 @@ access_token_deletion_desc=Bu kişisel erişim anahtarını silerseniz uygulaman
 delete_token_success=Kişisel erişim anahtarı başarıyla kaldırıldı! Uygulamanızı güncellemeyi de unutmayın!
 
 orgs.none=You are not a member of any organizations.
-orgs.leave_title=Leave an organization
+orgs.leave_title=Leave organization
 orgs.leave_desc=You will lose access to all repositories and teams after you left the organization. Do you want to continue?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=Hesabınızı Silin
 delete_prompt=Bu işlem hesabınızı kalıcı olarak silecektir ve <strong>GERİ ALINAMAZ</strong>!
 confirm_delete_account=Silmeyi Onayla
@@ -413,7 +450,7 @@ quick_guide=Hızlı Başlangıç Kılavuzu
 clone_this_repo=Bu depoyu klonla
 create_new_repo_command=Komut satırında yeni bir depo oluştur
 push_exist_repo=Var olan bir depoyu komut satırında gönder
-repo_is_empty=Bu depo boş. Lütfen daha sonra tekrar gelin!
+bare_message=This repository does not have any content yet.
 
 files=Files
 branch=Dal
@@ -426,6 +463,7 @@ pulls=Değişiklik İstekleri
 labels=Etiketler
 milestones=Kilometre Taşları
 commits=İşlemeler
+git_branches=Branches
 releases=Sürümler
 file_raw=Ham
 file_history=Geçmiş
@@ -434,6 +472,13 @@ file_permalink=Kalıcı Bağlantı
 file_too_large=Bu dosya sergilenmek için çok büyük
 video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=All Branches
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=New file
 editor.upload_file=Upload file
 editor.edit_file=Dosya düzenle
@@ -641,9 +686,11 @@ settings.collaboration.write=Yaz
 settings.collaboration.read=Oku
 settings.collaboration.undefined=Belirsiz
 settings.branches=Branches
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch=Default Branch
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=Update
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
 settings.protected_branches=Protected Branches
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Disable force pushes and prevent from deletion
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
 settings.protect_whitelist_search_users=Search users
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Bu değişiklik, bağlantıların depoyla olan i
 settings.advanced_settings=Gelişmiş Ayarlar
 settings.wiki_desc=Viki sıstemini etkinleştir
 settings.use_internal_wiki=Use builtin wiki
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=Harici Wiki kullan
 settings.external_wiki_url=Harici Wiki bağlantısı
 settings.external_wiki_url_desc=Ziyaretçiler, sekmeye tıkladıklarında bağlantıya yönlendirilecektir.
 settings.issues_desc=Enable issue tracker
 settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=Harici sorun takipçisi kullan
 settings.external_tracker_url=External Issue Tracker URL
 settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Web isteği başarıyla silindi!
 settings.webhook.test_delivery=Test Dağıtımı
 settings.webhook.test_delivery_desc=Web isteği ayarlarınızı test etmek için sahte bir anlık olay gönderin
 settings.webhook.test_delivery_success=Test web isteği, dağıtım kuyruğuna eklendi. Bunun dağıtım geçmişinde görünmesi birkaç saniye sürebilir.
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=İstekler
 settings.webhook.response=Cevaplar
 settings.webhook.headers=Başlıklar
@@ -755,10 +806,20 @@ settings.event_send_everything=<strong>Her şeye</strong> ihtiyacım var.
 settings.event_choose=Neye ihtiyacım olduğunu seçtir.
 settings.event_create=Oluştur
 settings.event_create_desc=Dal veya biçim imi oluşturuldu
-settings.event_pull_request=Pull Request
-settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=Push
 settings.event_push_desc=Bir depoya git push
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Release
+settings.event_release_desc=Release published in a repository.
 settings.active=Aktif
 settings.active_helper=Bu isteği tetikleyen olaya ilişkin detaylar da gönderilecektir.
 settings.add_hook_success=Yeni web isteği eklendi.
@@ -803,7 +864,6 @@ release.releases=Sürümler
 release.new_release=Yeni Sürüm
 release.draft=Taslak
 release.prerelease=Ön Sürüm
-release.stable=Kararlı
 release.edit=düzenle
 release.ahead=%s son sürümden beri <strong>%d</strong> işleme
 release.source_code=Kaynak Kodu
@@ -1019,6 +1079,7 @@ repos.private=Özel
 repos.watches=İzlemeler
 repos.stars=Yıldızlar
 repos.issues=Sorunlar
+repos.size=Size
 
 auths.auth_manage_panel=Yetkilendirme Yönetim Paneli
 auths.new=Yeni Kaynak Ekle
@@ -1039,9 +1100,14 @@ auths.user_base=Kullanıcı Arama Tabanı
 auths.user_dn=Kullanıcı DN'i
 auths.attribute_username=Kullanıcı özelliği
 auths.attribute_username_placeholder=Kullanıcı adı için giriş yapma form alanı kullanmak için boş bırakın.
-auths.attribute_name=Ad özelliği
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=Soyad özelliği
 auths.attribute_mail=E-posta özelliği
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Bağlı DN tabanındaki özellikleri çek
 auths.filter=Kullanıcı Filtresi
 auths.admin_filter=Yönetici Filtresi
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Pull Operation Timeout
 config.git_gc_timeout=GC Operation Timeout
 
 config.log_config=Log Yapılandırması
-config.log_mode=Log Modu
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Cron Görevleri
 monitor.name=İsim
@@ -1205,19 +1272,23 @@ notices.delete_success=Sistem bildirimleri başarıyla silindi.
 
 [action]
 create_repo=depo <a href="%s">%s</a> oluşturuldu
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=<code>%[1]s</code> olan depo adını <a href="%[2]s">%[3]s</a> buna çevirdi
 commit_repo=<a href="%[1]s">%[4]s</a> zamanında <a href="%[1]s/src/%[2]s">%[3]s</a> buraya push yaptı
+compare_commits=Bu %d işlemeler için karşılaştırmaları görüntüle
+transfer_repo=depo <code>%s</code> <a href="%s">%s</a>'a aktarıldı
 create_issue=`<a href="%s/issues/%s">%s#%[2]s</a> sorununu açtı`
 close_issue=`<a href="%s/issues/%s">%s#%[2]s</a> sorununu kapattı`
 reopen_issue=`<a href="%s/issues/%s">%s#%[2]s</a> sorununu tekrar açtı`
+comment_issue=`<a href="%s/issues/%s">%s#%[2]s</a> sorununa yorum yazdı`
 create_pull_request=`<a href="%s/pulls/%s">%s#%[2]s</a> değişiklik isteğini oluşturdu`
 close_pull_request=`<a href="%s/pulls/%s">%s#%[2]s</a> değişiklik isteğini kapattı`
 reopen_pull_request=`<a href="%s/pulls/%s">%s#%[2]s</a> değişiklik isteğini tekrar açtı`
-comment_issue=`<a href="%s/issues/%s">%s#%[2]s</a> sorununa yorum yazdı`
 merge_pull_request=`<a href="%s/pulls/%s">%s#%[2]s</a> değişim isteğini birleştirdi`
-transfer_repo=depo <code>%s</code> <a href="%s">%s</a>'a aktarıldı
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=etiket <a href="%s/src/%s">%[2]s</a> <a href="%[1]s">%[3]s</a>'a itelendi
-compare_commits=Bu %d işlemeler için karşılaştırmaları görüntüle
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=önce

conf/locale/locale_uk-UA.ini

@@ -40,7 +40,7 @@ your_settings=Ваші налаштування
 
 activities=Дії
 pull_requests=Запити на злиття
-issues=Обговорення
+issues=Проблеми
 
 cancel=Скасувати
 
@@ -82,6 +82,8 @@ app_url=Адреса програми
 app_url_helper=Це впливає на клонування через HTTP/HTTPS та десь у електроній пошті.
 log_root_path=Шлях до лог файлу
 log_root_path_helper=Каталог для файлів журналу.
+enable_console_mode=Увімкнути консольний режим
+enable_console_mode_popup=На додаток до файлового режиму писати логи також і до консолі.
 
 optional_title=Додаткові налаштування
 email_title=Параметри електронної пошти
@@ -117,6 +119,7 @@ sqlite3_not_available=Ваша версія не підтримує SQLite3, б
 invalid_db_setting=Налаштування бази даних помилкові: %v
 invalid_repo_path=Неприпустимий шлях до сховища репозиторіїв: %v
 run_user_not_match=Користувач, що здійснює запуск, не відповідає поточному: %s -> %s
+smtp_host_missing_port=В адресі SMTP-хосту не вистачає порту.
 invalid_smtp_from=Невалідне SMTP поле Від: %v
 save_config_failed=Не в змозі зберегти конфігурацію: %v
 invalid_admin_setting=Неприпустимі налаштування облікового запису адміністратора: %v
@@ -166,6 +169,14 @@ reset_password_helper=Натисніть тут для скидання паро
 password_too_short=Довжина пароля не може бути меншою за 6.
 non_local_account=Нелокальні облікові записи не можуть змінити пароль через Gogs.
 
+login_two_factor=Двофакторна автентифікація
+login_two_factor_passcode=Код автентифікації
+login_two_factor_enter_recovery_code=Введіть двофакторний код відновлення
+login_two_factor_recovery=Двофакторне відновлення
+login_two_factor_recovery_code=Код відновлення
+login_two_factor_enter_passcode=Введіть двофакторний код
+login_two_factor_invalid_recovery_code=Код відновлення не валідний, або його вже було використано.
+
 [mail]
 activate_account=Будь ласка, активуйте ваш обліковий запис
 activate_email=Перевірте свою електронну адресу
@@ -201,6 +212,7 @@ Content=Вміст
 require_error=' не може бути пустим.'
 alpha_dash_error=` має складатись з буков, цифр, або рисок(-_).`
 alpha_dash_dot_error=` має складатись з буков, цифр, рисок(-_), або крапок.`
+alpha_dash_dot_slash_error=` мусить бути валідною буквою, або цифрою, або рискою(-_), або крапкою, або слешем.`
 size_error=` має мати розмір %s.`
 min_size_error=' має містити принаймні %s символів.'
 max_size_error=' має містити принаймні %s символів.'
@@ -252,11 +264,11 @@ profile=Профіль
 password=Пароль
 avatar=Аватар
 ssh_keys=Ключі SSH
-social=Соціальні акаунти
-applications=Додатки
+security=Безпека
+repos=Репозиторії
 orgs=Організації
+applications=Додатки
 delete=Видалити обліковий запис
-uid=Унікальний ідентифікатор користувача
 
 public_profile=Загальнодоступний профіль
 profile_desc=Ваша адреса електронної пошти є публічною і буде використовуватися для будь-яких повідомлень щодо вашого облікового запису і будь-яких веб-операцій, що здійснюються через сайт.
@@ -322,12 +334,32 @@ no_activity=Жодної діяльності
 key_state_desc=Цей ключ використовувався в останні 7 днів
 token_state_desc=Цей токен використовувався в останні 7 днів
 
-manage_social=Керувати пов'язаними соціальними акаунтами
-social_desc=Це список пов'язаних соціальних акаунтів. Видаліть будь-який прив'язок, які ви не визнаєте.
-unbind=Відв'язати
-unbind_success=Соціальну мережу відключено.
+two_factor=Двофакторна автентифікація
+two_factor_status=Статус:
+two_factor_on=Вкл.
+two_factor_off=Викл.
+two_factor_enable=Увімкнути
+two_factor_disable=Вимкнути
+two_factor_view_recovery_codes=Перегляньте й збережіть <a href="%s%s">ваші ключі відновлення</a> у безпечному місці. Ви можете використовувати іх як паролі якщо втратите доступ до вашої програми автентифікації.
+two_factor_http=Для HTTP/HTTPS операцій, ви більше не можете використовувати звичайні ім'я та пароль. Будь ласка створіть та використовуйте <a href="%[1]s%[2]s">персональний токен доступу</a> як ваші облікові дані, наприклад <code>%[3]s</code>.
+two_factor_enable_title=Увімкнути двофакторну автентифікацію
+two_factor_scan_qr=Будь ласка, використовуйте ваш додаток автентифікації для сканування зображення:
+two_factor_or_enter_secret=Або введіть секрет:
+two_factor_then_enter_passcode=Потім введіть пароль:
+two_factor_verify=Перевірити
+two_factor_invalid_passcode=Введений пароль не валідний, будь ласка, спробуйте ще раз!
+two_factor_enable_error=Увімкнення двофакторної автентифікації не вдалося: %v
+two_factor_enable_success=Двофакторну автентифікацію успішно активовано для вашого акаунту!
+two_factor_recovery_codes_title=Пароль відновлення для двофакторної автентифікації
+two_factor_recovery_codes_desc=Пароль відновлення використовується коли ви тимчасово втрачаєте доступ до вашого додатку автентифікації. Кожен пароль відновлення може бути використаний лише один раз. <b>Будь ласка, тримайте ці паролі у безпечному місці</b>.
+two_factor_regenerate_recovery_codes=Перегенерувати паролі відновлення
+two_factor_regenerate_recovery_codes_error=Перегенерація паролів відновлення не вдалася: %v
+two_factor_regenerate_recovery_codes_success=Нові коди відновлення було успішно сгенеровано!
+two_factor_disable_title=Вимкнути двофакторну автентифікацію
+two_factor_disable_desc=Рівень безпеки вашого акаунту знизиться після вимикання двофакторної автентифікаціЇ. Бажаєте продовжити?
+two_factor_disable_success=Двофакторну автентифікацію було успішно вимкнено!
 
-manage_access_token=Керувати жетони особистого доступу
+manage_access_token=Керувати токенами особистого доступу
 generate_new_token=Генерувати новий жетон
 tokens_desc=Створені вами токени для доступу до Gogs API.
 new_token_desc=На даний момент будь-який жетон має повний доступ до вашого облікового запису.
@@ -343,6 +375,11 @@ orgs.none=Ви не є членом будь-якої організації.
 orgs.leave_title=Залишити організацію
 orgs.leave_desc=Ви втратите доступ до всіх репозиторіїв і команд після того, як ви покинете організацію. Ви хочете продовжити?
 
+repos.leave=Покинути
+repos.leave_title=Покинути репозиторій
+repos.leave_desc=Ви можете втратити доступ до репозиторію після того як покинете його. Бажаєте продовжити?
+repos.leave_success=Ви успішно покинули репозиторій '%s'!
+
 delete_account=Видалити ваш обліковий запис
 delete_prompt=Ця операція остаточно видалить обліковий запис, і її <strong>НЕМОЖЛИВО</strong> буде скасувати!
 confirm_delete_account=Підтвердження видалення
@@ -413,7 +450,7 @@ quick_guide=Короткий посібник
 clone_this_repo=Кнонувати цей репозиторій
 create_new_repo_command=Створити новий репозиторій з командного рядка
 push_exist_repo=Штовхнути існуючий репозиторій з командного рядка
-repo_is_empty=Даний репозиторій пустий, будь ласка, повертайтесь пізніше!
+bare_message=Цей репозиторій ще не має жодного вмісту.
 
 files=Файли
 branch=Гілка
@@ -426,6 +463,7 @@ pulls=Запити на злиття
 labels=Мітка
 milestones=Проміжні етапи
 commits=Коміти
+git_branches=Гілки
 releases=Релізи
 file_raw=Запис
 file_history=Історія
@@ -434,6 +472,13 @@ file_permalink=Постійне посилання
 file_too_large=Цей файл завеликий для показу
 video_not_supported_in_browser=Ваш браузер не підтримує єлемент HTML5 video.
 
+branches.overview=Огляд
+branches.active_branches=Активні гілки
+branches.stale_branches=Застарілі гілки
+branches.all=Усі гілки
+branches.updated_by=Оновлено %[1]s з %[2]s
+branches.change_default_branch=Гілку за замовчуванням змінено
+
 editor.new_file=Новий файл
 editor.upload_file=Завантажити файл
 editor.edit_file=Редагування файла
@@ -641,9 +686,11 @@ settings.collaboration.write=Запис
 settings.collaboration.read=Читання
 settings.collaboration.undefined=Не визначено
 settings.branches=Гілки
+settings.branches_bare=Ви не можете керувати гілками у bare-репозиторії. Спочатку додайте у нього якогось вмісту, будь ласка.
 settings.default_branch=Гілка за замовчуванням
 settings.default_branch_desc=Гілка за замовчанням вважається базовою для комітів, запросів злиття та онлайн редагувань.
 settings.update=Оновлення
+settings.update_default_branch_unsupported=Зміна гілки за замувчуванням не підтримується серверною версією Git.
 settings.update_default_branch_success=Гілку за замовчуванням цього репозиторію було успішно оновлено!
 settings.protected_branches=Захищені гілки
 settings.protected_branches_desc=Захистіть гілки від force push, випадкового видалення та коміттерів з білого списку.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Вимкнути примусовий push т
 settings.protect_require_pull_request=Вимагати запрос на злиття замість прямого push
 settings.protect_require_pull_request_desc=Увімкніть цю опцію для заборони прямого push у цю гілку. Коміт має бути запушений у іншу, незахищену гілку та влитий у цю через запрос на злиття.
 settings.protect_whitelist_committers=Білий список тих, хто може робити push у цю гілку
-settings.protect_whitelist_committers_desc=Додати людей або команди у білий список для виконання push до цієї гілки.
+settings.protect_whitelist_committers_desc=Додати людей або команди до білого списку тих, хто може робити push у цю гілку. Користувачі з білого списку оминатимуть контроль запитів на злиття.
 settings.protect_whitelist_users=Користувачі що можуть виконувати push до цієї гілки
 settings.protect_whitelist_search_users=Пошук користувачів
 settings.protect_whitelist_teams=Команди, члени яких можуть виконувати push до цієї гілки
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=Ця зміна вплине на відноше
 settings.advanced_settings=Додаткові налаштування
 settings.wiki_desc=Увімкнути wiki-систему
 settings.use_internal_wiki=Використовувати вбудовану wiki
+settings.allow_public_wiki_desc=Дозволити публічний доступ до wiki поки репозиторій залишається приватним
 settings.use_external_wiki=Використовувати зовнішню wiki
 settings.external_wiki_url=URL зовнішньої wiki
 settings.external_wiki_url_desc=Відвідувачі будуть переспрямовані до URL коли вони клацнуть на вкладці.
 settings.issues_desc=Увімкнути систему відстеження проблем
 settings.use_internal_issue_tracker=Використовувати вбудовану легку систему відстеження помилок
+settings.allow_public_issues_desc=Дозволити публічний доступ до проблем поки репозиторій залишається приватним
 settings.use_external_issue_tracker=Використовувати зовнішній трекер задач
 settings.external_tracker_url=URL зовнішньої системи відстеження проблем
 settings.external_tracker_url_desc=Відвідувача буде перенаправлено до URL коли він натисне на вкладку.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Webhook успішно видалено!
 settings.webhook.test_delivery=Перевірити поставку
 settings.webhook.test_delivery_desc=Відправити тестовий push для перевірки налаштувань web-хуків
 settings.webhook.test_delivery_success=Тестовий web-хук може бути доданий у чергу поставки. Поки він з'явиться у історії поставки, може пройти кілька секунд.
+settings.webhook.redelivery=Зворотня доставка
+settings.webhook.redelivery_success=Завдання хуку '%s' було передодано у чергу доставки. Оновлення статусу доставки в історії може зайняти якийсь час.
 settings.webhook.request=Запит
 settings.webhook.response=Відповідь
 settings.webhook.headers=Заголовки
@@ -755,10 +806,20 @@ settings.event_send_everything=Мені потрібно <strong>усе</strong>
 settings.event_choose=Дозвольте мені вибрати те, що потрібно.
 settings.event_create=Створити
 settings.event_create_desc=Гілку або тег створено
-settings.event_pull_request=Запити до злиття
-settings.event_pull_request_desc=Запрос злиття відкрито, закрито, перевідкрито, змінено, призначено, знято, мітку оновлено, мітку прибрано або синхронізовано.
+settings.event_delete=Видалити
+settings.event_delete_desc=Гілку або мітку було видалено
+settings.event_fork=Відгалуження
+settings.event_fork_desc=Репозиторій було відгалуджено
 settings.event_push=Push
 settings.event_push_desc=Git push до репозиторію
+settings.event_issues=Проблеми
+settings.event_issues_desc=Проблему відкрито, закрито, перевідкрито, відредаговано, призначено, відкріплено, змінено мітку, очищено мітку, створено етап, очищено етап.
+settings.event_issue_comment=Коментар проблеми
+settings.event_issue_comment_desc=Коментар проблеми створено, видалено чи відредаговано.
+settings.event_pull_request=Запити до злиття
+settings.event_pull_request_desc=Запрос на злиття відкрито, закрито, перевідкрито, прикріплено, відкріплено, оновлено мітку, очищено мітку, створено етап, очищено етап або синхронізовано.
+settings.event_release=Реліз
+settings.event_release_desc=Реліз опубліковано у репозиторії.
 settings.active=Активний
 settings.active_helper=Подробиці події, що викликала спрацювання хука, будуть надані також.
 settings.add_hook_success=Новий web-хук було додано.
@@ -803,7 +864,6 @@ release.releases=Релізи
 release.new_release=Новий реліз
 release.draft=Чернетка
 release.prerelease=Пре-реліз
-release.stable=Стабільний
 release.edit=редагувати
 release.ahead=<strong>%d</strong> коммітів %s після цього релізу
 release.source_code=Вихідний код
@@ -1019,6 +1079,7 @@ repos.private=Приватний
 repos.watches=Стежать
 repos.stars=У обраному
 repos.issues=Питання
+repos.size=Розмір
 
 auths.auth_manage_panel=Керування автентифікацій
 auths.new=Додати нове джерело
@@ -1042,6 +1103,11 @@ auths.attribute_username_placeholder=Залиште порожнім щоб ви
 auths.attribute_name=Атрибут імені
 auths.attribute_surname=Атрибут прізвища
 auths.attribute_mail=Атрибут електронної пошти
+auths.verify_group_membership=Верифікувати членство у групі
+auths.group_search_base_dn=Базовий DN пошуку групи
+auths.group_filter=Фільтр груп
+auths.group_attribute_contain_user_list=Атрибут групи зі списком користувачів
+auths.user_attribute_listed_in_group=Атрибути користувача що відображені у групі
 auths.attributes_in_bind=Отримати атрибути контексту Bind DN
 auths.filter=Користувацький фільтр
 auths.admin_filter=Фільтр адміністратора
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Тайм-аут операції витягання
 config.git_gc_timeout=Тайм-аут операції GC
 
 config.log_config=Конфігурація журналу
-config.log_mode=Режим журналювання
+config.log_mode=Режим
+config.log_options=Опції
 
 monitor.cron=Завдання cron
 monitor.name=Назва
@@ -1205,19 +1272,23 @@ notices.delete_success=Системні повідомлення було усп
 
 [action]
 create_repo=створено репозиторій <a href="%s">%s</a>
+fork_repo=відгалуджено репозиторій у <a href="%s">%s</a>
 rename_repo=репозиторій перейменовано з <code>%[1]s</code> на <a href="%[2]s">%[3]s</a>
 commit_repo=запушено до <a href="%[1]s/src/%[2]s">%[3]s</a> у <a href="%[1]s">%[4]s</a>
+compare_commits=Перегляд порівняння для цих %d комітів
+transfer_repo=перенесено репозиторій <code>%s</code> у <a href="%s">%s</a>
 create_issue=`відкрито проблему <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`закрито проблему <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`перевідкрито проблему <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`відкоментовано проблему <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`створено запит на втягування <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`закрито запит на втягування <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`перевідкрито запит на втягування <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`відкоментовано проблему <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`запит на злиття влито <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=перенесено репозиторій <code>%s</code> у <a href="%s">%s</a>
+create_branch=створено нову гілку <a href="%[1]s/src/%[2]s">%[3]s</a> у <a href="%[1]s">%[4]s</a>
+delete_branch=видалено гілку <code>%[2]s</code> у <a href="%[1]s">%[3]s</a>
 push_tag=заштовхнуто тег <a href="%s/src/%s">%[2]s</a> до <a href="%[1]s">%[3]s</a>
-compare_commits=Перегляд порівняння для цих %d комітів
+delete_tag=видалено мітку <code>%[2]s</code> у <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=тому

conf/locale/locale_zh-CN.ini

@@ -1,4 +1,4 @@
-app_desc=基于 Go 语言的自助 Git 服务
+app_desc=一款极易搭建的自助 Git 服务
 
 home=首页
 dashboard=控制面板
@@ -82,6 +82,8 @@ app_url=应用 URL
 app_url_helper=该设置影响 HTTP/HTTPS 克隆地址和一些邮箱中的链接。
 log_root_path=日志路径
 log_root_path_helper=存放日志文件的目录
+enable_console_mode=启用控制台模式
+enable_console_mode_popup=除了使用文件模式外，还将日志输出到控制台
 
 optional_title=可选设置
 email_title=邮件服务设置
@@ -117,6 +119,7 @@ sqlite3_not_available=您所使用的发行版不支持 SQLite3，请从 %s 下
 invalid_db_setting=数据库设置不正确：%v
 invalid_repo_path=仓库根目录设置不正确：%v
 run_user_not_match=运行系统用户非当前用户：%s -> %s
+smtp_host_missing_port=SMTP 地址缺少端口号。
 invalid_smtp_from=SMTP From 字段不合法：%v
 save_config_failed=应用配置保存失败：%v
 invalid_admin_setting=管理员帐户设置不正确：%v
@@ -166,6 +169,14 @@ reset_password_helper=单击此处重置密码
 password_too_short=密码长度不能少于 6 位！
 non_local_account=非本地类型的帐户无法通过 Gogs 修改密码。
 
+login_two_factor=两步验证登录
+login_two_factor_passcode=动态令牌
+login_two_factor_enter_recovery_code=输入两步验证恢复密钥
+login_two_factor_recovery=两步验证恢复登录
+login_two_factor_recovery_code=恢复密钥
+login_two_factor_enter_passcode=输入两步验证动态令牌
+login_two_factor_invalid_recovery_code=恢复密钥已经被使用或是无效的
+
 [mail]
 activate_account=请激活您的帐户
 activate_email=请验证您的邮箱地址
@@ -201,6 +212,7 @@ Content=内容
 require_error=不能为空。
 alpha_dash_error=必须为英文字母、阿拉伯数字或横线（-_）。
 alpha_dash_dot_error=必须为英文字母、阿拉伯数字、横线（-_）或点。
+alpha_dash_dot_slash_error=必须为英文字母、阿拉伯数字、横线（-_）、点或斜线。
 size_error=长度必须为 %s。
 min_size_error=长度最小为 %s 个字符。
 max_size_error=长度最大为 %s 个字符。
@@ -251,12 +263,12 @@ form.name_pattern_not_allowed=用户名不允许 '%s' 的格式。
 profile=个人信息
 password=修改密码
 avatar=头像设置
-ssh_keys=管理 SSH 密钥
-social=社交帐号绑定
-applications=管理授权应用
-orgs=管理组织
+ssh_keys=SSH 密钥
+security=帐户安全
+repos=仓库列表
+orgs=组织列表
+applications=授权应用
 delete=删除帐户
-uid=用户 ID
 
 public_profile=公开信息
 profile_desc=您的邮箱地址将会被公开，并被用于接收帐户的所有提醒和通知。
@@ -312,7 +324,7 @@ ssh_key_name_used=使用相同名称的公开密钥已经存在！
 key_name=密钥名称
 key_content=密钥内容
 add_key_success=新的 SSH 密钥 '%s' 添加成功！
-delete_key=删除
+delete_key=删除密钥
 ssh_key_deletion=删除 SSH 公钥操作
 ssh_key_deletion_desc=删除该 SSH 公钥将删除所有与您帐户相关的访问权限。是否继续?
 ssh_key_deletion_success=SSH 公钥删除成功！
@@ -322,10 +334,30 @@ no_activity=没有最近活动
 key_state_desc=该密钥在 7 天内被使用过
 token_state_desc=该令牌在 7 天内被使用过
 
-manage_social=管理关联社交帐户
-social_desc=以下是与您帐户所关联的社交帐号，如果您发现有陌生的关联，请立即解除绑定！
-unbind=解除绑定
-unbind_success=社交帐号解除绑定成功！
+two_factor=两步验证
+two_factor_status=当前状态：
+two_factor_on=开启
+two_factor_off=关闭
+two_factor_enable=启用两步验证
+two_factor_disable=关闭两步验证
+two_factor_view_recovery_codes=查看并备份 <a href="%s%s">恢复密钥</a> 到一个安全的地方，当您无法使用认证应用时可以使用恢复密钥作为临时令牌。
+two_factor_http=对于 HTTP/HTTPS 操作，您不再能够使用用户名和密码作为凭据。请创建和使用 <a href="%[1]s%[2]s"> 个人操作令牌</a> 作为您的凭据，如 <code>%[3]s</code>。
+two_factor_enable_title=启用两步验证
+two_factor_scan_qr=请使用您的认证应用扫描以下二维码︰
+two_factor_or_enter_secret=或者直接输入密钥：
+two_factor_then_enter_passcode=然后输入动态令牌：
+two_factor_verify=验证令牌
+two_factor_invalid_passcode=您输入的动态令牌无效，请重试！
+two_factor_enable_error=启用两步验证失败：%v
+two_factor_enable_success=两步验证登录启用成功！
+two_factor_recovery_codes_title=两步验证恢复密钥
+two_factor_recovery_codes_desc=当您无法使用认证应用时，可以使用恢复密钥作为临时令牌。每个恢复密钥只能被使用一次，<b>请务必将它们保存在一个安全的地方</b>。
+two_factor_regenerate_recovery_codes=重新生成恢复密钥
+two_factor_regenerate_recovery_codes_error=重新生成恢复密钥失败：%v
+two_factor_regenerate_recovery_codes_success=新的恢复密钥生成成功！
+two_factor_disable_title=关闭两步验证
+two_factor_disable_desc=关闭两步验证后，您的帐户安全等级将变低。是否继续？
+two_factor_disable_success=两步验证登录关闭成功！
 
 manage_access_token=管理个人操作令牌
 generate_new_token=生成新的令牌
@@ -343,6 +375,11 @@ orgs.none=您现在还不是任何组织的成员。
 orgs.leave_title=离开组织
 orgs.leave_desc=离开组织后，组织相关的所有仓库和团队权限将被收回。是否继续？
 
+repos.leave=离开仓库
+repos.leave_title=退出仓库协作
+repos.leave_desc=离开仓库后，相关权限将被收回。是否继续？
+repos.leave_success=您已经成功退出 '%s' 的仓库协作！
+
 delete_account=删除当前帐户
 delete_prompt=删除操作会永久清除您的帐户信息，并且 <strong>不可恢复</strong>！
 confirm_delete_account=确认删除帐户
@@ -413,7 +450,7 @@ quick_guide=快速帮助
 clone_this_repo=克隆当前仓库
 create_new_repo_command=从命令行创建一个新的仓库
 push_exist_repo=从命令行推送已经创建的仓库
-repo_is_empty=该仓库不包含任何内容，请稍后再进行访问！
+bare_message=这个家伙很懒，什么都没有推送。
 
 files=文件
 branch=分支
@@ -426,6 +463,7 @@ pulls=合并请求
 labels=标签管理
 milestones=里程碑
 commits=提交历史
+git_branches=代码分支
 releases=版本发布
 file_raw=原始文件
 file_history=文件历史
@@ -434,6 +472,13 @@ file_permalink=永久链接
 file_too_large=文件过大导致无法显示
 video_not_supported_in_browser=您的浏览器不支持使用 HTML5 播放视频。
 
+branches.overview=概况
+branches.active_branches=活跃分支
+branches.stale_branches=陈旧分支
+branches.all=所有分支
+branches.updated_by=由 %[2]s 更新于 %[1]s
+branches.change_default_branch=更改默认分支
+
 editor.new_file=新的文件
 editor.upload_file=上传文件
 editor.edit_file=编辑文件
@@ -638,12 +683,14 @@ settings.options=基本设置
 settings.collaboration=管理协作者
 settings.collaboration.admin=管理权限
 settings.collaboration.write=可写权限
-settings.collaboration.read=可读权限
+settings.collaboration.read=只读权限
 settings.collaboration.undefined=未定义
 settings.branches=管理分支
+settings.branches_bare=您无法对空仓库进行分支管理，请先推送一些内容到仓库。
 settings.default_branch=默认分支
 settings.default_branch_desc=默认分支是被用于代码提交、合并请求和在线编辑的基准分支。
 settings.update=更新
+settings.update_default_branch_unsupported=服务器上的 Git 版本不支持修改默认分支。
 settings.update_default_branch_success=仓库默认分支更新成功！
 settings.protected_branches=保护分支
 settings.protected_branches_desc=保护分支不被强制推送、意外删除和限制代码提交白名单。
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=禁止强制推送和删除分支。
 settings.protect_require_pull_request=要求通过合并请求提交代码
 settings.protect_require_pull_request_desc=启用该选项后代码将不能直接被推送到此分支，所有的代码提交都必须通过另一个非保护分支发起合并请求进行合并。
 settings.protect_whitelist_committers=限制可以推送代码的成员
-settings.protect_whitelist_committers_desc=添加用户或团队到可直接推送代码的白名单。
+settings.protect_whitelist_committers_desc=添加用户或团队到可直接推送代码的白名单，列入白名单中的用户将跳过合并请求检查。
 settings.protect_whitelist_users=允许推送到此分支的用户
 settings.protect_whitelist_search_users=搜索用户
 settings.protect_whitelist_teams=允许其成员推送到此分支的团队
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=该操作将会影响到所有与该仓库有关
 settings.advanced_settings=高级设置
 settings.wiki_desc=启用 Wiki 系统
 settings.use_internal_wiki=使用内置 Wiki 系统
+settings.allow_public_wiki_desc=当仓库为私有时，允许 Wiki 的公开访问
 settings.use_external_wiki=使用外部 Wiki
 settings.external_wiki_url=外部 Wiki 链接
 settings.external_wiki_url_desc=当访问者单击分页标签时，将会被重定向到该链接。
 settings.issues_desc=启用工单管理系统
 settings.use_internal_issue_tracker=使用内置的轻量级工单管理系统
+settings.allow_public_issues_desc=当仓库为私有时，允许工单的公开访问
 settings.use_external_issue_tracker=使用外部的工单管理系统
 settings.external_tracker_url=外部工单管理系统 URL
 settings.external_tracker_url_desc=当访问者单击分页标签时，将会被重定向到该链接。
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Web 钩子删除成功！
 settings.webhook.test_delivery=测试推送
 settings.webhook.test_delivery_desc=生成并推送一个模拟的 Push 事件
 settings.webhook.test_delivery_success=测试推送已经加入到队列，请耐心等待数秒再刷新推送记录。
+settings.webhook.redelivery=重新推送
+settings.webhook.redelivery_success=任务 '%s' 已经被重新加入到推送队列，请耐心等待数秒再刷新推送记录。
 settings.webhook.request=请求内容
 settings.webhook.response=响应内容
 settings.webhook.headers=头信息
@@ -751,14 +802,24 @@ settings.slack_icon_url=图标 URL
 settings.slack_color=颜色代码
 settings.event_desc=请设置您希望触发 Web 钩子的事件：
 settings.event_push_only=只推送 <code>push</code> 事件。
-settings.event_send_everything=请把 <strong>一切</strong> 都给我
-settings.event_choose=我的命运自己主宰
+settings.event_send_everything=推送 <strong>所有</strong> 事件
+settings.event_choose=选择指定的事件
 settings.event_create=创建
 settings.event_create_desc=创建分支或标签
-settings.event_pull_request=合并请求
-settings.event_pull_request_desc=开启、关闭、重新开启、编辑、指派、取消指派、更新标签、清除标签或同步合并请求
+settings.event_delete=删除
+settings.event_delete_desc=删除分支或标签
+settings.event_fork=派生
+settings.event_fork_desc=仓库被派生
 settings.event_push=推送
 settings.event_push_desc=Git 仓库推送
+settings.event_issues=工单
+settings.event_issues_desc=工单被开启、关闭、重新开启、编辑、指派、取消指派、更新标签、清除标签、设置里程碑或取消设置里程碑
+settings.event_issue_comment=工单评论
+settings.event_issue_comment_desc=工单评论被创建、编辑和删除
+settings.event_pull_request=合并请求
+settings.event_pull_request_desc=合并请求被开启、关闭、重新开启、编辑、指派、取消指派、更新标签、清除标签、设置里程碑、取消设置里程碑或代码同步
+settings.event_release=版本发布
+settings.event_release_desc=仓库发布新的版本
 settings.active=是否激活
 settings.active_helper=当指定事件发生时我们将会触发此 Web 钩子。
 settings.add_hook_success=Web 钩子添加成功！
@@ -803,7 +864,6 @@ release.releases=版本发布
 release.new_release=发布新版
 release.draft=草稿
 release.prerelease=预发行
-release.stable=稳定
 release.edit=编辑
 release.ahead=在该版本发布之后已有 <strong>%d</strong> 次代码提交到 %s 分支
 release.source_code=源代码
@@ -1019,6 +1079,7 @@ repos.private=私有库
 repos.watches=关注数
 repos.stars=点赞数
 repos.issues=工单数
+repos.size=用量
 
 auths.auth_manage_panel=认证管理面板
 auths.new=添加新的源
@@ -1042,6 +1103,11 @@ auths.attribute_username_placeholder=留空表示使用用户登录时所使用
 auths.attribute_name=名字属性
 auths.attribute_surname=姓氏属性
 auths.attribute_mail=邮箱属性
+auths.verify_group_membership=验证组成员身份
+auths.group_search_base_dn=组搜索基准 DN
+auths.group_filter=组名称过滤
+auths.group_attribute_contain_user_list=包含用户的组属性
+auths.user_attribute_listed_in_group=组内用户属性
 auths.attributes_in_bind=从 Bind DN 中拉取属性信息
 auths.filter=用户过滤规则
 auths.admin_filter=管理员过滤规则
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=拉取操作超时
 config.git_gc_timeout=GC 操作超时
 
 config.log_config=日志配置
-config.log_mode=日志模式
+config.log_mode=模式
+config.log_options=选项
 
 monitor.cron=Cron 任务
 monitor.name=任务名称
@@ -1205,24 +1272,28 @@ notices.delete_success=系统提示删除成功！
 
 [action]
 create_repo=创建了仓库 <a href="%s">%s</a>
+fork_repo=派生了仓库 <a href="%s">%s</a>
 rename_repo=重命名仓库 <code>%[1]s</code> 为 <a href="%[2]s">%[3]s</a>
 commit_repo=推送了 <a href="%[1]s/src/%[2]s">%[3]s</a> 分支的代码到 <a href="%[1]s">%[4]s</a>
+compare_commits=对比 %d 次代码提交
+transfer_repo=将仓库 <code>%s</code> 转移至 <a href="%s">%s</a>
 create_issue=`创建了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`关闭了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`重新开启了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`评论了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`创建了合并请求 <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`关闭了合并请求 <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`重新开启了合并请求 <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`评论了工单 <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`合并了合并请求 <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=将仓库 <code>%s</code> 转移至 <a href="%s">%s</a>
+create_branch=创建了新的分支 <a href="%[1]s/src/%[2]s">%[3]s</a> 到 <a href="%[1]s">%[4]s</a>
+delete_branch=删除了 <a href="%[1]s">%[3]s</a> 的分支 <code>%[2]s</code>
 push_tag=推送了标签 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>
-compare_commits=对比 %d 次代码提交
+delete_tag=删除了 <a href="%[1]s">%[3]s</a> 的标签 <code>%[2]s</code>
 
 [tool]
 ago=之前
 from_now=之后
-now=现在
+now=刚刚
 1s=1 秒%s
 1m=1 分钟%s
 1h=1 小时%s

conf/locale/locale_zh-HK.ini

@@ -82,6 +82,8 @@ app_url=應用程式網址
 app_url_helper=該設置影響 HTTP/HTTPS 複製地址和一些郵箱中的連結。
 log_root_path=日誌路徑
 log_root_path_helper=寫入日誌檔目錄
+enable_console_mode=Enable Console Mode
+enable_console_mode_popup=In addition to file mode, also print logs to console.
 
 optional_title=可選設置
 email_title=電子郵件服務設定
@@ -117,6 +119,7 @@ sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s
 invalid_db_setting=數據庫設置不正確：%v
 invalid_repo_path=倉庫根目錄設置不正確：%v
 run_user_not_match=執行系統用戶非當前用戶：%s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=SMTP From field is not valid: %v
 save_config_failed=應用配置保存失敗：%v
 invalid_admin_setting=管理員帳戶設置不正確：%v
@@ -166,6 +169,14 @@ reset_password_helper=單擊此處重置密碼
 password_too_short=密碼長度不能少於 6 位！
 non_local_account=Non-local accounts cannot change passwords through Gogs.
 
+login_two_factor=Two-factor Authentication
+login_two_factor_passcode=Authentication Passcode
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Recovery Code
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+
 [mail]
 activate_account=請激活您的帳戶
 activate_email=請驗證您的郵箱地址
@@ -201,6 +212,7 @@ Content=Content
 require_error=不能為空。
 alpha_dash_error=必須為英文字母、阿拉伯數字或橫線（-_）。
 alpha_dash_dot_error=必須為英文字母、阿拉伯數字、橫線（-_）或點。
+alpha_dash_dot_slash_error=` must be valid alpha or numeric or dash(-_) or dot characters or slashes.`
 size_error=長度必須為 %s。
 min_size_error=長度最小為 %s 個字符。
 max_size_error=長度最大為 %s 個字符。
@@ -252,11 +264,11 @@ profile=個人信息
 password=修改密碼
 avatar=Avatar
 ssh_keys=管理 SSH 密鑰
-social=社交帳號綁定
-applications=管理授權應用
+security=Security
+repos=Repositories
 orgs=管理組織
+applications=管理授權應用
 delete=刪除帳戶
-uid=用戶 ID
 
 public_profile=公開信息
 profile_desc=您的郵箱地址將會被公開，並被用於接收帳戶的所有提醒和通知。
@@ -322,10 +334,30 @@ no_activity=沒有最近活動
 key_state_desc=該密鑰在 7 天內被使用過
 token_state_desc=此token在過去七天內曾經被使用過
 
-manage_social=管理關聯社交帳戶
-social_desc=以下是與您帳戶所關聯的社交帳號，如果您發現有陌生的關聯，請立即解除綁定！
-unbind=解除綁定
-unbind_success=社交帳號解除綁定成功！
+two_factor=Two-factor Authentication
+two_factor_status=Status:
+two_factor_on=On
+two_factor_off=Off
+two_factor_enable=Enable
+two_factor_disable=Disable
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=管理個人操作令牌
 generate_new_token=生成新的令牌
@@ -340,9 +372,14 @@ access_token_deletion_desc=刪除此連接token將會刪除與相關應用程式
 delete_token_success=您的連接token已成功刪除。請記得更新您的應用程式。
 
 orgs.none=You are not a member of any organizations.
-orgs.leave_title=Leave an organization
+orgs.leave_title=Leave organization
 orgs.leave_desc=You will lose access to all repositories and teams after you left the organization. Do you want to continue?
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=刪除當前帳戶
 delete_prompt=刪除操作會永久清除您的帳戶信息，並且 <strong>不可恢復</strong>！
 confirm_delete_account=確認刪除帳戶
@@ -413,7 +450,7 @@ quick_guide=快速幫助
 clone_this_repo=複製當前倉庫
 create_new_repo_command=從命令行創建一個新的倉庫
 push_exist_repo=從命令行推送已經創建的倉庫
-repo_is_empty=這倉庫不包含任何內容，請稍後再訪問！
+bare_message=This repository does not have any content yet.
 
 files=Files
 branch=分支
@@ -426,6 +463,7 @@ pulls=合併請求
 labels=標籤
 milestones=里程碑
 commits=提交歷史
+git_branches=Branches
 releases=版本發佈
 file_raw=原始文件
 file_history=文件歷史
@@ -434,6 +472,13 @@ file_permalink=永久連結
 file_too_large=This file is too large to be shown
 video_not_supported_in_browser=Your browser doesn't support HTML5 video tag.
 
+branches.overview=Overview
+branches.active_branches=Active Branches
+branches.stale_branches=Stale Branches
+branches.all=All Branches
+branches.updated_by=Updated %[1]s by %[2]s
+branches.change_default_branch=Change Default Branch
+
 editor.new_file=New file
 editor.upload_file=Upload file
 editor.edit_file=Edit file
@@ -641,9 +686,11 @@ settings.collaboration.write=Write
 settings.collaboration.read=Read
 settings.collaboration.undefined=Undefined
 settings.branches=Branches
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch=Default Branch
 settings.default_branch_desc=The default branch is considered the "base" branch for code commits, pull requests and online editing.
 settings.update=Update
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=Default branch of this repository has been updated successfully!
 settings.protected_branches=Protected Branches
 settings.protected_branches_desc=Protect branches from force pushing, accidental deletion and whitelist code committers.
@@ -655,7 +702,7 @@ settings.protect_this_branch_desc=Disable force pushes and prevent from deletion
 settings.protect_require_pull_request=Require pull request instead direct pushing
 settings.protect_require_pull_request_desc=Enable this option to disable direct pushing to this branch. Commits have to be pushed to another non-protected branch and merged to this branch through pull request.
 settings.protect_whitelist_committers=Whitelist who can push to this branch
-settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch.
+settings.protect_whitelist_committers_desc=Add people or teams to whitelist of direct push to this branch. Users in whitelist will bypass require pull request check.
 settings.protect_whitelist_users=Users who can push to this branch
 settings.protect_whitelist_search_users=Search users
 settings.protect_whitelist_teams=Teams for which members of them can push to this branch
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=該操作將會影響到所有與該倉庫有關
 settings.advanced_settings=高級設置
 settings.wiki_desc=Enable wiki system
 settings.use_internal_wiki=Use builtin wiki
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=使用外部 wiki
 settings.external_wiki_url=外部 Wiki 連結
 settings.external_wiki_url_desc=當分頁上按一下，訪客將會重新導到 URL。
 settings.issues_desc=Enable issue tracker
 settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=使用外部的問題管理系統
 settings.external_tracker_url=External Issue Tracker URL
 settings.external_tracker_url_desc=Visitors will be redirected to URL when they click on the tab.
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Web 鉤子刪除成功！
 settings.webhook.test_delivery=測試推送
 settings.webhook.test_delivery_desc=生成並推送一個模擬的 Push 事件
 settings.webhook.test_delivery_success=測試推送已經加入到隊列，請耐心等待數秒再刷新推送記錄。
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=請求內容
 settings.webhook.response=響應內容
 settings.webhook.headers=標題
@@ -755,10 +806,20 @@ settings.event_send_everything=推送 <strong>所有</strong> 事件
 settings.event_choose=讓我選擇我的需要
 settings.event_create=創建
 settings.event_create_desc=創建分支或標籤
-settings.event_pull_request=Pull Request
-settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, or synchronized.
+settings.event_delete=Delete
+settings.event_delete_desc=Branch or tag deleted
+settings.event_fork=Fork
+settings.event_fork_desc=Repository forked
 settings.event_push=推送
 settings.event_push_desc=Git 倉庫推送
+settings.event_issues=Issues
+settings.event_issues_desc=Issue opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, or demilestoned.
+settings.event_issue_comment=Issue Comment
+settings.event_issue_comment_desc=Issue comment created, edited, or deleted.
+settings.event_pull_request=Pull Request
+settings.event_pull_request_desc=Pull request opened, closed, reopened, edited, assigned, unassigned, label updated, label cleared, milestoned, demilestoned, or synchronized.
+settings.event_release=Release
+settings.event_release_desc=Release published in a repository.
 settings.active=是否激活
 settings.active_helper=當指定事件發生時我們將會觸發此 Web 鉤子。
 settings.add_hook_success=Web 鉤子添加成功！
@@ -803,7 +864,6 @@ release.releases=版本發佈
 release.new_release=發佈新版本
 release.draft=草稿
 release.prerelease=預發佈版本
-release.stable=穩定
 release.edit=編輯
 release.ahead=在該版本發佈之後已有 <strong>%d</strong> 次代碼提交到 %s 分支
 release.source_code=源代碼
@@ -1019,6 +1079,7 @@ repos.private=私有庫
 repos.watches=關註數
 repos.stars=讚好數
 repos.issues=問題數
+repos.size=Size
 
 auths.auth_manage_panel=認證管理面板
 auths.new=添加新認證源
@@ -1039,9 +1100,14 @@ auths.user_base=用戶搜索基準
 auths.user_dn=User DN
 auths.attribute_username=用戶名屬性
 auths.attribute_username_placeholder=留空表示使用用戶登錄時所使用的用戶名
-auths.attribute_name=名子屬性
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=姓氏屬性
 auths.attribute_mail=電子郵箱屬性
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=Fetch attributes in Bind DN context
 auths.filter=使用者篩選器
 auths.admin_filter=管理者篩選器
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=Pull Operation Timeout
 config.git_gc_timeout=GC Operation Timeout
 
 config.log_config=日誌配置
-config.log_mode=日誌模式
+config.log_mode=Mode
+config.log_options=Options
 
 monitor.cron=Cron 任務
 monitor.name=任務名稱
@@ -1205,19 +1272,23 @@ notices.delete_success=系統提示刪除成功！
 
 [action]
 create_repo=創建了儲存庫 <a href="%s">%s</a>
+fork_repo=forked a repository to <a href="%s">%s</a>
 rename_repo=重新命名倉庫 <code>%[1]s</code> 為 <a href="%[2]s">%[3]s</a>
 commit_repo=推送了 <a href="%[1]s/src/%[2]s">%[3]s</a> 分支的代碼到 <a href="%[1]s">%[4]s</a>
+compare_commits=查看 %d 次提交的內容比對
+transfer_repo=將儲存庫 <code>%s</code> 轉移至 <a href="%s">%s</a>
 create_issue=`創建了問題 <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`closed issue <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`reopened issue <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`評論了問題 <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`創建了合併請求 <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`closed pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`reopened pull request <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`評論了問題 <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`合併了合併請求 <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=將儲存庫 <code>%s</code> 轉移至 <a href="%s">%s</a>
+create_branch=created new branch <a href="%[1]s/src/%[2]s">%[3]s</a> at <a href="%[1]s">%[4]s</a>
+delete_branch=deleted branch <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 push_tag=推送了標籤 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>
-compare_commits=查看 %d 次提交的內容比對
+delete_tag=deleted tag <code>%[2]s</code> at <a href="%[1]s">%[3]s</a>
 
 [tool]
 ago=之前

conf/locale/locale_zh-TW.ini

@@ -82,6 +82,8 @@ app_url=應用程式網址
 app_url_helper=該設置影響 HTTP/HTTPS 複製地址和一些郵箱中的連結。
 log_root_path=日誌路徑
 log_root_path_helper=寫入日誌檔目錄
+enable_console_mode=Enable Console Mode
+enable_console_mode_popup=In addition to file mode, also print logs to console.
 
 optional_title=可選設置
 email_title=電子郵件服務設定
@@ -117,6 +119,7 @@ sqlite3_not_available=您所使用的發行版本不支持 SQLite3，請從 %s
 invalid_db_setting=資料庫設定不正確: %v
 invalid_repo_path=倉庫根目錄設置不正確：%v
 run_user_not_match=執行系統用戶非當前用戶：%s -> %s
+smtp_host_missing_port=SMTP Host is missing port in address.
 invalid_smtp_from=SMTP 寄件者欄位無效﹔%v
 save_config_failed=設定儲存失敗：%v
 invalid_admin_setting=管理員帳戶設置不正確：%v
@@ -166,6 +169,14 @@ reset_password_helper=單擊此處重置密碼
 password_too_short=密碼長度不能少於 6 位！
 non_local_account=非本地帳戶無法通過 Gogs 修改密碼。
 
+login_two_factor=Two-factor Authentication
+login_two_factor_passcode=Authentication Passcode
+login_two_factor_enter_recovery_code=Enter a two-factor recovery code
+login_two_factor_recovery=Two-factor Recovery
+login_two_factor_recovery_code=Recovery Code
+login_two_factor_enter_passcode=Enter a two-factor passcode
+login_two_factor_invalid_recovery_code=Recovery code has been used or does not valid.
+
 [mail]
 activate_account=請激活您的帳戶
 activate_email=請驗證您的郵箱地址
@@ -201,6 +212,7 @@ Content=內容
 require_error=不能為空。
 alpha_dash_error=必須為英文字母、阿拉伯數字或橫線（-_）。
 alpha_dash_dot_error=必須為英文字母、阿拉伯數字、橫線（-_）或點。
+alpha_dash_dot_slash_error=` 必須是合法的英文字母、數字、分隔符號(-_)、半形句點或斜線。`
 size_error=長度必須為 %s。
 min_size_error=長度最小為 %s 個字符。
 max_size_error=長度最大為 %s 個字符。
@@ -252,11 +264,11 @@ profile=個人信息
 password=修改密碼
 avatar=頭像
 ssh_keys=管理 SSH 密鑰
-social=社交帳號綁定
-applications=管理授權應用
+security=Security
+repos=Repositories
 orgs=管理組織
+applications=管理授權應用
 delete=刪除帳戶
-uid=用戶 ID
 
 public_profile=公開信息
 profile_desc=您的郵箱地址將會被公開，並被用於接收帳戶的所有提醒和通知。
@@ -322,10 +334,30 @@ no_activity=沒有最近活動
 key_state_desc=該密鑰在 7 天內被使用過
 token_state_desc=此token在過去七天內曾經被使用過
 
-manage_social=管理關聯社交帳戶
-social_desc=以下是與您帳戶所關聯的社交帳號，如果您發現有陌生的關聯，請立即解除綁定！
-unbind=解除綁定
-unbind_success=社交帳號解除綁定成功！
+two_factor=Two-factor Authentication
+two_factor_status=Status:
+two_factor_on=On
+two_factor_off=Off
+two_factor_enable=Enable
+two_factor_disable=Disable
+two_factor_view_recovery_codes=View and save <a href="%s%s">your recovery codes</a> in a safe place. You can use them as passcode if you lose access to your authentication application.
+two_factor_http=For HTTP/HTTPS operations, you are no longer able to use plain username and password. Please create and use <a href="%[1]s%[2]s">Personal Access Token</a> as your credential, e.g. <code>%[3]s</code>.
+two_factor_enable_title=Enable Two-factor Authentication
+two_factor_scan_qr=Please use your authentication application to scan the image:
+two_factor_or_enter_secret=Or enter the secret:
+two_factor_then_enter_passcode=Then enter passcode:
+two_factor_verify=Verify
+two_factor_invalid_passcode=The passcode you entered is not valid, please try again!
+two_factor_enable_error=Enable Two-factor authentication failed: %v
+two_factor_enable_success=Two-factor authentication has enabled for your account successfully!
+two_factor_recovery_codes_title=Two-factor Authentication Recovery Codes
+two_factor_recovery_codes_desc=Recovery codes are used when you temporarily lose access to your authentication application. Each recovery code can only be used once, <b>please keep these codes in a safe place</b>.
+two_factor_regenerate_recovery_codes=Regenerate Recovery Codes
+two_factor_regenerate_recovery_codes_error=Regenerate recovery codes failed: %v
+two_factor_regenerate_recovery_codes_success=New recovery codes has been generated successfully!
+two_factor_disable_title=Disable Two-factor Authentication
+two_factor_disable_desc=Your account security level will decrease after disabled two-factor authentication. Do you want to continue?
+two_factor_disable_success=Two-factor authentication has disabled successfully!
 
 manage_access_token=管理個人操作令牌
 generate_new_token=生成新的令牌
@@ -343,6 +375,11 @@ orgs.none=您現在還不是任何組織的成員。
 orgs.leave_title=離開組織
 orgs.leave_desc=離開組織後，所有與組織相關的倉庫和團隊權限將被取消。是否繼續？
 
+repos.leave=Leave
+repos.leave_title=Leave repository
+repos.leave_desc=You will lose access to the repository after you left. Do you want to continue?
+repos.leave_success=You have left repository '%s' successfully!
+
 delete_account=刪除當前帳戶
 delete_prompt=刪除操作會永久清除您的帳戶信息，並且 <strong>不可恢復</strong>！
 confirm_delete_account=確認刪除帳戶
@@ -413,7 +450,7 @@ quick_guide=快速幫助
 clone_this_repo=複製當前倉庫
 create_new_repo_command=從命令行創建一個新的倉庫
 push_exist_repo=從命令行推送已經創建的倉庫
-repo_is_empty=這倉庫不包含任何內容，請稍後再訪問！
+bare_message=This repository does not have any content yet.
 
 files=檔案
 branch=分支
@@ -426,6 +463,7 @@ pulls=合併請求
 labels=標籤
 milestones=里程碑
 commits=提交歷史
+git_branches=分支列表
 releases=版本發佈
 file_raw=原始文件
 file_history=文件歷史
@@ -434,6 +472,13 @@ file_permalink=永久連結
 file_too_large=檔案太大，無法顯示
 video_not_supported_in_browser=您的瀏覽器不支援 HTML5 影片播放標籤。
 
+branches.overview=概覽
+branches.active_branches=活躍分支
+branches.stale_branches=陳舊分支
+branches.all=所有分支
+branches.updated_by=%[2]s 更新了 %[1]s
+branches.change_default_branch=變更預設分支
+
 editor.new_file=開新檔案
 editor.upload_file=上傳檔案
 editor.edit_file=編輯文件
@@ -641,9 +686,11 @@ settings.collaboration.write=可寫權限
 settings.collaboration.read=可讀權限
 settings.collaboration.undefined=未定義
 settings.branches=分支列表
+settings.branches_bare=You cannot manage branches for bare repository. Please push some content first.
 settings.default_branch=預設分支
 settings.default_branch_desc=預設分支是程式碼 commit、pull requests 及線上編輯的基準分支。
 settings.update=更新
+settings.update_default_branch_unsupported=Change default branch is not supported by the Git version on server.
 settings.update_default_branch_success=這個 repository 的預設分支更新成功！
 settings.protected_branches=保護分支
 settings.protected_branches_desc=保護分支不被強制 Push、意外刪除以及限制 Commit 者白名單
@@ -655,10 +702,10 @@ settings.protect_this_branch_desc=停用強制Push及分支刪除。
 settings.protect_require_pull_request=請使用 pull request 來更新(合併)程式碼。
 settings.protect_require_pull_request_desc=啟用這個選項之後，程式碼將無法直接 Push 到這個分支，所有 Commit 必須先 Push 到另一個非保護的分支，再透過 Pull Request 來要求合併。
 settings.protect_whitelist_committers=限制誰可以 Push 到這個分支
-settings.protect_whitelist_committers_desc=新增用戶或團隊到可以直接push到這個分支的白名單。
+settings.protect_whitelist_committers_desc=新增成員或團隊到允許直接 push 到這個分支的白名單。白名單中的使用者將會略過 pull request 的檢查。
 settings.protect_whitelist_users=限制那些使用者可以 push 到這個分支
 settings.protect_whitelist_search_users=搜尋用戶
-settings.protect_whitelist_teams=Teams for which members of them can push to this branch
+settings.protect_whitelist_teams=團隊的成員可以 push 到這個分支
 settings.protect_whitelist_search_teams=搜尋團隊
 settings.update_protect_branch_success=此分支設置保護已更新成功!
 settings.hooks=管理 Web 鉤子
@@ -673,11 +720,13 @@ settings.change_reponame_prompt=該操作將會影響到所有與該倉庫有關
 settings.advanced_settings=高級設置
 settings.wiki_desc=啓用 Wiki 系統
 settings.use_internal_wiki=使用內建 wiki
+settings.allow_public_wiki_desc=Allow public access to wiki when repository is private
 settings.use_external_wiki=使用外部 wiki
 settings.external_wiki_url=外部 Wiki 連結
 settings.external_wiki_url_desc=當分頁上按一下，訪客將會重新導到 URL。
 settings.issues_desc=啟用問題追蹤
 settings.use_internal_issue_tracker=使用內建輕量級問題追蹤
+settings.allow_public_issues_desc=Allow public access to issues when repository is private
 settings.use_external_issue_tracker=使用外部的問題管理系統
 settings.external_tracker_url=外部Issue Tracker網址
 settings.external_tracker_url_desc=當訪客在分頁上按一下，他們將會重新導向到 URL。
@@ -688,7 +737,7 @@ settings.tracker_issue_style.alphanumeric=字母及數字
 settings.tracker_url_format_desc=您可以使用 <code>{user} {repo} {index}</code> 分別作為用戶名、倉庫名和問題索引的占位符。
 settings.pulls_desc=啟用合併請求以接受社區貢獻
 settings.danger_zone=危險操作區
-settings.cannot_fork_to_same_owner=You cannot fork a repository to its original owner.
+settings.cannot_fork_to_same_owner=你不可以 fork 一個 repository 到它的擁有者。
 settings.new_owner_has_same_repo=新的倉庫擁有者已經存在同名倉庫！
 settings.convert=轉換為正規倉庫
 settings.convert_desc=您可以將此鏡像轉成正規倉庫。此動做不可逆。
@@ -731,6 +780,8 @@ settings.webhook_deletion_success=Web 鉤子刪除成功！
 settings.webhook.test_delivery=測試推送
 settings.webhook.test_delivery_desc=生成並推送一個模擬的 Push 事件
 settings.webhook.test_delivery_success=測試推送已經加入到隊列，請耐心等待數秒再刷新推送記錄。
+settings.webhook.redelivery=Redelivery
+settings.webhook.redelivery_success=Hook task '%s' has been readded to delivery queue. It may take few seconds to update delivery status in history.
 settings.webhook.request=請求內容
 settings.webhook.response=響應內容
 settings.webhook.headers=標題
@@ -745,7 +796,7 @@ settings.add_webhook_desc=我們會通過 <code>POST</code> 請求將訂閱事
 settings.payload_url=推送地址
 settings.content_type=數據格式
 settings.secret=密鑰文本
-settings.secret_desc=Secret will be sent as SHA256 HMAC hex digest of payload via <code>X-Gogs-Signature</code> header.
+settings.secret_desc=密鑰將會以 SHA256 HMAC 的十六進位數字放進<code>X-Gogs-Signature</code> 標頭中送出。
 settings.slack_username=服務名稱
 settings.slack_icon_url=圖標 URL
 settings.slack_color=顏色代碼
@@ -755,10 +806,20 @@ settings.event_send_everything=推送 <strong>所有</strong> 事件
 settings.event_choose=讓我選擇我的需要
 settings.event_create=創建
 settings.event_create_desc=創建分支或標籤
-settings.event_pull_request=合併請求
-settings.event_pull_request_desc=請求打開，關閉，重新打開，編輯，分配，未分配，標籤更新，標籤清除，或同步。
+settings.event_delete=刪除
+settings.event_delete_desc=分支或標籤已經被刪除
+settings.event_fork=Fork
+settings.event_fork_desc=Repository 已經  fork
 settings.event_push=推送
 settings.event_push_desc=Git 倉庫推送
+settings.event_issues=Issues
+settings.event_issues_desc=已經開啟、關閉、重啟、修改、指派、取消指派、更新標籤、清除標籤、新增里程碑或刪除里程碑的 issue。
+settings.event_issue_comment=Issue 評論
+settings.event_issue_comment_desc=已經建立、編輯或刪除的 Issue 評論。
+settings.event_pull_request=合併請求
+settings.event_pull_request_desc=已經開啟、關閉、重啟、編輯、指派、解除指派、更新標籤、清除標籤、新增里程碑、刪除里程碑或同步的 pull request。
+settings.event_release=Release
+settings.event_release_desc=Release 將發佈在一個 repository 中。
 settings.active=是否激活
 settings.active_helper=當指定事件發生時我們將會觸發此 Web 鉤子。
 settings.add_hook_success=Web 鉤子添加成功！
@@ -803,7 +864,6 @@ release.releases=版本發佈
 release.new_release=發佈新版本
 release.draft=草稿
 release.prerelease=預發佈版本
-release.stable=穩定
 release.edit=編輯
 release.ahead=在該版本發佈之後已有 <strong>%d</strong> 次代碼提交到 %s 分支
 release.source_code=源代碼
@@ -1019,6 +1079,7 @@ repos.private=私有庫
 repos.watches=關註數
 repos.stars=讚好數
 repos.issues=問題數
+repos.size=大小
 
 auths.auth_manage_panel=認證管理面板
 auths.new=添加新認證源
@@ -1039,9 +1100,14 @@ auths.user_base=用戶搜索基準
 auths.user_dn=User DN
 auths.attribute_username=用戶名屬性
 auths.attribute_username_placeholder=留空表示使用用戶登錄時所使用的用戶名
-auths.attribute_name=名子屬性
+auths.attribute_name=First Name Attribute
 auths.attribute_surname=姓氏屬性
 auths.attribute_mail=電子郵箱屬性
+auths.verify_group_membership=Verify group membership
+auths.group_search_base_dn=Group Search Base DN
+auths.group_filter=Group Filter
+auths.group_attribute_contain_user_list=Group Attribute Containing List of Users
+auths.user_attribute_listed_in_group=User Attribute Listed in Group
 auths.attributes_in_bind=從 Bind DN 中獲取屬性信息
 auths.filter=使用者篩選器
 auths.admin_filter=管理者篩選器
@@ -1176,7 +1242,8 @@ config.git_pull_timeout=操作超時
 config.git_gc_timeout=GC 操作超時
 
 config.log_config=日誌配置
-config.log_mode=日誌模式
+config.log_mode=模式
+config.log_options=選項
 
 monitor.cron=Cron 任務
 monitor.name=任務名稱
@@ -1205,19 +1272,23 @@ notices.delete_success=系統提示刪除成功！
 
 [action]
 create_repo=創建了儲存庫 <a href="%s">%s</a>
+fork_repo=已經 fork 一個 repository 到 <a href="%s">%s</a>
 rename_repo=重新命名倉庫 <code>%[1]s</code> 為 <a href="%[2]s">%[3]s</a>
 commit_repo=推送了 <a href="%[1]s/src/%[2]s">%[3]s</a> 分支的代碼到 <a href="%[1]s">%[4]s</a>
+compare_commits=查看 %d 次提交的內容比對
+transfer_repo=將儲存庫 <code>%s</code> 轉移至 <a href="%s">%s</a>
 create_issue=`創建了問題 <a href="%s/issues/%s">%s#%[2]s</a>`
 close_issue=`已關閉問題 <a href="%s/issues/%s">%s#%[2]s</a>`
 reopen_issue=`已重新開啟問題 <a href="%s/issues/%s">%s#%[2]s</a>`
+comment_issue=`評論了問題 <a href="%s/issues/%s">%s#%[2]s</a>`
 create_pull_request=`創建了合併請求 <a href="%s/pulls/%s">%s#%[2]s</a>`
 close_pull_request=`已關閉合併請求 <a href="%s/pulls/%s">%s#%[2]s</a>`
 reopen_pull_request=`已重新開啟合併請求 <a href="%s/pulls/%s">%s#%[2]s</a>`
-comment_issue=`評論了問題 <a href="%s/issues/%s">%s#%[2]s</a>`
 merge_pull_request=`合併了合併請求 <a href="%s/pulls/%s">%s#%[2]s</a>`
-transfer_repo=將儲存庫 <code>%s</code> 轉移至 <a href="%s">%s</a>
+create_branch=在 <a href="%[1]s">%[4]s</a> 建立新的分支 <a href="%[1]s/src/%[2]s">%[3]s</a>
+delete_branch=已經刪除在 <a href="%[1]s">%[3]s</a> 上的分支 <code>%[2]s</code>
 push_tag=推送了標籤 <a href="%s/src/%s">%[2]s</a> 到 <a href="%[1]s">%[3]s</a>
-compare_commits=查看 %d 次提交的內容比對
+delete_tag=已經刪除在 <a href="%[1]s">%[3]s</a> 上的標籤 <code>%[2]s</code>
 
 [tool]
 ago=之前

docker/README.md

@@ -73,7 +73,7 @@ Most of settings are obvious and easy to understand, but there are some settings
 
 Full documentation of application settings can be found [here](https://gogs.io/docs/advanced/configuration_cheat_sheet.html).
 
-### Container Options
+### Container Options
 
 This container have some options available via environment variables, these options are opt-in features that can help the administration of this container:
 

docker/build.sh

@@ -16,7 +16,6 @@ ln -s /app/gogs/build ${GOPATH}/src/github.com/gogits/gogs
 cd ${GOPATH}/src/github.com/gogits/gogs
 # Needed since git 2.9.3 or 2.9.4
 git config --global http.https://gopkg.in.followRedirects true
-go get -v -tags "sqlite cert pam" ./...
 make build TAGS="sqlite cert pam"
 
 # Cleanup GOPATH

gogs.go

@@ -1,4 +1,4 @@
-// +build go1.5
+// +build go1.6
 
 // Copyright 2014 The Gogs Authors. All rights reserved.
 // Use of this source code is governed by a MIT-style
@@ -13,10 +13,10 @@ import (
 	"github.com/urfave/cli"
 
 	"github.com/gogits/gogs/cmd"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
-const APP_VER = "0.10.8.0307"
+const APP_VER = "0.11.19.0609"
 
 func init() {
 	setting.AppVer = APP_VER

models/access.go

@@ -8,6 +8,8 @@ import (
 	"fmt"
 
 	log "gopkg.in/clog.v1"
+
+	"github.com/gogits/gogs/models/errors"
 )
 
 type AccessMode int
@@ -51,7 +53,7 @@ func ParseAccessMode(permission string) AccessMode {
 // that is not in this table is the real owner of a repository. In case of an organization
 // repository, the members of the owners team are in this table.
 type Access struct {
-	ID     int64 `xorm:"pk autoincr"`
+	ID     int64
 	UserID int64 `xorm:"UNIQUE(s)"`
 	RepoID int64 `xorm:"UNIQUE(s)"`
 	Mode   AccessMode
@@ -109,7 +111,7 @@ func (u *User) GetRepositoryAccesses() (map[*Repository]AccessMode, error) {
 	for _, access := range accesses {
 		repo, err := GetRepositoryByID(access.RepoID)
 		if err != nil {
-			if IsErrRepoNotExist(err) {
+			if errors.IsRepoNotExist(err) {
 				log.Error(4, "GetRepositoryByID: %v", err)
 				continue
 			}

models/action.go

@@ -20,8 +20,9 @@ import (
 	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/tool"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 type ActionType int
@@ -107,7 +108,7 @@ func (a *Action) GetActUserName() string {
 }
 
 func (a *Action) ShortActUserName() string {
-	return base.EllipsisString(a.ActUserName, 20)
+	return tool.EllipsisString(a.ActUserName, 20)
 }
 
 func (a *Action) GetRepoUserName() string {
@@ -115,7 +116,7 @@ func (a *Action) GetRepoUserName() string {
 }
 
 func (a *Action) ShortRepoUserName() string {
-	return base.EllipsisString(a.RepoUserName, 20)
+	return tool.EllipsisString(a.RepoUserName, 20)
 }
 
 func (a *Action) GetRepoName() string {
@@ -123,7 +124,7 @@ func (a *Action) GetRepoName() string {
 }
 
 func (a *Action) ShortRepoName() string {
-	return base.EllipsisString(a.RepoName, 33)
+	return tool.EllipsisString(a.RepoName, 33)
 }
 
 func (a *Action) GetRepoPath() string {
@@ -135,8 +136,8 @@ func (a *Action) ShortRepoPath() string {
 }
 
 func (a *Action) GetRepoLink() string {
-	if len(setting.AppSubUrl) > 0 {
-		return path.Join(setting.AppSubUrl, a.GetRepoPath())
+	if len(setting.AppSubURL) > 0 {
+		return path.Join(setting.AppSubURL, a.GetRepoPath())
 	}
 	return "/" + a.GetRepoPath()
 }
@@ -250,20 +251,30 @@ func NewPushCommits() *PushCommits {
 	}
 }
 
-func (pc *PushCommits) ToApiPayloadCommits(repoLink string) []*api.PayloadCommit {
+func (pc *PushCommits) ToApiPayloadCommits(repoPath, repoLink string) ([]*api.PayloadCommit, error) {
 	commits := make([]*api.PayloadCommit, len(pc.Commits))
 	for i, commit := range pc.Commits {
 		authorUsername := ""
 		author, err := GetUserByEmail(commit.AuthorEmail)
 		if err == nil {
 			authorUsername = author.Name
+		} else if !errors.IsUserNotExist(err) {
+			return nil, fmt.Errorf("GetUserByEmail: %v", err)
 		}
+
 		committerUsername := ""
 		committer, err := GetUserByEmail(commit.CommitterEmail)
 		if err == nil {
-			// TODO: check errors other than email not found.
 			committerUsername = committer.Name
+		} else if !errors.IsUserNotExist(err) {
+			return nil, fmt.Errorf("GetUserByEmail: %v", err)
 		}
+
+		fileStatus, err := git.GetCommitFileStatus(repoPath, commit.Sha1)
+		if err != nil {
+			return nil, fmt.Errorf("FileStatus [commit_sha1: %s]: %v", commit.Sha1, err)
+		}
+
 		commits[i] = &api.PayloadCommit{
 			ID:      commit.Sha1,
 			Message: commit.Message,
@@ -278,10 +289,13 @@ func (pc *PushCommits) ToApiPayloadCommits(repoLink string) []*api.PayloadCommit
 				Email:    commit.CommitterEmail,
 				UserName: committerUsername,
 			},
+			Added:     fileStatus.Added,
+			Removed:   fileStatus.Removed,
+			Modified:  fileStatus.Modified,
 			Timestamp: commit.Timestamp,
 		}
 	}
-	return commits
+	return commits, nil
 }
 
 // AvatarLink tries to match user in database with e-mail
@@ -291,8 +305,8 @@ func (push *PushCommits) AvatarLink(email string) string {
 	if !ok {
 		u, err := GetUserByEmail(email)
 		if err != nil {
-			push.avatars[email] = base.AvatarLink(email)
-			if !IsErrUserNotExist(err) {
+			push.avatars[email] = tool.AvatarLink(email)
+			if !errors.IsUserNotExist(err) {
 				log.Error(4, "GetUserByEmail: %v", err)
 			}
 		} else {
@@ -329,7 +343,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
 
 			issue, err := GetIssueByRef(ref)
 			if err != nil {
-				if IsErrIssueNotExist(err) {
+				if errors.IsIssueNotExist(err) {
 					continue
 				}
 				return err
@@ -372,7 +386,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
 
 			issue, err := GetIssueByRef(ref)
 			if err != nil {
-				if IsErrIssueNotExist(err) {
+				if errors.IsIssueNotExist(err) {
 					continue
 				}
 				return err
@@ -412,7 +426,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit) err
 
 			issue, err := GetIssueByRef(ref)
 			if err != nil {
-				if IsErrIssueNotExist(err) {
+				if errors.IsIssueNotExist(err) {
 					continue
 				}
 				return err
@@ -526,7 +540,7 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
 			return nil
 		}
 
-		compareURL := setting.AppUrl + opts.Commits.CompareURL
+		compareURL := setting.AppURL + opts.Commits.CompareURL
 		if isNewRef {
 			compareURL = ""
 			if err = PrepareWebhooks(repo, HOOK_EVENT_CREATE, &api.CreatePayload{
@@ -545,12 +559,17 @@ func CommitRepoAction(opts CommitRepoActionOptions) error {
 			}
 		}
 
+		commits, err := opts.Commits.ToApiPayloadCommits(repo.RepoPath(), repo.HTMLURL())
+		if err != nil {
+			return fmt.Errorf("ToApiPayloadCommits: %v", err)
+		}
+
 		if err = PrepareWebhooks(repo, HOOK_EVENT_PUSH, &api.PushPayload{
 			Ref:        opts.RefFullName,
 			Before:     opts.OldCommitID,
 			After:      opts.NewCommitID,
 			CompareURL: compareURL,
-			Commits:    opts.Commits.ToApiPayloadCommits(repo.HTMLURL()),
+			Commits:    commits,
 			Repo:       apiRepo,
 			Pusher:     apiPusher,
 			Sender:     apiPusher,
@@ -652,9 +671,12 @@ func MergePullRequestAction(actUser *User, repo *Repository, pull *Issue) error
 // GetFeeds returns action list of given user in given context.
 // actorID is the user who's requesting, ctxUserID is the user/org that is requested.
 // actorID can be -1 when isProfile is true or to skip the permission check.
-func GetFeeds(ctxUser *User, actorID, offset int64, isProfile bool) ([]*Action, error) {
-	actions := make([]*Action, 0, 20)
-	sess := x.Limit(20, int(offset)).Desc("id").Where("user_id = ?", ctxUser.ID)
+func GetFeeds(ctxUser *User, actorID, afterID int64, isProfile bool) ([]*Action, error) {
+	actions := make([]*Action, 0, setting.UI.User.NewsFeedPagingNum)
+	sess := x.Limit(setting.UI.User.NewsFeedPagingNum).Where("user_id = ?", ctxUser.ID).Desc("id")
+	if afterID > 0 {
+		sess.And("id < ?", afterID)
+	}
 	if isProfile {
 		sess.And("is_private = ?", false).And("act_user_id = ?", ctxUser.ID)
 	} else if actorID != -1 && ctxUser.IsOrganization() {

models/admin.go

@@ -15,8 +15,8 @@ import (
 	"github.com/go-xorm/xorm"
 	log "gopkg.in/clog.v1"
 
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/tool"
 )
 
 type NoticeType int
@@ -27,7 +27,7 @@ const (
 
 // Notice represents a system notice for admin.
 type Notice struct {
-	ID          int64 `xorm:"pk autoincr"`
+	ID          int64
 	Type        NoticeType
 	Description string    `xorm:"TEXT"`
 	Created     time.Time `xorm:"-"`
@@ -128,6 +128,6 @@ func DeleteNoticesByIDs(ids []int64) error {
 	if len(ids) == 0 {
 		return nil
 	}
-	_, err := x.Where("id IN (" + strings.Join(base.Int64sToStrings(ids), ",") + ")").Delete(new(Notice))
+	_, err := x.Where("id IN (" + strings.Join(tool.Int64sToStrings(ids), ",") + ")").Delete(new(Notice))
 	return err
 }

models/attachment.go

@@ -15,12 +15,12 @@ import (
 	"github.com/go-xorm/xorm"
 	gouuid "github.com/satori/go.uuid"
 
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 // Attachment represent a attachment of issue/comment/release.
 type Attachment struct {
-	ID        int64  `xorm:"pk autoincr"`
+	ID        int64
 	UUID      string `xorm:"uuid UNIQUE"`
 	IssueID   int64  `xorm:"INDEX"`
 	CommentID int64
@@ -110,7 +110,7 @@ func GetAttachmentByUUID(uuid string) (*Attachment, error) {
 }
 
 func getAttachmentsByIssueID(e Engine, issueID int64) ([]*Attachment, error) {
-	attachments := make([]*Attachment, 0, 10)
+	attachments := make([]*Attachment, 0, 5)
 	return attachments, e.Where("issue_id = ? AND comment_id = 0", issueID).Find(&attachments)
 }
 
@@ -120,15 +120,25 @@ func GetAttachmentsByIssueID(issueID int64) ([]*Attachment, error) {
 }
 
 func getAttachmentsByCommentID(e Engine, commentID int64) ([]*Attachment, error) {
-	attachments := make([]*Attachment, 0, 10)
+	attachments := make([]*Attachment, 0, 5)
 	return attachments, e.Where("comment_id=?", commentID).Find(&attachments)
 }
 
-// GetAttachmentsByCommentID returns all attachments if comment by given ID.
+// GetAttachmentsByCommentID returns all attachments of a comment.
 func GetAttachmentsByCommentID(commentID int64) ([]*Attachment, error) {
 	return getAttachmentsByCommentID(x, commentID)
 }
 
+func getAttachmentsByReleaseID(e Engine, releaseID int64) ([]*Attachment, error) {
+	attachments := make([]*Attachment, 0, 10)
+	return attachments, e.Where("release_id = ?", releaseID).Find(&attachments)
+}
+
+// GetAttachmentsByReleaseID returns all attachments of a release.
+func GetAttachmentsByReleaseID(releaseID int64) ([]*Attachment, error) {
+	return getAttachmentsByReleaseID(x, releaseID)
+}
+
 // DeleteAttachment deletes the given attachment and optionally the associated file.
 func DeleteAttachment(a *Attachment, remove bool) error {
 	_, err := DeleteAttachments([]*Attachment{a}, remove)

models/comment.go

@@ -15,7 +15,8 @@ import (
 
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/markdown"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/markup"
 )
 
 // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.
@@ -48,7 +49,7 @@ const (
 
 // Comment represents a comment in commit and issue page.
 type Comment struct {
-	ID              int64 `xorm:"pk autoincr"`
+	ID              int64
 	Type            CommentType
 	PosterID        int64
 	Poster          *User  `xorm:"-"`
@@ -95,7 +96,7 @@ func (c *Comment) loadAttributes(e Engine) (err error) {
 	if c.Poster == nil {
 		c.Poster, err = GetUserByID(c.PosterID)
 		if err != nil {
-			if IsErrUserNotExist(err) {
+			if errors.IsUserNotExist(err) {
 				c.PosterID = -1
 				c.Poster = NewGhostUser()
 			} else {
@@ -150,9 +151,13 @@ func (c *Comment) APIFormat() *api.Comment {
 	}
 }
 
+func CommentHashTag(id int64) string {
+	return "issuecomment-" + com.ToStr(id)
+}
+
 // HashTag returns unique hash tag for comment.
 func (c *Comment) HashTag() string {
-	return "issuecomment-" + com.ToStr(c.ID)
+	return CommentHashTag(c.ID)
 }
 
 // EventTag returns unique event hash tag for comment.
@@ -163,7 +168,7 @@ func (c *Comment) EventTag() string {
 // mailParticipants sends new comment emails to repository watchers
 // and mentioned people.
 func (cmt *Comment) mailParticipants(e Engine, opType ActionType, issue *Issue) (err error) {
-	mentions := markdown.FindAllMentions(cmt.Content)
+	mentions := markup.FindAllMentions(cmt.Content)
 	if err = updateIssueMentions(e, cmt.IssueID, mentions); err != nil {
 		return fmt.Errorf("UpdateIssueMentions [%d]: %v", cmt.IssueID, err)
 	}
@@ -270,7 +275,10 @@ func createComment(e *xorm.Session, opts *CreateCommentOptions) (_ *Comment, err
 		if err != nil {
 			return nil, err
 		}
+	}
 
+	if _, err = e.Exec("UPDATE `issue` SET updated_unix = ? WHERE id = ?", time.Now().Unix(), opts.Issue.ID); err != nil {
+		return nil, fmt.Errorf("update issue 'updated_unix': %v", err)
 	}
 
 	// Notify watchers for whatever action comes in, ignore if no action type.
@@ -330,7 +338,7 @@ func CreateComment(opts *CreateCommentOptions) (comment *Comment, err error) {
 
 // CreateIssueComment creates a plain issue comment.
 func CreateIssueComment(doer *User, repo *Repository, issue *Issue, content string, attachments []string) (*Comment, error) {
-	return CreateComment(&CreateCommentOptions{
+	comment, err := CreateComment(&CreateCommentOptions{
 		Type:        COMMENT_TYPE_COMMENT,
 		Doer:        doer,
 		Repo:        repo,
@@ -338,6 +346,22 @@ func CreateIssueComment(doer *User, repo *Repository, issue *Issue, content stri
 		Content:     content,
 		Attachments: attachments,
 	})
+	if err != nil {
+		return nil, fmt.Errorf("CreateComment: %v", err)
+	}
+
+	comment.Issue = issue
+	if err = PrepareWebhooks(repo, HOOK_EVENT_ISSUE_COMMENT, &api.IssueCommentPayload{
+		Action:     api.HOOK_ISSUE_COMMENT_CREATED,
+		Issue:      issue.APIFormat(),
+		Comment:    comment.APIFormat(),
+		Repository: repo.APIFormat(nil),
+		Sender:     doer.APIFormat(),
+	}); err != nil {
+		log.Error(2, "PrepareWebhooks [comment_id: %d]: %v", comment.ID, err)
+	}
+
+	return comment, nil
 }
 
 // CreateRefComment creates a commit reference comment to issue.
@@ -437,13 +461,33 @@ func GetCommentsByRepoIDSince(repoID, since int64) ([]*Comment, error) {
 }
 
 // UpdateComment updates information of comment.
-func UpdateComment(c *Comment) error {
-	_, err := x.Id(c.ID).AllCols().Update(c)
-	return err
+func UpdateComment(doer *User, c *Comment, oldContent string) (err error) {
+	if _, err = x.Id(c.ID).AllCols().Update(c); err != nil {
+		return err
+	}
+
+	if err = c.Issue.LoadAttributes(); err != nil {
+		log.Error(2, "Issue.LoadAttributes [issue_id: %d]: %v", c.IssueID, err)
+	} else if err = PrepareWebhooks(c.Issue.Repo, HOOK_EVENT_ISSUE_COMMENT, &api.IssueCommentPayload{
+		Action:  api.HOOK_ISSUE_COMMENT_EDITED,
+		Issue:   c.Issue.APIFormat(),
+		Comment: c.APIFormat(),
+		Changes: &api.ChangesPayload{
+			Body: &api.ChangesFromPayload{
+				From: oldContent,
+			},
+		},
+		Repository: c.Issue.Repo.APIFormat(nil),
+		Sender:     doer.APIFormat(),
+	}); err != nil {
+		log.Error(2, "PrepareWebhooks [comment_id: %d]: %v", c.ID, err)
+	}
+
+	return nil
 }
 
 // DeleteCommentByID deletes the comment by given ID.
-func DeleteCommentByID(id int64) error {
+func DeleteCommentByID(doer *User, id int64) error {
 	comment, err := GetCommentByID(id)
 	if err != nil {
 		if IsErrCommentNotExist(err) {
@@ -468,5 +512,20 @@ func DeleteCommentByID(id int64) error {
 		}
 	}
 
-	return sess.Commit()
+	if err = sess.Commit(); err != nil {
+		return fmt.Errorf("Commit: %v", err)
+	}
+
+	if err = comment.Issue.LoadAttributes(); err != nil {
+		log.Error(2, "Issue.LoadAttributes [issue_id: %d]: %v", comment.IssueID, err)
+	} else if err = PrepareWebhooks(comment.Issue.Repo, HOOK_EVENT_ISSUE_COMMENT, &api.IssueCommentPayload{
+		Action:     api.HOOK_ISSUE_COMMENT_DELETED,
+		Issue:      comment.Issue.APIFormat(),
+		Comment:    comment.APIFormat(),
+		Repository: comment.Issue.Repo.APIFormat(nil),
+		Sender:     doer.APIFormat(),
+	}); err != nil {
+		log.Error(2, "PrepareWebhooks [comment_id: %d]: %v", comment.ID, err)
+	}
+	return nil
 }

models/error.go

@@ -54,20 +54,6 @@ func (err ErrUserAlreadyExist) Error() string {
 	return fmt.Sprintf("user already exists [name: %s]", err.Name)
 }
 
-type ErrUserNotExist struct {
-	UID  int64
-	Name string
-}
-
-func IsErrUserNotExist(err error) bool {
-	_, ok := err.(ErrUserNotExist)
-	return ok
-}
-
-func (err ErrUserNotExist) Error() string {
-	return fmt.Sprintf("user does not exist [uid: %d, name: %s]", err.UID, err.Name)
-}
-
 type ErrEmailAlreadyUsed struct {
 	Email string
 }
@@ -107,19 +93,6 @@ func (err ErrUserHasOrgs) Error() string {
 	return fmt.Sprintf("user still has membership of organizations [uid: %d]", err.UID)
 }
 
-type ErrReachLimitOfRepo struct {
-	Limit int
-}
-
-func IsErrReachLimitOfRepo(err error) bool {
-	_, ok := err.(ErrReachLimitOfRepo)
-	return ok
-}
-
-func (err ErrReachLimitOfRepo) Error() string {
-	return fmt.Sprintf("user has reached maximum limit of repositories [limit: %d]", err.Limit)
-}
-
 //  __      __.__ __   .__
 // /  \    /  \__|  | _|__|
 // \   \/\/   /  |  |/ /  |
@@ -319,21 +292,6 @@ func (err ErrLastOrgOwner) Error() string {
 //  |____|_  /\___  >   __/ \____/____  >__||__|  \____/|__|   / ____|
 //         \/     \/|__|              \/                       \/
 
-type ErrRepoNotExist struct {
-	ID   int64
-	UID  int64
-	Name string
-}
-
-func IsErrRepoNotExist(err error) bool {
-	_, ok := err.(ErrRepoNotExist)
-	return ok
-}
-
-func (err ErrRepoNotExist) Error() string {
-	return fmt.Sprintf("repository does not exist [id: %d, uid: %d, name: %s]", err.ID, err.UID, err.Name)
-}
-
 type ErrRepoAlreadyExist struct {
 	Uname string
 	Name  string
@@ -450,48 +408,6 @@ func (err ErrBranchNotExist) Error() string {
 	return fmt.Sprintf("branch does not exist [name: %s]", err.Name)
 }
 
-//  __      __      ___.   .__                   __
-// /  \    /  \ ____\_ |__ |  |__   ____   ____ |  | __
-// \   \/\/   // __ \| __ \|  |  \ /  _ \ /  _ \|  |/ /
-//  \        /\  ___/| \_\ \   Y  (  <_> |  <_> )    <
-//   \__/\  /  \___  >___  /___|  /\____/ \____/|__|_ \
-//        \/       \/    \/     \/                   \/
-
-type ErrWebhookNotExist struct {
-	ID int64
-}
-
-func IsErrWebhookNotExist(err error) bool {
-	_, ok := err.(ErrWebhookNotExist)
-	return ok
-}
-
-func (err ErrWebhookNotExist) Error() string {
-	return fmt.Sprintf("webhook does not exist [id: %d]", err.ID)
-}
-
-// .___
-// |   | ______ ________ __   ____
-// |   |/  ___//  ___/  |  \_/ __ \
-// |   |\___ \ \___ \|  |  /\  ___/
-// |___/____  >____  >____/  \___  >
-//          \/     \/            \/
-
-type ErrIssueNotExist struct {
-	ID     int64
-	RepoID int64
-	Index  int64
-}
-
-func IsErrIssueNotExist(err error) bool {
-	_, ok := err.(ErrIssueNotExist)
-	return ok
-}
-
-func (err ErrIssueNotExist) Error() string {
-	return fmt.Sprintf("issue does not exist [id: %d, repo_id: %d, index: %d]", err.ID, err.RepoID, err.Index)
-}
-
 // __________      .__  .__ __________                                     __
 // \______   \__ __|  | |  |\______   \ ____  ________ __   ____   _______/  |_
 //  |     ___/  |  \  | |  | |       _// __ \/ ____/  |  \_/ __ \ /  ___/\   __\

models/errors/errors.go

@@ -0,0 +1,12 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package errors
+
+import "errors"
+
+// New is a wrapper of real errors.New function.
+func New(text string) error {
+	return errors.New(text)
+}

models/errors/issue.go

@@ -0,0 +1,35 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package errors
+
+import "fmt"
+
+type IssueNotExist struct {
+	ID     int64
+	RepoID int64
+	Index  int64
+}
+
+func IsIssueNotExist(err error) bool {
+	_, ok := err.(IssueNotExist)
+	return ok
+}
+
+func (err IssueNotExist) Error() string {
+	return fmt.Sprintf("issue does not exist [id: %d, repo_id: %d, index: %d]", err.ID, err.RepoID, err.Index)
+}
+
+type InvalidIssueReference struct {
+	Ref string
+}
+
+func IsInvalidIssueReference(err error) bool {
+	_, ok := err.(InvalidIssueReference)
+	return ok
+}
+
+func (err InvalidIssueReference) Error() string {
+	return fmt.Sprintf("invalid issue reference [ref: %s]", err.Ref)
+}

models/errors/login_source.go

@@ -0,0 +1,33 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package errors
+
+import "fmt"
+
+type LoginSourceNotActivated struct {
+	SourceID int64
+}
+
+func IsLoginSourceNotActivated(err error) bool {
+	_, ok := err.(LoginSourceNotActivated)
+	return ok
+}
+
+func (err LoginSourceNotActivated) Error() string {
+	return fmt.Sprintf("login source is not activated [source_id: %d]", err.SourceID)
+}
+
+type InvalidLoginSourceType struct {
+	Type interface{}
+}
+
+func IsInvalidLoginSourceType(err error) bool {
+	_, ok := err.(InvalidLoginSourceType)
+	return ok
+}
+
+func (err InvalidLoginSourceType) Error() string {
+	return fmt.Sprintf("invalid login source type [type: %v]", err.Type)
+}

models/errors/repo.go

@@ -0,0 +1,61 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package errors
+
+import "fmt"
+
+type RepoNotExist struct {
+	ID     int64
+	UserID int64
+	Name   string
+}
+
+func IsRepoNotExist(err error) bool {
+	_, ok := err.(RepoNotExist)
+	return ok
+}
+
+func (err RepoNotExist) Error() string {
+	return fmt.Sprintf("repository does not exist [id: %d, user_id: %d, name: %s]", err.ID, err.UserID, err.Name)
+}
+
+type ReachLimitOfRepo struct {
+	Limit int
+}
+
+func IsReachLimitOfRepo(err error) bool {
+	_, ok := err.(ReachLimitOfRepo)
+	return ok
+}
+
+func (err ReachLimitOfRepo) Error() string {
+	return fmt.Sprintf("user has reached maximum limit of repositories [limit: %d]", err.Limit)
+}
+
+type InvalidRepoReference struct {
+	Ref string
+}
+
+func IsInvalidRepoReference(err error) bool {
+	_, ok := err.(InvalidRepoReference)
+	return ok
+}
+
+func (err InvalidRepoReference) Error() string {
+	return fmt.Sprintf("invalid repository reference [ref: %s]", err.Ref)
+}
+
+type MirrorNotExist struct {
+	RepoID int64
+}
+
+func IsMirrorNotExist(err error) bool {
+	_, ok := err.(MirrorNotExist)
+	return ok
+}
+
+func (err MirrorNotExist) Error() string {
+	return fmt.Sprintf("mirror does not exist [repo_id: %d]", err.RepoID)
+}

models/errors/two_factor.go

@@ -0,0 +1,33 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package errors
+
+import "fmt"
+
+type TwoFactorNotFound struct {
+	UserID int64
+}
+
+func IsTwoFactorNotFound(err error) bool {
+	_, ok := err.(TwoFactorNotFound)
+	return ok
+}
+
+func (err TwoFactorNotFound) Error() string {
+	return fmt.Sprintf("two-factor authentication does not found [user_id: %d]", err.UserID)
+}
+
+type TwoFactorRecoveryCodeNotFound struct {
+	Code string
+}
+
+func IsTwoFactorRecoveryCodeNotFound(err error) bool {
+	_, ok := err.(TwoFactorRecoveryCodeNotFound)
+	return ok
+}
+
+func (err TwoFactorRecoveryCodeNotFound) Error() string {
+	return fmt.Sprintf("two-factor recovery code does not found [code: %s]", err.Code)
+}

models/errors/user.go

@@ -0,0 +1,45 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package errors
+
+import "fmt"
+
+type EmptyName struct{}
+
+func IsEmptyName(err error) bool {
+	_, ok := err.(EmptyName)
+	return ok
+}
+
+func (err EmptyName) Error() string {
+	return "empty name"
+}
+
+type UserNotExist struct {
+	UserID int64
+	Name   string
+}
+
+func IsUserNotExist(err error) bool {
+	_, ok := err.(UserNotExist)
+	return ok
+}
+
+func (err UserNotExist) Error() string {
+	return fmt.Sprintf("user does not exist [user_id: %d, name: %s]", err.UserID, err.Name)
+}
+
+type UserNotKeyOwner struct {
+	KeyID int64
+}
+
+func IsUserNotKeyOwner(err error) bool {
+	_, ok := err.(UserNotKeyOwner)
+	return ok
+}
+
+func (err UserNotKeyOwner) Error() string {
+	return fmt.Sprintf("user is not the owner of public key [key_id: %d]", err.KeyID)
+}

models/errors/user_mail.go

@@ -0,0 +1,33 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package errors
+
+import "fmt"
+
+type EmailNotFound struct {
+	Email string
+}
+
+func IsEmailNotFound(err error) bool {
+	_, ok := err.(EmailNotFound)
+	return ok
+}
+
+func (err EmailNotFound) Error() string {
+	return fmt.Sprintf("email is not found [email: %s]", err.Email)
+}
+
+type EmailNotVerified struct {
+	Email string
+}
+
+func IsEmailNotVerified(err error) bool {
+	_, ok := err.(EmailNotVerified)
+	return ok
+}
+
+func (err EmailNotVerified) Error() string {
+	return fmt.Sprintf("email has not been verified [email: %s]", err.Email)
+}

models/errors/webhook.go

@@ -0,0 +1,34 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package errors
+
+import "fmt"
+
+type WebhookNotExist struct {
+	ID int64
+}
+
+func IsWebhookNotExist(err error) bool {
+	_, ok := err.(WebhookNotExist)
+	return ok
+}
+
+func (err WebhookNotExist) Error() string {
+	return fmt.Sprintf("webhook does not exist [id: %d]", err.ID)
+}
+
+type HookTaskNotExist struct {
+	HookID int64
+	UUID   string
+}
+
+func IsHookTaskNotExist(err error) bool {
+	_, ok := err.(HookTaskNotExist)
+	return ok
+}
+
+func (err HookTaskNotExist) Error() string {
+	return fmt.Sprintf("hook task does not exist [hook_id: %d, uuid: %s]", err.HookID, err.UUID)
+}

models/git_diff.go

@@ -5,63 +5,25 @@
 package models
 
 import (
-	"bufio"
 	"bytes"
 	"fmt"
 	"html"
 	"html/template"
 	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"strings"
 
-	"github.com/Unknwon/com"
 	"github.com/sergi/go-diff/diffmatchpatch"
 	"golang.org/x/net/html/charset"
 	"golang.org/x/text/transform"
-	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/process"
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/template/highlight"
+	"github.com/gogits/gogs/pkg/tool"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/template/highlight"
 )
 
-type DiffLineType uint8
-
-const (
-	DIFF_LINE_PLAIN DiffLineType = iota + 1
-	DIFF_LINE_ADD
-	DIFF_LINE_DEL
-	DIFF_LINE_SECTION
-)
-
-type DiffFileType uint8
-
-const (
-	DIFF_FILE_ADD DiffFileType = iota + 1
-	DIFF_FILE_CHANGE
-	DIFF_FILE_DEL
-	DIFF_FILE_RENAME
-)
-
-type DiffLine struct {
-	LeftIdx  int
-	RightIdx int
-	Type     DiffLineType
-	Content  string
-}
-
-func (d *DiffLine) GetType() int {
-	return int(d.Type)
-}
-
 type DiffSection struct {
-	Name  string
-	Lines []*DiffLine
+	*git.DiffSection
 }
 
 var (
@@ -70,24 +32,24 @@ var (
 	codeTagSuffix     = []byte("</span>")
 )
 
-func diffToHTML(diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTML {
+func diffToHTML(diffs []diffmatchpatch.Diff, lineType git.DiffLineType) template.HTML {
 	buf := bytes.NewBuffer(nil)
 
 	// Reproduce signs which are cutted for inline diff before.
 	switch lineType {
-	case DIFF_LINE_ADD:
+	case git.DIFF_LINE_ADD:
 		buf.WriteByte('+')
-	case DIFF_LINE_DEL:
+	case git.DIFF_LINE_DEL:
 		buf.WriteByte('-')
 	}
 
 	for i := range diffs {
 		switch {
-		case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DIFF_LINE_ADD:
+		case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == git.DIFF_LINE_ADD:
 			buf.Write(addedCodePrefix)
 			buf.WriteString(html.EscapeString(diffs[i].Text))
 			buf.Write(codeTagSuffix)
-		case diffs[i].Type == diffmatchpatch.DiffDelete && lineType == DIFF_LINE_DEL:
+		case diffs[i].Type == diffmatchpatch.DiffDelete && lineType == git.DIFF_LINE_DEL:
 			buf.Write(removedCodePrefix)
 			buf.WriteString(html.EscapeString(diffs[i].Text))
 			buf.Write(codeTagSuffix)
@@ -99,77 +61,34 @@ func diffToHTML(diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTM
 	return template.HTML(buf.Bytes())
 }
 
-// get an specific line by type (add or del) and file line number
-func (diffSection *DiffSection) GetLine(lineType DiffLineType, idx int) *DiffLine {
-	var (
-		difference    = 0
-		addCount      = 0
-		delCount      = 0
-		matchDiffLine *DiffLine
-	)
-
-LOOP:
-	for _, diffLine := range diffSection.Lines {
-		switch diffLine.Type {
-		case DIFF_LINE_ADD:
-			addCount++
-		case DIFF_LINE_DEL:
-			delCount++
-		default:
-			if matchDiffLine != nil {
-				break LOOP
-			}
-			difference = diffLine.RightIdx - diffLine.LeftIdx
-			addCount = 0
-			delCount = 0
-		}
-
-		switch lineType {
-		case DIFF_LINE_DEL:
-			if diffLine.RightIdx == 0 && diffLine.LeftIdx == idx-difference {
-				matchDiffLine = diffLine
-			}
-		case DIFF_LINE_ADD:
-			if diffLine.LeftIdx == 0 && diffLine.RightIdx == idx+difference {
-				matchDiffLine = diffLine
-			}
-		}
-	}
-
-	if addCount == delCount {
-		return matchDiffLine
-	}
-	return nil
-}
-
 var diffMatchPatch = diffmatchpatch.New()
 
 func init() {
 	diffMatchPatch.DiffEditCost = 100
 }
 
-// computes inline diff for the given line
-func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) template.HTML {
+// ComputedInlineDiffFor computes inline diff for the given line.
+func (diffSection *DiffSection) ComputedInlineDiffFor(diffLine *git.DiffLine) template.HTML {
 	if setting.Git.DisableDiffHighlight {
 		return template.HTML(html.EscapeString(diffLine.Content[1:]))
 	}
 	var (
-		compareDiffLine *DiffLine
+		compareDiffLine *git.DiffLine
 		diff1           string
 		diff2           string
 	)
 
 	// try to find equivalent diff line. ignore, otherwise
 	switch diffLine.Type {
-	case DIFF_LINE_ADD:
-		compareDiffLine = diffSection.GetLine(DIFF_LINE_DEL, diffLine.RightIdx)
+	case git.DIFF_LINE_ADD:
+		compareDiffLine = diffSection.Line(git.DIFF_LINE_DEL, diffLine.RightIdx)
 		if compareDiffLine == nil {
 			return template.HTML(html.EscapeString(diffLine.Content))
 		}
 		diff1 = compareDiffLine.Content
 		diff2 = diffLine.Content
-	case DIFF_LINE_DEL:
-		compareDiffLine = diffSection.GetLine(DIFF_LINE_ADD, diffLine.LeftIdx)
+	case git.DIFF_LINE_DEL:
+		compareDiffLine = diffSection.Line(git.DIFF_LINE_ADD, diffLine.LeftIdx)
 		if compareDiffLine == nil {
 			return template.HTML(html.EscapeString(diffLine.Content))
 		}
@@ -186,336 +105,90 @@ func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) tem
 }
 
 type DiffFile struct {
-	Name               string
-	OldName            string
-	Index              string // 40-byte SHA, Changed/New: new SHA; Deleted: old SHA
-	Addition, Deletion int
-	Type               DiffFileType
-	IsCreated          bool
-	IsDeleted          bool
-	IsBin              bool
-	IsRenamed          bool
-	IsSubmodule        bool
-	Sections           []*DiffSection
-	IsIncomplete       bool
+	*git.DiffFile
+	Sections []*DiffSection
 }
 
-func (diffFile *DiffFile) GetType() int {
-	return int(diffFile.Type)
-}
-
-func (diffFile *DiffFile) GetHighlightClass() string {
+func (diffFile *DiffFile) HighlightClass() string {
 	return highlight.FileNameToHighlightClass(diffFile.Name)
 }
 
 type Diff struct {
-	TotalAddition, TotalDeletion int
-	Files                        []*DiffFile
-	IsIncomplete                 bool
+	*git.Diff
+	Files []*DiffFile
 }
 
-func (diff *Diff) NumFiles() int {
-	return len(diff.Files)
-}
-
-const DIFF_HEAD = "diff --git "
-
-// TODO: move this function to gogits/git-module
-func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*Diff, error) {
-	var (
-		diff = &Diff{Files: make([]*DiffFile, 0)}
-
-		curFile    *DiffFile
-		curSection = &DiffSection{
-			Lines: make([]*DiffLine, 0, 10),
-		}
-
-		leftLine, rightLine int
-		lineCount           int
-		curFileLinesCount   int
-	)
-
-	input := bufio.NewReader(reader)
-	isEOF := false
-	for !isEOF {
-		line, err := input.ReadString('\n')
-		if err != nil {
-			if err == io.EOF {
-				isEOF = true
-			} else {
-				return nil, fmt.Errorf("ReadString: %v", err)
-			}
-		}
-
-		if len(line) > 0 && line[len(line)-1] == '\n' {
-			// Remove line break.
-			line = line[:len(line)-1]
-		}
-
-		if strings.HasPrefix(line, "+++ ") || strings.HasPrefix(line, "--- ") || len(line) == 0 {
-			continue
-		}
-
-		curFileLinesCount++
-		lineCount++
-
-		// Diff data too large, we only show the first about maxlines lines
-		if curFileLinesCount >= maxLines || len(line) >= maxLineCharacteres {
-			curFile.IsIncomplete = true
-		}
-
-		switch {
-		case line[0] == ' ':
-			diffLine := &DiffLine{Type: DIFF_LINE_PLAIN, Content: line, LeftIdx: leftLine, RightIdx: rightLine}
-			leftLine++
-			rightLine++
-			curSection.Lines = append(curSection.Lines, diffLine)
-			continue
-		case line[0] == '@':
-			curSection = &DiffSection{}
-			curFile.Sections = append(curFile.Sections, curSection)
-			ss := strings.Split(line, "@@")
-			diffLine := &DiffLine{Type: DIFF_LINE_SECTION, Content: line}
-			curSection.Lines = append(curSection.Lines, diffLine)
-
-			// Parse line number.
-			ranges := strings.Split(ss[1][1:], " ")
-			leftLine, _ = com.StrTo(strings.Split(ranges[0], ",")[0][1:]).Int()
-			if len(ranges) > 1 {
-				rightLine, _ = com.StrTo(strings.Split(ranges[1], ",")[0]).Int()
-			} else {
-				log.Warn("Parse line number failed: %v", line)
-				rightLine = leftLine
-			}
-			continue
-		case line[0] == '+':
-			curFile.Addition++
-			diff.TotalAddition++
-			diffLine := &DiffLine{Type: DIFF_LINE_ADD, Content: line, RightIdx: rightLine}
-			rightLine++
-			curSection.Lines = append(curSection.Lines, diffLine)
-			continue
-		case line[0] == '-':
-			curFile.Deletion++
-			diff.TotalDeletion++
-			diffLine := &DiffLine{Type: DIFF_LINE_DEL, Content: line, LeftIdx: leftLine}
-			if leftLine > 0 {
-				leftLine++
-			}
-			curSection.Lines = append(curSection.Lines, diffLine)
-		case strings.HasPrefix(line, "Binary"):
-			curFile.IsBin = true
-			continue
-		}
-
-		// Get new file.
-		if strings.HasPrefix(line, DIFF_HEAD) {
-			middle := -1
-
-			// Note: In case file name is surrounded by double quotes (it happens only in git-shell).
-			// e.g. diff --git "a/xxx" "b/xxx"
-			hasQuote := line[len(DIFF_HEAD)] == '"'
-			if hasQuote {
-				middle = strings.Index(line, ` "b/`)
-			} else {
-				middle = strings.Index(line, " b/")
-			}
-
-			beg := len(DIFF_HEAD)
-			a := line[beg+2 : middle]
-			b := line[middle+3:]
-			if hasQuote {
-				a = string(git.UnescapeChars([]byte(a[1 : len(a)-1])))
-				b = string(git.UnescapeChars([]byte(b[1 : len(b)-1])))
-			}
-
-			curFile = &DiffFile{
-				Name:     a,
-				Type:     DIFF_FILE_CHANGE,
-				Sections: make([]*DiffSection, 0, 10),
-			}
-			diff.Files = append(diff.Files, curFile)
-			if len(diff.Files) >= maxFiles {
-				diff.IsIncomplete = true
-				io.Copy(ioutil.Discard, reader)
-				break
-			}
-			curFileLinesCount = 0
-
-			// Check file diff type and submodule.
-		CHECK_TYPE:
-			for {
-				line, err := input.ReadString('\n')
-				if err != nil {
-					if err == io.EOF {
-						isEOF = true
-					} else {
-						return nil, fmt.Errorf("ReadString: %v", err)
-					}
-				}
-
-				switch {
-				case strings.HasPrefix(line, "new file"):
-					curFile.Type = DIFF_FILE_ADD
-					curFile.IsCreated = true
-					curFile.IsSubmodule = strings.HasSuffix(line, " 160000\n")
-				case strings.HasPrefix(line, "deleted"):
-					curFile.Type = DIFF_FILE_DEL
-					curFile.IsDeleted = true
-					curFile.IsSubmodule = strings.HasSuffix(line, " 160000\n")
-				case strings.HasPrefix(line, "index"):
-					if curFile.IsDeleted {
-						curFile.Index = line[6:46]
-					} else if len(line) >= 88 {
-						curFile.Index = line[49:88]
-					} else {
-						curFile.Index = curFile.Name
-					}
-					break CHECK_TYPE
-				case strings.HasPrefix(line, "similarity index 100%"):
-					curFile.Type = DIFF_FILE_RENAME
-					curFile.IsRenamed = true
-					curFile.OldName = curFile.Name
-					curFile.Name = b
-					curFile.Index = b
-					break CHECK_TYPE
-				}
-			}
-		}
+func NewDiff(gitDiff *git.Diff) *Diff {
+	diff := &Diff{
+		Diff:  gitDiff,
+		Files: make([]*DiffFile, gitDiff.NumFiles()),
 	}
 
 	// FIXME: detect encoding while parsing.
 	var buf bytes.Buffer
-	for _, f := range diff.Files {
+	for i := range gitDiff.Files {
 		buf.Reset()
-		for _, sec := range f.Sections {
-			for _, l := range sec.Lines {
-				buf.WriteString(l.Content)
+
+		diff.Files[i] = &DiffFile{
+			DiffFile: gitDiff.Files[i],
+			Sections: make([]*DiffSection, gitDiff.Files[i].NumSections()),
+		}
+
+		for j := range gitDiff.Files[i].Sections {
+			diff.Files[i].Sections[j] = &DiffSection{
+				DiffSection: gitDiff.Files[i].Sections[j],
+			}
+
+			for k := range diff.Files[i].Sections[j].Lines {
+				buf.WriteString(diff.Files[i].Sections[j].Lines[k].Content)
 				buf.WriteString("\n")
 			}
 		}
-		charsetLabel, err := base.DetectEncoding(buf.Bytes())
+
+		charsetLabel, err := tool.DetectEncoding(buf.Bytes())
 		if charsetLabel != "UTF-8" && err == nil {
 			encoding, _ := charset.Lookup(charsetLabel)
 			if encoding != nil {
 				d := encoding.NewDecoder()
-				for _, sec := range f.Sections {
-					for _, l := range sec.Lines {
-						if c, _, err := transform.String(d, l.Content); err == nil {
-							l.Content = c
+				for j := range diff.Files[i].Sections {
+					for k := range diff.Files[i].Sections[j].Lines {
+						if c, _, err := transform.String(d, diff.Files[i].Sections[j].Lines[k].Content); err == nil {
+							diff.Files[i].Sections[j].Lines[k].Content = c
 						}
 					}
 				}
 			}
 		}
 	}
-	return diff, nil
+
+	return diff
+}
+
+func ParsePatch(maxLines, maxLineCharacteres, maxFiles int, reader io.Reader) (*Diff, error) {
+	done := make(chan error)
+	var gitDiff *git.Diff
+	go func() {
+		gitDiff = git.ParsePatch(done, maxLines, maxLineCharacteres, maxFiles, reader)
+	}()
+
+	if err := <-done; err != nil {
+		return nil, fmt.Errorf("ParsePatch: %v", err)
+	}
+	return NewDiff(gitDiff), nil
 }
 
 func GetDiffRange(repoPath, beforeCommitID, afterCommitID string, maxLines, maxLineCharacteres, maxFiles int) (*Diff, error) {
-	gitRepo, err := git.OpenRepository(repoPath)
+	gitDiff, err := git.GetDiffRange(repoPath, beforeCommitID, afterCommitID, maxLines, maxLineCharacteres, maxFiles)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("GetDiffRange: %v", err)
 	}
-
-	commit, err := gitRepo.GetCommit(afterCommitID)
-	if err != nil {
-		return nil, err
-	}
-
-	var cmd *exec.Cmd
-	// if "after" commit given
-	if len(beforeCommitID) == 0 {
-		// First commit of repository.
-		if commit.ParentCount() == 0 {
-			cmd = exec.Command("git", "show", "--full-index", afterCommitID)
-		} else {
-			c, _ := commit.Parent(0)
-			cmd = exec.Command("git", "diff", "--full-index", "-M", c.ID.String(), afterCommitID)
-		}
-	} else {
-		cmd = exec.Command("git", "diff", "--full-index", "-M", beforeCommitID, afterCommitID)
-	}
-	cmd.Dir = repoPath
-	cmd.Stderr = os.Stderr
-
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil, fmt.Errorf("StdoutPipe: %v", err)
-	}
-
-	if err = cmd.Start(); err != nil {
-		return nil, fmt.Errorf("Start: %v", err)
-	}
-
-	pid := process.Add(fmt.Sprintf("GetDiffRange [repo_path: %s]", repoPath), cmd)
-	defer process.Remove(pid)
-
-	diff, err := ParsePatch(maxLines, maxLineCharacteres, maxFiles, stdout)
-	if err != nil {
-		return nil, fmt.Errorf("ParsePatch: %v", err)
-	}
-
-	if err = cmd.Wait(); err != nil {
-		return nil, fmt.Errorf("Wait: %v", err)
-	}
-
-	return diff, nil
-}
-
-type RawDiffType string
-
-const (
-	RAW_DIFF_NORMAL RawDiffType = "diff"
-	RAW_DIFF_PATCH  RawDiffType = "patch"
-)
-
-// GetRawDiff dumps diff results of repository in given commit ID to io.Writer.
-// TODO: move this function to gogits/git-module
-func GetRawDiff(repoPath, commitID string, diffType RawDiffType, writer io.Writer) error {
-	repo, err := git.OpenRepository(repoPath)
-	if err != nil {
-		return fmt.Errorf("OpenRepository: %v", err)
-	}
-
-	commit, err := repo.GetCommit(commitID)
-	if err != nil {
-		return fmt.Errorf("GetCommit: %v", err)
-	}
-
-	var cmd *exec.Cmd
-	switch diffType {
-	case RAW_DIFF_NORMAL:
-		if commit.ParentCount() == 0 {
-			cmd = exec.Command("git", "show", commitID)
-		} else {
-			c, _ := commit.Parent(0)
-			cmd = exec.Command("git", "diff", "-M", c.ID.String(), commitID)
-		}
-	case RAW_DIFF_PATCH:
-		if commit.ParentCount() == 0 {
-			cmd = exec.Command("git", "format-patch", "--no-signature", "--stdout", "--root", commitID)
-		} else {
-			c, _ := commit.Parent(0)
-			query := fmt.Sprintf("%s...%s", commitID, c.ID.String())
-			cmd = exec.Command("git", "format-patch", "--no-signature", "--stdout", query)
-		}
-	default:
-		return fmt.Errorf("invalid diffType: %s", diffType)
-	}
-
-	stderr := new(bytes.Buffer)
-
-	cmd.Dir = repoPath
-	cmd.Stdout = writer
-	cmd.Stderr = stderr
-
-	if err = cmd.Run(); err != nil {
-		return fmt.Errorf("Run: %v - %s", err, stderr)
-	}
-	return nil
+	return NewDiff(gitDiff), nil
 }
 
 func GetDiffCommit(repoPath, commitID string, maxLines, maxLineCharacteres, maxFiles int) (*Diff, error) {
-	return GetDiffRange(repoPath, "", commitID, maxLines, maxLineCharacteres, maxFiles)
+	gitDiff, err := git.GetDiffCommit(repoPath, commitID, maxLines, maxLineCharacteres, maxFiles)
+	if err != nil {
+		return nil, fmt.Errorf("GetDiffCommit: %v", err)
+	}
+	return NewDiff(gitDiff), nil
 }

models/git_diff_test.go

@@ -1,9 +1,15 @@
+// Copyright 2016 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
 package models
 
 import (
-	dmp "github.com/sergi/go-diff/diffmatchpatch"
 	"html/template"
 	"testing"
+
+	"github.com/gogits/git-module"
+	dmp "github.com/sergi/go-diff/diffmatchpatch"
 )
 
 func assertEqual(t *testing.T, s1 string, s2 template.HTML) {
@@ -12,24 +18,24 @@ func assertEqual(t *testing.T, s1 string, s2 template.HTML) {
 	}
 }
 
-func assertLineEqual(t *testing.T, d1 *DiffLine, d2 *DiffLine) {
+func assertLineEqual(t *testing.T, d1 *git.DiffLine, d2 *git.DiffLine) {
 	if d1 != d2 {
 		t.Errorf("%v should be equal %v", d1, d2)
 	}
 }
 
-func TestDiffToHTML(t *testing.T) {
+func Test_diffToHTML(t *testing.T) {
 	assertEqual(t, "+foo <span class=\"added-code\">bar</span> biz", diffToHTML([]dmp.Diff{
 		dmp.Diff{dmp.DiffEqual, "foo "},
 		dmp.Diff{dmp.DiffInsert, "bar"},
 		dmp.Diff{dmp.DiffDelete, " baz"},
 		dmp.Diff{dmp.DiffEqual, " biz"},
-	}, DIFF_LINE_ADD))
+	}, git.DIFF_LINE_ADD))
 
 	assertEqual(t, "-foo <span class=\"removed-code\">bar</span> biz", diffToHTML([]dmp.Diff{
 		dmp.Diff{dmp.DiffEqual, "foo "},
 		dmp.Diff{dmp.DiffDelete, "bar"},
 		dmp.Diff{dmp.DiffInsert, " baz"},
 		dmp.Diff{dmp.DiffEqual, " biz"},
-	}, DIFF_LINE_DEL))
+	}, git.DIFF_LINE_DEL))
 }

models/issue.go

@@ -5,18 +5,19 @@
 package models
 
 import (
-	"errors"
 	"fmt"
 	"strings"
 	"time"
 
 	"github.com/Unknwon/com"
 	"github.com/go-xorm/xorm"
-	api "github.com/gogits/go-gogs-client"
 	log "gopkg.in/clog.v1"
 
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/setting"
+	api "github.com/gogits/go-gogs-client"
+
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/tool"
 )
 
 var (
@@ -25,7 +26,7 @@ var (
 
 // Issue represents an issue or pull request of repository.
 type Issue struct {
-	ID              int64       `xorm:"pk autoincr"`
+	ID              int64
 	RepoID          int64       `xorm:"INDEX UNIQUE(repo_index)"`
 	Repo            *Repository `xorm:"-"`
 	Index           int64       `xorm:"UNIQUE(repo_index)"` // Index in one repository.
@@ -89,7 +90,7 @@ func (issue *Issue) loadAttributes(e Engine) (err error) {
 	if issue.Poster == nil {
 		issue.Poster, err = getUserByID(e, issue.PosterID)
 		if err != nil {
-			if IsErrUserNotExist(err) {
+			if errors.IsUserNotExist(err) {
 				issue.PosterID = -1
 				issue.Poster = NewGhostUser()
 			} else {
@@ -230,7 +231,7 @@ func (issue *Issue) sendLabelUpdatedWebhook(doer *User) {
 	if issue.IsPull {
 		err = issue.PullRequest.LoadIssue()
 		if err != nil {
-			log.Error(4, "LoadIssue: %v", err)
+			log.Error(2, "LoadIssue: %v", err)
 			return
 		}
 		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
@@ -240,11 +241,17 @@ func (issue *Issue) sendLabelUpdatedWebhook(doer *User) {
 			Repository:  issue.Repo.APIFormat(nil),
 			Sender:      doer.APIFormat(),
 		})
+	} else {
+		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_ISSUES, &api.IssuesPayload{
+			Action:     api.HOOK_ISSUE_LABEL_UPDATED,
+			Index:      issue.Index,
+			Issue:      issue.APIFormat(),
+			Repository: issue.Repo.APIFormat(nil),
+			Sender:     doer.APIFormat(),
+		})
 	}
 	if err != nil {
-		log.Error(4, "PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
-	} else {
-		go HookQueue.Add(issue.RepoID)
+		log.Error(2, "PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
 	}
 }
 
@@ -334,7 +341,7 @@ func (issue *Issue) ClearLabels(doer *User) (err error) {
 	if issue.IsPull {
 		err = issue.PullRequest.LoadIssue()
 		if err != nil {
-			log.Error(4, "LoadIssue: %v", err)
+			log.Error(2, "LoadIssue: %v", err)
 			return
 		}
 		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
@@ -344,11 +351,17 @@ func (issue *Issue) ClearLabels(doer *User) (err error) {
 			Repository:  issue.Repo.APIFormat(nil),
 			Sender:      doer.APIFormat(),
 		})
+	} else {
+		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_ISSUES, &api.IssuesPayload{
+			Action:     api.HOOK_ISSUE_LABEL_CLEARED,
+			Index:      issue.Index,
+			Issue:      issue.APIFormat(),
+			Repository: issue.Repo.APIFormat(nil),
+			Sender:     doer.APIFormat(),
+		})
 	}
 	if err != nil {
-		log.Error(4, "PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
-	} else {
-		go HookQueue.Add(issue.RepoID)
+		log.Error(2, "PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
 	}
 
 	return nil
@@ -377,7 +390,7 @@ func (i *Issue) GetAssignee() (err error) {
 	}
 
 	i.Assignee, err = GetUserByID(i.AssigneeID)
-	if IsErrUserNotExist(err) {
+	if errors.IsUserNotExist(err) {
 		return nil
 	}
 	return err
@@ -470,11 +483,22 @@ func (issue *Issue) ChangeStatus(doer *User, repo *Repository, isClosed bool) (e
 			apiPullRequest.Action = api.HOOK_ISSUE_REOPENED
 		}
 		err = PrepareWebhooks(repo, HOOK_EVENT_PULL_REQUEST, apiPullRequest)
+	} else {
+		apiIssues := &api.IssuesPayload{
+			Index:      issue.Index,
+			Issue:      issue.APIFormat(),
+			Repository: repo.APIFormat(nil),
+			Sender:     doer.APIFormat(),
+		}
+		if isClosed {
+			apiIssues.Action = api.HOOK_ISSUE_CLOSED
+		} else {
+			apiIssues.Action = api.HOOK_ISSUE_REOPENED
+		}
+		err = PrepareWebhooks(repo, HOOK_EVENT_ISSUES, apiIssues)
 	}
 	if err != nil {
-		log.Error(4, "PrepareWebhooks [is_pull: %v, is_closed: %v]: %v", issue.IsPull, isClosed, err)
-	} else {
-		go HookQueue.Add(repo.ID)
+		log.Error(2, "PrepareWebhooks [is_pull: %v, is_closed: %v]: %v", issue.IsPull, isClosed, err)
 	}
 
 	return nil
@@ -490,22 +514,33 @@ func (issue *Issue) ChangeTitle(doer *User, title string) (err error) {
 	if issue.IsPull {
 		issue.PullRequest.Issue = issue
 		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
-			Action: api.HOOK_ISSUE_EDITED,
-			Index:  issue.Index,
+			Action:      api.HOOK_ISSUE_EDITED,
+			Index:       issue.Index,
+			PullRequest: issue.PullRequest.APIFormat(),
 			Changes: &api.ChangesPayload{
 				Title: &api.ChangesFromPayload{
 					From: oldTitle,
 				},
 			},
-			PullRequest: issue.PullRequest.APIFormat(),
-			Repository:  issue.Repo.APIFormat(nil),
-			Sender:      doer.APIFormat(),
+			Repository: issue.Repo.APIFormat(nil),
+			Sender:     doer.APIFormat(),
+		})
+	} else {
+		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_ISSUES, &api.IssuesPayload{
+			Action: api.HOOK_ISSUE_EDITED,
+			Index:  issue.Index,
+			Issue:  issue.APIFormat(),
+			Changes: &api.ChangesPayload{
+				Title: &api.ChangesFromPayload{
+					From: oldTitle,
+				},
+			},
+			Repository: issue.Repo.APIFormat(nil),
+			Sender:     doer.APIFormat(),
 		})
 	}
 	if err != nil {
-		log.Error(4, "PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
-	} else {
-		go HookQueue.Add(issue.RepoID)
+		log.Error(2, "PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
 	}
 
 	return nil
@@ -521,22 +556,33 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) {
 	if issue.IsPull {
 		issue.PullRequest.Issue = issue
 		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
-			Action: api.HOOK_ISSUE_EDITED,
-			Index:  issue.Index,
+			Action:      api.HOOK_ISSUE_EDITED,
+			Index:       issue.Index,
+			PullRequest: issue.PullRequest.APIFormat(),
 			Changes: &api.ChangesPayload{
 				Body: &api.ChangesFromPayload{
 					From: oldContent,
 				},
 			},
-			PullRequest: issue.PullRequest.APIFormat(),
-			Repository:  issue.Repo.APIFormat(nil),
-			Sender:      doer.APIFormat(),
+			Repository: issue.Repo.APIFormat(nil),
+			Sender:     doer.APIFormat(),
+		})
+	} else {
+		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_ISSUES, &api.IssuesPayload{
+			Action: api.HOOK_ISSUE_EDITED,
+			Index:  issue.Index,
+			Issue:  issue.APIFormat(),
+			Changes: &api.ChangesPayload{
+				Body: &api.ChangesFromPayload{
+					From: oldContent,
+				},
+			},
+			Repository: issue.Repo.APIFormat(nil),
+			Sender:     doer.APIFormat(),
 		})
 	}
 	if err != nil {
-		log.Error(4, "PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
-	} else {
-		go HookQueue.Add(issue.RepoID)
+		log.Error(2, "PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
 	}
 
 	return nil
@@ -549,7 +595,7 @@ func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) {
 	}
 
 	issue.Assignee, err = GetUserByID(issue.AssigneeID)
-	if err != nil && !IsErrUserNotExist(err) {
+	if err != nil && !errors.IsUserNotExist(err) {
 		log.Error(4, "GetUserByID [assignee_id: %v]: %v", issue.AssigneeID, err)
 		return nil
 	}
@@ -570,11 +616,22 @@ func (issue *Issue) ChangeAssignee(doer *User, assigneeID int64) (err error) {
 			apiPullRequest.Action = api.HOOK_ISSUE_ASSIGNED
 		}
 		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, apiPullRequest)
+	} else {
+		apiIssues := &api.IssuesPayload{
+			Index:      issue.Index,
+			Issue:      issue.APIFormat(),
+			Repository: issue.Repo.APIFormat(nil),
+			Sender:     doer.APIFormat(),
+		}
+		if isRemoveAssignee {
+			apiIssues.Action = api.HOOK_ISSUE_UNASSIGNED
+		} else {
+			apiIssues.Action = api.HOOK_ISSUE_ASSIGNED
+		}
+		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_ISSUES, apiIssues)
 	}
 	if err != nil {
 		log.Error(4, "PrepareWebhooks [is_pull: %v, remove_assignee: %v]: %v", issue.IsPull, isRemoveAssignee, err)
-	} else {
-		go HookQueue.Add(issue.RepoID)
 	}
 
 	return nil
@@ -611,7 +668,7 @@ func newIssue(e *xorm.Session, opts NewIssueOptions) (err error) {
 
 	if opts.Issue.AssigneeID > 0 {
 		assignee, err := getUserByID(e, opts.Issue.AssigneeID)
-		if err != nil && !IsErrUserNotExist(err) {
+		if err != nil && !errors.IsUserNotExist(err) {
 			return fmt.Errorf("getUserByID: %v", err)
 		}
 
@@ -684,7 +741,7 @@ func newIssue(e *xorm.Session, opts NewIssueOptions) (err error) {
 	return opts.Issue.loadAttributes(e)
 }
 
-// NewIssue creates new issue with labels for repository.
+// NewIssue creates new issue with labels and attachments for repository.
 func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, uuids []string) (err error) {
 	sess := x.NewSession()
 	defer sessionRelease(sess)
@@ -715,10 +772,20 @@ func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, uuids []string)
 		RepoName:     repo.Name,
 		IsPrivate:    repo.IsPrivate,
 	}); err != nil {
-		log.Error(4, "NotifyWatchers: %v", err)
+		log.Error(2, "NotifyWatchers: %v", err)
 	}
 	if err = issue.MailParticipants(); err != nil {
-		log.Error(4, "MailParticipants: %v", err)
+		log.Error(2, "MailParticipants: %v", err)
+	}
+
+	if err = PrepareWebhooks(repo, HOOK_EVENT_ISSUES, &api.IssuesPayload{
+		Action:     api.HOOK_ISSUE_OPENED,
+		Index:      issue.Index,
+		Issue:      issue.APIFormat(),
+		Repository: repo.APIFormat(nil),
+		Sender:     issue.Poster.APIFormat(),
+	}); err != nil {
+		log.Error(2, "PrepareWebhooks: %v", err)
 	}
 
 	return nil
@@ -729,7 +796,7 @@ func NewIssue(repo *Repository, issue *Issue, labelIDs []int64, uuids []string)
 func GetIssueByRef(ref string) (*Issue, error) {
 	n := strings.IndexByte(ref, byte('#'))
 	if n == -1 {
-		return nil, ErrMissingIssueNumber
+		return nil, errors.InvalidIssueReference{ref}
 	}
 
 	index, err := com.StrTo(ref[n+1:]).Int64()
@@ -760,7 +827,7 @@ func GetRawIssueByIndex(repoID, index int64) (*Issue, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrIssueNotExist{0, repoID, index}
+		return nil, errors.IssueNotExist{0, repoID, index}
 	}
 	return issue, nil
 }
@@ -780,7 +847,7 @@ func getRawIssueByID(e Engine, id int64) (*Issue, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrIssueNotExist{id, 0, 0}
+		return nil, errors.IssueNotExist{id, 0, 0}
 	}
 	return issue, nil
 }
@@ -828,7 +895,7 @@ func buildIssuesQuery(opts *IssuesOptions) *xorm.Session {
 		if len(opts.RepoIDs) == 0 {
 			return nil
 		}
-		sess.In("issue.repo_id", base.Int64sToStrings(opts.RepoIDs)).And("issue.is_closed=?", opts.IsClosed)
+		sess.In("issue.repo_id", opts.RepoIDs).And("issue.is_closed=?", opts.IsClosed)
 	} else {
 		sess.Where("issue.is_closed=?", opts.IsClosed)
 	}
@@ -863,7 +930,7 @@ func buildIssuesQuery(opts *IssuesOptions) *xorm.Session {
 	}
 
 	if len(opts.Labels) > 0 && opts.Labels != "0" {
-		labelIDs := base.StringsToInt64s(strings.Split(opts.Labels, ","))
+		labelIDs := strings.Split(opts.Labels, ",")
 		if len(labelIDs) > 0 {
 			sess.Join("INNER", "issue_label", "issue.id = issue_label.issue_id").In("issue_label.label_id", labelIDs)
 		}
@@ -914,6 +981,23 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
 	return issues, nil
 }
 
+// GetParticipantsByIssueID returns all users who are participated in comments of an issue.
+func GetParticipantsByIssueID(issueID int64) ([]*User, error) {
+	userIDs := make([]int64, 0, 5)
+	if err := x.Table("comment").Cols("poster_id").
+		Where("issue_id = ?", issueID).
+		Distinct("poster_id").
+		Find(&userIDs); err != nil {
+		return nil, fmt.Errorf("get poster IDs: %v", err)
+	}
+	if len(userIDs) == 0 {
+		return nil, nil
+	}
+
+	users := make([]*User, 0, len(userIDs))
+	return users, x.In("id", userIDs).Find(&users)
+}
+
 // .___                             ____ ___
 // |   | ______ ________ __   ____ |    |   \______ ___________
 // |   |/  ___//  ___/  |  \_/ __ \|    |   /  ___// __ \_  __ \
@@ -923,7 +1007,7 @@ func Issues(opts *IssuesOptions) ([]*Issue, error) {
 
 // IssueUser represents an issue-user relation.
 type IssueUser struct {
-	ID          int64 `xorm:"pk autoincr"`
+	ID          int64
 	UID         int64 `xorm:"INDEX"` // User ID.
 	IssueID     int64
 	RepoID      int64 `xorm:"INDEX"`
@@ -1129,7 +1213,7 @@ func GetIssueStats(opts *IssueStatsOptions) *IssueStats {
 		sess := x.Where("issue.repo_id = ?", opts.RepoID).And("is_pull = ?", opts.IsPull)
 
 		if len(opts.Labels) > 0 && opts.Labels != "0" {
-			labelIDs := base.StringsToInt64s(strings.Split(opts.Labels, ","))
+			labelIDs := tool.StringsToInt64s(strings.Split(opts.Labels, ","))
 			if len(labelIDs) > 0 {
 				sess.Join("INNER", "issue_label", "issue.id = issue_id").In("label_id", labelIDs)
 			}

models/issue_label.go

@@ -15,7 +15,7 @@ import (
 
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/pkg/tool"
 )
 
 var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")
@@ -54,7 +54,7 @@ func GetLabelTemplateFile(name string) ([][2]string, error) {
 
 // Label represents a label of repository for issues.
 type Label struct {
-	ID              int64 `xorm:"pk autoincr"`
+	ID              int64
 	RepoID          int64 `xorm:"INDEX"`
 	Name            string
 	Color           string `xorm:"VARCHAR(7)"`
@@ -68,7 +68,7 @@ func (label *Label) APIFormat() *api.Label {
 	return &api.Label{
 		ID:    label.ID,
 		Name:  label.Name,
-		Color: label.Color,
+		Color: strings.TrimLeft(label.Color, "#"),
 	}
 }
 
@@ -103,7 +103,28 @@ func NewLabels(labels ...*Label) error {
 	return err
 }
 
-// getLabelOfRepoByID returns a label by ID in given repository.
+// getLabelOfRepoByName returns a label by Name in given repository.
+// If pass repoID as 0, then ORM will ignore limitation of repository
+// and can return arbitrary label with any valid ID.
+func getLabelOfRepoByName(e Engine, repoID int64, labelName string) (*Label, error) {
+	if len(labelName) <= 0 {
+		return nil, ErrLabelNotExist{0, repoID}
+	}
+
+	l := &Label{
+		Name:   labelName,
+		RepoID: repoID,
+	}
+	has, err := x.Get(l)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, ErrLabelNotExist{0, l.RepoID}
+	}
+	return l, nil
+}
+
+// getLabelInRepoByID returns a label by ID in given repository.
 // If pass repoID as 0, then ORM will ignore limitation of repository
 // and can return arbitrary label with any valid ID.
 func getLabelOfRepoByID(e Engine, repoID, labelID int64) (*Label, error) {
@@ -134,11 +155,16 @@ func GetLabelOfRepoByID(repoID, labelID int64) (*Label, error) {
 	return getLabelOfRepoByID(x, repoID, labelID)
 }
 
+// GetLabelOfRepoByName returns a label by name in given repository.
+func GetLabelOfRepoByName(repoID int64, labelName string) (*Label, error) {
+	return getLabelOfRepoByName(x, repoID, labelName)
+}
+
 // GetLabelsInRepoByIDs returns a list of labels by IDs in given repository,
 // it silently ignores label IDs that are not belong to the repository.
 func GetLabelsInRepoByIDs(repoID int64, labelIDs []int64) ([]*Label, error) {
 	labels := make([]*Label, 0, len(labelIDs))
-	return labels, x.Where("repo_id = ?", repoID).In("id", base.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
+	return labels, x.Where("repo_id = ?", repoID).In("id", tool.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
 }
 
 // GetLabelsByRepoID returns all labels that belong to given repository by ID.
@@ -161,7 +187,7 @@ func getLabelsByIssueID(e Engine, issueID int64) ([]*Label, error) {
 	}
 
 	labels := make([]*Label, 0, len(labelIDs))
-	return labels, e.Where("id > 0").In("id", base.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
+	return labels, e.Where("id > 0").In("id", tool.Int64sToStrings(labelIDs)).Asc("name").Find(&labels)
 }
 
 // GetLabelsByIssueID returns all labels that belong to given issue by ID.
@@ -213,7 +239,7 @@ func DeleteLabel(repoID, labelID int64) error {
 
 // IssueLabel represetns an issue-lable relation.
 type IssueLabel struct {
-	ID      int64 `xorm:"pk autoincr"`
+	ID      int64
 	IssueID int64 `xorm:"UNIQUE(s)"`
 	LabelID int64 `xorm:"UNIQUE(s)"`
 }
@@ -240,7 +266,13 @@ func newIssueLabel(e *xorm.Session, issue *Issue, label *Label) (err error) {
 	if issue.IsClosed {
 		label.NumClosedIssues++
 	}
-	return updateLabel(e, label)
+
+	if err = updateLabel(e, label); err != nil {
+		return fmt.Errorf("updateLabel: %v", err)
+	}
+
+	issue.Labels = append(issue.Labels, label)
+	return nil
 }
 
 // NewIssueLabel creates a new issue-label relation.
@@ -313,7 +345,17 @@ func deleteIssueLabel(e *xorm.Session, issue *Issue, label *Label) (err error) {
 	if issue.IsClosed {
 		label.NumClosedIssues--
 	}
-	return updateLabel(e, label)
+	if err = updateLabel(e, label); err != nil {
+		return fmt.Errorf("updateLabel: %v", err)
+	}
+
+	for i := range issue.Labels {
+		if issue.Labels[i].ID == label.ID {
+			issue.Labels = append(issue.Labels[:i], issue.Labels[i+1:]...)
+			break
+		}
+	}
+	return nil
 }
 
 // DeleteIssueLabel deletes issue-label relation.

models/issue_mail.go

@@ -10,9 +10,9 @@ import (
 	"github.com/Unknwon/com"
 	log "gopkg.in/clog.v1"
 
-	"github.com/gogits/gogs/modules/mailer"
-	"github.com/gogits/gogs/modules/markdown"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/mailer"
+	"github.com/gogits/gogs/pkg/markup"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 func (issue *Issue) MailSubject() string {
@@ -91,18 +91,30 @@ func NewMailerIssue(issue *Issue) mailer.Issue {
 }
 
 // mailIssueCommentToParticipants can be used for both new issue creation and comment.
+// This functions sends two list of emails:
+// 1. Repository watchers and users who are participated in comments.
+// 2. Users who are not in 1. but get mentioned in current issue/comment.
 func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string) error {
 	if !setting.Service.EnableNotifyMail {
 		return nil
 	}
 
-	// Mail wahtcers.
 	watchers, err := GetWatchers(issue.RepoID)
 	if err != nil {
-		return fmt.Errorf("GetWatchers [%d]: %v", issue.RepoID, err)
+		return fmt.Errorf("GetWatchers [repo_id: %d]: %v", issue.RepoID, err)
+	}
+	participants, err := GetParticipantsByIssueID(issue.ID)
+	if err != nil {
+		return fmt.Errorf("GetParticipantsByIssueID [issue_id: %d]: %v", issue.ID, err)
 	}
 
-	tos := make([]string, 0, len(watchers)) // List of email addresses.
+	// In case the issue poster is not watching the repository,
+	// even if we have duplicated in watchers, can be safely filtered out.
+	if issue.PosterID != doer.ID {
+		participants = append(participants, issue.Poster)
+	}
+
+	tos := make([]string, 0, len(watchers)) // List of email addresses
 	names := make([]string, 0, len(watchers))
 	for i := range watchers {
 		if watchers[i].UserID == doer.ID {
@@ -120,6 +132,16 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string)
 		tos = append(tos, to.Email)
 		names = append(names, to.Name)
 	}
+	for i := range participants {
+		if participants[i].ID == doer.ID {
+			continue
+		} else if com.IsSliceContainsStr(names, participants[i].Name) {
+			continue
+		}
+
+		tos = append(tos, participants[i].Email)
+		names = append(names, participants[i].Name)
+	}
 	mailer.SendIssueCommentMail(NewMailerIssue(issue), NewMailerRepo(issue.Repo), NewMailerUser(doer), tos)
 
 	// Mail mentioned people and exclude watchers.
@@ -140,7 +162,7 @@ func mailIssueCommentToParticipants(issue *Issue, doer *User, mentions []string)
 // MailParticipants sends new issue thread created emails to repository watchers
 // and mentioned people.
 func (issue *Issue) MailParticipants() (err error) {
-	mentions := markdown.FindAllMentions(issue.Content)
+	mentions := markup.FindAllMentions(issue.Content)
 	if err = updateIssueMentions(x, issue.ID, mentions); err != nil {
 		return fmt.Errorf("UpdateIssueMentions [%d]: %v", issue.ID, err)
 	}

models/login_source.go

@@ -7,7 +7,6 @@ package models
 import (
 	"crypto/tls"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/smtp"
 	"net/textproto"
@@ -20,8 +19,9 @@ import (
 	"github.com/go-xorm/xorm"
 	log "gopkg.in/clog.v1"
 
-	"github.com/gogits/gogs/modules/auth/ldap"
-	"github.com/gogits/gogs/modules/auth/pam"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/auth/ldap"
+	"github.com/gogits/gogs/pkg/auth/pam"
 )
 
 type LoginType int
@@ -103,7 +103,7 @@ func (cfg *PAMConfig) ToDB() ([]byte, error) {
 
 // LoginSource represents an external way for authorizing users.
 type LoginSource struct {
-	ID        int64 `xorm:"pk autoincr"`
+	ID        int64
 	Type      LoginType
 	Name      string          `xorm:"UNIQUE"`
 	IsActived bool            `xorm:"NOT NULL DEFAULT false"`
@@ -296,7 +296,7 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
 	username, fn, sn, mail, isAdmin, succeed := source.Cfg.(*LDAPConfig).SearchEntry(login, password, source.Type == LOGIN_DLDAP)
 	if !succeed {
 		// User not in LDAP, do nothing
-		return nil, ErrUserNotExist{0, login}
+		return nil, errors.UserNotExist{0, login}
 	}
 
 	if !autoRegister {
@@ -327,6 +327,16 @@ func LoginViaLDAP(user *User, login, password string, source *LoginSource, autoR
 		IsActive:    true,
 		IsAdmin:     isAdmin,
 	}
+
+	ok, err := IsUserExist(0, user.Name)
+	if err != nil {
+		return user, err
+	}
+
+	if ok {
+		return user, UpdateUser(user)
+	}
+
 	return user, CreateUser(user)
 }
 
@@ -394,7 +404,7 @@ func SMTPAuth(a smtp.Auth, cfg *SMTPConfig) error {
 		}
 		return nil
 	}
-	return ErrUnsupportedLoginType
+	return errors.New("Unsupported SMTP authentication method")
 }
 
 // LoginViaSMTP queries if login/password is valid against the SMTP,
@@ -404,9 +414,9 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
 	if len(cfg.AllowedDomains) > 0 {
 		idx := strings.Index(login, "@")
 		if idx == -1 {
-			return nil, ErrUserNotExist{0, login}
+			return nil, errors.UserNotExist{0, login}
 		} else if !com.IsSliceContainsStr(strings.Split(cfg.AllowedDomains, ","), login[idx+1:]) {
-			return nil, ErrUserNotExist{0, login}
+			return nil, errors.UserNotExist{0, login}
 		}
 	}
 
@@ -416,7 +426,7 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
 	} else if cfg.Auth == SMTP_LOGIN {
 		auth = &smtpLoginAuth{login, password}
 	} else {
-		return nil, errors.New("Unsupported SMTP auth type")
+		return nil, errors.New("Unsupported SMTP authentication type")
 	}
 
 	if err := SMTPAuth(auth, cfg); err != nil {
@@ -425,7 +435,7 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
 		tperr, ok := err.(*textproto.Error)
 		if (ok && tperr.Code == 535) ||
 			strings.Contains(err.Error(), "Username and Password not accepted") {
-			return nil, ErrUserNotExist{0, login}
+			return nil, errors.UserNotExist{0, login}
 		}
 		return nil, err
 	}
@@ -465,7 +475,7 @@ func LoginViaSMTP(user *User, login, password string, sourceID int64, cfg *SMTPC
 func LoginViaPAM(user *User, login, password string, sourceID int64, cfg *PAMConfig, autoRegister bool) (*User, error) {
 	if err := pam.PAMAuth(cfg.ServiceName, login, password); err != nil {
 		if strings.Contains(err.Error(), "Authentication failure") {
-			return nil, ErrUserNotExist{0, login}
+			return nil, errors.UserNotExist{0, login}
 		}
 		return nil, err
 	}
@@ -489,7 +499,7 @@ func LoginViaPAM(user *User, login, password string, sourceID int64, cfg *PAMCon
 
 func ExternalUserLogin(user *User, login, password string, source *LoginSource, autoRegister bool) (*User, error) {
 	if !source.IsActived {
-		return nil, ErrLoginSourceNotActived
+		return nil, errors.LoginSourceNotActivated{source.ID}
 	}
 
 	switch source.Type {
@@ -501,7 +511,7 @@ func ExternalUserLogin(user *User, login, password string, source *LoginSource,
 		return LoginViaPAM(user, login, password, source.ID, source.Cfg.(*PAMConfig), autoRegister)
 	}
 
-	return nil, ErrUnsupportedLoginType
+	return nil, errors.InvalidLoginSourceType{source.Type}
 }
 
 // UserSignIn validates user name and password.
@@ -525,7 +535,7 @@ func UserSignIn(username, password string) (*User, error) {
 				return user, nil
 			}
 
-			return nil, ErrUserNotExist{user.ID, user.Name}
+			return nil, errors.UserNotExist{user.ID, user.Name}
 
 		default:
 			var source LoginSource
@@ -554,5 +564,5 @@ func UserSignIn(username, password string) (*User, error) {
 		log.Warn("Failed to login '%s' via '%s': %v", username, source.Name, err)
 	}
 
-	return nil, ErrUserNotExist{user.ID, user.Name}
+	return nil, errors.UserNotExist{user.ID, user.Name}
 }

models/migrations/migrations.go

@@ -13,7 +13,7 @@ import (
 	"github.com/go-xorm/xorm"
 	log "gopkg.in/clog.v1"
 
-	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/pkg/tool"
 )
 
 const _MIN_DB_VER = 10
@@ -60,6 +60,10 @@ var migrations = []Migration{
 	NewMigration("set comment updated with created", setCommentUpdatedWithCreated),
 	// v14 -> v15:v0.9.147
 	NewMigration("generate and migrate Git hooks", generateAndMigrateGitHooks),
+	// v15 -> v16:v0.10.16
+	NewMigration("update repository sizes", updateRepositorySizes),
+	// v16 -> v17:v0.10.31
+	NewMigration("remove invalid protect branch whitelist", removeInvalidProtectBranchWhitelist),
 }
 
 // Migrate database to current version
@@ -101,7 +105,7 @@ Please save following instructions to somewhere and start working:
 Once finished downloading,
 
 1. Extract the archive and to upgrade steps as usual.
-2. Run it once. To verify, you should see some migration traces. 
+2. Run it once. To verify, you should see some migration traces.
 3. Once it starts web server successfully, stop it.
 4. Now it's time to put back the release archive you originally intent to upgrade.
 5. Enjoy!
@@ -155,10 +159,10 @@ func generateOrgRandsAndSalt(x *xorm.Engine) (err error) {
 	}
 
 	for _, org := range orgs {
-		if org.Rands, err = base.GetRandomString(10); err != nil {
+		if org.Rands, err = tool.RandomString(10); err != nil {
 			return err
 		}
-		if org.Salt, err = base.GetRandomString(10); err != nil {
+		if org.Salt, err = tool.RandomString(10); err != nil {
 			return err
 		}
 		if _, err = sess.Id(org.ID).Update(org); err != nil {

models/migrations/v15.go

@@ -15,7 +15,7 @@ import (
 	"github.com/go-xorm/xorm"
 	log "gopkg.in/clog.v1"
 
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 func generateAndMigrateGitHooks(x *xorm.Engine) (err error) {

models/migrations/v16.go

@@ -0,0 +1,77 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	"github.com/go-xorm/xorm"
+	log "gopkg.in/clog.v1"
+
+	"github.com/gogits/git-module"
+
+	"github.com/gogits/gogs/pkg/setting"
+)
+
+func updateRepositorySizes(x *xorm.Engine) (err error) {
+	log.Info("This migration could take up to minutes, please be patient.")
+	type Repository struct {
+		ID      int64
+		OwnerID int64
+		Name    string
+		Size    int64
+	}
+	type User struct {
+		ID   int64
+		Name string
+	}
+	if err = x.Sync2(new(Repository)); err != nil {
+		return fmt.Errorf("Sync2: %v", err)
+	}
+
+	// For the sake of SQLite3, we can't use x.Iterate here.
+	offset := 0
+	for {
+		repos := make([]*Repository, 0, 10)
+		if err = x.Sql(fmt.Sprintf("SELECT * FROM `repository` ORDER BY id ASC LIMIT 10 OFFSET %d", offset)).
+			Find(&repos); err != nil {
+			return fmt.Errorf("select repos [offset: %d]: %v", offset, err)
+		}
+		log.Trace("Select [offset: %d, repos: %d]", offset, len(repos))
+		if len(repos) == 0 {
+			break
+		}
+		offset += 10
+
+		for _, repo := range repos {
+			if repo.Name == "." || repo.Name == ".." {
+				continue
+			}
+
+			user := new(User)
+			has, err := x.Where("id = ?", repo.OwnerID).Get(user)
+			if err != nil {
+				return fmt.Errorf("query owner of repository [repo_id: %d, owner_id: %d]: %v", repo.ID, repo.OwnerID, err)
+			} else if !has {
+				continue
+			}
+
+			repoPath := filepath.Join(setting.RepoRootPath, strings.ToLower(user.Name), strings.ToLower(repo.Name)) + ".git"
+			countObject, err := git.GetRepoSize(repoPath)
+			if err != nil {
+				log.Warn("GetRepoSize: %v", err)
+				continue
+			}
+
+			repo.Size = countObject.Size + countObject.SizePack
+			if _, err = x.Id(repo.ID).Cols("size").Update(repo); err != nil {
+				return fmt.Errorf("update size: %v", err)
+			}
+		}
+	}
+	return nil
+}

models/migrations/v17.go

@@ -0,0 +1,22 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"fmt"
+
+	"github.com/go-xorm/xorm"
+)
+
+func removeInvalidProtectBranchWhitelist(x *xorm.Engine) error {
+	exist, err := x.IsTableExist("protect_branch_whitelist")
+	if err != nil {
+		return fmt.Errorf("IsTableExist: %v", err)
+	} else if !exist {
+		return nil
+	}
+	_, err = x.Exec("DELETE FROM protect_branch_whitelist WHERE protect_branch_id = 0")
+	return err
+}

models/milestone.go

@@ -5,18 +5,20 @@
 package models
 
 import (
+	"fmt"
 	"time"
 
 	"github.com/go-xorm/xorm"
+	log "gopkg.in/clog.v1"
 
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 // Milestone represents a milestone of repository.
 type Milestone struct {
-	ID              int64 `xorm:"pk autoincr"`
+	ID              int64
 	RepoID          int64 `xorm:"INDEX"`
 	Name            string
 	Content         string `xorm:"TEXT"`
@@ -101,6 +103,15 @@ func (m *Milestone) APIFormat() *api.Milestone {
 	return apiMilestone
 }
 
+func (m *Milestone) CountIssues(isClosed, includePulls bool) int64 {
+	sess := x.Where("milestone_id = ?", m.ID).And("is_closed = ?", isClosed)
+	if !includePulls {
+		sess.And("is_pull = ?", false)
+	}
+	count, _ := sess.Count(new(Issue))
+	return count
+}
+
 // NewMilestone creates new milestone of repository.
 func NewMilestone(m *Milestone) (err error) {
 	sess := x.NewSession()
@@ -272,6 +283,8 @@ func changeMilestoneAssign(e *xorm.Session, issue *Issue, oldMilestoneID int64)
 		} else if _, err = e.Exec("UPDATE `issue_user` SET milestone_id = 0 WHERE issue_id = ?", issue.ID); err != nil {
 			return err
 		}
+
+		issue.Milestone = nil
 	}
 
 	if issue.MilestoneID > 0 {
@@ -290,13 +303,15 @@ func changeMilestoneAssign(e *xorm.Session, issue *Issue, oldMilestoneID int64)
 		} else if _, err = e.Exec("UPDATE `issue_user` SET milestone_id = ? WHERE issue_id = ?", m.ID, issue.ID); err != nil {
 			return err
 		}
+
+		issue.Milestone = m
 	}
 
 	return updateIssue(e, issue)
 }
 
 // ChangeMilestoneAssign changes assignment of milestone for issue.
-func ChangeMilestoneAssign(issue *Issue, oldMilestoneID int64) (err error) {
+func ChangeMilestoneAssign(doer *User, issue *Issue, oldMilestoneID int64) (err error) {
 	sess := x.NewSession()
 	defer sess.Close()
 	if err = sess.Begin(); err != nil {
@@ -306,7 +321,45 @@ func ChangeMilestoneAssign(issue *Issue, oldMilestoneID int64) (err error) {
 	if err = changeMilestoneAssign(sess, issue, oldMilestoneID); err != nil {
 		return err
 	}
-	return sess.Commit()
+
+	if err = sess.Commit(); err != nil {
+		return fmt.Errorf("Commit: %v", err)
+	}
+
+	var hookAction api.HookIssueAction
+	if issue.MilestoneID > 0 {
+		hookAction = api.HOOK_ISSUE_MILESTONED
+	} else {
+		hookAction = api.HOOK_ISSUE_DEMILESTONED
+	}
+
+	if issue.IsPull {
+		err = issue.PullRequest.LoadIssue()
+		if err != nil {
+			log.Error(2, "LoadIssue: %v", err)
+			return
+		}
+		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
+			Action:      hookAction,
+			Index:       issue.Index,
+			PullRequest: issue.PullRequest.APIFormat(),
+			Repository:  issue.Repo.APIFormat(nil),
+			Sender:      doer.APIFormat(),
+		})
+	} else {
+		err = PrepareWebhooks(issue.Repo, HOOK_EVENT_ISSUES, &api.IssuesPayload{
+			Action:     hookAction,
+			Index:      issue.Index,
+			Issue:      issue.APIFormat(),
+			Repository: issue.Repo.APIFormat(nil),
+			Sender:     doer.APIFormat(),
+		})
+	}
+	if err != nil {
+		log.Error(2, "PrepareWebhooks [is_pull: %v]: %v", issue.IsPull, err)
+	}
+
+	return nil
 }
 
 // DeleteMilestoneOfRepoByID deletes a milestone from a repository.

models/mirror.go

@@ -6,6 +6,7 @@ package models
 
 import (
 	"fmt"
+	"net/url"
 	"strings"
 	"time"
 
@@ -16,16 +17,17 @@ import (
 
 	"github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/modules/process"
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/process"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/sync"
 )
 
 var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)
 
 // Mirror represents mirror information of a repository.
 type Mirror struct {
-	ID          int64 `xorm:"pk autoincr"`
+	ID          int64
 	RepoID      int64
 	Repo        *Repository `xorm:"-"`
 	Interval    int         // Hour.
@@ -55,11 +57,11 @@ func (m *Mirror) AfterSet(colName string, _ xorm.Cell) {
 	case "repo_id":
 		m.Repo, err = GetRepositoryByID(m.RepoID)
 		if err != nil {
-			log.Error(3, "GetRepositoryByID[%d]: %v", m.ID, err)
+			log.Error(3, "GetRepositoryByID [%d]: %v", m.ID, err)
 		}
 	case "updated_unix":
 		m.Updated = time.Unix(m.UpdatedUnix, 0).Local()
-	case "next_updated_unix":
+	case "next_update_unix":
 		m.NextUpdate = time.Unix(m.NextUpdateUnix, 0).Local()
 	}
 }
@@ -69,6 +71,46 @@ func (m *Mirror) ScheduleNextUpdate() {
 	m.NextUpdate = time.Now().Add(time.Duration(m.Interval) * time.Hour)
 }
 
+// findPasswordInMirrorAddress returns start (inclusive) and end index (exclusive)
+// of password portion of credentials in given mirror address.
+// It returns a boolean value to indicate whether password portion is found.
+func findPasswordInMirrorAddress(addr string) (start int, end int, found bool) {
+	// Find end of credentials (start of path)
+	end = strings.LastIndex(addr, "@")
+	if end == -1 {
+		return -1, -1, false
+	}
+
+	// Find delimiter of credentials (end of username)
+	start = strings.Index(addr, "://")
+	if start == -1 {
+		return -1, -1, false
+	}
+	start += 3
+	delim := strings.Index(addr[start:], ":")
+	if delim == -1 {
+		return -1, -1, false
+	}
+	delim += 1
+
+	if start+delim >= end {
+		return -1, -1, false // No password portion presented
+	}
+
+	return start + delim, end, true
+}
+
+// unescapeMirrorCredentials returns mirror address with unescaped credentials.
+func unescapeMirrorCredentials(addr string) string {
+	start, end, found := findPasswordInMirrorAddress(addr)
+	if !found {
+		return addr
+	}
+
+	password, _ := url.QueryUnescape(addr[start:end])
+	return addr[:start] + password + addr[end:]
+}
+
 func (m *Mirror) readAddress() {
 	if len(m.address) > 0 {
 		return
@@ -76,16 +118,16 @@ func (m *Mirror) readAddress() {
 
 	cfg, err := ini.Load(m.Repo.GitConfigPath())
 	if err != nil {
-		log.Error(4, "Load: %v", err)
+		log.Error(2, "Load: %v", err)
 		return
 	}
 	m.address = cfg.Section("remote \"origin\"").Key("url").Value()
 }
 
-// HandleCloneUserCredentials replaces user credentials from HTTP/HTTPS URL
+// HandleMirrorCredentials replaces user credentials from HTTP/HTTPS URL
 // with placeholder <credentials>.
-// It will fail for any other forms of clone addresses.
-func HandleCloneUserCredentials(url string, mosaics bool) string {
+// It returns original string if protocol is not HTTP/HTTPS.
+func HandleMirrorCredentials(url string, mosaics bool) string {
 	i := strings.Index(url, "@")
 	if i == -1 {
 		return url
@@ -103,21 +145,37 @@ func HandleCloneUserCredentials(url string, mosaics bool) string {
 // Address returns mirror address from Git repository config without credentials.
 func (m *Mirror) Address() string {
 	m.readAddress()
-	return HandleCloneUserCredentials(m.address, false)
+	return HandleMirrorCredentials(m.address, false)
 }
 
 // MosaicsAddress returns mirror address from Git repository config with credentials under mosaics.
 func (m *Mirror) MosaicsAddress() string {
 	m.readAddress()
-	return HandleCloneUserCredentials(m.address, true)
+	return HandleMirrorCredentials(m.address, true)
 }
 
-// FullAddress returns mirror address from Git repository config.
-func (m *Mirror) FullAddress() string {
+// RawAddress returns raw mirror address directly from Git repository config.
+func (m *Mirror) RawAddress() string {
 	m.readAddress()
 	return m.address
 }
 
+// FullAddress returns mirror address from Git repository config with unescaped credentials.
+func (m *Mirror) FullAddress() string {
+	m.readAddress()
+	return unescapeMirrorCredentials(m.address)
+}
+
+// escapeCredentials returns mirror address with escaped credentials.
+func escapeMirrorCredentials(addr string) string {
+	start, end, found := findPasswordInMirrorAddress(addr)
+	if !found {
+		return addr
+	}
+
+	return addr[:start] + url.QueryEscape(addr[start:end]) + addr[end:]
+}
+
 // SaveAddress writes new address to Git repository config.
 func (m *Mirror) SaveAddress(addr string) error {
 	configPath := m.Repo.GitConfigPath()
@@ -126,7 +184,7 @@ func (m *Mirror) SaveAddress(addr string) error {
 		return fmt.Errorf("Load: %v", err)
 	}
 
-	cfg.Section("remote \"origin\"").Key("url").SetValue(addr)
+	cfg.Section(`remote "origin"`).Key("url").SetValue(escapeMirrorCredentials(addr))
 	return cfg.SaveToIndent(configPath, "\t")
 }
 
@@ -139,12 +197,12 @@ func (m *Mirror) runSync() bool {
 	// Do a fast-fail testing against on repository URL to ensure it is accessible under
 	// good condition to prevent long blocking on URL resolution without syncing anything.
 	if !git.IsRepoURLAccessible(git.NetworkOptions{
-		URL:     m.FullAddress(),
+		URL:     m.RawAddress(),
 		Timeout: 10 * time.Second,
 	}) {
-		desc := fmt.Sprintf("Mirror repository URL is not accessible: %s", m.MosaicsAddress())
+		desc := fmt.Sprintf("Source URL of mirror repository '%s' is not accessible: %s", m.Repo.FullName(), m.MosaicsAddress())
 		if err := CreateRepositoryNotice(desc); err != nil {
-			log.Error(4, "CreateRepositoryNotice: %v", err)
+			log.Error(2, "CreateRepositoryNotice: %v", err)
 		}
 		return false
 	}
@@ -157,20 +215,25 @@ func (m *Mirror) runSync() bool {
 		timeout, repoPath, fmt.Sprintf("Mirror.runSync: %s", repoPath),
 		"git", gitArgs...); err != nil {
 		desc := fmt.Sprintf("Fail to update mirror repository '%s': %s", repoPath, stderr)
-		log.Error(4, desc)
+		log.Error(2, desc)
 		if err = CreateRepositoryNotice(desc); err != nil {
-			log.Error(4, "CreateRepositoryNotice: %v", err)
+			log.Error(2, "CreateRepositoryNotice: %v", err)
 		}
 		return false
 	}
+
+	if err := m.Repo.UpdateSize(); err != nil {
+		log.Error(2, "UpdateSize [repo_id: %d]: %v", m.Repo.ID, err)
+	}
+
 	if m.Repo.HasWiki() {
 		if _, stderr, err := process.ExecDir(
 			timeout, wikiPath, fmt.Sprintf("Mirror.runSync: %s", wikiPath),
 			"git", "remote", "update", "--prune"); err != nil {
 			desc := fmt.Sprintf("Fail to update mirror wiki repository '%s': %s", wikiPath, stderr)
-			log.Error(4, desc)
+			log.Error(2, desc)
 			if err = CreateRepositoryNotice(desc); err != nil {
-				log.Error(4, "CreateRepositoryNotice: %v", err)
+				log.Error(2, "CreateRepositoryNotice: %v", err)
 			}
 			return false
 		}
@@ -185,7 +248,7 @@ func getMirrorByRepoID(e Engine, repoID int64) (*Mirror, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrMirrorNotExist
+		return nil, errors.MirrorNotExist{repoID}
 	}
 	return m, nil
 }
@@ -222,14 +285,14 @@ func MirrorUpdate() {
 	if err := x.Where("next_update_unix<=?", time.Now().Unix()).Iterate(new(Mirror), func(idx int, bean interface{}) error {
 		m := bean.(*Mirror)
 		if m.Repo == nil {
-			log.Error(4, "Disconnected mirror repository found: %d", m.ID)
+			log.Error(2, "Disconnected mirror repository found: %d", m.ID)
 			return nil
 		}
 
 		MirrorQueue.Add(m.RepoID)
 		return nil
 	}); err != nil {
-		log.Error(4, "MirrorUpdate: %v", err)
+		log.Error(2, "MirrorUpdate: %v", err)
 	}
 }
 
@@ -243,7 +306,7 @@ func SyncMirrors() {
 
 		m, err := GetMirrorByRepoID(com.StrTo(repoID).MustInt64())
 		if err != nil {
-			log.Error(4, "GetMirrorByRepoID [%s]: %v", repoID, err)
+			log.Error(2, "GetMirrorByRepoID [%s]: %v", m.RepoID, err)
 			continue
 		}
 
@@ -253,7 +316,22 @@ func SyncMirrors() {
 
 		m.ScheduleNextUpdate()
 		if err = UpdateMirror(m); err != nil {
-			log.Error(4, "UpdateMirror [%s]: %v", repoID, err)
+			log.Error(2, "UpdateMirror [%s]: %v", m.RepoID, err)
+			continue
+		}
+
+		// Get latest commit date and compare to current repository updated time,
+		// update if latest commit date is newer.
+		commitDate, err := git.GetLatestCommitDate(m.Repo.RepoPath(), "")
+		if err != nil {
+			log.Error(2, "GetLatestCommitDate [%s]: %v", m.RepoID, err)
+			continue
+		} else if commitDate.Before(m.Repo.Updated) {
+			continue
+		}
+
+		if _, err = x.Exec("UPDATE repository SET updated_unix = ? WHERE id = ?", commitDate.Unix(), m.RepoID); err != nil {
+			log.Error(2, "Update repository 'updated_unix' [%s]: %v", m.RepoID, err)
 			continue
 		}
 	}

models/mirror_test.go

@@ -0,0 +1,74 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package models
+
+import (
+	"testing"
+
+	. "github.com/smartystreets/goconvey/convey"
+)
+
+func Test_findPasswordInMirrorAddress(t *testing.T) {
+	Convey("Find password portion in mirror address", t, func() {
+		testCases := []struct {
+			addr       string
+			start, end int
+			found      bool
+			password   string
+		}{
+			{"http://localhost:3000/user/repo.git", -1, -1, false, ""},
+			{"http://user@localhost:3000/user/repo.git", -1, -1, false, ""},
+			{"http://user:@localhost:3000/user/repo.git", -1, -1, false, ""},
+			{"http://user:password@localhost:3000/user/repo.git", 12, 20, true, "password"},
+			{"http://username:my%3Asecure%3Bpassword@localhost:3000/user/repo.git", 16, 38, true, "my%3Asecure%3Bpassword"},
+			{"http://username:my%40secure%23password@localhost:3000/user/repo.git", 16, 38, true, "my%40secure%23password"},
+			{"http://username:@@localhost:3000/user/repo.git", 16, 17, true, "@"},
+		}
+
+		for _, tc := range testCases {
+			start, end, found := findPasswordInMirrorAddress(tc.addr)
+			So(start, ShouldEqual, tc.start)
+			So(end, ShouldEqual, tc.end)
+			So(found, ShouldEqual, tc.found)
+			if found {
+				So(tc.addr[start:end], ShouldEqual, tc.password)
+			}
+		}
+	})
+}
+
+func Test_unescapeMirrorCredentials(t *testing.T) {
+	Convey("Escape credentials in mirror address", t, func() {
+		testCases := []string{
+			"http://localhost:3000/user/repo.git", "http://localhost:3000/user/repo.git",
+			"http://user@localhost:3000/user/repo.git", "http://user@localhost:3000/user/repo.git",
+			"http://user:@localhost:3000/user/repo.git", "http://user:@localhost:3000/user/repo.git",
+			"http://user:password@localhost:3000/user/repo.git", "http://user:password@localhost:3000/user/repo.git",
+			"http://user:my%3Asecure%3Bpassword@localhost:3000/user/repo.git", "http://user:my:secure;password@localhost:3000/user/repo.git",
+			"http://user:my%40secure%23password@localhost:3000/user/repo.git", "http://user:my@secure#password@localhost:3000/user/repo.git",
+		}
+
+		for i := 0; i < len(testCases); i += 2 {
+			So(unescapeMirrorCredentials(testCases[i]), ShouldEqual, testCases[i+1])
+		}
+	})
+}
+
+func Test_escapeMirrorCredentials(t *testing.T) {
+	Convey("Escape credentials in mirror address", t, func() {
+		testCases := []string{
+			"http://localhost:3000/user/repo.git", "http://localhost:3000/user/repo.git",
+			"http://user@localhost:3000/user/repo.git", "http://user@localhost:3000/user/repo.git",
+			"http://user:@localhost:3000/user/repo.git", "http://user:@localhost:3000/user/repo.git",
+			"http://user:password@localhost:3000/user/repo.git", "http://user:password@localhost:3000/user/repo.git",
+			"http://user:my:secure;password@localhost:3000/user/repo.git", "http://user:my%3Asecure%3Bpassword@localhost:3000/user/repo.git",
+			"http://user:my@secure#password@localhost:3000/user/repo.git", "http://user:my%40secure%23password@localhost:3000/user/repo.git",
+		}
+
+		for i := 0; i < len(testCases); i += 2 {
+			So(escapeMirrorCredentials(testCases[i]), ShouldEqual, testCases[i+1])
+		}
+	})
+}

models/models.go

@@ -21,12 +21,13 @@ import (
 	"github.com/go-xorm/core"
 	"github.com/go-xorm/xorm"
 	_ "github.com/lib/pq"
+	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/gogs/models/migrations"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
-// Engine represents a xorm engine or session.
+// Engine represents a XORM engine or session.
 type Engine interface {
 	Delete(interface{}) (int64, error)
 	Exec(string, ...interface{}) (sql.Result, error)
@@ -63,7 +64,7 @@ var (
 
 func init() {
 	tables = append(tables,
-		new(User), new(PublicKey), new(AccessToken),
+		new(User), new(PublicKey), new(AccessToken), new(TwoFactor), new(TwoFactorRecoveryCode),
 		new(Repository), new(DeployKey), new(Collaboration), new(Access), new(Upload),
 		new(Watch), new(Star), new(Follow), new(Action),
 		new(Issue), new(PullRequest), new(Comment), new(Attachment), new(IssueUser),
@@ -192,18 +193,22 @@ func SetEngine() (err error) {
 
 	// WARNING: for serv command, MUST remove the output to os.stdout,
 	// so use log file to instead print to stdout.
-	logPath := path.Join(setting.LogRootPath, "xorm.log")
-	os.MkdirAll(path.Dir(logPath), os.ModePerm)
-
-	f, err := os.Create(logPath)
+	sec := setting.Cfg.Section("log.xorm")
+	logger, err := log.NewFileWriter(path.Join(setting.LogRootPath, "xorm.log"),
+		log.FileRotationConfig{
+			Rotate:  sec.Key("ROTATE").MustBool(true),
+			Daily:   sec.Key("ROTATE_DAILY").MustBool(true),
+			MaxSize: sec.Key("MAX_SIZE").MustInt64(100) * 1024 * 1024,
+			MaxDays: sec.Key("MAX_DAYS").MustInt64(3),
+		})
 	if err != nil {
-		return fmt.Errorf("Fail to create xorm.log: %v", err)
+		return fmt.Errorf("Fail to create 'xorm.log': %v", err)
 	}
 
 	if setting.ProdMode {
-		x.SetLogger(xorm.NewSimpleLogger3(f, xorm.DEFAULT_LOG_PREFIX, xorm.DEFAULT_LOG_FLAG, core.LOG_WARNING))
+		x.SetLogger(xorm.NewSimpleLogger3(logger, xorm.DEFAULT_LOG_PREFIX, xorm.DEFAULT_LOG_FLAG, core.LOG_WARNING))
 	} else {
-		x.SetLogger(xorm.NewSimpleLogger(f))
+		x.SetLogger(xorm.NewSimpleLogger(logger))
 	}
 	x.ShowSQL(true)
 	return nil
@@ -297,7 +302,9 @@ func DumpDatabase(dirPath string) (err error) {
 }
 
 // ImportDatabase imports data from backup archive.
-func ImportDatabase(dirPath string) (err error) {
+func ImportDatabase(dirPath string, verbose bool) (err error) {
+	snakeMapper := core.SnakeMapper{}
+
 	// Purposely create a local variable to not modify global variable
 	tables := append(tables, new(Version))
 	for _, table := range tables {
@@ -307,6 +314,10 @@ func ImportDatabase(dirPath string) (err error) {
 			continue
 		}
 
+		if verbose {
+			log.Trace("Importing table '%s'...", tableName)
+		}
+
 		if err = x.DropTables(table); err != nil {
 			return fmt.Errorf("fail to drop table '%s': %v", tableName, err)
 		} else if err = x.Sync2(table); err != nil {
@@ -348,6 +359,15 @@ func ImportDatabase(dirPath string) (err error) {
 				return fmt.Errorf("fail to insert strcut: %v", err)
 			}
 		}
+
+		// PostgreSQL needs manually reset table sequence for auto increment keys
+		if setting.UsePostgreSQL {
+			rawTableName := snakeMapper.Obj2Table(tableName)
+			seqName := rawTableName + "_id_seq"
+			if _, err = x.Exec(fmt.Sprintf(`SELECT setval('%s', COALESCE((SELECT MAX(id)+1 FROM "%s"), 1), false);`, seqName, rawTableName)); err != nil {
+				return fmt.Errorf("fail to reset table '%s' sequence: %v", rawTableName, err)
+			}
+		}
 	}
 	return nil
 }

models/org.go

@@ -237,7 +237,7 @@ func DeleteOrganization(org *User) (err error) {
 
 // OrgUser represents an organization-user relation.
 type OrgUser struct {
-	ID       int64 `xorm:"pk autoincr"`
+	ID       int64
 	Uid      int64 `xorm:"INDEX UNIQUE(s)"`
 	OrgID    int64 `xorm:"INDEX UNIQUE(s)"`
 	IsPublic bool

models/org_team.go

@@ -16,7 +16,7 @@ const OWNER_TEAM = "Owners"
 
 // Team represents a organization team.
 type Team struct {
-	ID          int64 `xorm:"pk autoincr"`
+	ID          int64
 	OrgID       int64 `xorm:"INDEX"`
 	LowerName   string
 	Name        string
@@ -31,7 +31,7 @@ type Team struct {
 func (t *Team) AfterSet(colName string, _ xorm.Cell) {
 	switch colName {
 	case "num_repos":
-		// LEGACY [0.11]: this is backward compatibility bug fix for https://github.com/gogits/gogs/issues/3671
+		// LEGACY [1.0]: this is backward compatibility bug fix for https://github.com/gogits/gogs/issues/3671
 		if t.NumRepos < 0 {
 			t.NumRepos = 0
 		}
@@ -406,7 +406,7 @@ func DeleteTeam(t *Team) error {
 
 // TeamUser represents an team-user relation.
 type TeamUser struct {
-	ID     int64 `xorm:"pk autoincr"`
+	ID     int64
 	OrgID  int64 `xorm:"INDEX"`
 	TeamID int64 `xorm:"UNIQUE(s)"`
 	UID    int64 `xorm:"UNIQUE(s)"`
@@ -424,7 +424,7 @@ func IsTeamMember(orgID, teamID, uid int64) bool {
 
 func getTeamMembers(e Engine, teamID int64) (_ []*User, err error) {
 	teamUsers := make([]*TeamUser, 0, 10)
-	if err = e.Sql("SELECT `id`, `org_id`, `team_id`, `uid` FROM `team_user` WHERE team_id=?", teamID).
+	if err = e.Sql("SELECT `id`, `org_id`, `team_id`, `uid` FROM `team_user` WHERE team_id = ?", teamID).
 		Find(&teamUsers); err != nil {
 		return nil, fmt.Errorf("get team-users: %v", err)
 	}
@@ -450,10 +450,11 @@ func getUserTeams(e Engine, orgID, userID int64) ([]*Team, error) {
 		return nil, err
 	}
 
-	teamIDs := make([]int64, len(teamUsers))
+	teamIDs := make([]int64, len(teamUsers)+1)
 	for i := range teamUsers {
 		teamIDs[i] = teamUsers[i].TeamID
 	}
+	teamIDs[len(teamUsers)] = -1
 
 	teams := make([]*Team, 0, len(teamIDs))
 	return teams, e.Where("org_id = ?", orgID).In("id", teamIDs).Find(&teams)

models/pull.go

@@ -18,9 +18,10 @@ import (
 	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/process"
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/process"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/sync"
 )
 
 var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)
@@ -42,7 +43,7 @@ const (
 
 // PullRequest represents relation between pull request and repositories.
 type PullRequest struct {
-	ID     int64 `xorm:"pk autoincr"`
+	ID     int64
 	Type   PullRequestType
 	Status PullRequestStatus
 
@@ -87,7 +88,7 @@ func (pr *PullRequest) AfterSet(colName string, _ xorm.Cell) {
 func (pr *PullRequest) loadAttributes(e Engine) (err error) {
 	if pr.HeadRepo == nil {
 		pr.HeadRepo, err = getRepositoryByID(e, pr.HeadRepoID)
-		if err != nil && !IsErrRepoNotExist(err) {
+		if err != nil && !errors.IsRepoNotExist(err) {
 			return fmt.Errorf("getRepositoryByID.(HeadRepo) [%d]: %v", pr.HeadRepoID, err)
 		}
 	}
@@ -101,7 +102,7 @@ func (pr *PullRequest) loadAttributes(e Engine) (err error) {
 
 	if pr.HasMerged && pr.Merger == nil {
 		pr.Merger, err = getUserByID(e, pr.MergerID)
-		if IsErrUserNotExist(err) {
+		if errors.IsUserNotExist(err) {
 			pr.MergerID = -1
 			pr.Merger = NewGhostUser()
 		} else if err != nil {
@@ -277,12 +278,12 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 	}
 
 	if err = MergePullRequestAction(doer, pr.Issue.Repo, pr.Issue); err != nil {
-		log.Error(4, "MergePullRequestAction [%d]: %v", pr.ID, err)
+		log.Error(2, "MergePullRequestAction [%d]: %v", pr.ID, err)
 	}
 
 	// Reload pull request information.
 	if err = pr.LoadAttributes(); err != nil {
-		log.Error(4, "LoadAttributes: %v", err)
+		log.Error(2, "LoadAttributes: %v", err)
 		return nil
 	}
 	if err = PrepareWebhooks(pr.Issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
@@ -292,13 +293,13 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 		Repository:  pr.Issue.Repo.APIFormat(nil),
 		Sender:      doer.APIFormat(),
 	}); err != nil {
-		log.Error(4, "PrepareWebhooks: %v", err)
+		log.Error(2, "PrepareWebhooks: %v", err)
 		return nil
 	}
 
 	l, err := headGitRepo.CommitsBetweenIDs(pr.MergedCommitID, pr.MergeBase)
 	if err != nil {
-		log.Error(4, "CommitsBetweenIDs: %v", err)
+		log.Error(2, "CommitsBetweenIDs: %v", err)
 		return nil
 	}
 
@@ -308,35 +309,34 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 	// to avoid strange diff commits produced.
 	mergeCommit, err := baseGitRepo.GetBranchCommit(pr.BaseBranch)
 	if err != nil {
-		log.Error(4, "GetBranchCommit: %v", err)
+		log.Error(2, "GetBranchCommit: %v", err)
 		return nil
 	}
 	l.PushFront(mergeCommit)
 
+	commits, err := ListToPushCommits(l).ToApiPayloadCommits(pr.BaseRepo.RepoPath(), pr.BaseRepo.HTMLURL())
+	if err != nil {
+		log.Error(2, "ToApiPayloadCommits: %v", err)
+		return nil
+	}
+
 	p := &api.PushPayload{
 		Ref:        git.BRANCH_PREFIX + pr.BaseBranch,
 		Before:     pr.MergeBase,
 		After:      pr.MergedCommitID,
-		CompareURL: setting.AppUrl + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
-		Commits:    ListToPushCommits(l).ToApiPayloadCommits(pr.BaseRepo.HTMLURL()),
+		CompareURL: setting.AppURL + pr.BaseRepo.ComposeCompareURL(pr.MergeBase, pr.MergedCommitID),
+		Commits:    commits,
 		Repo:       pr.BaseRepo.APIFormat(nil),
 		Pusher:     pr.HeadRepo.MustOwner().APIFormat(),
 		Sender:     doer.APIFormat(),
 	}
 	if err = PrepareWebhooks(pr.BaseRepo, HOOK_EVENT_PUSH, p); err != nil {
-		return fmt.Errorf("PrepareWebhooks: %v", err)
+		log.Error(2, "PrepareWebhooks: %v", err)
+		return nil
 	}
 	return nil
 }
 
-// patchConflicts is a list of conflit description from Git.
-var patchConflicts = []string{
-	"patch does not apply",
-	"already exists in working directory",
-	"unrecognized input",
-	"error:",
-}
-
 // testPatch checks if patch can be merged to base repository without conflit.
 // FIXME: make a mechanism to clean up stable local copies.
 func (pr *PullRequest) testPatch() (err error) {
@@ -372,16 +372,9 @@ func (pr *PullRequest) testPatch() (err error) {
 		fmt.Sprintf("testPatch (git apply --check): %d", pr.BaseRepo.ID),
 		"git", "apply", "--check", patchPath)
 	if err != nil {
-		for i := range patchConflicts {
-			if strings.Contains(stderr, patchConflicts[i]) {
-				log.Trace("PullRequest[%d].testPatch (apply): has conflit", pr.ID)
-				fmt.Println(stderr)
-				pr.Status = PULL_REQUEST_STATUS_CONFLICT
-				return nil
-			}
-		}
-
-		return fmt.Errorf("git apply --check: %v - %s", err, stderr)
+		log.Trace("PullRequest[%d].testPatch (apply): has conflit\n%s", pr.ID, stderr)
+		pr.Status = PULL_REQUEST_STATUS_CONFLICT
+		return nil
 	}
 	return nil
 }
@@ -437,9 +430,10 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str
 		RepoName:     repo.Name,
 		IsPrivate:    repo.IsPrivate,
 	}); err != nil {
-		log.Error(4, "NotifyWatchers: %v", err)
-	} else if err = pull.MailParticipants(); err != nil {
-		log.Error(4, "MailParticipants: %v", err)
+		log.Error(2, "NotifyWatchers: %v", err)
+	}
+	if err = pull.MailParticipants(); err != nil {
+		log.Error(2, "MailParticipants: %v", err)
 	}
 
 	pr.Issue = pull
@@ -451,9 +445,8 @@ func NewPullRequest(repo *Repository, pull *Issue, labelIDs []int64, uuids []str
 		Repository:  repo.APIFormat(nil),
 		Sender:      pull.Poster.APIFormat(),
 	}); err != nil {
-		log.Error(4, "PrepareWebhooks: %v", err)
+		log.Error(2, "PrepareWebhooks: %v", err)
 	}
-	go HookQueue.Add(repo.ID)
 
 	return nil
 }
@@ -614,7 +607,7 @@ func (pr *PullRequest) AddToTaskQueue() {
 	go PullRequestQueue.AddFunc(pr.ID, func() {
 		pr.Status = PULL_REQUEST_STATUS_CHECKING
 		if err := pr.UpdateCols("status"); err != nil {
-			log.Error(5, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
+			log.Error(3, "AddToTaskQueue.UpdateCols[%d].(add to queue): %v", pr.ID, err)
 		}
 	})
 }
@@ -627,16 +620,18 @@ func (prs PullRequestList) loadAttributes(e Engine) (err error) {
 	}
 
 	// Load issues
-	issueIDs := make([]int64, 0, len(prs))
+	set := make(map[int64]*Issue)
 	for i := range prs {
-		issueIDs = append(issueIDs, prs[i].IssueID)
+		set[prs[i].IssueID] = nil
+	}
+	issueIDs := make([]int64, 0, len(prs))
+	for issueID := range set {
+		issueIDs = append(issueIDs, issueID)
 	}
 	issues := make([]*Issue, 0, len(issueIDs))
 	if err = e.Where("id > 0").In("id", issueIDs).Find(&issues); err != nil {
 		return fmt.Errorf("find issues: %v", err)
 	}
-
-	set := make(map[int64]*Issue)
 	for i := range issues {
 		set[issues[i].ID] = issues[i]
 	}
@@ -679,20 +674,20 @@ func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool
 	log.Trace("AddTestPullRequestTask [head_repo_id: %d, head_branch: %s]: finding pull requests", repoID, branch)
 	prs, err := GetUnmergedPullRequestsByHeadInfo(repoID, branch)
 	if err != nil {
-		log.Error(4, "Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
+		log.Error(2, "Find pull requests [head_repo_id: %d, head_branch: %s]: %v", repoID, branch, err)
 		return
 	}
 
 	if isSync {
 		if err = PullRequestList(prs).LoadAttributes(); err != nil {
-			log.Error(4, "PullRequestList.LoadAttributes: %v", err)
+			log.Error(2, "PullRequestList.LoadAttributes: %v", err)
 		}
 
 		if err == nil {
 			for _, pr := range prs {
 				pr.Issue.PullRequest = pr
 				if err = pr.Issue.LoadAttributes(); err != nil {
-					log.Error(4, "LoadAttributes: %v", err)
+					log.Error(2, "LoadAttributes: %v", err)
 					continue
 				}
 				if err = PrepareWebhooks(pr.Issue.Repo, HOOK_EVENT_PULL_REQUEST, &api.PullRequestPayload{
@@ -702,10 +697,9 @@ func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool
 					Repository:  pr.Issue.Repo.APIFormat(nil),
 					Sender:      doer.APIFormat(),
 				}); err != nil {
-					log.Error(4, "PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
+					log.Error(2, "PrepareWebhooks [pull_id: %v]: %v", pr.ID, err)
 					continue
 				}
-				go HookQueue.Add(pr.Issue.Repo.ID)
 			}
 		}
 	}
@@ -715,7 +709,7 @@ func AddTestPullRequestTask(doer *User, repoID int64, branch string, isSync bool
 	log.Trace("AddTestPullRequestTask [base_repo_id: %d, base_branch: %s]: finding pull requests", repoID, branch)
 	prs, err = GetUnmergedPullRequestsByBaseInfo(repoID, branch)
 	if err != nil {
-		log.Error(4, "Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
+		log.Error(2, "Find pull requests [base_repo_id: %d, base_branch: %s]: %v", repoID, branch, err)
 		return
 	}
 	for _, pr := range prs {

models/release.go

@@ -11,16 +11,20 @@ import (
 	"time"
 
 	"github.com/go-xorm/xorm"
+	log "gopkg.in/clog.v1"
 
 	"github.com/gogits/git-module"
+	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/process"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/process"
 )
 
 // Release represents a release of repository.
 type Release struct {
-	ID               int64 `xorm:"pk autoincr"`
+	ID               int64
 	RepoID           int64
+	Repo             *Repository `xorm:"-"`
 	PublisherID      int64
 	Publisher        *User `xorm:"-"`
 	TagName          string
@@ -36,6 +40,8 @@ type Release struct {
 
 	Created     time.Time `xorm:"-"`
 	CreatedUnix int64
+
+	Attachments []*Attachment `xorm:"-"`
 }
 
 func (r *Release) BeforeInsert() {
@@ -51,6 +57,56 @@ func (r *Release) AfterSet(colName string, _ xorm.Cell) {
 	}
 }
 
+func (r *Release) loadAttributes(e Engine) (err error) {
+	if r.Repo == nil {
+		r.Repo, err = getRepositoryByID(e, r.RepoID)
+		if err != nil {
+			return fmt.Errorf("getRepositoryByID [repo_id: %d]: %v", r.RepoID, err)
+		}
+	}
+
+	if r.Publisher == nil {
+		r.Publisher, err = getUserByID(e, r.PublisherID)
+		if err != nil {
+			if errors.IsUserNotExist(err) {
+				r.PublisherID = -1
+				r.Publisher = NewGhostUser()
+			} else {
+				return fmt.Errorf("getUserByID.(Publisher) [publisher_id: %d]: %v", r.PublisherID, err)
+			}
+		}
+	}
+
+	if r.Attachments == nil {
+		r.Attachments, err = getAttachmentsByReleaseID(e, r.ID)
+		if err != nil {
+			return fmt.Errorf("getAttachmentsByReleaseID [%d]: %v", r.ID, err)
+		}
+	}
+
+	return nil
+}
+
+func (r *Release) LoadAttributes() error {
+	return r.loadAttributes(x)
+}
+
+// This method assumes some fields assigned with values:
+// Required - Publisher
+func (r *Release) APIFormat() *api.Release {
+	return &api.Release{
+		ID:              r.ID,
+		TagName:         r.TagName,
+		TargetCommitish: r.Target,
+		Name:            r.Title,
+		Body:            r.Note,
+		Draft:           r.IsDraft,
+		Prerelease:      r.IsPrerelease,
+		Author:          r.Publisher.APIFormat(),
+		Created:         r.Created,
+	}
+}
+
 // IsReleaseExist returns true if release with given tag name already exists.
 func IsReleaseExist(repoID int64, tagName string) (bool, error) {
 	if len(tagName) == 0 {
@@ -60,31 +116,31 @@ func IsReleaseExist(repoID int64, tagName string) (bool, error) {
 	return x.Get(&Release{RepoID: repoID, LowerTagName: strings.ToLower(tagName)})
 }
 
-func createTag(gitRepo *git.Repository, rel *Release) error {
+func createTag(gitRepo *git.Repository, r *Release) error {
 	// Only actual create when publish.
-	if !rel.IsDraft {
-		if !gitRepo.IsTagExist(rel.TagName) {
-			commit, err := gitRepo.GetBranchCommit(rel.Target)
+	if !r.IsDraft {
+		if !gitRepo.IsTagExist(r.TagName) {
+			commit, err := gitRepo.GetBranchCommit(r.Target)
 			if err != nil {
 				return fmt.Errorf("GetBranchCommit: %v", err)
 			}
 
 			// Trim '--' prefix to prevent command line argument vulnerability.
-			rel.TagName = strings.TrimPrefix(rel.TagName, "--")
-			if err = gitRepo.CreateTag(rel.TagName, commit.ID.String()); err != nil {
+			r.TagName = strings.TrimPrefix(r.TagName, "--")
+			if err = gitRepo.CreateTag(r.TagName, commit.ID.String()); err != nil {
 				if strings.Contains(err.Error(), "is not a valid tag name") {
-					return ErrInvalidTagName{rel.TagName}
+					return ErrInvalidTagName{r.TagName}
 				}
 				return err
 			}
 		} else {
-			commit, err := gitRepo.GetTagCommit(rel.TagName)
+			commit, err := gitRepo.GetTagCommit(r.TagName)
 			if err != nil {
 				return fmt.Errorf("GetTagCommit: %v", err)
 			}
 
-			rel.Sha1 = commit.ID.String()
-			rel.NumCommits, err = commit.CommitsCount()
+			r.Sha1 = commit.ID.String()
+			r.NumCommits, err = commit.CommitsCount()
 			if err != nil {
 				return fmt.Errorf("CommitsCount: %v", err)
 			}
@@ -93,21 +149,61 @@ func createTag(gitRepo *git.Repository, rel *Release) error {
 	return nil
 }
 
-// CreateRelease creates a new release of repository.
-func CreateRelease(gitRepo *git.Repository, rel *Release) error {
-	isExist, err := IsReleaseExist(rel.RepoID, rel.TagName)
+func (r *Release) preparePublishWebhooks() {
+	if err := PrepareWebhooks(r.Repo, HOOK_EVENT_RELEASE, &api.ReleasePayload{
+		Action:     api.HOOK_RELEASE_PUBLISHED,
+		Release:    r.APIFormat(),
+		Repository: r.Repo.APIFormat(nil),
+		Sender:     r.Publisher.APIFormat(),
+	}); err != nil {
+		log.Error(2, "PrepareWebhooks: %v", err)
+	}
+}
+
+// NewRelease creates a new release with attachments for repository.
+func NewRelease(gitRepo *git.Repository, r *Release, uuids []string) error {
+	isExist, err := IsReleaseExist(r.RepoID, r.TagName)
 	if err != nil {
 		return err
 	} else if isExist {
-		return ErrReleaseAlreadyExist{rel.TagName}
+		return ErrReleaseAlreadyExist{r.TagName}
 	}
 
-	if err = createTag(gitRepo, rel); err != nil {
+	if err = createTag(gitRepo, r); err != nil {
 		return err
 	}
-	rel.LowerTagName = strings.ToLower(rel.TagName)
-	_, err = x.InsertOne(rel)
-	return err
+	r.LowerTagName = strings.ToLower(r.TagName)
+
+	sess := x.NewSession()
+	defer sessionRelease(sess)
+	if err = sess.Begin(); err != nil {
+		return err
+	}
+
+	if _, err = sess.Insert(r); err != nil {
+		return fmt.Errorf("Insert: %v", err)
+	}
+
+	if len(uuids) > 0 {
+		if _, err = sess.In("uuid", uuids).Cols("release_id").Update(&Attachment{ReleaseID: r.ID}); err != nil {
+			return fmt.Errorf("link attachments: %v", err)
+		}
+	}
+
+	if err = sess.Commit(); err != nil {
+		return fmt.Errorf("Commit: %v", err)
+	}
+
+	// Only send webhook when actually published, skip drafts
+	if r.IsDraft {
+		return nil
+	}
+	r, err = GetReleaseByID(r.ID)
+	if err != nil {
+		return fmt.Errorf("GetReleaseByID: %v", err)
+	}
+	r.preparePublishWebhooks()
+	return nil
 }
 
 // GetRelease returns release by given ID.
@@ -119,63 +215,109 @@ func GetRelease(repoID int64, tagName string) (*Release, error) {
 		return nil, ErrReleaseNotExist{0, tagName}
 	}
 
-	rel := &Release{RepoID: repoID, LowerTagName: strings.ToLower(tagName)}
-	_, err = x.Get(rel)
-	return rel, err
+	r := &Release{RepoID: repoID, LowerTagName: strings.ToLower(tagName)}
+	if _, err = x.Get(r); err != nil {
+		return nil, fmt.Errorf("Get: %v", err)
+	}
+
+	return r, r.LoadAttributes()
 }
 
 // GetReleaseByID returns release with given ID.
 func GetReleaseByID(id int64) (*Release, error) {
-	rel := new(Release)
-	has, err := x.Id(id).Get(rel)
+	r := new(Release)
+	has, err := x.Id(id).Get(r)
 	if err != nil {
 		return nil, err
 	} else if !has {
 		return nil, ErrReleaseNotExist{id, ""}
 	}
 
-	return rel, nil
+	return r, r.LoadAttributes()
 }
 
-// GetReleasesByRepoID returns a list of releases of repository.
-func GetReleasesByRepoID(repoID int64) (rels []*Release, err error) {
-	err = x.Desc("created_unix").Find(&rels, Release{RepoID: repoID})
-	return rels, err
+// GetPublishedReleasesByRepoID returns a list of published releases of repository.
+// If matches is not empty, only published releases in matches will be returned.
+// In any case, drafts won't be returned by this function.
+func GetPublishedReleasesByRepoID(repoID int64, matches ...string) ([]*Release, error) {
+	sess := x.Where("repo_id = ?", repoID).And("is_draft = ?", false).Desc("created_unix")
+	if len(matches) > 0 {
+		sess.In("tag_name", matches)
+	}
+	releases := make([]*Release, 0, 5)
+	return releases, sess.Find(&releases, new(Release))
+}
+
+// GetDraftReleasesByRepoID returns all draft releases of repository.
+func GetDraftReleasesByRepoID(repoID int64) ([]*Release, error) {
+	releases := make([]*Release, 0)
+	return releases, x.Where("repo_id = ?", repoID).And("is_draft = ?", true).Find(&releases)
 }
 
 type ReleaseSorter struct {
-	rels []*Release
+	releases []*Release
 }
 
 func (rs *ReleaseSorter) Len() int {
-	return len(rs.rels)
+	return len(rs.releases)
 }
 
 func (rs *ReleaseSorter) Less(i, j int) bool {
-	diffNum := rs.rels[i].NumCommits - rs.rels[j].NumCommits
+	diffNum := rs.releases[i].NumCommits - rs.releases[j].NumCommits
 	if diffNum != 0 {
 		return diffNum > 0
 	}
-	return rs.rels[i].Created.After(rs.rels[j].Created)
+	return rs.releases[i].Created.After(rs.releases[j].Created)
 }
 
 func (rs *ReleaseSorter) Swap(i, j int) {
-	rs.rels[i], rs.rels[j] = rs.rels[j], rs.rels[i]
+	rs.releases[i], rs.releases[j] = rs.releases[j], rs.releases[i]
 }
 
 // SortReleases sorts releases by number of commits and created time.
 func SortReleases(rels []*Release) {
-	sorter := &ReleaseSorter{rels: rels}
+	sorter := &ReleaseSorter{releases: rels}
 	sort.Sort(sorter)
 }
 
 // UpdateRelease updates information of a release.
-func UpdateRelease(gitRepo *git.Repository, rel *Release) (err error) {
-	if err = createTag(gitRepo, rel); err != nil {
+func UpdateRelease(doer *User, gitRepo *git.Repository, r *Release, isPublish bool, uuids []string) (err error) {
+	if err = createTag(gitRepo, r); err != nil {
+		return fmt.Errorf("createTag: %v", err)
+	}
+
+	r.PublisherID = doer.ID
+
+	sess := x.NewSession()
+	defer sessionRelease(sess)
+	if err = sess.Begin(); err != nil {
 		return err
 	}
-	_, err = x.Id(rel.ID).AllCols().Update(rel)
-	return err
+	if _, err = sess.Id(r.ID).AllCols().Update(r); err != nil {
+		return fmt.Errorf("Update: %v", err)
+	}
+
+	// Unlink all current attachments and link back later if still valid
+	if _, err = sess.Exec("UPDATE attachment SET release_id = 0 WHERE release_id = ?", r.ID); err != nil {
+		return fmt.Errorf("unlink current attachments: %v", err)
+	}
+
+	if len(uuids) > 0 {
+		if _, err = sess.In("uuid", uuids).Cols("release_id").Update(&Attachment{ReleaseID: r.ID}); err != nil {
+			return fmt.Errorf("link attachments: %v", err)
+		}
+	}
+
+	if err = sess.Commit(); err != nil {
+		return fmt.Errorf("Commit: %v", err)
+	}
+
+	if !isPublish {
+		return nil
+	}
+	r.Publisher = doer
+	r.preparePublishWebhooks()
+	return nil
 }
 
 // DeleteReleaseOfRepoByID deletes a release and corresponding Git tag by given ID.

models/repo.go

@@ -6,15 +6,12 @@ package models
 
 import (
 	"bytes"
-	"errors"
 	"fmt"
-	"html/template"
 	"io/ioutil"
 	"os"
 	"os/exec"
 	"path"
 	"path/filepath"
-	"regexp"
 	"sort"
 	"strings"
 	"time"
@@ -29,23 +26,16 @@ import (
 	git "github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/bindata"
-	"github.com/gogits/gogs/modules/markdown"
-	"github.com/gogits/gogs/modules/process"
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/bindata"
+	"github.com/gogits/gogs/pkg/markup"
+	"github.com/gogits/gogs/pkg/process"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/sync"
 )
 
 var repoWorkingPool = sync.NewExclusivePool()
 
-var (
-	ErrRepoFileNotExist  = errors.New("Repository file does not exist")
-	ErrRepoFileNotLoaded = errors.New("Repository file not loaded")
-	ErrMirrorNotExist    = errors.New("Mirror does not exist")
-	ErrInvalidReference  = errors.New("Invalid reference specified")
-	ErrNameEmpty         = errors.New("Name is empty")
-)
-
 var (
 	Gitignores, Licenses, Readmes, LabelTemplates []string
 
@@ -123,6 +113,7 @@ func NewRepoContext() {
 	}
 	git.HookDir = "custom_hooks"
 	git.HookSampleDir = "hooks"
+	git.DefaultCommitsPageSize = setting.UI.User.CommitsPagingNum
 
 	// Git requires setting user.name and user.email in order to commit changes.
 	for configKey, defaultValue := range map[string]string{"user.name": "Gogs", "user.email": "gogs@fake.local"} {
@@ -148,9 +139,9 @@ func NewRepoContext() {
 	RemoveAllWithNotice("Clean up repository temporary data", filepath.Join(setting.AppDataPath, "tmp"))
 }
 
-// Repository represents a git repository.
+// Repository contains information of a repository.
 type Repository struct {
-	ID            int64  `xorm:"pk autoincr"`
+	ID            int64
 	OwnerID       int64  `xorm:"UNIQUE(s)"`
 	Owner         *User  `xorm:"-"`
 	LowerName     string `xorm:"UNIQUE(s) INDEX NOT NULL"`
@@ -158,6 +149,7 @@ type Repository struct {
 	Description   string
 	Website       string
 	DefaultBranch string
+	Size          int64 `xorm:"NOT NULL DEFAULT 0"`
 
 	NumWatches          int
 	NumStars            int
@@ -181,9 +173,11 @@ type Repository struct {
 
 	// Advanced settings
 	EnableWiki            bool `xorm:"NOT NULL DEFAULT true"`
+	AllowPublicWiki       bool
 	EnableExternalWiki    bool
 	ExternalWikiURL       string
 	EnableIssues          bool `xorm:"NOT NULL DEFAULT true"`
+	AllowPublicIssues     bool
 	EnableExternalTracker bool
 	ExternalTrackerURL    string
 	ExternalTrackerFormat string
@@ -225,7 +219,7 @@ func (repo *Repository) AfterSet(colName string, _ xorm.Cell) {
 		repo.NumOpenMilestones = repo.NumMilestones - repo.NumClosedMilestones
 	case "external_tracker_style":
 		if len(repo.ExternalTrackerStyle) == 0 {
-			repo.ExternalTrackerStyle = markdown.ISSUE_NAME_STYLE_NUMERIC
+			repo.ExternalTrackerStyle = markup.ISSUE_NAME_STYLE_NUMERIC
 		}
 	case "created_unix":
 		repo.Created = time.Unix(repo.CreatedUnix, 0).Local()
@@ -234,10 +228,48 @@ func (repo *Repository) AfterSet(colName string, _ xorm.Cell) {
 	}
 }
 
-// MustOwner always returns a valid *User object to avoid
-// conceptually impossible error handling.
-// It creates a fake object that contains error deftail
-// when error occurs.
+func (repo *Repository) loadAttributes(e Engine) (err error) {
+	if repo.Owner == nil {
+		repo.Owner, err = getUserByID(e, repo.OwnerID)
+		if err != nil {
+			return fmt.Errorf("getUserByID [%d]: %v", repo.OwnerID, err)
+		}
+	}
+
+	if repo.IsFork && repo.BaseRepo == nil {
+		repo.BaseRepo, err = getRepositoryByID(e, repo.ForkID)
+		if err != nil {
+			if errors.IsRepoNotExist(err) {
+				repo.IsFork = false
+				repo.ForkID = 0
+			} else {
+				return fmt.Errorf("getRepositoryByID [%d]: %v", repo.ForkID, err)
+			}
+		}
+	}
+
+	return nil
+}
+
+func (repo *Repository) LoadAttributes() error {
+	return repo.loadAttributes(x)
+}
+
+// IsPartialPublic returns true if repository is public or allow public access to wiki or issues.
+func (repo *Repository) IsPartialPublic() bool {
+	return !repo.IsPrivate || repo.AllowPublicWiki || repo.AllowPublicIssues
+}
+
+func (repo *Repository) CanGuestViewWiki() bool {
+	return repo.EnableWiki && !repo.EnableExternalWiki && repo.AllowPublicWiki
+}
+
+func (repo *Repository) CanGuestViewIssues() bool {
+	return repo.EnableIssues && !repo.EnableExternalTracker && repo.AllowPublicIssues
+}
+
+// MustOwner always returns a valid *User object to avoid conceptually impossible error handling.
+// It creates a fake object that contains error deftail when error occurs.
 func (repo *Repository) MustOwner() *User {
 	return repo.mustOwner(x)
 }
@@ -247,13 +279,13 @@ func (repo *Repository) FullName() string {
 }
 
 func (repo *Repository) HTMLURL() string {
-	return setting.AppUrl + repo.FullName()
+	return setting.AppURL + repo.FullName()
 }
 
 // Arguments that are allowed to be nil: permission
 func (repo *Repository) APIFormat(permission *api.Permission) *api.Repository {
 	cloneLink := repo.CloneLink()
-	return &api.Repository{
+	apiRepo := &api.Repository{
 		ID:            repo.ID,
 		Owner:         repo.Owner.APIFormat(),
 		Name:          repo.Name,
@@ -261,6 +293,9 @@ func (repo *Repository) APIFormat(permission *api.Permission) *api.Repository {
 		Description:   repo.Description,
 		Private:       repo.IsPrivate,
 		Fork:          repo.IsFork,
+		Empty:         repo.IsBare,
+		Mirror:        repo.IsMirror,
+		Size:          repo.Size,
 		HTMLURL:       repo.HTMLURL(),
 		SSHURL:        cloneLink.SSH,
 		CloneURL:      cloneLink.HTTPS,
@@ -274,6 +309,11 @@ func (repo *Repository) APIFormat(permission *api.Permission) *api.Repository {
 		Updated:       repo.Updated,
 		Permissions:   permission,
 	}
+	if repo.IsFork {
+		// FIXME: check precise permission for base repository
+		apiRepo.Parent = repo.BaseRepo.APIFormat(nil)
+	}
+	return apiRepo
 }
 
 func (repo *Repository) getOwner(e Engine) (err error) {
@@ -300,6 +340,19 @@ func (repo *Repository) mustOwner(e Engine) *User {
 	return repo.Owner
 }
 
+func (repo *Repository) UpdateSize() error {
+	countObject, err := git.GetRepoSize(repo.RepoPath())
+	if err != nil {
+		return fmt.Errorf("GetRepoSize: %v", err)
+	}
+
+	repo.Size = countObject.Size + countObject.SizePack
+	if _, err = x.Id(repo.ID).Cols("size").Update(repo); err != nil {
+		return fmt.Errorf("update size: %v", err)
+	}
+	return nil
+}
+
 // ComposeMetas composes a map of metas for rendering external issue tracker URL.
 func (repo *Repository) ComposeMetas() map[string]string {
 	if !repo.EnableExternalTracker {
@@ -311,10 +364,10 @@ func (repo *Repository) ComposeMetas() map[string]string {
 			"repo":   repo.Name,
 		}
 		switch repo.ExternalTrackerStyle {
-		case markdown.ISSUE_NAME_STYLE_ALPHANUMERIC:
-			repo.ExternalMetas["style"] = markdown.ISSUE_NAME_STYLE_ALPHANUMERIC
+		case markup.ISSUE_NAME_STYLE_ALPHANUMERIC:
+			repo.ExternalMetas["style"] = markup.ISSUE_NAME_STYLE_ALPHANUMERIC
 		default:
-			repo.ExternalMetas["style"] = markdown.ISSUE_NAME_STYLE_NUMERIC
+			repo.ExternalMetas["style"] = markup.ISSUE_NAME_STYLE_NUMERIC
 		}
 
 	}
@@ -396,15 +449,6 @@ func (repo *Repository) GetMirror() (err error) {
 	return err
 }
 
-func (repo *Repository) GetBaseRepo() (err error) {
-	if !repo.IsFork {
-		return nil
-	}
-
-	repo.BaseRepo, err = GetRepositoryByID(repo.ForkID)
-	return err
-}
-
 func (repo *Repository) repoPath(e Engine) string {
 	return RepoPath(repo.mustOwner(e).Name, repo.Name)
 }
@@ -422,7 +466,7 @@ func (repo *Repository) RelLink() string {
 }
 
 func (repo *Repository) Link() string {
-	return setting.AppSubUrl + "/" + repo.FullName()
+	return setting.AppSubURL + "/" + repo.FullName()
 }
 
 func (repo *Repository) ComposeCompareURL(oldCommitID, newCommitID string) string {
@@ -445,7 +489,7 @@ func (repo *Repository) CanBeForked() bool {
 
 // CanEnablePulls returns true if repository meets the requirements of accepting pulls.
 func (repo *Repository) CanEnablePulls() bool {
-	return !repo.IsMirror
+	return !repo.IsMirror && !repo.IsBare
 }
 
 // AllowPulls returns true if repository meets the requirements of accepting pulls and has them enabled.
@@ -468,18 +512,6 @@ func (repo *Repository) NextIssueIndex() int64 {
 	return int64(repo.NumIssues+repo.NumPulls) + 1
 }
 
-var (
-	DescPattern = regexp.MustCompile(`https?://\S+`)
-)
-
-// DescriptionHtml does special handles to description and return HTML string.
-func (repo *Repository) DescriptionHtml() template.HTML {
-	sanitize := func(s string) string {
-		return fmt.Sprintf(`<a href="%[1]s" target="_blank">%[1]s</a>`, s)
-	}
-	return template.HTML(DescPattern.ReplaceAllStringFunc(markdown.Sanitizer.Sanitize(repo.Description), sanitize))
-}
-
 func (repo *Repository) LocalCopyPath() string {
 	return path.Join(setting.AppDataPath, "tmp/local-repo", com.ToStr(repo.ID))
 }
@@ -573,7 +605,7 @@ type CloneLink struct {
 
 // ComposeHTTPSCloneURL returns HTTPS clone URL based on given owner and repository name.
 func ComposeHTTPSCloneURL(owner, repo string) string {
-	return fmt.Sprintf("%s%s/%s.git", setting.AppUrl, owner, repo)
+	return fmt.Sprintf("%s%s/%s.git", setting.AppURL, owner, repo)
 }
 
 func (repo *Repository) cloneLink(isWiki bool) *CloneLink {
@@ -699,6 +731,10 @@ func MigrateRepository(doer, owner *User, opts MigrateRepoOptions) (*Repository,
 		if headBranch != nil {
 			repo.DefaultBranch = headBranch.Name
 		}
+
+		if err = repo.UpdateSize(); err != nil {
+			log.Error(2, "UpdateSize [repo_id: %d]: %v", repo.ID, err)
+		}
 	}
 
 	if opts.IsMirror {
@@ -985,13 +1021,13 @@ func createRepository(e *xorm.Session, doer, owner *User, repo *Repository) (err
 		return fmt.Errorf("newRepoAction: %v", err)
 	}
 
-	return nil
+	return repo.loadAttributes(e)
 }
 
 // CreateRepository creates a repository for given user or organization.
 func CreateRepository(doer, owner *User, opts CreateRepoOptions) (_ *Repository, err error) {
 	if !owner.CanCreateRepo() {
-		return nil, ErrReachLimitOfRepo{owner.MaxRepoCreation}
+		return nil, errors.ReachLimitOfRepo{owner.RepoCreationNum()}
 	}
 
 	repo := &Repository{
@@ -1028,7 +1064,7 @@ func CreateRepository(doer, owner *User, opts CreateRepoOptions) (_ *Repository,
 			repoPath, fmt.Sprintf("CreateRepository 'git update-server-info': %s", repoPath),
 			"git", "update-server-info")
 		if err != nil {
-			return nil, errors.New("CreateRepository 'git update-server-info': " + stderr)
+			return nil, fmt.Errorf("CreateRepository 'git update-server-info': %s", stderr)
 		}
 	}
 
@@ -1359,7 +1395,7 @@ func DeleteRepository(uid, repoID int64) error {
 	if err != nil {
 		return err
 	} else if !has {
-		return ErrRepoNotExist{repoID, uid, ""}
+		return errors.RepoNotExist{repoID, uid, ""}
 	}
 
 	// In case is a organization.
@@ -1474,7 +1510,7 @@ func DeleteRepository(uid, repoID int64) error {
 func GetRepositoryByRef(ref string) (*Repository, error) {
 	n := strings.IndexByte(ref, byte('/'))
 	if n < 2 {
-		return nil, ErrInvalidReference
+		return nil, errors.InvalidRepoReference{ref}
 	}
 
 	userName, repoName := ref[:n], ref[n+1:]
@@ -1496,9 +1532,9 @@ func GetRepositoryByName(ownerID int64, name string) (*Repository, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrRepoNotExist{0, ownerID, name}
+		return nil, errors.RepoNotExist{0, ownerID, name}
 	}
-	return repo, err
+	return repo, repo.LoadAttributes()
 }
 
 func getRepositoryByID(e Engine, id int64) (*Repository, error) {
@@ -1507,9 +1543,9 @@ func getRepositoryByID(e Engine, id int64) (*Repository, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrRepoNotExist{id, 0, ""}
+		return nil, errors.RepoNotExist{id, 0, ""}
 	}
-	return repo, nil
+	return repo, repo.loadAttributes(e)
 }
 
 // GetRepositoryByID returns the repository by given id if exists.
@@ -1552,6 +1588,24 @@ func GetRecentUpdatedRepositories(page, pageSize int) (repos []*Repository, err
 		Where("is_private=?", false).Limit(pageSize).Desc("updated_unix").Find(&repos)
 }
 
+// GetUserAndCollaborativeRepositories returns list of repositories the user owns and collaborates.
+func GetUserAndCollaborativeRepositories(userID int64) ([]*Repository, error) {
+	repos := make([]*Repository, 0, 10)
+	if err := x.Alias("repo").
+		Join("INNER", "collaboration", "collaboration.repo_id = repo.id").
+		Where("collaboration.user_id = ?", userID).
+		Find(&repos); err != nil {
+		return nil, fmt.Errorf("select collaborative repositories: %v", err)
+	}
+
+	ownRepos := make([]*Repository, 0, 10)
+	if err := x.Where("owner_id = ?", userID).Find(&ownRepos); err != nil {
+		return nil, fmt.Errorf("select own repositories: %v", err)
+	}
+
+	return append(repos, ownRepos...), nil
+}
+
 func getRepositoryCount(e Engine, u *User) (int64, error) {
 	return x.Count(&Repository{OwnerID: u.ID})
 }
@@ -1564,6 +1618,7 @@ func GetRepositoryCount(u *User) (int64, error) {
 type SearchRepoOptions struct {
 	Keyword  string
 	OwnerID  int64
+	UserID   int64 // When set results will contain all public/private repositories user has access to
 	OrderBy  string
 	Private  bool // Include private repositories in results
 	Page     int
@@ -1573,24 +1628,28 @@ type SearchRepoOptions struct {
 // SearchRepositoryByName takes keyword and part of repository name to search,
 // it returns results in given range and number of total results.
 func SearchRepositoryByName(opts *SearchRepoOptions) (repos []*Repository, _ int64, _ error) {
-	if len(opts.Keyword) == 0 {
-		return repos, 0, nil
-	}
-	opts.Keyword = strings.ToLower(opts.Keyword)
-
 	if opts.Page <= 0 {
 		opts.Page = 1
 	}
 
 	repos = make([]*Repository, 0, opts.PageSize)
-
-	// Append conditions
-	sess := x.Where("LOWER(lower_name) LIKE ?", "%"+opts.Keyword+"%")
-	if opts.OwnerID > 0 {
-		sess.And("owner_id = ?", opts.OwnerID)
+	sess := x.Alias("repo")
+	// Attempt to find repositories that opts.UserID has access to,
+	// this does not include other people's private repositories even if opts.UserID is an admin.
+	if !opts.Private && opts.UserID > 0 {
+		sess.Join("LEFT", "access", "access.repo_id = repo.id").
+			Where("(repo.owner_id = ? OR access.user_id = ? OR repo.is_private = ?)", opts.UserID, opts.UserID, false)
+	} else {
+		// Only return public repositories if opts.Private is not set
+		if !opts.Private {
+			sess.And("repo.is_private = ?", false)
+		}
 	}
-	if !opts.Private {
-		sess.And("is_private=?", false)
+	if len(opts.Keyword) > 0 {
+		sess.And("repo.lower_name LIKE ? OR repo.description LIKE ?", "%"+strings.ToLower(opts.Keyword)+"%", "%"+strings.ToLower(opts.Keyword)+"%")
+	}
+	if opts.OwnerID > 0 {
+		sess.And("repo.owner_id = ?", opts.OwnerID)
 	}
 
 	var countSess xorm.Session
@@ -1601,9 +1660,9 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos []*Repository, _ int
 	}
 
 	if len(opts.OrderBy) > 0 {
-		sess.OrderBy(opts.OrderBy)
+		sess.OrderBy("repo." + opts.OrderBy)
 	}
-	return repos, count, sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&repos)
+	return repos, count, sess.Distinct("repo.*").Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&repos)
 }
 
 func DeleteOldRepositoryArchives() {
@@ -1933,13 +1992,13 @@ func (repos RepositoryList) loadAttributes(e Engine) error {
 		return nil
 	}
 
-	// Load owners.
-	set := make(map[int64]*User)
+	// Load owners
+	userSet := make(map[int64]*User)
 	for i := range repos {
-		set[repos[i].OwnerID] = nil
+		userSet[repos[i].OwnerID] = nil
 	}
-	userIDs := make([]int64, 0, len(set))
-	for userID := range set {
+	userIDs := make([]int64, 0, len(userSet))
+	for userID := range userSet {
 		userIDs = append(userIDs, userID)
 	}
 	users := make([]*User, 0, len(userIDs))
@@ -1947,11 +2006,36 @@ func (repos RepositoryList) loadAttributes(e Engine) error {
 		return fmt.Errorf("find users: %v", err)
 	}
 	for i := range users {
-		set[users[i].ID] = users[i]
+		userSet[users[i].ID] = users[i]
 	}
 	for i := range repos {
-		repos[i].Owner = set[repos[i].OwnerID]
+		repos[i].Owner = userSet[repos[i].OwnerID]
 	}
+
+	// Load base repositories
+	repoSet := make(map[int64]*Repository)
+	for i := range repos {
+		if repos[i].IsFork {
+			repoSet[repos[i].ForkID] = nil
+		}
+	}
+	baseIDs := make([]int64, 0, len(repoSet))
+	for baseID := range repoSet {
+		baseIDs = append(baseIDs, baseID)
+	}
+	baseRepos := make([]*Repository, 0, len(baseIDs))
+	if err := e.Where("id > 0").In("id", baseIDs).Find(&baseRepos); err != nil {
+		return fmt.Errorf("find base repositories: %v", err)
+	}
+	for i := range baseRepos {
+		repoSet[baseRepos[i].ID] = baseRepos[i]
+	}
+	for i := range repos {
+		if repos[i].IsFork {
+			repos[i].BaseRepo = repoSet[repos[i].ForkID]
+		}
+	}
+
 	return nil
 }
 
@@ -2003,7 +2087,7 @@ func (repos MirrorRepositoryList) LoadAttributes() error {
 
 // Watch is connection request for receiving repository notification.
 type Watch struct {
-	ID     int64 `xorm:"pk autoincr"`
+	ID     int64
 	UserID int64 `xorm:"UNIQUE(watch)"`
 	RepoID int64 `xorm:"UNIQUE(watch)"`
 }
@@ -2109,7 +2193,7 @@ func NotifyWatchers(act *Action) error {
 //         \/           \/
 
 type Star struct {
-	ID     int64 `xorm:"pk autoincr"`
+	ID     int64
 	UID    int64 `xorm:"UNIQUE(s)"`
 	RepoID int64 `xorm:"UNIQUE(s)"`
 }
@@ -2199,6 +2283,8 @@ func ForkRepository(doer, owner *User, baseRepo *Repository, name, desc string)
 	}
 
 	repoPath := repo.repoPath(sess)
+	RemoveAllWithNotice("Repository path erase before creation", repoPath)
+
 	_, stderr, err := process.ExecTimeout(10*time.Minute,
 		fmt.Sprintf("ForkRepository 'git clone': %s/%s", owner.Name, repo.Name),
 		"git", "clone", "--bare", baseRepo.RepoPath(), repoPath)
@@ -2215,15 +2301,23 @@ func ForkRepository(doer, owner *User, baseRepo *Repository, name, desc string)
 
 	if err = createDelegateHooks(repoPath); err != nil {
 		return nil, fmt.Errorf("createDelegateHooks: %v", err)
-	} else if err = prepareWebhooks(sess, baseRepo, HOOK_EVENT_FORK, &api.ForkPayload{
+	}
+
+	if err = sess.Commit(); err != nil {
+		return nil, fmt.Errorf("Commit: %v", err)
+	}
+
+	if err = repo.UpdateSize(); err != nil {
+		log.Error(2, "UpdateSize [repo_id: %d]: %v", repo.ID, err)
+	}
+	if err = PrepareWebhooks(baseRepo, HOOK_EVENT_FORK, &api.ForkPayload{
 		Forkee: repo.APIFormat(nil),
 		Repo:   baseRepo.APIFormat(nil),
 		Sender: doer.APIFormat(),
 	}); err != nil {
-		return nil, fmt.Errorf("prepareWebhooks: %v", err)
+		log.Error(2, "PrepareWebhooks [repo_id: %d]: %v", baseRepo.ID, err)
 	}
-
-	return repo, sess.Commit()
+	return repo, nil
 }
 
 func (repo *Repository) GetForks() ([]*Repository, error) {

models/repo_branch.go

@@ -11,12 +11,15 @@ import (
 	"github.com/Unknwon/com"
 	"github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/pkg/tool"
 )
 
 type Branch struct {
-	Path string
-	Name string
+	RepoPath string
+	Name     string
+
+	IsProtected bool
+	Commit      *git.Commit
 }
 
 func GetBranchesByPath(path string) ([]*Branch, error) {
@@ -33,8 +36,8 @@ func GetBranchesByPath(path string) ([]*Branch, error) {
 	branches := make([]*Branch, len(brs))
 	for i := range brs {
 		branches[i] = &Branch{
-			Path: path,
-			Name: brs[i],
+			RepoPath: path,
+			Name:     brs[i],
 		}
 	}
 	return branches, nil
@@ -45,8 +48,8 @@ func (repo *Repository) GetBranch(br string) (*Branch, error) {
 		return nil, ErrBranchNotExist{br}
 	}
 	return &Branch{
-		Path: repo.RepoPath(),
-		Name: br,
+		RepoPath: repo.RepoPath(),
+		Name:     br,
 	}, nil
 }
 
@@ -55,7 +58,7 @@ func (repo *Repository) GetBranches() ([]*Branch, error) {
 }
 
 func (br *Branch) GetCommit() (*git.Commit, error) {
-	gitRepo, err := git.OpenRepository(br.Path)
+	gitRepo, err := git.OpenRepository(br.RepoPath)
 	if err != nil {
 		return nil, err
 	}
@@ -146,10 +149,10 @@ func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whit
 	}
 
 	hasUsersChanged := false
-	validUserIDs := base.StringsToInt64s(strings.Split(protectBranch.WhitelistUserIDs, ","))
+	validUserIDs := tool.StringsToInt64s(strings.Split(protectBranch.WhitelistUserIDs, ","))
 	if protectBranch.WhitelistUserIDs != whitelistUserIDs {
 		hasUsersChanged = true
-		userIDs := base.StringsToInt64s(strings.Split(whitelistUserIDs, ","))
+		userIDs := tool.StringsToInt64s(strings.Split(whitelistUserIDs, ","))
 		validUserIDs = make([]int64, 0, len(userIDs))
 		for _, userID := range userIDs {
 			has, err := HasAccess(userID, repo, ACCESS_MODE_WRITE)
@@ -162,14 +165,14 @@ func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whit
 			validUserIDs = append(validUserIDs, userID)
 		}
 
-		protectBranch.WhitelistUserIDs = strings.Join(base.Int64sToStrings(validUserIDs), ",")
+		protectBranch.WhitelistUserIDs = strings.Join(tool.Int64sToStrings(validUserIDs), ",")
 	}
 
 	hasTeamsChanged := false
-	validTeamIDs := base.StringsToInt64s(strings.Split(protectBranch.WhitelistTeamIDs, ","))
+	validTeamIDs := tool.StringsToInt64s(strings.Split(protectBranch.WhitelistTeamIDs, ","))
 	if protectBranch.WhitelistTeamIDs != whitelistTeamIDs {
 		hasTeamsChanged = true
-		teamIDs := base.StringsToInt64s(strings.Split(whitelistTeamIDs, ","))
+		teamIDs := tool.StringsToInt64s(strings.Split(whitelistTeamIDs, ","))
 		teams, err := GetTeamsHaveAccessToRepo(repo.OwnerID, repo.ID, ACCESS_MODE_WRITE)
 		if err != nil {
 			return fmt.Errorf("GetTeamsHaveAccessToRepo [org_id: %d, repo_id: %d]: %v", repo.OwnerID, repo.ID, err)
@@ -181,7 +184,14 @@ func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whit
 			}
 		}
 
-		protectBranch.WhitelistTeamIDs = strings.Join(base.Int64sToStrings(validTeamIDs), ",")
+		protectBranch.WhitelistTeamIDs = strings.Join(tool.Int64sToStrings(validTeamIDs), ",")
+	}
+
+	// Make sure protectBranch.ID is not 0 for whitelists
+	if protectBranch.ID == 0 {
+		if _, err = x.Insert(protectBranch); err != nil {
+			return fmt.Errorf("Insert: %v", err)
+		}
 	}
 
 	// Merge users and members of teams
@@ -223,12 +233,6 @@ func UpdateOrgProtectBranch(repo *Repository, protectBranch *ProtectBranch, whit
 		return err
 	}
 
-	if protectBranch.ID == 0 {
-		if _, err = sess.Insert(protectBranch); err != nil {
-			return fmt.Errorf("Insert: %v", err)
-		}
-	}
-
 	if _, err = sess.Id(protectBranch.ID).AllCols().Update(protectBranch); err != nil {
 		return fmt.Errorf("Update: %v", err)
 	}

models/repo_collaboration.go

@@ -7,12 +7,14 @@ package models
 import (
 	"fmt"
 
+	log "gopkg.in/clog.v1"
+
 	api "github.com/gogits/go-gogs-client"
 )
 
 // Collaboration represent the relation between an individual and a repository.
 type Collaboration struct {
-	ID     int64      `xorm:"pk autoincr"`
+	ID     int64
 	RepoID int64      `xorm:"UNIQUE(s) INDEX NOT NULL"`
 	UserID int64      `xorm:"UNIQUE(s) INDEX NOT NULL"`
 	Mode   AccessMode `xorm:"DEFAULT 2 NOT NULL"`
@@ -31,14 +33,22 @@ func (c *Collaboration) ModeI18nKey() string {
 	}
 }
 
-//IsCollaborator returns true if the user is a collaborator
-func (repo *Repository) IsCollaborator(uid int64) (bool, error) {
+// IsCollaborator returns true if the user is a collaborator of the repository.
+func IsCollaborator(repoID, userID int64) bool {
 	collaboration := &Collaboration{
-		RepoID: repo.ID,
-		UserID: uid,
+		RepoID: repoID,
+		UserID: userID,
 	}
+	has, err := x.Get(collaboration)
+	if err != nil {
+		log.Error(2, "get collaboration [repo_id: %d, user_id: %d]: %v", repoID, userID, err)
+		return false
+	}
+	return has
+}
 
-	return x.Get(collaboration)
+func (repo *Repository) IsCollaborator(userID int64) bool {
+	return IsCollaborator(repo.ID, userID)
 }
 
 // AddCollaborator adds new collaboration to a repository with default access mode.
@@ -164,7 +174,7 @@ func (repo *Repository) ChangeCollaborationAccessMode(userID int64, mode AccessM
 		return fmt.Errorf("update collaboration: %v", err)
 	}
 
-	access := Access{
+	access := &Access{
 		UserID: userID,
 		RepoID: repo.ID,
 	}
@@ -186,10 +196,14 @@ func (repo *Repository) ChangeCollaborationAccessMode(userID int64, mode AccessM
 }
 
 // DeleteCollaboration removes collaboration relation between the user and repository.
-func (repo *Repository) DeleteCollaboration(uid int64) (err error) {
+func DeleteCollaboration(repo *Repository, userID int64) (err error) {
+	if !IsCollaborator(repo.ID, userID) {
+		return nil
+	}
+
 	collaboration := &Collaboration{
 		RepoID: repo.ID,
-		UserID: uid,
+		UserID: userID,
 	}
 
 	sess := x.NewSession()
@@ -206,3 +220,7 @@ func (repo *Repository) DeleteCollaboration(uid int64) (err error) {
 
 	return sess.Commit()
 }
+
+func (repo *Repository) DeleteCollaboration(userID int64) error {
+	return DeleteCollaboration(repo, userID)
+}

models/repo_editor.go

@@ -21,8 +21,8 @@ import (
 
 	git "github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/process"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 // ___________    .___.__  __    ___________.__.__
@@ -135,12 +135,12 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (
 
 	gitRepo, err := git.OpenRepository(repo.RepoPath())
 	if err != nil {
-		log.Error(4, "OpenRepository: %v", err)
+		log.Error(2, "OpenRepository: %v", err)
 		return nil
 	}
 	commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
 	if err != nil {
-		log.Error(4, "GetBranchCommit [branch: %s]: %v", opts.NewBranch, err)
+		log.Error(2, "GetBranchCommit [branch: %s]: %v", opts.NewBranch, err)
 		return nil
 	}
 
@@ -162,10 +162,11 @@ func (repo *Repository) UpdateRepoFile(doer *User, opts UpdateRepoFileOptions) (
 		NewCommitID: commit.ID.String(),
 		Commits:     pushCommits,
 	}); err != nil {
-		log.Error(4, "CommitRepoAction: %v", err)
+		log.Error(2, "CommitRepoAction: %v", err)
 		return nil
 	}
 
+	go AddTestPullRequestTask(doer, repo.ID, opts.NewBranch, true)
 	return nil
 }
 
@@ -265,12 +266,12 @@ func (repo *Repository) DeleteRepoFile(doer *User, opts DeleteRepoFileOptions) (
 
 	gitRepo, err := git.OpenRepository(repo.RepoPath())
 	if err != nil {
-		log.Error(4, "OpenRepository: %v", err)
+		log.Error(2, "OpenRepository: %v", err)
 		return nil
 	}
 	commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
 	if err != nil {
-		log.Error(4, "GetBranchCommit [branch: %s]: %v", opts.NewBranch, err)
+		log.Error(2, "GetBranchCommit [branch: %s]: %v", opts.NewBranch, err)
 		return nil
 	}
 
@@ -288,10 +289,11 @@ func (repo *Repository) DeleteRepoFile(doer *User, opts DeleteRepoFileOptions) (
 		NewCommitID: commit.ID.String(),
 		Commits:     pushCommits,
 	}); err != nil {
-		log.Error(4, "CommitRepoAction: %v", err)
+		log.Error(2, "CommitRepoAction: %v", err)
 		return nil
 	}
 
+	go AddTestPullRequestTask(doer, repo.ID, opts.NewBranch, true)
 	return nil
 }
 
@@ -305,7 +307,7 @@ func (repo *Repository) DeleteRepoFile(doer *User, opts DeleteRepoFileOptions) (
 
 // Upload represent a uploaded file to a repo to be deleted when moved
 type Upload struct {
-	ID   int64  `xorm:"pk autoincr"`
+	ID   int64
 	UUID string `xorm:"uuid UNIQUE"`
 	Name string
 }
@@ -489,12 +491,12 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions)
 
 	gitRepo, err := git.OpenRepository(repo.RepoPath())
 	if err != nil {
-		log.Error(4, "OpenRepository: %v", err)
+		log.Error(2, "OpenRepository: %v", err)
 		return nil
 	}
 	commit, err := gitRepo.GetBranchCommit(opts.NewBranch)
 	if err != nil {
-		log.Error(4, "GetBranchCommit [branch: %s]: %v", opts.NewBranch, err)
+		log.Error(2, "GetBranchCommit [branch: %s]: %v", opts.NewBranch, err)
 		return nil
 	}
 
@@ -512,9 +514,10 @@ func (repo *Repository) UploadRepoFiles(doer *User, opts UploadRepoFileOptions)
 		NewCommitID: commit.ID.String(),
 		Commits:     pushCommits,
 	}); err != nil {
-		log.Error(4, "CommitRepoAction: %v", err)
+		log.Error(2, "CommitRepoAction: %v", err)
 		return nil
 	}
 
+	go AddTestPullRequestTask(doer, repo.ID, opts.NewBranch, true)
 	return DeleteUploads(uploads...)
 }

models/repo_test.go

@@ -1,11 +1,12 @@
 package models_test
 
 import (
-	. "github.com/gogits/gogs/models"
-	. "github.com/smartystreets/goconvey/convey"
 	"testing"
 
-	"github.com/gogits/gogs/modules/markdown"
+	. "github.com/smartystreets/goconvey/convey"
+
+	. "github.com/gogits/gogs/models"
+	"github.com/gogits/gogs/pkg/markup"
 )
 
 func TestRepo(t *testing.T) {
@@ -24,7 +25,7 @@ func TestRepo(t *testing.T) {
 			Convey("It should be nil even if other settings are present", func() {
 				repo.EnableExternalTracker = false
 				repo.ExternalTrackerFormat = "http://someurl.com/{user}/{repo}/{issue}"
-				repo.ExternalTrackerStyle = markdown.ISSUE_NAME_STYLE_NUMERIC
+				repo.ExternalTrackerStyle = markup.ISSUE_NAME_STYLE_NUMERIC
 				So(repo.ComposeMetas(), ShouldEqual, map[string]string(nil))
 			})
 		})
@@ -33,17 +34,17 @@ func TestRepo(t *testing.T) {
 			repo.EnableExternalTracker = true
 			Convey("It should default to numeric issue style", func() {
 				metas := repo.ComposeMetas()
-				So(metas["style"], ShouldEqual, markdown.ISSUE_NAME_STYLE_NUMERIC)
+				So(metas["style"], ShouldEqual, markup.ISSUE_NAME_STYLE_NUMERIC)
 			})
 			Convey("It should pass through numeric issue style setting", func() {
-				repo.ExternalTrackerStyle = markdown.ISSUE_NAME_STYLE_NUMERIC
+				repo.ExternalTrackerStyle = markup.ISSUE_NAME_STYLE_NUMERIC
 				metas := repo.ComposeMetas()
-				So(metas["style"], ShouldEqual, markdown.ISSUE_NAME_STYLE_NUMERIC)
+				So(metas["style"], ShouldEqual, markup.ISSUE_NAME_STYLE_NUMERIC)
 			})
 			Convey("It should pass through alphanumeric issue style setting", func() {
-				repo.ExternalTrackerStyle = markdown.ISSUE_NAME_STYLE_ALPHANUMERIC
+				repo.ExternalTrackerStyle = markup.ISSUE_NAME_STYLE_ALPHANUMERIC
 				metas := repo.ComposeMetas()
-				So(metas["style"], ShouldEqual, markdown.ISSUE_NAME_STYLE_ALPHANUMERIC)
+				So(metas["style"], ShouldEqual, markup.ISSUE_NAME_STYLE_ALPHANUMERIC)
 			})
 			Convey("It should contain the user name", func() {
 				metas := repo.ComposeMetas()

models/ssh_key.go

@@ -23,9 +23,9 @@ import (
 	"golang.org/x/crypto/ssh"
 	log "gopkg.in/clog.v1"
 
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/process"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/tool"
 )
 
 const (
@@ -43,7 +43,7 @@ const (
 
 // PublicKey represents a user or deploy SSH public key.
 type PublicKey struct {
-	ID          int64      `xorm:"pk autoincr"`
+	ID          int64
 	OwnerID     int64      `xorm:"INDEX NOT NULL"`
 	Name        string     `xorm:"NOT NULL"`
 	Fingerprint string     `xorm:"NOT NULL"`
@@ -223,7 +223,6 @@ func SSHKeyGenParsePublicKey(key string) (string, int, error) {
 }
 
 // SSHNativeParsePublicKey extracts the key type and length using the golang SSH library.
-// NOTE: ed25519 is not supported.
 func SSHNativeParsePublicKey(keyLine string) (string, int, error) {
 	fields := strings.Fields(keyLine)
 	if len(fields) < 2 {
@@ -272,7 +271,7 @@ func SSHNativeParsePublicKey(keyLine string) (string, int, error) {
 		return "ecdsa", 384, nil
 	case ssh.KeyAlgoECDSA521:
 		return "ecdsa", 521, nil
-	case "ssh-ed25519": // TODO: replace with ssh constant when available
+	case ssh.KeyAlgoED25519:
 		return "ed25519", 256, nil
 	}
 	return "", 0, fmt.Errorf("unsupported key length detection for type: %s", pkey.Type())
@@ -298,6 +297,10 @@ func CheckPublicKeyString(content string) (_ string, err error) {
 	// remove any unnecessary whitespace now
 	content = strings.TrimSpace(content)
 
+	if !setting.SSH.MinimumKeySizeCheck {
+		return content, nil
+	}
+
 	var (
 		fnName  string
 		keyType string
@@ -315,9 +318,6 @@ func CheckPublicKeyString(content string) (_ string, err error) {
 	}
 	log.Trace("Key info [native: %v]: %s-%d", setting.SSH.StartBuiltinServer, keyType, length)
 
-	if !setting.SSH.MinimumKeySizeCheck {
-		return content, nil
-	}
 	if minLen, found := setting.SSH.MinimumKeySizes[keyType]; found && length >= minLen {
 		return content, nil
 	} else if found && length < minLen {
@@ -484,7 +484,7 @@ func deletePublicKeys(e *xorm.Session, keyIDs ...int64) error {
 		return nil
 	}
 
-	_, err := e.In("id", strings.Join(base.Int64sToStrings(keyIDs), ",")).Delete(new(PublicKey))
+	_, err := e.In("id", strings.Join(tool.Int64sToStrings(keyIDs), ",")).Delete(new(PublicKey))
 	return err
 }
 
@@ -527,6 +527,7 @@ func RewriteAllPublicKeys() error {
 	sshOpLocker.Lock()
 	defer sshOpLocker.Unlock()
 
+	os.MkdirAll(setting.SSH.RootPath, os.ModePerm)
 	fpath := filepath.Join(setting.SSH.RootPath, "authorized_keys")
 	tmpPath := fpath + ".tmp"
 	f, err := os.OpenFile(tmpPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
@@ -565,7 +566,7 @@ func RewriteAllPublicKeys() error {
 
 // DeployKey represents deploy key information and its relation with repository.
 type DeployKey struct {
-	ID          int64 `xorm:"pk autoincr"`
+	ID          int64
 	KeyID       int64 `xorm:"UNIQUE(s) INDEX"`
 	RepoID      int64 `xorm:"UNIQUE(s) INDEX"`
 	Name        string

models/ssh_key_test.go

@@ -11,7 +11,7 @@ import (
 
 	. "github.com/smartystreets/goconvey/convey"
 
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 func init() {

models/token.go

@@ -10,12 +10,12 @@ import (
 	"github.com/go-xorm/xorm"
 	gouuid "github.com/satori/go.uuid"
 
-	"github.com/gogits/gogs/modules/base"
+	"github.com/gogits/gogs/pkg/tool"
 )
 
 // AccessToken represents a personal access token.
 type AccessToken struct {
-	ID   int64 `xorm:"pk autoincr"`
+	ID   int64
 	UID  int64 `xorm:"INDEX"`
 	Name string
 	Sha1 string `xorm:"UNIQUE VARCHAR(40)"`
@@ -49,7 +49,7 @@ func (t *AccessToken) AfterSet(colName string, _ xorm.Cell) {
 
 // NewAccessToken creates new access token.
 func NewAccessToken(t *AccessToken) error {
-	t.Sha1 = base.EncodeSha1(gouuid.NewV4().String())
+	t.Sha1 = tool.SHA1(gouuid.NewV4().String())
 	_, err := x.Insert(t)
 	return err
 }

models/two_factor.go

@@ -0,0 +1,201 @@
+// Copyright 2017 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package models
+
+import (
+	"encoding/base64"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/Unknwon/com"
+	"github.com/go-xorm/xorm"
+	"github.com/pquerna/otp/totp"
+	log "gopkg.in/clog.v1"
+
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/tool"
+)
+
+// TwoFactor represents a two-factor authentication token.
+type TwoFactor struct {
+	ID          int64
+	UserID      int64 `xorm:"UNIQUE"`
+	Secret      string
+	Created     time.Time `xorm:"-"`
+	CreatedUnix int64
+}
+
+func (t *TwoFactor) BeforeInsert() {
+	t.CreatedUnix = time.Now().Unix()
+}
+
+func (t *TwoFactor) AfterSet(colName string, _ xorm.Cell) {
+	switch colName {
+	case "created_unix":
+		t.Created = time.Unix(t.CreatedUnix, 0).Local()
+	}
+}
+
+// ValidateTOTP returns true if given passcode is valid for two-factor authentication token.
+// It also returns possible validation error.
+func (t *TwoFactor) ValidateTOTP(passcode string) (bool, error) {
+	secret, err := base64.StdEncoding.DecodeString(t.Secret)
+	if err != nil {
+		return false, fmt.Errorf("DecodeString: %v", err)
+	}
+	decryptSecret, err := com.AESGCMDecrypt(tool.MD5Bytes(setting.SecretKey), secret)
+	if err != nil {
+		return false, fmt.Errorf("AESGCMDecrypt: %v", err)
+	}
+	return totp.Validate(passcode, string(decryptSecret)), nil
+}
+
+// IsUserEnabledTwoFactor returns true if user has enabled two-factor authentication.
+func IsUserEnabledTwoFactor(userID int64) bool {
+	has, err := x.Where("user_id = ?", userID).Get(new(TwoFactor))
+	if err != nil {
+		log.Error(2, "IsUserEnabledTwoFactor [user_id: %d]: %v", userID, err)
+	}
+	return has
+}
+
+func generateRecoveryCodes(userID int64) ([]*TwoFactorRecoveryCode, error) {
+	recoveryCodes := make([]*TwoFactorRecoveryCode, 10)
+	for i := 0; i < 10; i++ {
+		code, err := tool.RandomString(10)
+		if err != nil {
+			return nil, fmt.Errorf("RandomString: %v", err)
+		}
+		recoveryCodes[i] = &TwoFactorRecoveryCode{
+			UserID: userID,
+			Code:   strings.ToLower(code[:5] + "-" + code[5:]),
+		}
+	}
+	return recoveryCodes, nil
+}
+
+// NewTwoFactor creates a new two-factor authentication token and recovery codes for given user.
+func NewTwoFactor(userID int64, secret string) error {
+	t := &TwoFactor{
+		UserID: userID,
+	}
+
+	// Encrypt secret
+	encryptSecret, err := com.AESGCMEncrypt(tool.MD5Bytes(setting.SecretKey), []byte(secret))
+	if err != nil {
+		return fmt.Errorf("AESGCMEncrypt: %v", err)
+	}
+	t.Secret = base64.StdEncoding.EncodeToString(encryptSecret)
+
+	recoveryCodes, err := generateRecoveryCodes(userID)
+	if err != nil {
+		return fmt.Errorf("generateRecoveryCodes: %v", err)
+	}
+
+	sess := x.NewSession()
+	defer sess.Close()
+	if err = sess.Begin(); err != nil {
+		return err
+	}
+
+	if _, err = sess.Insert(t); err != nil {
+		return fmt.Errorf("insert two-factor: %v", err)
+	} else if _, err = sess.Insert(recoveryCodes); err != nil {
+		return fmt.Errorf("insert recovery codes: %v", err)
+	}
+
+	return sess.Commit()
+}
+
+// GetTwoFactorByUserID returns two-factor authentication token of given user.
+func GetTwoFactorByUserID(userID int64) (*TwoFactor, error) {
+	t := new(TwoFactor)
+	has, err := x.Where("user_id = ?", userID).Get(t)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, errors.TwoFactorNotFound{userID}
+	}
+
+	return t, nil
+}
+
+// DeleteTwoFactor removes two-factor authentication token and recovery codes of given user.
+func DeleteTwoFactor(userID int64) (err error) {
+	sess := x.NewSession()
+	defer sess.Close()
+	if err = sess.Begin(); err != nil {
+		return err
+	}
+
+	if _, err = sess.Where("user_id = ?", userID).Delete(new(TwoFactor)); err != nil {
+		return fmt.Errorf("delete two-factor: %v", err)
+	} else if err = deleteRecoveryCodesByUserID(sess, userID); err != nil {
+		return fmt.Errorf("deleteRecoveryCodesByUserID: %v", err)
+	}
+
+	return sess.Commit()
+}
+
+// TwoFactorRecoveryCode represents a two-factor authentication recovery code.
+type TwoFactorRecoveryCode struct {
+	ID     int64
+	UserID int64
+	Code   string `xorm:"VARCHAR(11)"`
+	IsUsed bool
+}
+
+// GetRecoveryCodesByUserID returns all recovery codes of given user.
+func GetRecoveryCodesByUserID(userID int64) ([]*TwoFactorRecoveryCode, error) {
+	recoveryCodes := make([]*TwoFactorRecoveryCode, 0, 10)
+	return recoveryCodes, x.Where("user_id = ?", userID).Find(&recoveryCodes)
+}
+
+func deleteRecoveryCodesByUserID(e Engine, userID int64) error {
+	_, err := e.Where("user_id = ?", userID).Delete(new(TwoFactorRecoveryCode))
+	return err
+}
+
+// RegenerateRecoveryCodes regenerates new set of recovery codes for given user.
+func RegenerateRecoveryCodes(userID int64) error {
+	recoveryCodes, err := generateRecoveryCodes(userID)
+	if err != nil {
+		return fmt.Errorf("generateRecoveryCodes: %v", err)
+	}
+
+	sess := x.NewSession()
+	defer sess.Close()
+	if err = sess.Begin(); err != nil {
+		return err
+	}
+
+	if err = deleteRecoveryCodesByUserID(sess, userID); err != nil {
+		return fmt.Errorf("deleteRecoveryCodesByUserID: %v", err)
+	} else if _, err = sess.Insert(recoveryCodes); err != nil {
+		return fmt.Errorf("insert new recovery codes: %v", err)
+	}
+
+	return sess.Commit()
+}
+
+// UseRecoveryCode validates recovery code of given user and marks it is used if valid.
+func UseRecoveryCode(userID int64, code string) error {
+	recoveryCode := new(TwoFactorRecoveryCode)
+	has, err := x.Where("code = ?", code).And("is_used = ?", false).Get(recoveryCode)
+	if err != nil {
+		return fmt.Errorf("get unused code: %v", err)
+	} else if !has {
+		return errors.TwoFactorRecoveryCodeNotFound{code}
+	}
+
+	recoveryCode.IsUsed = true
+	if _, err = x.Id(recoveryCode.ID).Cols("is_used").Update(recoveryCode); err != nil {
+		return fmt.Errorf("mark code as used: %v", err)
+	}
+
+	return nil
+}

models/update.go

@@ -85,7 +85,11 @@ func PushUpdate(opts PushUpdateOptions) (err error) {
 		return fmt.Errorf("GetRepositoryByName: %v", err)
 	}
 
-	// Push tags.
+	if err = repo.UpdateSize(); err != nil {
+		return fmt.Errorf("UpdateSize: %v", err)
+	}
+
+	// Push tags
 	if strings.HasPrefix(opts.RefFullName, git.TAG_PREFIX) {
 		if err := CommitRepoAction(CommitRepoActionOptions{
 			PusherName:  opts.PusherName,
@@ -104,7 +108,7 @@ func PushUpdate(opts PushUpdateOptions) (err error) {
 	var l *list.List
 	// Skip read parent commits when delete branch
 	if !isDelRef {
-		// Push new branch.
+		// Push new branch
 		newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
 		if err != nil {
 			return fmt.Errorf("GetCommit [commit_id: %s]: %v", opts.NewCommitID, err)

models/user.go

@@ -10,7 +10,6 @@ import (
 	"crypto/sha256"
 	"crypto/subtle"
 	"encoding/hex"
-	"errors"
 	"fmt"
 	"image"
 	_ "image/jpeg"
@@ -30,10 +29,10 @@ import (
 	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/avatar"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/markdown"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/avatar"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/tool"
 )
 
 type UserType int
@@ -43,18 +42,9 @@ const (
 	USER_TYPE_ORGANIZATION
 )
 
-var (
-	ErrUserNotKeyOwner       = errors.New("User does not the owner of public key")
-	ErrEmailNotExist         = errors.New("E-mail does not exist")
-	ErrEmailNotActivated     = errors.New("E-mail address has not been activated")
-	ErrUserNameIllegal       = errors.New("User name contains illegal characters")
-	ErrLoginSourceNotActived = errors.New("Login source is not actived")
-	ErrUnsupportedLoginType  = errors.New("Login source is unknown")
-)
-
 // User represents the object of individual and member of organization.
 type User struct {
-	ID        int64  `xorm:"pk autoincr"`
+	ID        int64
 	LowerName string `xorm:"UNIQUE NOT NULL"`
 	Name      string `xorm:"UNIQUE NOT NULL"`
 	FullName  string
@@ -123,8 +113,6 @@ func (u *User) BeforeUpdate() {
 
 func (u *User) AfterSet(colName string, _ xorm.Cell) {
 	switch colName {
-	case "full_name":
-		u.FullName = markdown.Sanitizer.Sanitize(u.FullName)
 	case "created_unix":
 		u.Created = time.Unix(u.CreatedUnix, 0).Local()
 	case "updated_unix":
@@ -187,23 +175,23 @@ func (u *User) CanImportLocal() bool {
 // DashboardLink returns the user dashboard page link.
 func (u *User) DashboardLink() string {
 	if u.IsOrganization() {
-		return setting.AppSubUrl + "/org/" + u.Name + "/dashboard/"
+		return setting.AppSubURL + "/org/" + u.Name + "/dashboard/"
 	}
-	return setting.AppSubUrl + "/"
+	return setting.AppSubURL + "/"
 }
 
 // HomeLink returns the user or organization home page link.
 func (u *User) HomeLink() string {
-	return setting.AppSubUrl + "/" + u.Name
+	return setting.AppSubURL + "/" + u.Name
 }
 
 func (u *User) HTMLURL() string {
-	return setting.AppUrl + u.Name
+	return setting.AppURL + u.Name
 }
 
 // GenerateEmailActivateCode generates an activate code based on user information and given e-mail.
 func (u *User) GenerateEmailActivateCode(email string) string {
-	code := base.CreateTimeLimitCode(
+	code := tool.CreateTimeLimitCode(
 		com.ToStr(u.ID)+email+u.LowerName+u.Passwd+u.Rands,
 		setting.Service.ActiveCodeLives, nil)
 
@@ -254,7 +242,7 @@ func (u *User) GenerateRandomAvatar() error {
 // which includes app sub-url as prefix. However, it is possible
 // to return full URL if user enables Gravatar-like service.
 func (u *User) RelAvatarLink() string {
-	defaultImgUrl := setting.AppSubUrl + "/img/avatar_default.png"
+	defaultImgUrl := setting.AppSubURL + "/img/avatar_default.png"
 	if u.ID == -1 {
 		return defaultImgUrl
 	}
@@ -264,7 +252,7 @@ func (u *User) RelAvatarLink() string {
 		if !com.IsExist(u.CustomAvatarPath()) {
 			return defaultImgUrl
 		}
-		return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID)
+		return setting.AppSubURL + "/avatars/" + com.ToStr(u.ID)
 	case setting.DisableGravatar, setting.OfflineMode:
 		if !com.IsExist(u.CustomAvatarPath()) {
 			if err := u.GenerateRandomAvatar(); err != nil {
@@ -272,16 +260,16 @@ func (u *User) RelAvatarLink() string {
 			}
 		}
 
-		return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID)
+		return setting.AppSubURL + "/avatars/" + com.ToStr(u.ID)
 	}
-	return base.AvatarLink(u.AvatarEmail)
+	return tool.AvatarLink(u.AvatarEmail)
 }
 
 // AvatarLink returns user avatar absolute link.
 func (u *User) AvatarLink() string {
 	link := u.RelAvatarLink()
 	if link[0] == '/' && link[1] != '/' {
-		return setting.AppUrl + strings.TrimPrefix(link, setting.AppSubUrl)[1:]
+		return setting.AppURL + strings.TrimPrefix(link, setting.AppSubURL)[1:]
 	}
 	return link
 }
@@ -416,6 +404,11 @@ func (u *User) IsPublicMember(orgId int64) bool {
 	return IsPublicMembership(orgId, u.ID)
 }
 
+// IsEnabledTwoFactor returns true if user has enabled two-factor authentication.
+func (u *User) IsEnabledTwoFactor() bool {
+	return IsUserEnabledTwoFactor(u.ID)
+}
+
 func (u *User) getOrganizationCount(e Engine) (int64, error) {
 	return e.Where("uid=?", u.ID).Count(new(OrgUser))
 }
@@ -453,9 +446,12 @@ func (u *User) GetOrganizations(showPrivate bool) error {
 	if err != nil {
 		return fmt.Errorf("GetOrgIDsByUserID: %v", err)
 	}
+	if len(orgIDs) == 0 {
+		return nil
+	}
 
 	u.Orgs = make([]*User, 0, len(orgIDs))
-	if err = x.In("id", orgIDs).Find(&u.Orgs); err != nil {
+	if err = x.Where("type = ?", USER_TYPE_ORGANIZATION).In("id", orgIDs).Find(&u.Orgs); err != nil {
 		return err
 	}
 	return nil
@@ -471,7 +467,7 @@ func (u *User) DisplayName() string {
 }
 
 func (u *User) ShortName(length int) string {
-	return base.EllipsisString(u.Name, length)
+	return tool.EllipsisString(u.Name, length)
 }
 
 // IsMailable checks if a user is elegible
@@ -488,12 +484,12 @@ func IsUserExist(uid int64, name string) (bool, error) {
 	if len(name) == 0 {
 		return false, nil
 	}
-	return x.Where("id!=?", uid).Get(&User{LowerName: strings.ToLower(name)})
+	return x.Where("id != ?", uid).Get(&User{LowerName: strings.ToLower(name)})
 }
 
 // GetUserSalt returns a ramdom user salt token.
 func GetUserSalt() (string, error) {
-	return base.GetRandomString(10)
+	return tool.RandomString(10)
 }
 
 // NewGhostUser creates and returns a fake user for someone has deleted his/her account.
@@ -516,7 +512,7 @@ var (
 func isUsableName(names, patterns []string, name string) error {
 	name = strings.TrimSpace(strings.ToLower(name))
 	if utf8.RuneCountInString(name) == 0 {
-		return ErrNameEmpty
+		return errors.EmptyName{}
 	}
 
 	for i := range names {
@@ -562,7 +558,7 @@ func CreateUser(u *User) (err error) {
 
 	u.LowerName = strings.ToLower(u.Name)
 	u.AvatarEmail = u.Email
-	u.Avatar = base.HashEmail(u.AvatarEmail)
+	u.Avatar = tool.HashEmail(u.AvatarEmail)
 	if u.Rands, err = GetUserSalt(); err != nil {
 		return err
 	}
@@ -603,19 +599,21 @@ func Users(page, pageSize int) ([]*User, error) {
 	return users, x.Limit(pageSize, (page-1)*pageSize).Where("type=0").Asc("id").Find(&users)
 }
 
-// get user by erify code
-func getVerifyUser(code string) (user *User) {
-	if len(code) <= base.TimeLimitCodeLength {
+// parseUserFromCode returns user by username encoded in code.
+// It returns nil if code or username is invalid.
+func parseUserFromCode(code string) (user *User) {
+	if len(code) <= tool.TIME_LIMIT_CODE_LENGTH {
 		return nil
 	}
 
-	// use tail hex username query user
-	hexStr := code[base.TimeLimitCodeLength:]
+	// Use tail hex username to query user
+	hexStr := code[tool.TIME_LIMIT_CODE_LENGTH:]
 	if b, err := hex.DecodeString(hexStr); err == nil {
 		if user, err = GetUserByName(string(b)); user != nil {
 			return user
+		} else if !errors.IsUserNotExist(err) {
+			log.Error(2, "GetUserByName: %v", err)
 		}
-		log.Error(4, "user.getVerifyUser: %v", err)
 	}
 
 	return nil
@@ -625,12 +623,12 @@ func getVerifyUser(code string) (user *User) {
 func VerifyUserActiveCode(code string) (user *User) {
 	minutes := setting.Service.ActiveCodeLives
 
-	if user = getVerifyUser(code); user != nil {
+	if user = parseUserFromCode(code); user != nil {
 		// time limit code
-		prefix := code[:base.TimeLimitCodeLength]
+		prefix := code[:tool.TIME_LIMIT_CODE_LENGTH]
 		data := com.ToStr(user.ID) + user.Email + user.LowerName + user.Passwd + user.Rands
 
-		if base.VerifyTimeLimitCode(data, minutes, prefix) {
+		if tool.VerifyTimeLimitCode(data, minutes, prefix) {
 			return user
 		}
 	}
@@ -641,12 +639,12 @@ func VerifyUserActiveCode(code string) (user *User) {
 func VerifyActiveEmailCode(code, email string) *EmailAddress {
 	minutes := setting.Service.ActiveCodeLives
 
-	if user := getVerifyUser(code); user != nil {
+	if user := parseUserFromCode(code); user != nil {
 		// time limit code
-		prefix := code[:base.TimeLimitCodeLength]
+		prefix := code[:tool.TIME_LIMIT_CODE_LENGTH]
 		data := com.ToStr(user.ID) + email + user.LowerName + user.Passwd + user.Rands
 
-		if base.VerifyTimeLimitCode(data, minutes, prefix) {
+		if tool.VerifyTimeLimitCode(data, minutes, prefix) {
 			emailAddress := &EmailAddress{Email: email}
 			if has, _ := x.Get(emailAddress); has {
 				return emailAddress
@@ -705,15 +703,14 @@ func updateUser(e Engine, u *User) error {
 		if len(u.AvatarEmail) == 0 {
 			u.AvatarEmail = u.Email
 		}
-		u.Avatar = base.HashEmail(u.AvatarEmail)
+		u.Avatar = tool.HashEmail(u.AvatarEmail)
 	}
 
 	u.LowerName = strings.ToLower(u.Name)
-	u.Location = base.TruncateString(u.Location, 255)
-	u.Website = base.TruncateString(u.Website, 255)
-	u.Description = base.TruncateString(u.Description, 255)
+	u.Location = tool.TruncateString(u.Location, 255)
+	u.Website = tool.TruncateString(u.Website, 255)
+	u.Description = tool.TruncateString(u.Description, 255)
 
-	u.FullName = markdown.Sanitizer.Sanitize(u.FullName)
 	_, err := e.Id(u.ID).AllCols().Update(u)
 	return err
 }
@@ -887,11 +884,11 @@ func UserPath(userName string) string {
 
 func GetUserByKeyID(keyID int64) (*User, error) {
 	user := new(User)
-	has, err := x.Sql("SELECT a.* FROM `user` AS a, public_key AS b WHERE a.id = b.owner_id AND b.id=?", keyID).Get(user)
+	has, err := x.SQL("SELECT a.* FROM `user` AS a, public_key AS b WHERE a.id = b.owner_id AND b.id=?", keyID).Get(user)
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrUserNotKeyOwner
+		return nil, errors.UserNotKeyOwner{keyID}
 	}
 	return user, nil
 }
@@ -902,7 +899,7 @@ func getUserByID(e Engine, id int64) (*User, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrUserNotExist{id, ""}
+		return nil, errors.UserNotExist{id, ""}
 	}
 	return u, nil
 }
@@ -918,22 +915,22 @@ func GetAssigneeByID(repo *Repository, userID int64) (*User, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrUserNotExist{userID, ""}
+		return nil, errors.UserNotExist{userID, ""}
 	}
 	return GetUserByID(userID)
 }
 
-// GetUserByName returns user by given name.
+// GetUserByName returns a user by given name.
 func GetUserByName(name string) (*User, error) {
 	if len(name) == 0 {
-		return nil, ErrUserNotExist{0, name}
+		return nil, errors.UserNotExist{0, name}
 	}
 	u := &User{LowerName: strings.ToLower(name)}
 	has, err := x.Get(u)
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrUserNotExist{0, name}
+		return nil, errors.UserNotExist{0, name}
 	}
 	return u, nil
 }
@@ -1011,7 +1008,7 @@ func ValidateCommitsWithEmails(oldCommits *list.List) *list.List {
 // GetUserByEmail returns the user object by given e-mail if exists.
 func GetUserByEmail(email string) (*User, error) {
 	if len(email) == 0 {
-		return nil, ErrUserNotExist{0, "email"}
+		return nil, errors.UserNotExist{0, "email"}
 	}
 
 	email = strings.ToLower(email)
@@ -1035,7 +1032,7 @@ func GetUserByEmail(email string) (*User, error) {
 		return GetUserByID(emailAddress.UID)
 	}
 
-	return nil, ErrUserNotExist{0, email}
+	return nil, errors.UserNotExist{0, email}
 }
 
 type SearchUserOptions struct {
@@ -1090,7 +1087,7 @@ func SearchUserByName(opts *SearchUserOptions) (users []*User, _ int64, _ error)
 
 // Follow represents relations of user and his/her followers.
 type Follow struct {
-	ID       int64 `xorm:"pk autoincr"`
+	ID       int64
 	UserID   int64 `xorm:"UNIQUE(follow)"`
 	FollowID int64 `xorm:"UNIQUE(follow)"`
 }

models/user_mail.go

@@ -7,12 +7,14 @@ package models
 import (
 	"fmt"
 	"strings"
+
+	"github.com/gogits/gogs/models/errors"
 )
 
 // EmailAdresses is the list of all email addresses of a user. Can contain the
 // primary email address, but is not obligatory.
 type EmailAddress struct {
-	ID          int64  `xorm:"pk autoincr"`
+	ID          int64
 	UID         int64  `xorm:"INDEX NOT NULL"`
 	Email       string `xorm:"UNIQUE NOT NULL"`
 	IsActivated bool
@@ -163,11 +165,11 @@ func MakeEmailPrimary(email *EmailAddress) error {
 	if err != nil {
 		return err
 	} else if !has {
-		return ErrEmailNotExist
+		return errors.EmailNotFound{email.Email}
 	}
 
 	if !email.IsActivated {
-		return ErrEmailNotActivated
+		return errors.EmailNotVerified{email.Email}
 	}
 
 	user := &User{ID: email.UID}
@@ -175,7 +177,7 @@ func MakeEmailPrimary(email *EmailAddress) error {
 	if err != nil {
 		return err
 	} else if !has {
-		return ErrUserNotExist{email.UID, ""}
+		return errors.UserNotExist{email.UID, ""}
 	}
 
 	// Make sure the former primary email doesn't disappear.

models/webhook.go

@@ -21,9 +21,10 @@ import (
 
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/httplib"
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/httplib"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/sync"
 )
 
 var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)
@@ -62,11 +63,14 @@ func IsValidHookContentType(name string) bool {
 }
 
 type HookEvents struct {
-	Create      bool `json:"create"`
-	Delete      bool `json:"delete"`
-	Fork        bool `json:"fork"`
-	Push        bool `json:"push"`
-	PullRequest bool `json:"pull_request"`
+	Create       bool `json:"create"`
+	Delete       bool `json:"delete"`
+	Fork         bool `json:"fork"`
+	Push         bool `json:"push"`
+	Issues       bool `json:"issues"`
+	IssueComment bool `json:"issue_comment"`
+	PullRequest  bool `json:"pull_request"`
+	Release      bool `json:"release"`
 }
 
 // HookEvent represents events that will delivery hook.
@@ -88,7 +92,7 @@ const (
 
 // Webhook represents a web hook object.
 type Webhook struct {
-	ID           int64 `xorm:"pk autoincr"`
+	ID           int64
 	RepoID       int64
 	OrgID        int64
 	URL          string `xorm:"url TEXT"`
@@ -176,28 +180,51 @@ func (w *Webhook) HasPushEvent() bool {
 		(w.ChooseEvents && w.HookEvents.Push)
 }
 
+// HasIssuesEvent returns true if hook enabled issues event.
+func (w *Webhook) HasIssuesEvent() bool {
+	return w.SendEverything ||
+		(w.ChooseEvents && w.HookEvents.Issues)
+}
+
+// HasIssueCommentEvent returns true if hook enabled issue comment event.
+func (w *Webhook) HasIssueCommentEvent() bool {
+	return w.SendEverything ||
+		(w.ChooseEvents && w.HookEvents.IssueComment)
+}
+
 // HasPullRequestEvent returns true if hook enabled pull request event.
 func (w *Webhook) HasPullRequestEvent() bool {
 	return w.SendEverything ||
 		(w.ChooseEvents && w.HookEvents.PullRequest)
 }
 
+// HasReleaseEvent returns true if hook enabled release event.
+func (w *Webhook) HasReleaseEvent() bool {
+	return w.SendEverything ||
+		(w.ChooseEvents && w.HookEvents.Release)
+}
+
+type eventChecker struct {
+	checker func() bool
+	typ     HookEventType
+}
+
 func (w *Webhook) EventsArray() []string {
-	events := make([]string, 0, 5)
-	if w.HasCreateEvent() {
-		events = append(events, string(HOOK_EVENT_CREATE))
+	events := make([]string, 0, 7)
+	eventCheckers := []eventChecker{
+		{w.HasCreateEvent, HOOK_EVENT_CREATE},
+		{w.HasDeleteEvent, HOOK_EVENT_DELETE},
+		{w.HasForkEvent, HOOK_EVENT_FORK},
+		{w.HasPushEvent, HOOK_EVENT_PUSH},
+		{w.HasIssuesEvent, HOOK_EVENT_ISSUES},
+		{w.HasIssueCommentEvent, HOOK_EVENT_ISSUE_COMMENT},
+		{w.HasPullRequestEvent, HOOK_EVENT_PULL_REQUEST},
+		{w.HasReleaseEvent, HOOK_EVENT_RELEASE},
 	}
-	if w.HasDeleteEvent() {
-		events = append(events, string(HOOK_EVENT_DELETE))
-	}
-	if w.HasForkEvent() {
-		events = append(events, string(HOOK_EVENT_FORK))
-	}
-	if w.HasPushEvent() {
-		events = append(events, string(HOOK_EVENT_PUSH))
-	}
-	if w.HasPullRequestEvent() {
-		events = append(events, string(HOOK_EVENT_PULL_REQUEST))
+	for _, c := range eventCheckers {
+		if c.checker() {
+			events = append(events, string(c.typ))
+		}
 	}
 	return events
 }
@@ -215,7 +242,7 @@ func getWebhook(bean *Webhook) (*Webhook, error) {
 	if err != nil {
 		return nil, err
 	} else if !has {
-		return nil, ErrWebhookNotExist{bean.ID}
+		return nil, errors.WebhookNotExist{bean.ID}
 	}
 	return bean, nil
 }
@@ -356,11 +383,14 @@ func IsValidHookTaskType(name string) bool {
 type HookEventType string
 
 const (
-	HOOK_EVENT_CREATE       HookEventType = "create"
-	HOOK_EVENT_DELETE       HookEventType = "delete"
-	HOOK_EVENT_FORK         HookEventType = "fork"
-	HOOK_EVENT_PUSH         HookEventType = "push"
-	HOOK_EVENT_PULL_REQUEST HookEventType = "pull_request"
+	HOOK_EVENT_CREATE        HookEventType = "create"
+	HOOK_EVENT_DELETE        HookEventType = "delete"
+	HOOK_EVENT_FORK          HookEventType = "fork"
+	HOOK_EVENT_PUSH          HookEventType = "push"
+	HOOK_EVENT_ISSUES        HookEventType = "issues"
+	HOOK_EVENT_ISSUE_COMMENT HookEventType = "issue_comment"
+	HOOK_EVENT_PULL_REQUEST  HookEventType = "pull_request"
+	HOOK_EVENT_RELEASE       HookEventType = "release"
 )
 
 // HookRequest represents hook task request information.
@@ -377,7 +407,7 @@ type HookResponse struct {
 
 // HookTask represents a hook task.
 type HookTask struct {
-	ID              int64 `xorm:"pk autoincr"`
+	ID              int64
 	RepoID          int64 `xorm:"INDEX"`
 	HookID          int64
 	UUID            string
@@ -465,6 +495,21 @@ func createHookTask(e Engine, t *HookTask) error {
 	return err
 }
 
+// GetHookTaskOfWebhookByUUID returns hook task of given webhook by UUID.
+func GetHookTaskOfWebhookByUUID(webhookID int64, uuid string) (*HookTask, error) {
+	hookTask := &HookTask{
+		HookID: webhookID,
+		UUID:   uuid,
+	}
+	has, err := x.Get(hookTask)
+	if err != nil {
+		return nil, err
+	} else if !has {
+		return nil, errors.HookTaskNotExist{webhookID, uuid}
+	}
+	return hookTask, nil
+}
+
 // UpdateHookTask updates information of hook task.
 func UpdateHookTask(t *HookTask) error {
 	_, err := x.Id(t.ID).AllCols().Update(t)
@@ -488,14 +533,30 @@ func prepareHookTasks(e Engine, repo *Repository, event HookEventType, p api.Pay
 			if !w.HasDeleteEvent() {
 				continue
 			}
+		case HOOK_EVENT_FORK:
+			if !w.HasForkEvent() {
+				continue
+			}
 		case HOOK_EVENT_PUSH:
 			if !w.HasPushEvent() {
 				continue
 			}
+		case HOOK_EVENT_ISSUES:
+			if !w.HasIssuesEvent() {
+				continue
+			}
+		case HOOK_EVENT_ISSUE_COMMENT:
+			if !w.HasIssueCommentEvent() {
+				continue
+			}
 		case HOOK_EVENT_PULL_REQUEST:
 			if !w.HasPullRequestEvent() {
 				continue
 			}
+		case HOOK_EVENT_RELEASE:
+			if !w.HasReleaseEvent() {
+				continue
+			}
 		}
 
 		// Use separate objects so modifcations won't be made on payload on non-Gogs type hooks.
@@ -541,7 +602,8 @@ func prepareHookTasks(e Engine, repo *Repository, event HookEventType, p api.Pay
 	}
 
 	// It's safe to fail when the whole function is called during hook execution
-	// because resource released after exit.
+	// because resource released after exit. Also, there is no process started to
+	// consume this input during hook execution.
 	go HookQueue.Add(repo.ID)
 	return nil
 }
@@ -658,7 +720,7 @@ func (t *HookTask) deliver() {
 // TODO: shoot more hooks at same time.
 func DeliverHooks() {
 	tasks := make([]*HookTask, 0, 10)
-	x.Where("is_delivered=?", false).Iterate(new(HookTask),
+	x.Where("is_delivered = ?", false).Iterate(new(HookTask),
 		func(idx int, bean interface{}) error {
 			t := bean.(*HookTask)
 			t.deliver()
@@ -679,7 +741,7 @@ func DeliverHooks() {
 		HookQueue.Remove(repoID)
 
 		tasks = make([]*HookTask, 0, 5)
-		if err := x.Where("repo_id=? AND is_delivered=?", repoID, false).Find(&tasks); err != nil {
+		if err := x.Where("repo_id = ?", repoID).And("is_delivered = ?", false).Find(&tasks); err != nil {
 			log.Error(4, "Get repository [%s] hook tasks: %v", repoID, err)
 			continue
 		}

models/webhook_discord.go

@@ -13,7 +13,7 @@ import (
 	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 type DiscordEmbedFooterObject struct {
@@ -77,7 +77,7 @@ func getDiscordCreatePayload(p *api.CreatePayload) (*DiscordPayload, error) {
 	return &DiscordPayload{
 		Embeds: []*DiscordEmbedObject{{
 			Description: content,
-			URL:         setting.AppUrl + p.Sender.UserName,
+			URL:         setting.AppURL + p.Sender.UserName,
 			Author: &DiscordEmbedAuthorObject{
 				Name:    p.Sender.UserName,
 				IconURL: p.Sender.AvatarUrl,
@@ -94,7 +94,7 @@ func getDiscordDeletePayload(p *api.DeletePayload) (*DiscordPayload, error) {
 	return &DiscordPayload{
 		Embeds: []*DiscordEmbedObject{{
 			Description: content,
-			URL:         setting.AppUrl + p.Sender.UserName,
+			URL:         setting.AppURL + p.Sender.UserName,
 			Author: &DiscordEmbedAuthorObject{
 				Name:    p.Sender.UserName,
 				IconURL: p.Sender.AvatarUrl,
@@ -111,7 +111,7 @@ func getDiscordForkPayload(p *api.ForkPayload) (*DiscordPayload, error) {
 	return &DiscordPayload{
 		Embeds: []*DiscordEmbedObject{{
 			Description: content,
-			URL:         setting.AppUrl + p.Sender.UserName,
+			URL:         setting.AppURL + p.Sender.UserName,
 			Author: &DiscordEmbedAuthorObject{
 				Name:    p.Sender.UserName,
 				IconURL: p.Sender.AvatarUrl,
@@ -159,7 +159,7 @@ func getDiscordPushPayload(p *api.PushPayload, slack *SlackMeta) (*DiscordPayloa
 		AvatarURL: slack.IconURL,
 		Embeds: []*DiscordEmbedObject{{
 			Description: content,
-			URL:         setting.AppUrl + p.Sender.UserName,
+			URL:         setting.AppURL + p.Sender.UserName,
 			Color:       int(color),
 			Author: &DiscordEmbedAuthorObject{
 				Name:    p.Sender.UserName,
@@ -169,6 +169,117 @@ func getDiscordPushPayload(p *api.PushPayload, slack *SlackMeta) (*DiscordPayloa
 	}, nil
 }
 
+func getDiscordIssuesPayload(p *api.IssuesPayload, slack *SlackMeta) (*DiscordPayload, error) {
+	title := fmt.Sprintf("#%d %s", p.Index, p.Issue.Title)
+	url := fmt.Sprintf("%s/issues/%d", p.Repository.HTMLURL, p.Index)
+	content := ""
+	fields := make([]*DiscordEmbedFieldObject, 0, 1)
+	switch p.Action {
+	case api.HOOK_ISSUE_OPENED:
+		title = "New issue: " + title
+		content = p.Issue.Body
+	case api.HOOK_ISSUE_CLOSED:
+		title = "Issue closed: " + title
+	case api.HOOK_ISSUE_REOPENED:
+		title = "Issue re-opened: " + title
+	case api.HOOK_ISSUE_EDITED:
+		title = "Issue edited: " + title
+		content = p.Issue.Body
+	case api.HOOK_ISSUE_ASSIGNED:
+		title = "Issue assigned: " + title
+		fields = []*DiscordEmbedFieldObject{{
+			Name:  "New Assignee",
+			Value: p.Issue.Assignee.UserName,
+		}}
+	case api.HOOK_ISSUE_UNASSIGNED:
+		title = "Issue unassigned: " + title
+	case api.HOOK_ISSUE_LABEL_UPDATED:
+		title = "Issue labels updated: " + title
+		labels := make([]string, len(p.Issue.Labels))
+		for i := range p.Issue.Labels {
+			labels[i] = p.Issue.Labels[i].Name
+		}
+		if len(labels) == 0 {
+			labels = []string{"<empty>"}
+		}
+		fields = []*DiscordEmbedFieldObject{{
+			Name:  "Labels",
+			Value: strings.Join(labels, ", "),
+		}}
+	case api.HOOK_ISSUE_LABEL_CLEARED:
+		title = "Issue labels cleared: " + title
+	case api.HOOK_ISSUE_SYNCHRONIZED:
+		title = "Issue synchronized: " + title
+	case api.HOOK_ISSUE_MILESTONED:
+		title = "Issue milestoned: " + title
+		fields = []*DiscordEmbedFieldObject{{
+			Name:  "New Milestone",
+			Value: p.Issue.Milestone.Title,
+		}}
+	case api.HOOK_ISSUE_DEMILESTONED:
+		title = "Issue demilestoned: " + title
+	}
+
+	color, _ := strconv.ParseInt(strings.TrimLeft(slack.Color, "#"), 16, 32)
+	return &DiscordPayload{
+		Username:  slack.Username,
+		AvatarURL: slack.IconURL,
+		Embeds: []*DiscordEmbedObject{{
+			Title:       title,
+			Description: content,
+			URL:         url,
+			Color:       int(color),
+			Footer: &DiscordEmbedFooterObject{
+				Text: p.Repository.FullName,
+			},
+			Author: &DiscordEmbedAuthorObject{
+				Name:    p.Sender.UserName,
+				IconURL: p.Sender.AvatarUrl,
+			},
+			Fields: fields,
+		}},
+	}, nil
+}
+
+func getDiscordIssueCommentPayload(p *api.IssueCommentPayload, slack *SlackMeta) (*DiscordPayload, error) {
+	title := fmt.Sprintf("#%d %s", p.Issue.Index, p.Issue.Title)
+	url := fmt.Sprintf("%s/issues/%d#%s", p.Repository.HTMLURL, p.Issue.Index, CommentHashTag(p.Comment.ID))
+	content := ""
+	fields := make([]*DiscordEmbedFieldObject, 0, 1)
+	switch p.Action {
+	case api.HOOK_ISSUE_COMMENT_CREATED:
+		title = "New comment: " + title
+		content = p.Comment.Body
+	case api.HOOK_ISSUE_COMMENT_EDITED:
+		title = "Comment edited: " + title
+		content = p.Comment.Body
+	case api.HOOK_ISSUE_COMMENT_DELETED:
+		title = "Comment deleted: " + title
+		url = fmt.Sprintf("%s/issues/%d", p.Repository.HTMLURL, p.Issue.Index)
+		content = p.Comment.Body
+	}
+
+	color, _ := strconv.ParseInt(strings.TrimLeft(slack.Color, "#"), 16, 32)
+	return &DiscordPayload{
+		Username:  slack.Username,
+		AvatarURL: slack.IconURL,
+		Embeds: []*DiscordEmbedObject{{
+			Title:       title,
+			Description: content,
+			URL:         url,
+			Color:       int(color),
+			Footer: &DiscordEmbedFooterObject{
+				Text: p.Repository.FullName,
+			},
+			Author: &DiscordEmbedAuthorObject{
+				Name:    p.Sender.UserName,
+				IconURL: p.Sender.AvatarUrl,
+			},
+			Fields: fields,
+		}},
+	}, nil
+}
+
 func getDiscordPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*DiscordPayload, error) {
 	title := fmt.Sprintf("#%d %s", p.Index, p.PullRequest.Title)
 	url := fmt.Sprintf("%s/pulls/%d", p.Repository.HTMLURL, p.Index)
@@ -211,6 +322,14 @@ func getDiscordPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (
 		title = "Pull request labels cleared: " + title
 	case api.HOOK_ISSUE_SYNCHRONIZED:
 		title = "Pull request synchronized: " + title
+	case api.HOOK_ISSUE_MILESTONED:
+		title = "Pull request milestoned: " + title
+		fields = []*DiscordEmbedFieldObject{{
+			Name:  "New Milestone",
+			Value: p.PullRequest.Milestone.Title,
+		}}
+	case api.HOOK_ISSUE_DEMILESTONED:
+		title = "Pull request demilestoned: " + title
 	}
 
 	color, _ := strconv.ParseInt(strings.TrimLeft(slack.Color, "#"), 16, 32)
@@ -234,6 +353,22 @@ func getDiscordPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (
 	}, nil
 }
 
+func getDiscordReleasePayload(p *api.ReleasePayload) (*DiscordPayload, error) {
+	repoLink := DiscordLinkFormatter(p.Repository.HTMLURL, p.Repository.Name)
+	refLink := DiscordLinkFormatter(p.Repository.HTMLURL+"/src/"+p.Release.TagName, p.Release.TagName)
+	content := fmt.Sprintf("Published new release %s of %s", refLink, repoLink)
+	return &DiscordPayload{
+		Embeds: []*DiscordEmbedObject{{
+			Description: content,
+			URL:         setting.AppURL + p.Sender.UserName,
+			Author: &DiscordEmbedAuthorObject{
+				Name:    p.Sender.UserName,
+				IconURL: p.Sender.AvatarUrl,
+			},
+		}},
+	}, nil
+}
+
 func GetDiscordPayload(p api.Payloader, event HookEventType, meta string) (payload *DiscordPayload, err error) {
 	slack := &SlackMeta{}
 	if err := json.Unmarshal([]byte(meta), &slack); err != nil {
@@ -249,8 +384,14 @@ func GetDiscordPayload(p api.Payloader, event HookEventType, meta string) (paylo
 		payload, err = getDiscordForkPayload(p.(*api.ForkPayload))
 	case HOOK_EVENT_PUSH:
 		payload, err = getDiscordPushPayload(p.(*api.PushPayload), slack)
+	case HOOK_EVENT_ISSUES:
+		payload, err = getDiscordIssuesPayload(p.(*api.IssuesPayload), slack)
+	case HOOK_EVENT_ISSUE_COMMENT:
+		payload, err = getDiscordIssueCommentPayload(p.(*api.IssueCommentPayload), slack)
 	case HOOK_EVENT_PULL_REQUEST:
 		payload, err = getDiscordPullRequestPayload(p.(*api.PullRequestPayload), slack)
+	case HOOK_EVENT_RELEASE:
+		payload, err = getDiscordReleasePayload(p.(*api.ReleasePayload))
 	}
 	if err != nil {
 		return nil, fmt.Errorf("event '%s': %v", event, err)

models/webhook_slack.go

@@ -12,7 +12,7 @@ import (
 	"github.com/gogits/git-module"
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/pkg/setting"
 )
 
 type SlackMeta struct {
@@ -145,8 +145,88 @@ func getSlackPushPayload(p *api.PushPayload, slack *SlackMeta) (*SlackPayload, e
 	}, nil
 }
 
+func getSlackIssuesPayload(p *api.IssuesPayload, slack *SlackMeta) (*SlackPayload, error) {
+	senderLink := SlackLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName)
+	titleLink := SlackLinkFormatter(fmt.Sprintf("%s/issues/%d", p.Repository.HTMLURL, p.Index),
+		fmt.Sprintf("#%d %s", p.Index, p.Issue.Title))
+	var text, title, attachmentText string
+	switch p.Action {
+	case api.HOOK_ISSUE_OPENED:
+		text = fmt.Sprintf("[%s] New issue created by %s", p.Repository.FullName, senderLink)
+		title = titleLink
+		attachmentText = SlackTextFormatter(p.Issue.Body)
+	case api.HOOK_ISSUE_CLOSED:
+		text = fmt.Sprintf("[%s] Issue closed: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_REOPENED:
+		text = fmt.Sprintf("[%s] Issue re-opened: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_EDITED:
+		text = fmt.Sprintf("[%s] Issue edited: %s by %s", p.Repository.FullName, titleLink, senderLink)
+		attachmentText = SlackTextFormatter(p.Issue.Body)
+	case api.HOOK_ISSUE_ASSIGNED:
+		text = fmt.Sprintf("[%s] Issue assigned to %s: %s by %s", p.Repository.FullName,
+			SlackLinkFormatter(setting.AppURL+p.Issue.Assignee.UserName, p.Issue.Assignee.UserName),
+			titleLink, senderLink)
+	case api.HOOK_ISSUE_UNASSIGNED:
+		text = fmt.Sprintf("[%s] Issue unassigned: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_LABEL_UPDATED:
+		text = fmt.Sprintf("[%s] Issue labels updated: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_LABEL_CLEARED:
+		text = fmt.Sprintf("[%s] Issue labels cleared: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_MILESTONED:
+		text = fmt.Sprintf("[%s] Issue milestoned: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_DEMILESTONED:
+		text = fmt.Sprintf("[%s] Issue demilestoned: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	}
+
+	return &SlackPayload{
+		Channel:  slack.Channel,
+		Text:     text,
+		Username: slack.Username,
+		IconURL:  slack.IconURL,
+		Attachments: []*SlackAttachment{{
+			Color: slack.Color,
+			Title: title,
+			Text:  attachmentText,
+		}},
+	}, nil
+}
+
+func getSlackIssueCommentPayload(p *api.IssueCommentPayload, slack *SlackMeta) (*SlackPayload, error) {
+	senderLink := SlackLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName)
+	titleLink := SlackLinkFormatter(fmt.Sprintf("%s/issues/%d#%s", p.Repository.HTMLURL, p.Issue.Index, CommentHashTag(p.Comment.ID)),
+		fmt.Sprintf("#%d %s", p.Issue.Index, p.Issue.Title))
+	var text, title, attachmentText string
+	switch p.Action {
+	case api.HOOK_ISSUE_COMMENT_CREATED:
+		text = fmt.Sprintf("[%s] New comment created by %s", p.Repository.FullName, senderLink)
+		title = titleLink
+		attachmentText = SlackTextFormatter(p.Comment.Body)
+	case api.HOOK_ISSUE_COMMENT_EDITED:
+		text = fmt.Sprintf("[%s] Comment edited by %s", p.Repository.FullName, senderLink)
+		title = titleLink
+		attachmentText = SlackTextFormatter(p.Comment.Body)
+	case api.HOOK_ISSUE_COMMENT_DELETED:
+		text = fmt.Sprintf("[%s] Comment deleted by %s", p.Repository.FullName, senderLink)
+		title = SlackLinkFormatter(fmt.Sprintf("%s/issues/%d", p.Repository.HTMLURL, p.Issue.Index),
+			fmt.Sprintf("#%d %s", p.Issue.Index, p.Issue.Title))
+		attachmentText = SlackTextFormatter(p.Comment.Body)
+	}
+
+	return &SlackPayload{
+		Channel:  slack.Channel,
+		Text:     text,
+		Username: slack.Username,
+		IconURL:  slack.IconURL,
+		Attachments: []*SlackAttachment{{
+			Color: slack.Color,
+			Title: title,
+			Text:  attachmentText,
+		}},
+	}, nil
+}
+
 func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*SlackPayload, error) {
-	senderLink := SlackLinkFormatter(setting.AppUrl+p.Sender.UserName, p.Sender.UserName)
+	senderLink := SlackLinkFormatter(setting.AppURL+p.Sender.UserName, p.Sender.UserName)
 	titleLink := SlackLinkFormatter(fmt.Sprintf("%s/pulls/%d", p.Repository.HTMLURL, p.Index),
 		fmt.Sprintf("#%d %s", p.Index, p.PullRequest.Title))
 	var text, title, attachmentText string
@@ -168,7 +248,7 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S
 		attachmentText = SlackTextFormatter(p.PullRequest.Body)
 	case api.HOOK_ISSUE_ASSIGNED:
 		text = fmt.Sprintf("[%s] Pull request assigned to %s: %s by %s", p.Repository.FullName,
-			SlackLinkFormatter(setting.AppUrl+p.PullRequest.Assignee.UserName, p.PullRequest.Assignee.UserName),
+			SlackLinkFormatter(setting.AppURL+p.PullRequest.Assignee.UserName, p.PullRequest.Assignee.UserName),
 			titleLink, senderLink)
 	case api.HOOK_ISSUE_UNASSIGNED:
 		text = fmt.Sprintf("[%s] Pull request unassigned: %s by %s", p.Repository.FullName, titleLink, senderLink)
@@ -178,6 +258,10 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S
 		text = fmt.Sprintf("[%s] Pull request labels cleared: %s by %s", p.Repository.FullName, titleLink, senderLink)
 	case api.HOOK_ISSUE_SYNCHRONIZED:
 		text = fmt.Sprintf("[%s] Pull request synchronized: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_MILESTONED:
+		text = fmt.Sprintf("[%s] Pull request milestoned: %s by %s", p.Repository.FullName, titleLink, senderLink)
+	case api.HOOK_ISSUE_DEMILESTONED:
+		text = fmt.Sprintf("[%s] Pull request demilestoned: %s by %s", p.Repository.FullName, titleLink, senderLink)
 	}
 
 	return &SlackPayload{
@@ -193,6 +277,15 @@ func getSlackPullRequestPayload(p *api.PullRequestPayload, slack *SlackMeta) (*S
 	}, nil
 }
 
+func getSlackReleasePayload(p *api.ReleasePayload) (*SlackPayload, error) {
+	repoLink := SlackLinkFormatter(p.Repository.HTMLURL, p.Repository.Name)
+	refLink := SlackLinkFormatter(p.Repository.HTMLURL+"/src/"+p.Release.TagName, p.Release.TagName)
+	text := fmt.Sprintf("[%s] new release %s published by %s", repoLink, refLink, p.Sender.UserName)
+	return &SlackPayload{
+		Text: text,
+	}, nil
+}
+
 func GetSlackPayload(p api.Payloader, event HookEventType, meta string) (payload *SlackPayload, err error) {
 	slack := &SlackMeta{}
 	if err := json.Unmarshal([]byte(meta), &slack); err != nil {
@@ -208,8 +301,14 @@ func GetSlackPayload(p api.Payloader, event HookEventType, meta string) (payload
 		payload, err = getSlackForkPayload(p.(*api.ForkPayload))
 	case HOOK_EVENT_PUSH:
 		payload, err = getSlackPushPayload(p.(*api.PushPayload), slack)
+	case HOOK_EVENT_ISSUES:
+		payload, err = getSlackIssuesPayload(p.(*api.IssuesPayload), slack)
+	case HOOK_EVENT_ISSUE_COMMENT:
+		payload, err = getSlackIssueCommentPayload(p.(*api.IssueCommentPayload), slack)
 	case HOOK_EVENT_PULL_REQUEST:
 		payload, err = getSlackPullRequestPayload(p.(*api.PullRequestPayload), slack)
+	case HOOK_EVENT_RELEASE:
+		payload, err = getSlackReleasePayload(p.(*api.ReleasePayload))
 	}
 	if err != nil {
 		return nil, fmt.Errorf("event '%s': %v", event, err)

models/wiki.go

@@ -17,8 +17,8 @@ import (
 
 	"github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/sync"
 )
 
 var wikiWorkingPool = sync.NewExclusivePool()

modules/base/base.go

@@ -1,11 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package base
-
-const DOC_URL = "https://github.com/gogits/go-gogs-client/wiki"
-
-type (
-	TplName string
-)

modules/context/auth.go

@@ -1,94 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package context
-
-import (
-	"net/url"
-
-	"github.com/go-macaron/csrf"
-	"gopkg.in/macaron.v1"
-
-	"github.com/gogits/gogs/modules/auth"
-	"github.com/gogits/gogs/modules/setting"
-)
-
-type ToggleOptions struct {
-	SignInRequired  bool
-	SignOutRequired bool
-	AdminRequired   bool
-	DisableCSRF     bool
-}
-
-func Toggle(options *ToggleOptions) macaron.Handler {
-	return func(ctx *Context) {
-		// Cannot view any page before installation.
-		if !setting.InstallLock {
-			ctx.Redirect(setting.AppSubUrl + "/install")
-			return
-		}
-
-		// Check prohibit login users.
-		if ctx.IsSigned && ctx.User.ProhibitLogin {
-			ctx.Data["Title"] = ctx.Tr("auth.prohibit_login")
-			ctx.HTML(200, "user/auth/prohibit_login")
-			return
-		}
-
-		// Check non-logged users landing page.
-		if !ctx.IsSigned && ctx.Req.RequestURI == "/" && setting.LandingPageURL != setting.LANDING_PAGE_HOME {
-			ctx.Redirect(setting.AppSubUrl + string(setting.LandingPageURL))
-			return
-		}
-
-		// Redirect to dashboard if user tries to visit any non-login page.
-		if options.SignOutRequired && ctx.IsSigned && ctx.Req.RequestURI != "/" {
-			ctx.Redirect(setting.AppSubUrl + "/")
-			return
-		}
-
-		if !options.SignOutRequired && !options.DisableCSRF && ctx.Req.Method == "POST" && !auth.IsAPIPath(ctx.Req.URL.Path) {
-			csrf.Validate(ctx.Context, ctx.csrf)
-			if ctx.Written() {
-				return
-			}
-		}
-
-		if options.SignInRequired {
-			if !ctx.IsSigned {
-				// Restrict API calls with error message.
-				if auth.IsAPIPath(ctx.Req.URL.Path) {
-					ctx.JSON(403, map[string]string{
-						"message": "Only signed in user is allowed to call APIs.",
-					})
-					return
-				}
-
-				ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl)
-				ctx.Redirect(setting.AppSubUrl + "/user/login")
-				return
-			} else if !ctx.User.IsActive && setting.Service.RegisterEmailConfirm {
-				ctx.Data["Title"] = ctx.Tr("auth.active_your_account")
-				ctx.HTML(200, "user/auth/activate")
-				return
-			}
-		}
-
-		// Redirect to log in page if auto-signin info is provided and has not signed in.
-		if !options.SignOutRequired && !ctx.IsSigned && !auth.IsAPIPath(ctx.Req.URL.Path) &&
-			len(ctx.GetCookie(setting.CookieUserName)) > 0 {
-			ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubUrl+ctx.Req.RequestURI), 0, setting.AppSubUrl)
-			ctx.Redirect(setting.AppSubUrl + "/user/login")
-			return
-		}
-
-		if options.AdminRequired {
-			if !ctx.User.IsAdmin {
-				ctx.Error(403)
-				return
-			}
-			ctx.Data["PageIsAdmin"] = true
-		}
-	}
-}

modules/context/context.go

@@ -1,203 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package context
-
-import (
-	"fmt"
-	"html/template"
-	"io"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/go-macaron/cache"
-	"github.com/go-macaron/csrf"
-	"github.com/go-macaron/i18n"
-	"github.com/go-macaron/session"
-	log "gopkg.in/clog.v1"
-	"gopkg.in/macaron.v1"
-
-	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/auth"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/form"
-	"github.com/gogits/gogs/modules/setting"
-)
-
-// Context represents context of a request.
-type Context struct {
-	*macaron.Context
-	Cache   cache.Cache
-	csrf    csrf.CSRF
-	Flash   *session.Flash
-	Session session.Store
-
-	User        *models.User
-	IsSigned    bool
-	IsBasicAuth bool
-
-	Repo *Repository
-	Org  *Organization
-}
-
-// HasError returns true if error occurs in form validation.
-func (ctx *Context) HasApiError() bool {
-	hasErr, ok := ctx.Data["HasError"]
-	if !ok {
-		return false
-	}
-	return hasErr.(bool)
-}
-
-func (ctx *Context) GetErrMsg() string {
-	return ctx.Data["ErrorMsg"].(string)
-}
-
-// HasError returns true if error occurs in form validation.
-func (ctx *Context) HasError() bool {
-	hasErr, ok := ctx.Data["HasError"]
-	if !ok {
-		return false
-	}
-	ctx.Flash.ErrorMsg = ctx.Data["ErrorMsg"].(string)
-	ctx.Data["Flash"] = ctx.Flash
-	return hasErr.(bool)
-}
-
-// HasValue returns true if value of given name exists.
-func (ctx *Context) HasValue(name string) bool {
-	_, ok := ctx.Data[name]
-	return ok
-}
-
-// HTML calls Context.HTML and converts template name to string.
-func (ctx *Context) HTML(status int, name base.TplName) {
-	log.Trace("Template: %s", name)
-	ctx.Context.HTML(status, string(name))
-}
-
-// RenderWithErr used for page has form validation but need to prompt error to users.
-func (ctx *Context) RenderWithErr(msg string, tpl base.TplName, f interface{}) {
-	if f != nil {
-		form.Assign(f, ctx.Data)
-	}
-	ctx.Flash.ErrorMsg = msg
-	ctx.Data["Flash"] = ctx.Flash
-	ctx.HTML(200, tpl)
-}
-
-// Handle handles and logs error by given status.
-func (ctx *Context) Handle(status int, title string, err error) {
-	switch status {
-	case 404:
-		ctx.Data["Title"] = "Page Not Found"
-	case 500:
-		ctx.Data["Title"] = "Internal Server Error"
-		log.Error(2, "%s: %v", title, err)
-		if !setting.ProdMode || (ctx.IsSigned && ctx.User.IsAdmin) {
-			ctx.Data["ErrorMsg"] = err
-		}
-	}
-	ctx.HTML(status, base.TplName(fmt.Sprintf("status/%d", status)))
-}
-
-// NotFound simply renders the 404 page.
-func (ctx *Context) NotFound() {
-	ctx.Handle(404, "", nil)
-}
-
-// NotFoundOrServerError use error check function to determine if the error
-// is about not found. It responses with 404 status code for not found error,
-// or error context description for logging purpose of 500 server error.
-func (ctx *Context) NotFoundOrServerError(title string, errck func(error) bool, err error) {
-	if errck(err) {
-		ctx.NotFound()
-		return
-	}
-
-	ctx.Handle(500, title, err)
-}
-
-func (ctx *Context) HandleText(status int, title string) {
-	ctx.PlainText(status, []byte(title))
-}
-
-func (ctx *Context) ServeContent(name string, r io.ReadSeeker, params ...interface{}) {
-	modtime := time.Now()
-	for _, p := range params {
-		switch v := p.(type) {
-		case time.Time:
-			modtime = v
-		}
-	}
-	ctx.Resp.Header().Set("Content-Description", "File Transfer")
-	ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
-	ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+name)
-	ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
-	ctx.Resp.Header().Set("Expires", "0")
-	ctx.Resp.Header().Set("Cache-Control", "must-revalidate")
-	ctx.Resp.Header().Set("Pragma", "public")
-	http.ServeContent(ctx.Resp, ctx.Req.Request, name, modtime, r)
-}
-
-// Contexter initializes a classic context for a request.
-func Contexter() macaron.Handler {
-	return func(c *macaron.Context, l i18n.Locale, cache cache.Cache, sess session.Store, f *session.Flash, x csrf.CSRF) {
-		ctx := &Context{
-			Context: c,
-			Cache:   cache,
-			csrf:    x,
-			Flash:   f,
-			Session: sess,
-			Repo: &Repository{
-				PullRequest: &PullRequest{},
-			},
-			Org: &Organization{},
-		}
-
-		if len(setting.HTTP.AccessControlAllowOrigin) > 0 {
-			ctx.Header().Set("Access-Control-Allow-Origin", setting.HTTP.AccessControlAllowOrigin)
-		}
-
-		// Compute current URL for real-time change language.
-		ctx.Data["Link"] = setting.AppSubUrl + strings.TrimSuffix(ctx.Req.URL.Path, "/")
-
-		ctx.Data["PageStartTime"] = time.Now()
-
-		// Get user from session if logined.
-		ctx.User, ctx.IsBasicAuth = auth.SignedInUser(ctx.Context, ctx.Session)
-
-		if ctx.User != nil {
-			ctx.IsSigned = true
-			ctx.Data["IsSigned"] = ctx.IsSigned
-			ctx.Data["SignedUser"] = ctx.User
-			ctx.Data["SignedUserID"] = ctx.User.ID
-			ctx.Data["SignedUserName"] = ctx.User.Name
-			ctx.Data["IsAdmin"] = ctx.User.IsAdmin
-		} else {
-			ctx.Data["SignedUserID"] = 0
-			ctx.Data["SignedUserName"] = ""
-		}
-
-		// If request sends files, parse them here otherwise the Query() can't be parsed and the CsrfToken will be invalid.
-		if ctx.Req.Method == "POST" && strings.Contains(ctx.Req.Header.Get("Content-Type"), "multipart/form-data") {
-			if err := ctx.Req.ParseMultipartForm(setting.AttachmentMaxSize << 20); err != nil && !strings.Contains(err.Error(), "EOF") { // 32MB max size
-				ctx.Handle(500, "ParseMultipartForm", err)
-				return
-			}
-		}
-
-		ctx.Data["CsrfToken"] = x.GetToken()
-		ctx.Data["CsrfTokenHtml"] = template.HTML(`<input type="hidden" name="_csrf" value="` + x.GetToken() + `">`)
-		log.Trace("Session ID: %s", sess.ID())
-		log.Trace("CSRF Token: %v", ctx.Data["CsrfToken"])
-
-		ctx.Data["ShowRegistrationButton"] = setting.Service.ShowRegistrationButton
-		ctx.Data["ShowFooterBranding"] = setting.ShowFooterBranding
-		ctx.Data["ShowFooterVersion"] = setting.ShowFooterVersion
-
-		c.Map(ctx)
-	}
-}

modules/context/org.go

@@ -1,153 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package context
-
-import (
-	"strings"
-
-	"gopkg.in/macaron.v1"
-
-	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/setting"
-)
-
-type Organization struct {
-	IsOwner      bool
-	IsMember     bool
-	IsTeamMember bool // Is member of team.
-	IsTeamAdmin  bool // In owner team or team that has admin permission level.
-	Organization *models.User
-	OrgLink      string
-
-	Team *models.Team
-}
-
-func HandleOrgAssignment(ctx *Context, args ...bool) {
-	var (
-		requireMember     bool
-		requireOwner      bool
-		requireTeamMember bool
-		requireTeamAdmin  bool
-	)
-	if len(args) >= 1 {
-		requireMember = args[0]
-	}
-	if len(args) >= 2 {
-		requireOwner = args[1]
-	}
-	if len(args) >= 3 {
-		requireTeamMember = args[2]
-	}
-	if len(args) >= 4 {
-		requireTeamAdmin = args[3]
-	}
-
-	orgName := ctx.Params(":org")
-
-	var err error
-	ctx.Org.Organization, err = models.GetUserByName(orgName)
-	if err != nil {
-		if models.IsErrUserNotExist(err) {
-			ctx.Handle(404, "GetUserByName", err)
-		} else {
-			ctx.Handle(500, "GetUserByName", err)
-		}
-		return
-	}
-	org := ctx.Org.Organization
-	ctx.Data["Org"] = org
-
-	// Force redirection when username is actually a user.
-	if !org.IsOrganization() {
-		ctx.Redirect("/" + org.Name)
-		return
-	}
-
-	// Admin has super access.
-	if ctx.IsSigned && ctx.User.IsAdmin {
-		ctx.Org.IsOwner = true
-		ctx.Org.IsMember = true
-		ctx.Org.IsTeamMember = true
-		ctx.Org.IsTeamAdmin = true
-	} else if ctx.IsSigned {
-		ctx.Org.IsOwner = org.IsOwnedBy(ctx.User.ID)
-		if ctx.Org.IsOwner {
-			ctx.Org.IsMember = true
-			ctx.Org.IsTeamMember = true
-			ctx.Org.IsTeamAdmin = true
-		} else {
-			if org.IsOrgMember(ctx.User.ID) {
-				ctx.Org.IsMember = true
-			}
-		}
-	} else {
-		// Fake data.
-		ctx.Data["SignedUser"] = &models.User{}
-	}
-	if (requireMember && !ctx.Org.IsMember) ||
-		(requireOwner && !ctx.Org.IsOwner) {
-		ctx.Handle(404, "OrgAssignment", err)
-		return
-	}
-	ctx.Data["IsOrganizationOwner"] = ctx.Org.IsOwner
-	ctx.Data["IsOrganizationMember"] = ctx.Org.IsMember
-
-	ctx.Org.OrgLink = setting.AppSubUrl + "/org/" + org.Name
-	ctx.Data["OrgLink"] = ctx.Org.OrgLink
-
-	// Team.
-	if ctx.Org.IsMember {
-		if ctx.Org.IsOwner {
-			if err := org.GetTeams(); err != nil {
-				ctx.Handle(500, "GetTeams", err)
-				return
-			}
-		} else {
-			org.Teams, err = org.GetUserTeams(ctx.User.ID)
-			if err != nil {
-				ctx.Handle(500, "GetUserTeams", err)
-				return
-			}
-		}
-	}
-
-	teamName := ctx.Params(":team")
-	if len(teamName) > 0 {
-		teamExists := false
-		for _, team := range org.Teams {
-			if team.LowerName == strings.ToLower(teamName) {
-				teamExists = true
-				ctx.Org.Team = team
-				ctx.Org.IsTeamMember = true
-				ctx.Data["Team"] = ctx.Org.Team
-				break
-			}
-		}
-
-		if !teamExists {
-			ctx.Handle(404, "OrgAssignment", err)
-			return
-		}
-
-		ctx.Data["IsTeamMember"] = ctx.Org.IsTeamMember
-		if requireTeamMember && !ctx.Org.IsTeamMember {
-			ctx.Handle(404, "OrgAssignment", err)
-			return
-		}
-
-		ctx.Org.IsTeamAdmin = ctx.Org.Team.IsOwnerTeam() || ctx.Org.Team.Authorize >= models.ACCESS_MODE_ADMIN
-		ctx.Data["IsTeamAdmin"] = ctx.Org.IsTeamAdmin
-		if requireTeamAdmin && !ctx.Org.IsTeamAdmin {
-			ctx.Handle(404, "OrgAssignment", err)
-			return
-		}
-	}
-}
-
-func OrgAssignment(args ...bool) macaron.Handler {
-	return func(ctx *Context) {
-		HandleOrgAssignment(ctx, args...)
-	}
-}

modules/context/repo.go

@@ -1,495 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package context
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path"
-	"strings"
-
-	"github.com/Unknwon/com"
-	log "gopkg.in/clog.v1"
-	"gopkg.in/editorconfig/editorconfig-core-go.v1"
-	"gopkg.in/macaron.v1"
-
-	"github.com/gogits/git-module"
-
-	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/setting"
-)
-
-type PullRequest struct {
-	BaseRepo *models.Repository
-	Allowed  bool
-	SameRepo bool
-	HeadInfo string // [<user>:]<branch>
-}
-
-type Repository struct {
-	AccessMode   models.AccessMode
-	IsWatching   bool
-	IsViewBranch bool
-	IsViewTag    bool
-	IsViewCommit bool
-	Repository   *models.Repository
-	Owner        *models.User
-	Commit       *git.Commit
-	Tag          *git.Tag
-	GitRepo      *git.Repository
-	BranchName   string
-	TagName      string
-	TreePath     string
-	CommitID     string
-	RepoLink     string
-	CloneLink    models.CloneLink
-	CommitsCount int64
-	Mirror       *models.Mirror
-
-	PullRequest *PullRequest
-}
-
-// IsOwner returns true if current user is the owner of repository.
-func (r *Repository) IsOwner() bool {
-	return r.AccessMode >= models.ACCESS_MODE_OWNER
-}
-
-// IsAdmin returns true if current user has admin or higher access of repository.
-func (r *Repository) IsAdmin() bool {
-	return r.AccessMode >= models.ACCESS_MODE_ADMIN
-}
-
-// IsWriter returns true if current user has write or higher access of repository.
-func (r *Repository) IsWriter() bool {
-	return r.AccessMode >= models.ACCESS_MODE_WRITE
-}
-
-// HasAccess returns true if the current user has at least read access for this repository
-func (r *Repository) HasAccess() bool {
-	return r.AccessMode >= models.ACCESS_MODE_READ
-}
-
-// CanEnableEditor returns true if repository is editable and user has proper access level.
-func (r *Repository) CanEnableEditor() bool {
-	return r.Repository.CanEnableEditor() && r.IsViewBranch && r.IsWriter() && !r.Repository.IsBranchRequirePullRequest(r.BranchName)
-}
-
-// GetEditorconfig returns the .editorconfig definition if found in the
-// HEAD of the default repo branch.
-func (r *Repository) GetEditorconfig() (*editorconfig.Editorconfig, error) {
-	commit, err := r.GitRepo.GetBranchCommit(r.Repository.DefaultBranch)
-	if err != nil {
-		return nil, err
-	}
-	treeEntry, err := commit.GetTreeEntryByPath(".editorconfig")
-	if err != nil {
-		return nil, err
-	}
-	reader, err := treeEntry.Blob().Data()
-	if err != nil {
-		return nil, err
-	}
-	data, err := ioutil.ReadAll(reader)
-	if err != nil {
-		return nil, err
-	}
-	return editorconfig.ParseBytes(data)
-}
-
-// PullRequestURL returns URL for composing a pull request.
-// This function does not check if the repository can actually compose a pull request.
-func (r *Repository) PullRequestURL(baseBranch, headBranch string) string {
-	repoLink := r.RepoLink
-	if r.PullRequest.BaseRepo != nil {
-		repoLink = r.PullRequest.BaseRepo.Link()
-	}
-	return fmt.Sprintf("%s/compare/%s...%s:%s", repoLink, baseBranch, r.Owner.Name, headBranch)
-}
-
-func RetrieveBaseRepo(ctx *Context, repo *models.Repository) {
-	// Non-fork repository will not return error in this method.
-	if err := repo.GetBaseRepo(); err != nil {
-		if models.IsErrRepoNotExist(err) {
-			repo.IsFork = false
-			repo.ForkID = 0
-			return
-		}
-		ctx.Handle(500, "GetBaseRepo", err)
-		return
-	} else if err = repo.BaseRepo.GetOwner(); err != nil {
-		ctx.Handle(500, "BaseRepo.GetOwner", err)
-		return
-	}
-}
-
-// composeGoGetImport returns go-get-import meta content.
-func composeGoGetImport(owner, repo string) string {
-	return path.Join(setting.Domain, setting.AppSubUrl, owner, repo)
-}
-
-// earlyResponseForGoGetMeta responses appropriate go-get meta with status 200
-// if user does not have actual access to the requested repository,
-// or the owner or repository does not exist at all.
-// This is particular a workaround for "go get" command which does not respect
-// .netrc file.
-func earlyResponseForGoGetMeta(ctx *Context) {
-	ctx.PlainText(200, []byte(com.Expand(`<meta name="go-import" content="{GoGetImport} git {CloneLink}">`,
-		map[string]string{
-			"GoGetImport": composeGoGetImport(ctx.Params(":username"), ctx.Params(":reponame")),
-			"CloneLink":   models.ComposeHTTPSCloneURL(ctx.Params(":username"), ctx.Params(":reponame")),
-		})))
-}
-
-func RepoAssignment(args ...bool) macaron.Handler {
-	return func(ctx *Context) {
-		var (
-			displayBare bool // To display bare page if it is a bare repo.
-		)
-		if len(args) >= 1 {
-			displayBare = args[0]
-		}
-
-		var (
-			owner *models.User
-			err   error
-		)
-
-		ownerName := ctx.Params(":username")
-		repoName := strings.TrimSuffix(ctx.Params(":reponame"), ".git")
-		refName := ctx.Params(":branchname")
-		if len(refName) == 0 {
-			refName = ctx.Params(":path")
-		}
-
-		// Check if the user is the same as the repository owner
-		if ctx.IsSigned && ctx.User.LowerName == strings.ToLower(ownerName) {
-			owner = ctx.User
-		} else {
-			owner, err = models.GetUserByName(ownerName)
-			if err != nil {
-				if models.IsErrUserNotExist(err) {
-					if ctx.Query("go-get") == "1" {
-						earlyResponseForGoGetMeta(ctx)
-						return
-					}
-					ctx.NotFound()
-				} else {
-					ctx.Handle(500, "GetUserByName", err)
-				}
-				return
-			}
-		}
-		ctx.Repo.Owner = owner
-		ctx.Data["Username"] = ctx.Repo.Owner.Name
-
-		// Get repository.
-		repo, err := models.GetRepositoryByName(owner.ID, repoName)
-		if err != nil {
-			if models.IsErrRepoNotExist(err) {
-				if ctx.Query("go-get") == "1" {
-					earlyResponseForGoGetMeta(ctx)
-					return
-				}
-				ctx.NotFound()
-			} else {
-				ctx.Handle(500, "GetRepositoryByName", err)
-			}
-			return
-		} else if err = repo.GetOwner(); err != nil {
-			ctx.Handle(500, "GetOwner", err)
-			return
-		}
-
-		// Admin has super access.
-		if ctx.IsSigned && ctx.User.IsAdmin {
-			ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER
-		} else {
-			var userID int64
-			if ctx.IsSigned {
-				userID = ctx.User.ID
-			}
-			mode, err := models.AccessLevel(userID, repo)
-			if err != nil {
-				ctx.Handle(500, "AccessLevel", err)
-				return
-			}
-			ctx.Repo.AccessMode = mode
-		}
-
-		// Check access.
-		if ctx.Repo.AccessMode == models.ACCESS_MODE_NONE {
-			if ctx.Query("go-get") == "1" {
-				earlyResponseForGoGetMeta(ctx)
-				return
-			}
-			ctx.NotFound()
-			return
-		}
-		ctx.Data["HasAccess"] = true
-
-		if repo.IsMirror {
-			ctx.Repo.Mirror, err = models.GetMirrorByRepoID(repo.ID)
-			if err != nil {
-				ctx.Handle(500, "GetMirror", err)
-				return
-			}
-			ctx.Data["MirrorEnablePrune"] = ctx.Repo.Mirror.EnablePrune
-			ctx.Data["MirrorInterval"] = ctx.Repo.Mirror.Interval
-			ctx.Data["Mirror"] = ctx.Repo.Mirror
-		}
-
-		ctx.Repo.Repository = repo
-		ctx.Data["RepoName"] = ctx.Repo.Repository.Name
-		ctx.Data["IsBareRepo"] = ctx.Repo.Repository.IsBare
-
-		gitRepo, err := git.OpenRepository(models.RepoPath(ownerName, repoName))
-		if err != nil {
-			ctx.Handle(500, "RepoAssignment Invalid repo "+models.RepoPath(ownerName, repoName), err)
-			return
-		}
-		ctx.Repo.GitRepo = gitRepo
-		ctx.Repo.RepoLink = repo.Link()
-		ctx.Data["RepoLink"] = ctx.Repo.RepoLink
-		ctx.Data["RepoRelPath"] = ctx.Repo.Owner.Name + "/" + ctx.Repo.Repository.Name
-
-		tags, err := ctx.Repo.GitRepo.GetTags()
-		if err != nil {
-			ctx.Handle(500, fmt.Sprintf("GetTags '%s'", ctx.Repo.Repository.RepoPath()), err)
-			return
-		}
-		ctx.Data["Tags"] = tags
-		ctx.Repo.Repository.NumTags = len(tags)
-
-		ctx.Data["Title"] = owner.Name + "/" + repo.Name
-		ctx.Data["Repository"] = repo
-		ctx.Data["Owner"] = ctx.Repo.Repository.Owner
-		ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner()
-		ctx.Data["IsRepositoryAdmin"] = ctx.Repo.IsAdmin()
-		ctx.Data["IsRepositoryWriter"] = ctx.Repo.IsWriter()
-
-		ctx.Data["DisableSSH"] = setting.SSH.Disabled
-		ctx.Data["DisableHTTP"] = setting.Repository.DisableHTTPGit
-		ctx.Data["CloneLink"] = repo.CloneLink()
-		ctx.Data["WikiCloneLink"] = repo.WikiCloneLink()
-
-		if ctx.IsSigned {
-			ctx.Data["IsWatchingRepo"] = models.IsWatching(ctx.User.ID, repo.ID)
-			ctx.Data["IsStaringRepo"] = models.IsStaring(ctx.User.ID, repo.ID)
-		}
-
-		// repo is bare and display enable
-		if ctx.Repo.Repository.IsBare {
-			log.Trace("Bare repository: %s", ctx.Repo.RepoLink)
-			// NOTE: to prevent templating error
-			ctx.Data["BranchName"] = ""
-			if displayBare {
-				if !ctx.Repo.IsAdmin() {
-					ctx.Flash.Info(ctx.Tr("repo.repo_is_empty"), true)
-				}
-				ctx.HTML(200, "repo/bare")
-			}
-			return
-		}
-
-		ctx.Data["TagName"] = ctx.Repo.TagName
-		brs, err := ctx.Repo.GitRepo.GetBranches()
-		if err != nil {
-			ctx.Handle(500, "GetBranches", err)
-			return
-		}
-		ctx.Data["Branches"] = brs
-		ctx.Data["BrancheCount"] = len(brs)
-
-		// If not branch selected, try default one.
-		// If default branch doesn't exists, fall back to some other branch.
-		if len(ctx.Repo.BranchName) == 0 {
-			if len(ctx.Repo.Repository.DefaultBranch) > 0 && gitRepo.IsBranchExist(ctx.Repo.Repository.DefaultBranch) {
-				ctx.Repo.BranchName = ctx.Repo.Repository.DefaultBranch
-			} else if len(brs) > 0 {
-				ctx.Repo.BranchName = brs[0]
-			}
-		}
-		ctx.Data["BranchName"] = ctx.Repo.BranchName
-		ctx.Data["CommitID"] = ctx.Repo.CommitID
-
-		if ctx.Query("go-get") == "1" {
-			ctx.Data["GoGetImport"] = composeGoGetImport(owner.Name, repo.Name)
-			prefix := setting.AppUrl + path.Join(owner.Name, repo.Name, "src", ctx.Repo.BranchName)
-			ctx.Data["GoDocDirectory"] = prefix + "{/dir}"
-			ctx.Data["GoDocFile"] = prefix + "{/dir}/{file}#L{line}"
-		}
-	}
-}
-
-// RepoRef handles repository reference name including those contain `/`.
-func RepoRef() macaron.Handler {
-	return func(ctx *Context) {
-		// Empty repository does not have reference information.
-		if ctx.Repo.Repository.IsBare {
-			return
-		}
-
-		var (
-			refName string
-			err     error
-		)
-
-		// For API calls.
-		if ctx.Repo.GitRepo == nil {
-			repoPath := models.RepoPath(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
-			ctx.Repo.GitRepo, err = git.OpenRepository(repoPath)
-			if err != nil {
-				ctx.Handle(500, "RepoRef Invalid repo "+repoPath, err)
-				return
-			}
-		}
-
-		// Get default branch.
-		if len(ctx.Params("*")) == 0 {
-			refName = ctx.Repo.Repository.DefaultBranch
-			if !ctx.Repo.GitRepo.IsBranchExist(refName) {
-				brs, err := ctx.Repo.GitRepo.GetBranches()
-				if err != nil {
-					ctx.Handle(500, "GetBranches", err)
-					return
-				}
-				refName = brs[0]
-			}
-			ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetBranchCommit(refName)
-			if err != nil {
-				ctx.Handle(500, "GetBranchCommit", err)
-				return
-			}
-			ctx.Repo.CommitID = ctx.Repo.Commit.ID.String()
-			ctx.Repo.IsViewBranch = true
-
-		} else {
-			hasMatched := false
-			parts := strings.Split(ctx.Params("*"), "/")
-			for i, part := range parts {
-				refName = strings.TrimPrefix(refName+"/"+part, "/")
-
-				if ctx.Repo.GitRepo.IsBranchExist(refName) ||
-					ctx.Repo.GitRepo.IsTagExist(refName) {
-					if i < len(parts)-1 {
-						ctx.Repo.TreePath = strings.Join(parts[i+1:], "/")
-					}
-					hasMatched = true
-					break
-				}
-			}
-			if !hasMatched && len(parts[0]) == 40 {
-				refName = parts[0]
-				ctx.Repo.TreePath = strings.Join(parts[1:], "/")
-			}
-
-			if ctx.Repo.GitRepo.IsBranchExist(refName) {
-				ctx.Repo.IsViewBranch = true
-
-				ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetBranchCommit(refName)
-				if err != nil {
-					ctx.Handle(500, "GetBranchCommit", err)
-					return
-				}
-				ctx.Repo.CommitID = ctx.Repo.Commit.ID.String()
-
-			} else if ctx.Repo.GitRepo.IsTagExist(refName) {
-				ctx.Repo.IsViewTag = true
-				ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetTagCommit(refName)
-				if err != nil {
-					ctx.Handle(500, "GetTagCommit", err)
-					return
-				}
-				ctx.Repo.CommitID = ctx.Repo.Commit.ID.String()
-			} else if len(refName) == 40 {
-				ctx.Repo.IsViewCommit = true
-				ctx.Repo.CommitID = refName
-
-				ctx.Repo.Commit, err = ctx.Repo.GitRepo.GetCommit(refName)
-				if err != nil {
-					ctx.NotFound()
-					return
-				}
-			} else {
-				ctx.Handle(404, "RepoRef invalid repo", fmt.Errorf("branch or tag not exist: %s", refName))
-				return
-			}
-		}
-
-		ctx.Repo.BranchName = refName
-		ctx.Data["BranchName"] = ctx.Repo.BranchName
-		ctx.Data["CommitID"] = ctx.Repo.CommitID
-		ctx.Data["TreePath"] = ctx.Repo.TreePath
-		ctx.Data["IsViewBranch"] = ctx.Repo.IsViewBranch
-		ctx.Data["IsViewTag"] = ctx.Repo.IsViewTag
-		ctx.Data["IsViewCommit"] = ctx.Repo.IsViewCommit
-
-		if ctx.Repo.Repository.IsFork {
-			RetrieveBaseRepo(ctx, ctx.Repo.Repository)
-			if ctx.Written() {
-				return
-			}
-		}
-
-		// People who have push access or have fored repository can propose a new pull request.
-		if ctx.Repo.IsWriter() || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) {
-			// Pull request is allowed if this is a fork repository
-			// and base repository accepts pull requests.
-			if ctx.Repo.Repository.BaseRepo != nil {
-				if ctx.Repo.Repository.BaseRepo.AllowsPulls() {
-					ctx.Data["BaseRepo"] = ctx.Repo.Repository.BaseRepo
-					ctx.Repo.PullRequest.BaseRepo = ctx.Repo.Repository.BaseRepo
-					ctx.Repo.PullRequest.Allowed = true
-					ctx.Repo.PullRequest.HeadInfo = ctx.Repo.Owner.Name + ":" + ctx.Repo.BranchName
-				}
-			} else {
-				// Or, this is repository accepts pull requests between branches.
-				if ctx.Repo.Repository.AllowsPulls() {
-					ctx.Data["BaseRepo"] = ctx.Repo.Repository
-					ctx.Repo.PullRequest.BaseRepo = ctx.Repo.Repository
-					ctx.Repo.PullRequest.Allowed = true
-					ctx.Repo.PullRequest.SameRepo = true
-					ctx.Repo.PullRequest.HeadInfo = ctx.Repo.BranchName
-				}
-			}
-		}
-		ctx.Data["PullRequestCtx"] = ctx.Repo.PullRequest
-
-		ctx.Repo.CommitsCount, err = ctx.Repo.Commit.CommitsCount()
-		if err != nil {
-			ctx.Handle(500, "CommitsCount", err)
-			return
-		}
-		ctx.Data["CommitsCount"] = ctx.Repo.CommitsCount
-	}
-}
-
-func RequireRepoAdmin() macaron.Handler {
-	return func(ctx *Context) {
-		if !ctx.IsSigned || (!ctx.Repo.IsAdmin() && !ctx.User.IsAdmin) {
-			ctx.NotFound()
-			return
-		}
-	}
-}
-
-func RequireRepoWriter() macaron.Handler {
-	return func(ctx *Context) {
-		if !ctx.IsSigned || (!ctx.Repo.IsWriter() && !ctx.User.IsAdmin) {
-			ctx.NotFound()
-			return
-		}
-	}
-}
-
-// GitHookService checks if repository Git hooks service has been enabled.
-func GitHookService() macaron.Handler {
-	return func(ctx *Context) {
-		if !ctx.User.CanEditGitHook() {
-			ctx.NotFound()
-			return
-		}
-	}
-}

pkg/auth/auth.go

@@ -14,8 +14,9 @@ import (
 	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/gogs/models"
-	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/gogits/gogs/models/errors"
+	"github.com/gogits/gogs/pkg/setting"
+	"github.com/gogits/gogs/pkg/tool"
 )
 
 func IsAPIPath(url string) bool {
@@ -23,17 +24,20 @@ func IsAPIPath(url string) bool {
 }
 
 // SignedInID returns the id of signed in user.
-func SignedInID(ctx *macaron.Context, sess session.Store) int64 {
+func SignedInID(c *macaron.Context, sess session.Store) int64 {
 	if !models.HasEngine {
 		return 0
 	}
 
 	// Check access token.
-	if IsAPIPath(ctx.Req.URL.Path) {
-		tokenSHA := ctx.Query("token")
+	if IsAPIPath(c.Req.URL.Path) {
+		tokenSHA := c.Query("token")
+		if len(tokenSHA) <= 0 {
+			tokenSHA = c.Query("access_token")
+		}
 		if len(tokenSHA) == 0 {
 			// Well, check with header again.
-			auHead := ctx.Req.Header.Get("Authorization")
+			auHead := c.Req.Header.Get("Authorization")
 			if len(auHead) > 0 {
 				auths := strings.Fields(auHead)
 				if len(auths) == 2 && auths[0] == "token" {
@@ -65,8 +69,8 @@ func SignedInID(ctx *macaron.Context, sess session.Store) int64 {
 	}
 	if id, ok := uid.(int64); ok {
 		if _, err := models.GetUserByID(id); err != nil {
-			if !models.IsErrUserNotExist(err) {
-				log.Error(2, "GetUserById: %v", err)
+			if !errors.IsUserNotExist(err) {
+				log.Error(2, "GetUserByID: %v", err)
 			}
 			return 0
 		}
@@ -90,7 +94,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool)
 			if len(webAuthUser) > 0 {
 				u, err := models.GetUserByName(webAuthUser)
 				if err != nil {
-					if !models.IsErrUserNotExist(err) {
+					if !errors.IsUserNotExist(err) {
 						log.Error(4, "GetUserByName: %v", err)
 						return nil, false
 					}
@@ -121,11 +125,11 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool)
 		if len(baHead) > 0 {
 			auths := strings.Fields(baHead)
 			if len(auths) == 2 && auths[0] == "Basic" {
-				uname, passwd, _ := base.BasicAuthDecode(auths[1])
+				uname, passwd, _ := tool.BasicAuthDecode(auths[1])
 
 				u, err := models.UserSignIn(uname, passwd)
 				if err != nil {
-					if !models.IsErrUserNotExist(err) {
+					if !errors.IsUserNotExist(err) {
 						log.Error(4, "UserSignIn: %v", err)
 					}
 					return nil, false